Bump [email protected] and get rid of the service delete workaround

frontend/client/types.ts

@@ -28,7 +28,6 @@ export type Service = {
   readme?: string;
   ledger: LedgerConfig;
   chain_data: ChainData;
-  active: boolean;
 };
 
 export type ServiceTemplate = {

operate/cli.py

@@ -25,17 +25,18 @@
 
 from aea_ledger_ethereum.ethereum import EthereumCrypto
 from clea import group, params, run
-from operate.constants import KEY, KEYS, OPERATE, SERVICES
-from operate.http import Resource
-from operate.keys import Keys
-from operate.services.manage import Services
 from starlette.applications import Starlette
 from starlette.middleware import Middleware
 from starlette.middleware.cors import CORSMiddleware
 from starlette.routing import Route
 from typing_extensions import Annotated
 from uvicorn.main import run as uvicorn
 
+from operate.constants import KEY, KEYS, OPERATE, SERVICES
+from operate.http import Resource
+from operate.keys import Keys
+from operate.services.manage import Services
+
 DEFAULT_HARDHAT_KEY = (
     "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
 ).encode()

operate/data/contracts/uniswap_v2_erc20/contract.py

@@ -26,7 +26,6 @@
 from aea.contracts.base import Contract
 from aea_ledger_ethereum import EthereumApi
 
-
 PUBLIC_ID = PublicId.from_str("valory/uniswap_v2_erc20:0.1.0")
 
 _logger = logging.getLogger(

operate/http/__init__.py

@@ -23,11 +23,12 @@
 import typing as t
 from abc import ABC
 
-from operate.http.exceptions import NotAllowed, ResourceException
 from starlette.requests import Request
 from starlette.responses import JSONResponse
 from starlette.types import Receive, Scope, Send
 
+from operate.http.exceptions import NotAllowed, ResourceException
+
 GenericResource = t.TypeVar("GenericResource")
 PostPayload = t.TypeVar("PostPayload")
 PostResponse = t.TypeVar("PostResponse")

operate/keys.py

@@ -24,6 +24,7 @@
 from pathlib import Path
 
 from aea_ledger_ethereum.ethereum import EthereumCrypto
+
 from operate.types import KeyType
 
 

operate/ledger/ethereum.py

@@ -22,6 +22,7 @@
 import typing as t
 
 from aea_ledger_ethereum import EthereumApi, EthereumCrypto
+
 from operate.ledger.base import LedgerHelper
 from operate.types import LedgerType
 

operate/services/manage.py

@@ -35,6 +35,9 @@
     TM_STATE_DIR,
     VENVS_DIR,
 )
+from starlette.types import Receive, Scope, Send
+from typing_extensions import TypedDict
+
 from operate.http import Resource
 from operate.http.exceptions import BadRequest
 from operate.keys import Keys
@@ -48,8 +51,6 @@
     ServiceTemplate,
     ServiceType,
 )
-from starlette.types import Receive, Scope, Send
-from typing_extensions import TypedDict
 
 OPERATE = ".operate"
 CONFIG = "config.json"

operate/services/protocol.py

@@ -43,14 +43,13 @@
 from autonomy.cli.helpers.chain import OnChainHelper
 from autonomy.cli.helpers.chain import ServiceHelper as ServiceManager
 from hexbytes import HexBytes
+
 from operate.data import DATA_DIR
 from operate.data.contracts.service_staking_token.contract import (
     ServiceStakingTokenContract,
 )
 from operate.ledger.profiles import CONTRACTS
 
-from ._subgraph import SubgraphClient
-
 ZERO_ETH = 0
 
 
@@ -447,7 +446,6 @@ def mint(
             key=self.key,
             update_token=update_token,
         )
-        manager.subgraph = SubgraphClient()
 
         # Prepare for minting
         (

operate/services/service.py

@@ -41,6 +41,9 @@
     VENVS_DIR,
 )
 from autonomy.deploy.generators.docker_compose.base import DockerComposeGenerator
+from starlette.types import Receive, Scope, Send
+from typing_extensions import TypedDict
+
 from operate.constants import (
     CONFIG,
     DEPLOYMENT,
@@ -63,8 +66,6 @@
     ServiceType,
     Status,
 )
-from starlette.types import Receive, Scope, Send
-from typing_extensions import TypedDict
 
 
 def build_dirs(build_dir: Path) -> None:
@@ -373,7 +374,6 @@ def __init__(
         keys: KeysType,
         ledger: t.Optional[LedgerConfig] = None,
         chain_data: t.Optional[ChainData] = None,
-        active: bool = False,
         name: t.Optional[str] = None,
     ) -> None:
         """Initialize object."""
@@ -382,7 +382,6 @@ def __init__(
         self.keys = keys
         self.hash = phash
         self.ledger = ledger
-        self.active = active
         self.service_path = service_path
         self.chain_data = chain_data or {}
         self.path = self.service_path.parent
@@ -427,7 +426,6 @@ def json(self) -> ServiceType:
                 "readme": (
                     readme.read_text(encoding="utf-8") if readme.exists() else None
                 ),
-                "active": self.active,
             }
         )
 
@@ -449,7 +447,6 @@ def load(cls, path: Path) -> "Service":
             chain_data=config.get("chain_data"),
             service_path=Path(config["service_path"]),
             name=config["name"],
-            active=config["active"],
         )
 
     @classmethod
@@ -480,31 +477,16 @@ def new(
             ledger=ledger,
             service_path=Path(downloaded),
             name=name,
-            active=True,
         )
         service.store()
         return service
 
     def __update(self, data: ServiceType) -> ServiceType:
         """Update service."""
         # TODO: Finish implementation
-        self.hash = data["hash"]
-        self.keys = data["keys"]
-        self.variables = data.get("variables", self.variables)
-        self.ledger = data.get("ledger", self.ledger)
-        self.name = data.get("name", self.name)
-        self.chain_data = data.get("chain_data", self.chain_data)
-        self.store()
         return self.json
 
     def delete(self, data: DeleteServicePayload) -> DeleteServiceResponse:
         """Delete service."""
-        try:
-            shutil.rmtree(self.path)
-        except (PermissionError, OSError):
-            # If we get permission error we set the service in-active
-            # user can then run operate prune with admin priviledges
-            # to clean up the cache/unused data
-            self.active = False
-            self.store()
+        shutil.rmtree(self.path)
         return DeleteServiceResponse({})

operate/types.py

@@ -173,7 +173,6 @@ class ServiceType(TypedDict):
     readme: NotRequired[str]
     ledger: NotRequired[LedgerConfig]
     chain_data: NotRequired[ChainData]
-    active: bool
 
 
 ServicesType = t.List[ServiceType]