olas-operate-middleware 0.6.1__tar.gz → 0.6.3__tar.gz

{olas_operate_middleware-0.6.1 → olas_operate_middleware-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: olas-operate-middleware
-Version: 0.6.1
+Version: 0.6.3
 Summary: 
 Author: David Vilela
 Author-email: dvilelaf@gmail.com
@@ -23,7 +23,7 @@ Requires-Dist: eth-keys (==0.4.0)
 Requires-Dist: eth-rlp (==0.3.0)
 Requires-Dist: eth-typing (==3.5.2)
 Requires-Dist: eth-utils (==2.3.1)
-Requires-Dist: fastapi (==0.110.0)
+Requires-Dist: fastapi (==0.110.3)
 Requires-Dist: frozenlist (==1.4.1)
 Requires-Dist: halo (==0.0.31)
 Requires-Dist: hexbytes (==0.3.1)
@@ -34,11 +34,11 @@ Requires-Dist: open-aea-cli-ipfs (==1.65.0)
 Requires-Dist: open-aea-ledger-cosmos (==1.65.0)
 Requires-Dist: open-aea-ledger-ethereum (==1.65.0)
 Requires-Dist: open-aea-ledger-ethereum-flashbots (==1.65.0)
-Requires-Dist: open-autonomy (==0.19.8)
+Requires-Dist: open-autonomy (>=0.19.11,<0.20.0)
 Requires-Dist: psutil (>=5.9.8,<6.0.0)
 Requires-Dist: pyinstaller (>=6.8.0,<7.0.0)
 Requires-Dist: requests-toolbelt (==1.0.0)
-Requires-Dist: starlette (==0.36.3)
+Requires-Dist: starlette (==0.37.2)
 Requires-Dist: twikit (==2.2.0)
 Requires-Dist: uvicorn (==0.27.0)
 Requires-Dist: web3 (==6.1.0)

{olas_operate_middleware-0.6.1 → olas_operate_middleware-0.6.3}/operate/cli.py

@@ -19,6 +19,7 @@
 
 """Operate app CLI module."""
 import asyncio
+import atexit
 import logging
 import multiprocessing
 import os
@@ -55,6 +56,7 @@ from operate.migration import MigrationManager
 from operate.operate_types import Chain, DeploymentStatus, LedgerType
 from operate.quickstart.analyse_logs import analyse_logs
 from operate.quickstart.claim_staking_rewards import claim_staking_rewards
+from operate.quickstart.reset_configs import reset_configs
 from operate.quickstart.reset_password import reset_password
 from operate.quickstart.reset_staking import reset_staking
 from operate.quickstart.run_service import run_service
@@ -325,6 +327,9 @@ def create_app(  # pylint: disable=too-many-locals, unused-argument, too-many-st
     # on backend app started we assume there are now started agents, so we force to pause all
     pause_all_services_on_startup()
 
+    # stop all services at  middleware exit
+    atexit.register(pause_all_services)
+
     app = FastAPI()
 
     app.add_middleware(
@@ -533,6 +538,35 @@ def create_app(  # pylint: disable=too-many-locals, unused-argument, too-many-st
         wallet, mnemonic = manager.create(ledger_type=ledger_type)
         return JSONResponse(content={"wallet": wallet.json, "mnemonic": mnemonic})
 
+    @app.post("/api/wallet/private_key")
+    @with_retries
+    async def _get_private_key(request: Request) -> t.List[t.Dict]:
+        """Get Master EOA private key."""
+        if operate.user_account is None:
+            return JSONResponse(
+                content={
+                    "error": "Cannot retrieve private key; User account does not exist!"
+                },
+                status_code=HTTPStatus.BAD_REQUEST,
+            )
+
+        data = await request.json()
+        password = data.get("password")
+        error = None
+        if operate.password is None:
+            error = {"error": "You need to login before retrieving the private key"}
+        if operate.password != password:
+            error = {"error": "Password is not valid"}
+        if error is not None:
+            return JSONResponse(
+                content=error,
+                status_code=HTTPStatus.UNAUTHORIZED,
+            )
+
+        ledger_type = data.get("ledger_type", LedgerType.ETHEREUM.value)
+        wallet = operate.wallet_manager.load(ledger_type=LedgerType(ledger_type))
+        return JSONResponse(content={"private_key": wallet.crypto.private_key})
+
     @app.get("/api/extended/wallet")
     @with_retries
     async def _get_wallet_safe(request: Request) -> t.List[t.Dict]:
@@ -1141,6 +1175,20 @@ def qs_claim(
     claim_staking_rewards(operate=operate, config_path=config)
 
 
+@_operate.command(name="reset-configs")
+def qs_reset_configs(
+    config: Annotated[str, params.String(help="Quickstart config file path")],
+    attended: Annotated[
+        str, params.String(help="Run in attended/unattended mode (default: true")
+    ] = "true",
+) -> None:
+    """Reset configs."""
+    os.environ["ATTENDED"] = attended.lower()
+    operate = OperateApp()
+    operate.setup()
+    reset_configs(operate=operate, config_path=config)
+
+
 @_operate.command(name="reset-staking")
 def qs_reset_staking(
     config: Annotated[str, params.String(help="Quickstart config file path")],

{olas_operate_middleware-0.6.1 → olas_operate_middleware-0.6.3}/operate/constants.py

@@ -31,7 +31,6 @@ DEPLOYMENT = "deployment"
 DEPLOYMENT_JSON = "deployment.json"
 CONFIG = "config.json"
 KEY = "key"
-KEYS = "keys"
 KEYS_JSON = "keys.json"
 DOCKER_COMPOSE_YAML = "docker-compose.yaml"
 SERVICE_YAML = "service.yaml"

{olas_operate_middleware-0.6.1 → olas_operate_middleware-0.6.3}/operate/keys.py

@@ -22,6 +22,7 @@
 import json
 import logging
 import os
+import shutil
 import typing as t
 from dataclasses import dataclass
 from pathlib import Path
@@ -85,21 +86,25 @@ class KeysManager:
     def create(self) -> str:
         """Creates new key."""
         crypto = EthereumCrypto()
-        path = self.path / crypto.address
-        if path.is_file():
-            return crypto.address
-
-        path.write_text(
-            json.dumps(
-                Key(
-                    ledger=LedgerType.ETHEREUM,
-                    address=crypto.address,
-                    private_key=crypto.private_key,
-                ).json,
-                indent=4,
-            ),
-            encoding="utf-8",
-        )
+        for path in (
+            self.path / f"{crypto.address}.bak",
+            self.path / crypto.address,
+        ):
+            if path.is_file():
+                continue
+
+            path.write_text(
+                json.dumps(
+                    Key(
+                        ledger=LedgerType.ETHEREUM,
+                        address=crypto.address,
+                        private_key=crypto.private_key,
+                    ).json,
+                    indent=4,
+                ),
+                encoding="utf-8",
+            )
+
         return crypto.address
 
     def delete(self, key: str) -> None:
@@ -109,17 +114,22 @@ class KeysManager:
     @classmethod
     def migrate_format(cls, path: Path) -> bool:
         """Migrate the JSON file format if needed."""
+        migrated = False
+        backup_path = path.with_suffix(".bak")
+        if not backup_path.is_file():
+            shutil.copyfile(path, backup_path)
+            migrated = True
+
         with open(path, "r", encoding="utf-8") as file:
             data = json.load(file)
 
         old_to_new_ledgers = {0: "ethereum", 1: "solana"}
-
-        migrated = False
         if data.get("ledger") in old_to_new_ledgers:
             data["ledger"] = old_to_new_ledgers.get(data["ledger"])
             migrated = True
 
-        with open(path, "w", encoding="utf-8") as file:
-            json.dump(data, file, indent=2)
+        if migrated:
+            with open(path, "w", encoding="utf-8") as file:
+                json.dump(data, file, indent=2)
 
         return migrated

olas_operate_middleware-0.6.3/operate/quickstart/reset_configs.py

@@ -0,0 +1,109 @@
+# -*- coding: utf-8 -*-
+# ------------------------------------------------------------------------------
+#
+#   Copyright 2023-2024 Valory AG
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+# ------------------------------------------------------------------------------
+"""Reset configurations."""
+
+import json
+from typing import Callable, Optional, TYPE_CHECKING, cast
+
+from operate.quickstart.run_service import load_local_config
+from operate.quickstart.utils import (
+    ask_or_get_from_env,
+    ask_yes_or_no,
+    check_rpc,
+    print_section,
+    print_title,
+)
+
+
+if TYPE_CHECKING:
+    from operate.cli import OperateApp
+
+
+def _ask_to_change(
+    name: str,
+    env_var: str,
+    old_value: str,
+    hidden: bool = False,
+    validator: Callable[[Optional[str]], bool] = lambda x: False if x is None else True,
+) -> str:
+    """Ask user if they want to change a configuration value."""
+    old_value_str = old_value
+    if hidden:
+        if len(old_value_str) < 4:
+            old_value_str = "*" * len(old_value_str)
+        else:
+            old_value_str = "*" * len(old_value_str[:-4]) + old_value_str[-4:]
+
+    print(f"\nCurrent '{name}' is set to: {old_value_str}")
+    if ask_yes_or_no(f"Do you want to change the '{name}'?"):
+        new_value = None
+        while not validator(new_value):
+            new_value = ask_or_get_from_env(
+                prompt=f"Enter new value for '{name}' {'[hidden]' if hidden else ''}: ",
+                env_var_name=env_var,
+                is_pass=hidden,
+            )
+
+        return str(new_value)
+
+    return old_value
+
+
+def reset_configs(operate: "OperateApp", config_path: str) -> None:
+    """Reset configurations."""
+    with open(config_path, "r") as config_file:
+        template = json.load(config_file)
+
+    operate.service_manager().migrate_service_configs()
+    operate.wallet_manager.migrate_wallet_configs()
+
+    print_title(f"Reset your {template['name']} configurations")
+
+    # check if agent was started before
+    config = load_local_config(
+        operate=operate, service_name=cast(str, template["name"])
+    )
+    if not config.path.exists():
+        print("No previous agent setup found. Exiting.")
+        return
+
+    if config.rpc is None:
+        config.rpc = {}
+
+    for chain_name in config.rpc:
+        config.rpc[chain_name] = _ask_to_change(
+            name=f"{chain_name.capitalize()} RPC URL",
+            env_var=f"{chain_name.upper()}_LEDGER_RPC",
+            old_value=config.rpc[chain_name],
+            hidden=True,
+            validator=check_rpc,
+        )
+
+    if config.user_provided_args is None:
+        config.user_provided_args = {}
+
+    for env_var in config.user_provided_args:
+        config.user_provided_args[env_var] = _ask_to_change(
+            name=env_var,
+            env_var=env_var,
+            old_value=config.user_provided_args[env_var],
+        )
+
+    config.store()
+    print_section("Configurations updated")

{olas_operate_middleware-0.6.1 → olas_operate_middleware-0.6.3}/operate/quickstart/run_service.py

@@ -99,8 +99,6 @@ QS_STAKING_PROGRAMS: t.Dict[Chain, t.Dict[str, str]] = {
         "quickstart_beta_mech_marketplace_expert_8": "trader",
         "mech_marketplace": "mech",
         "marketplace_supply_alpha": "mech",
-        "marketplace_demand_alpha_1": "mech",
-        "marketplace_demand_alpha_2": "mech",
     },
     Chain.OPTIMISTIC: {
         "optimus_alpha_2": "optimus",
@@ -111,8 +109,6 @@ QS_STAKING_PROGRAMS: t.Dict[Chain, t.Dict[str, str]] = {
     Chain.BASE: {
         "meme_base_alpha_2": "memeooorr",
         "marketplace_supply_alpha": "mech",
-        "marketplace_demand_alpha_1": "mech",
-        "marketplace_demand_alpha_2": "mech",
         "agents_fun_1": "memeooorr",
         "agents_fun_2": "memeooorr",
         "agents_fun_3": "memeooorr",

{olas_operate_middleware-0.6.1 → olas_operate_middleware-0.6.3}/operate/quickstart/utils.py

@@ -188,8 +188,12 @@ def ask_yes_or_no(question: str) -> bool:
     """Ask a yes/no question."""
     if os.environ.get("ATTENDED", "true").lower() != "true":
         return True
-    response = input(f"{question} (yes/no): ").strip().lower()
-    return response in ["yes", "y"]
+    while True:
+        response = input(f"{question} (yes/no): ").strip().lower()
+        if response.lower() in ("yes", "y"):
+            return True
+        if response.lower() in ("no", "n"):
+            return False
 
 
 def ask_or_get_from_env(

{olas_operate_middleware-0.6.1 → olas_operate_middleware-0.6.3}/operate/services/deployment_runner.py

@@ -18,6 +18,7 @@
 #
 # ------------------------------------------------------------------------------
 """Source code to run and stop deployments created."""
+import ctypes
 import json
 import multiprocessing
 import os
@@ -28,9 +29,10 @@ import sys  # nosec
 import time
 import typing as t
 from abc import ABC, ABCMeta, abstractmethod
+from io import TextIOWrapper
 from pathlib import Path
 from traceback import print_exc
-from typing import Any, List
+from typing import Any, Dict, List
 from venv import main as venv_cli
 
 import psutil
@@ -98,10 +100,16 @@ class BaseDeploymentRunner(AbstractDeploymentRunner, metaclass=ABCMeta):
     TM_CONTROL_URL = constants.TM_CONTROL_URL
     SLEEP_BEFORE_TM_KILL = 2  # seconds
 
+    def _open_agent_runner_log_file(self) -> TextIOWrapper:
+        """Open agent_runner.log file."""
+        return (
+            Path(self._work_directory).parent.parent.parent / "agent_runner.log"
+        ).open("w+")
+
     def _run_aea_command(self, *args: str, cwd: Path) -> Any:
         """Run aea command."""
         cmd = " ".join(args)
-        print("Runnin aea command: ", cmd, " at ", str(cwd))
+        print("Running aea command: ", cmd, " at ", str(cwd))
         p = multiprocessing.Process(
             target=self.__class__._call_aea_command,  # pylint: disable=protected-access
             args=(cwd, args),
@@ -293,28 +301,17 @@ class PyInstallerHostDeploymentRunner(BaseDeploymentRunner):
         env["PYTHONUTF8"] = "1"
         env["PYTHONIOENCODING"] = "utf8"
         env = {**os.environ, **env}
-        agent_runner_log_file = (
-            Path(self._work_directory).parent.parent.parent / "agent_runner.log"
-        ).open("a+")
-        process = subprocess.Popen(  # pylint: disable=consider-using-with # nosec
-            args=[
-                self._agent_runner_bin,
-                "-s",
-                "run",
-            ],  # TODO: Patch for Windows failing hash
-            cwd=working_dir / "agent",
-            stdout=agent_runner_log_file,
-            stderr=agent_runner_log_file,
-            env=env,
-            creationflags=(
-                0x00000200 if platform.system() == "Windows" else 0
-            ),  # Detach process from the main process
-        )
+
+        process = self._start_agent_process(env=env, working_dir=working_dir)
         (working_dir / "agent.pid").write_text(
             data=str(process.pid),
             encoding="utf-8",
         )
 
+    def _start_agent_process(self, env: Dict, working_dir: Path) -> subprocess.Popen:
+        """Start agent process."""
+        raise NotImplementedError
+
     def _start_tendermint(self) -> None:
         """Start tendermint process."""
         working_dir = self._work_directory
@@ -327,41 +324,182 @@ class PyInstallerHostDeploymentRunner(BaseDeploymentRunner):
             **env,
         }
 
-        if platform.system() == "Windows":
-            # to look up for bundled in tendermint.exe
-            env["PATH"] = os.path.dirname(sys.executable) + ";" + os.environ["PATH"]
-        else:
-            env["PATH"] = os.path.dirname(sys.executable) + ":" + os.environ["PATH"]
+        process = self._start_tendermint_process(env=env, working_dir=working_dir)
 
-        tendermint_com = self._tendermint_bin  # type: ignore  # pylint: disable=protected-access
-        process = subprocess.Popen(  # pylint: disable=consider-using-with # nosec
-            args=[tendermint_com],
-            cwd=working_dir,
-            stdout=subprocess.DEVNULL,
-            stderr=subprocess.DEVNULL,
-            env=env,
-            creationflags=(
-                0x00000200 if platform.system() == "Windows" else 0
-            ),  # Detach process from the main process
-        )
         (working_dir / "tendermint.pid").write_text(
             data=str(process.pid),
             encoding="utf-8",
         )
 
+    def _start_tendermint_process(
+        self, env: Dict, working_dir: Path
+    ) -> subprocess.Popen:
+        raise NotImplementedError
+
 
 class PyInstallerHostDeploymentRunnerMac(PyInstallerHostDeploymentRunner):
     """Mac deployment runner."""
 
+    def _start_agent_process(self, env: Dict, working_dir: Path) -> subprocess.Popen:
+        """Start agent process."""
+        agent_runner_log_file = self._open_agent_runner_log_file()
+        process = subprocess.Popen(  # pylint: disable=consider-using-with,subprocess-popen-preexec-fn # nosec
+            args=[
+                self._agent_runner_bin,
+                "-s",
+                "run",
+            ],
+            cwd=working_dir / "agent",
+            stdout=agent_runner_log_file,
+            stderr=agent_runner_log_file,
+            env=env,
+            preexec_fn=os.setpgrp,
+        )
+        return process
+
+    def _start_tendermint_process(
+        self, env: Dict, working_dir: Path
+    ) -> subprocess.Popen:
+        """Start tendermint process."""
+        env = {
+            **env,
+        }
+        env["PATH"] = os.path.dirname(sys.executable) + ":" + os.environ["PATH"]
+
+        process = subprocess.Popen(  # pylint: disable=consider-using-with,subprocess-popen-preexec-fn # nosec
+            args=[self._tendermint_bin],
+            cwd=working_dir,
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+            env=env,
+            preexec_fn=os.setpgrp,  # pylint: disable=subprocess-popen-preexec-fn # nosec
+        )
+        return process
+
 
 class PyInstallerHostDeploymentRunnerWindows(PyInstallerHostDeploymentRunner):
     """Windows deployment runner."""
 
+    def __init__(self, work_directory: Path) -> None:
+        """Init the runner."""
+        super().__init__(work_directory)
+        self._job = self.set_windows_object_job()
+
+    @staticmethod
+    def set_windows_object_job() -> Any:
+        """Set windows job object to handle sub processes."""
+        from ctypes import (  # type: ignore # pylint:disable=import-outside-toplevel,reimported
+            wintypes,
+        )
+
+        kernel32 = ctypes.windll.kernel32  # type: ignore
+
+        class JOBOBJECT_BASIC_LIMIT_INFORMATION(
+            ctypes.Structure
+        ):  # pylint: disable=missing-class-docstring
+            _fields_ = [
+                ("PerProcessUserTimeLimit", wintypes.LARGE_INTEGER),
+                ("PerJobUserTimeLimit", wintypes.LARGE_INTEGER),
+                ("LimitFlags", wintypes.DWORD),
+                ("MinimumWorkingSetSize", ctypes.c_size_t),
+                ("MaximumWorkingSetSize", ctypes.c_size_t),
+                ("ActiveProcessLimit", wintypes.DWORD),
+                ("Affinity", ctypes.POINTER(wintypes.ULONG)),
+                ("PriorityClass", wintypes.DWORD),
+                ("SchedulingClass", wintypes.DWORD),
+            ]
+
+        class IO_COUNTERS(ctypes.Structure):  # pylint: disable=missing-class-docstring
+            _fields_ = [
+                ("ReadOperationCount", ctypes.c_ulonglong),
+                ("WriteOperationCount", ctypes.c_ulonglong),
+                ("OtherOperationCount", ctypes.c_ulonglong),
+                ("ReadTransferCount", ctypes.c_ulonglong),
+                ("WriteTransferCount", ctypes.c_ulonglong),
+                ("OtherTransferCount", ctypes.c_ulonglong),
+            ]
+
+        class JOBOBJECT_EXTENDED_LIMIT_INFORMATION(
+            ctypes.Structure
+        ):  # pylint: disable=missing-class-docstring
+            _fields_ = [
+                ("BasicLimitInformation", JOBOBJECT_BASIC_LIMIT_INFORMATION),
+                ("IoInfo", IO_COUNTERS),
+                ("ProcessMemoryLimit", ctypes.c_size_t),
+                ("JobMemoryLimit", ctypes.c_size_t),
+                ("PeakProcessMemoryUsed", ctypes.c_size_t),
+                ("PeakJobMemoryUsed", ctypes.c_size_t),
+            ]
+
+        # Создаем Job Object
+        job = kernel32.CreateJobObjectW(None, None)
+        if not job:
+            raise ctypes.WinError()  # type: ignore
+
+        # Настраиваем автоматическое завершение процессов при закрытии Job
+        info = JOBOBJECT_EXTENDED_LIMIT_INFORMATION()
+        info.BasicLimitInformation.LimitFlags = (
+            0x2000  # JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE
+        )
+
+        if not kernel32.SetInformationJobObject(
+            job,
+            9,  # JobObjectExtendedLimitInformation
+            ctypes.byref(info),
+            ctypes.sizeof(info),
+        ):
+            kernel32.CloseHandle(job)
+            raise ctypes.WinError()  # type: ignore
+
+        return job
+
+    def assign_to_job(self, pid: int) -> None:
+        """Windows-only: привязывает процесс к Job Object."""
+        ctypes.windll.kernel32.AssignProcessToJobObject(self._job, pid)  # type: ignore
+
     @property
     def _tendermint_bin(self) -> str:
         """Return tendermint path."""
         return str(Path(os.path.dirname(sys.executable)) / "tendermint_win.exe")  # type: ignore # pylint: disable=protected-access
 
+    def _start_agent_process(self, env: Dict, working_dir: Path) -> subprocess.Popen:
+        """Start agent process."""
+        agent_runner_log_file = self._open_agent_runner_log_file()
+        process = subprocess.Popen(  # pylint: disable=consider-using-with # nosec
+            args=[
+                self._agent_runner_bin,
+                "-s",
+                "run",
+            ],  # TODO: Patch for Windows failing hash
+            cwd=working_dir / "agent",
+            stdout=agent_runner_log_file,
+            stderr=agent_runner_log_file,
+            env=env,
+            creationflags=0x00000200,  # Detach process from the main process
+        )
+        self.assign_to_job(process._handle)  # type: ignore # pylint: disable=protected-access
+        return process
+
+    def _start_tendermint_process(
+        self, env: Dict, working_dir: Path
+    ) -> subprocess.Popen:
+        """Start tendermint process."""
+        env = {
+            **env,
+        }
+        env["PATH"] = os.path.dirname(sys.executable) + ";" + os.environ["PATH"]
+
+        process = subprocess.Popen(  # pylint: disable=consider-using-with # nosec
+            args=[self._tendermint_bin],
+            cwd=working_dir,
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+            env=env,
+            creationflags=0x00000200,  # Detach process from the main process
+        )
+        self.assign_to_job(process._handle)  # type: ignore # pylint: disable=protected-access
+        return process
+
 
 class HostPythonHostDeploymentRunner(BaseDeploymentRunner):
     """Deployment runner for host installed python."""
@@ -377,6 +515,7 @@ class HostPythonHostDeploymentRunner(BaseDeploymentRunner):
         env = json.loads((working_dir / "agent.json").read_text(encoding="utf-8"))
         env["PYTHONUTF8"] = "1"
         env["PYTHONIOENCODING"] = "utf8"
+        agent_runner_log_file = self._open_agent_runner_log_file()
 
         process = subprocess.Popen(  # pylint: disable=consider-using-with # nosec
             args=[
@@ -386,6 +525,8 @@ class HostPythonHostDeploymentRunner(BaseDeploymentRunner):
             ],  # TODO: Patch for Windows failing hash
             cwd=str(working_dir / "agent"),
             env={**os.environ, **env},
+            stdout=agent_runner_log_file,
+            stderr=agent_runner_log_file,
             creationflags=(
                 0x00000008 if platform.system() == "Windows" else 0
             ),  # Detach process from the main process
@@ -453,15 +594,19 @@ class HostPythonHostDeploymentRunner(BaseDeploymentRunner):
 
     def _setup_agent(self) -> None:
         """Prepare agent."""
+        multiprocessing.set_start_method("spawn")
         self._setup_venv()
         super()._setup_agent()
         # Install agent dependencies
-        self._run_aea_command(
-            "-v",
-            "debug",
-            "install",
-            "--timeout",
-            "600",
+        self._run_cmd(
+            args=[
+                self._agent_runner_bin,
+                "-v",
+                "debug",
+                "install",
+                "--timeout",
+                "600",
+            ],
             cwd=self._work_directory / "agent",
         )
 

{olas_operate_middleware-0.6.1 → olas_operate_middleware-0.6.3}/operate/services/manage.py

@@ -106,6 +106,9 @@ HTTP_OK = 200
 URI_HASH_POSITION = 7
 IPFS_GATEWAY = "https://gateway.autonolas.tech/ipfs/"
 DEFAULT_TOPUP_THRESHOLD = 0.5
+# At the moment, we only support running one agent per service locally on a machine.
+# If multiple agents are provided in the service.yaml file, only the 0th index config will be used.
+NUM_LOCAL_AGENT_INSTANCES = 1
 
 
 class ServiceManager:
@@ -227,7 +230,7 @@ class ServiceManager:
         if not service.keys:
             service.keys = [
                 self.keys_manager.get(self.keys_manager.create())
-                for _ in range(service.helper.config.number_of_agents)
+                for _ in range(NUM_LOCAL_AGENT_INSTANCES)
             ]
             service.store()
 
@@ -267,7 +270,7 @@ class ServiceManager:
         if not service.keys:
             service.keys = [
                 self.keys_manager.get(self.keys_manager.create())
-                for _ in range(service.helper.config.number_of_agents)
+                for _ in range(NUM_LOCAL_AGENT_INSTANCES)
             ]
             service.store()
 
@@ -437,7 +440,7 @@ class ServiceManager:
                 ocm.mint(
                     package_path=service.package_absolute_path_absolute_path,
                     agent_id=staking_params["agent_ids"][0],
-                    number_of_slots=service.helper.config.number_of_agents,
+                    number_of_slots=NUM_LOCAL_AGENT_INSTANCES,
                     cost_of_bond=(
                         staking_params["min_staking_deposit"]
                         if user_params.use_staking
@@ -709,7 +712,7 @@ class ServiceManager:
                 )
                 protocol_asset_requirements[target_staking_params["staking_token"]] = (
                     target_staking_params["min_staking_deposit"]
-                    * service.helper.config.number_of_agents
+                    * NUM_LOCAL_AGENT_INSTANCES
                 )
             else:
                 protocol_asset_requirements = {}
@@ -791,7 +794,7 @@ class ServiceManager:
                         sftxb.get_mint_tx_data(
                             package_path=service.package_absolute_path,
                             agent_id=agent_id,
-                            number_of_slots=service.helper.config.number_of_agents,
+                            number_of_slots=NUM_LOCAL_AGENT_INSTANCES,
                             cost_of_bond=(
                                 target_staking_params["min_staking_deposit"]
                                 if user_params.use_staking
@@ -841,7 +844,7 @@ class ServiceManager:
                     sftxb.get_mint_tx_data(
                         package_path=service.package_absolute_path,
                         agent_id=agent_id,
-                        number_of_slots=service.helper.config.number_of_agents,
+                        number_of_slots=NUM_LOCAL_AGENT_INSTANCES,
                         cost_of_bond=(
                             target_staking_params["min_staking_deposit"]
                             if user_params.use_staking
@@ -2462,6 +2465,14 @@ class ServiceManager:
             ).call()
             agent_bonds += num_agent_instances * agent_bond
 
+        if service_state == OnChainState.TERMINATED_BONDED:
+            num_agent_instances = service_info[5]
+            token_bond = service_registry_token_utility.functions.getOperatorBalance(
+                master_safe,
+                service_id,
+            ).call()
+            agent_bonds += num_agent_instances * token_bond
+
         security_deposit = 0
         if (
             OnChainState.ACTIVE_REGISTRATION
@@ -2496,7 +2507,7 @@ class ServiceManager:
         chain_config = service.chain_configs[chain]
         user_params = chain_config.chain_data.user_params
         ledger_config = chain_config.ledger_config
-        number_of_agents = service.helper.config.number_of_agents
+        number_of_agents = NUM_LOCAL_AGENT_INSTANCES
         os.environ["CUSTOM_CHAIN_RPC"] = ledger_config.rpc
         sftxb = self.get_eth_safe_tx_builder(ledger_config=ledger_config)
         service_asset_requirements: defaultdict = defaultdict(int)

{olas_operate_middleware-0.6.1 → olas_operate_middleware-0.6.3}/operate/services/service.py

@@ -315,13 +315,24 @@ class HostDeploymentGenerator(BaseDeploymentGenerator):
         tendermint_executable = str(
             shutil.which("tendermint"),
         )
+        env = {}
+        env["PATH"] = os.path.dirname(sys.executable) + ":" + os.environ["PATH"]
         tendermint_executable = str(
             Path(os.path.dirname(sys.executable)) / "tendermint"
         )
+
         if platform.system() == "Windows":
+            env["PATH"] = os.path.dirname(sys.executable) + ";" + os.environ["PATH"]
             tendermint_executable = str(
                 Path(os.path.dirname(sys.executable)) / "tendermint.exe"
             )
+
+        if not (getattr(sys, "frozen", False) and hasattr(sys, "_MEIPASS")):
+            # we dont run inside pyinstaller, mean DEV mode!
+            tendermint_executable = "tendermint"
+            if platform.system() == "Windows":
+                tendermint_executable = "tendermint.exe"
+
         subprocess.run(  # pylint: disable=subprocess-run-check # nosec
             args=[
                 tendermint_executable,
@@ -1246,6 +1257,8 @@ class Service(LocalResource):
                 config  # type: ignore
             )
 
+            self.chain_configs[chain].ledger_config.rpc = config["rpc"]
+
         self.store()
 
     def consume_env_variables(self) -> None:

{olas_operate_middleware-0.6.1 → olas_operate_middleware-0.6.3}/operate/services/utils/mech.py

@@ -26,7 +26,7 @@ from aea_ledger_ethereum import Web3
 
 from operate.constants import MECH_MARKETPLACE_JSON_URL
 from operate.operate_types import Chain
-from operate.quickstart.utils import print_section, unit_to_wei
+from operate.quickstart.utils import print_section
 from operate.services.protocol import EthSafeTxBuilder
 from operate.services.service import Service
 from operate.utils.gnosis import SafeOperation
@@ -74,9 +74,11 @@ def deploy_mech(sftxb: EthSafeTxBuilder, service: Service) -> Tuple[str, str]:
         mech_type
     ]
 
-    # 0.01xDAI hardcoded for price
-    # better to be configurable and part of local config
-    mech_request_price = unit_to_wei(0.01)
+    mech_request_price = int(
+        service.env_variables.get("MECH_REQUEST_PRICE", {}).get(
+            "value", 10000000000000000
+        )
+    )
     contract = sftxb.ledger_api.api.eth.contract(
         address=Web3.to_checksum_address(mech_marketplace_address), abi=abi
     )

{olas_operate_middleware-0.6.1 → olas_operate_middleware-0.6.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "olas-operate-middleware"
-version = "0.6.1"
+version = "0.6.3"
 description = ""
 authors = ["David Vilela <dvilelaf@gmail.com>", "Viraj Patel <vptl185@gmail.com>"]
 readme = "README.md"
@@ -19,7 +19,7 @@ operate = "operate.cli:main"
 
 [tool.poetry.dependencies]
 python = "<3.12,>=3.9"
-open-autonomy = "==0.19.8"
+open-autonomy = "^0.19.11"
 open-aea-ledger-cosmos = "==1.65.0"
 open-aea-ledger-ethereum = "==1.65.0"
 open-aea-ledger-ethereum-flashbots = "==1.65.0"
@@ -27,7 +27,7 @@ open-aea-cli-ipfs = "==1.65.0"
 clea = "==0.1.0rc4"
 cytoolz = "==0.12.3"
 docker = "6.1.2"
-fastapi = "==0.110.0"
+fastapi = "0.110.3"
 eth-hash = "==0.7.0"
 eth-account = "==0.8.0"
 eth-keyfile = "==0.6.1"
@@ -42,7 +42,7 @@ ipfshttpclient = "==0.8.0a2"
 jsonschema = "==4.3.3"
 multidict = "==6.0.5"
 requests-toolbelt = "1.0.0"
-starlette = "==0.36.3"
+starlette = "0.37.2"
 uvicorn = "==0.27.0"
 web3 = "==6.1.0"
 psutil = "^5.9.8"

olas_operate_middleware-0.6.1/operate/data/contracts/service_staking_token/contract.yaml

@@ -1,23 +0,0 @@
-name: service_staking_token
-author: valory
-version: 0.1.0
-type: contract
-description: Service staking token contract
-license: Apache-2.0
-aea_version: '>=1.0.0, <2.0.0'
-fingerprint:
-  __init__.py: bafybeid3wfzglolebuo6jrrsopswzu4lk77bm76mvw3euizlsjtnt3wmgu
-  build/ServiceStakingToken.json: bafybeiclsckyk2kkuwhrmifupugg7ixj2hpwhd3mjghwgcdlrjqbwafwym
-  contract.py: bafybeiff62bquzeisbd6iptqdjetrhlkt2ut5d7j6md2kqinrqgmbveceu
-fingerprint_ignore_patterns: []
-contracts: []
-class_name: ServiceStakingTokenContract
-contract_interface_paths:
-  ethereum: build/ServiceStakingToken.json
-dependencies:
-  open-aea-ledger-ethereum:
-    version: ==1.42.0
-  open-aea-test-autonomy:
-    version: ==0.13.6
-  web3:
-    version: <7,>=6.0.0