place agent release details from template

Author: solarw

operate/services/agent_runner.py

@@ -19,6 +19,7 @@
 # -------------------------------------------------------------
 """Source dode to download and run agent from the repos."""
 import hashlib
+import json
 import os
 import platform
 import shutil
@@ -40,6 +41,7 @@ class AgentRelease:
     owner: str
     repo: str
     release: str
+    is_aea: bool
 
     @property
     def release_url(self) -> str:
@@ -62,25 +64,10 @@ def get_url_and_hash(self, asset_name: str) -> tuple[str, str]:
         return file_url, file_hash
 
 
-# list of agents releases supported
-AGENTS_SUPPORTED = {
-    "valory/trader": AgentRelease(
-        owner="valory-xyz", repo="trader", release="v0.0.101"
-    ),
-    "valory/optimus": AgentRelease(
-        owner="valory-xyz", repo="optimus", release="v0.0.103"
-    ),
-    "dvilela/memeooorr": AgentRelease(
-        owner="valory-xyz", repo="meme-ooorr", release="v0.0.101"
-    ),
-}
-
-
 class AgentRunnerManager:
     """Agent Runner Manager."""
 
     logger = setup_logger(name="operate.agent_runner_manager")
-    AGENTS = AGENTS_SUPPORTED
 
     @staticmethod
     def get_agent_runner_executable_name() -> str:
@@ -131,14 +118,19 @@ def download_file(cls, url: str, save_path: Path) -> None:
             raise
 
     @classmethod
-    def get_agent_release_by_public_id(cls, agent_public_id_str: str) -> AgentRelease:
+    def get_agent_release_from_service_dir(cls, service_dir: Path) -> AgentRelease:
         """Get agent release object according to public id."""
-        agent_author, agent_name = cls.parse_agent(public_id_str=agent_public_id_str)
-
-        agent_name = f"{agent_author}/{agent_name}"
-        agent_release = cls.AGENTS.get(agent_name, None)
-        if agent_release is None:
-            raise ValueError(f"{agent_name} is not supported!")
+        service_config_file = service_dir / "config.json"
+        service_config = json.loads(service_config_file.read_text())
+        if "agent_release" not in service_config:
+            raise ValueError(f"Agent release details are not found in {service_config}")
+        agent_release_data = service_config["agent_release"]
+        agent_release = AgentRelease(
+            is_aea=agent_release_data["is_aea"],
+            owner=agent_release_data["repo_owner"],
+            repo=agent_release_data["repo_name"],
+            release=agent_release_data["version"],
+        )
         return agent_release
 
     @staticmethod
@@ -187,13 +179,11 @@ def update_agent_runner(
             raise
 
     @classmethod
-    def get_agent_runner_path(cls, service_dir: Path, agent_public_id_str: str) -> str:
+    def get_agent_runner_path(cls, service_dir: Path) -> str:
         """Get path to the agent runner bin palced."""
         agent_runner_name = cls.get_agent_runner_executable_name()
         agent_runner_path: Path = service_dir / agent_runner_name
-        agent_release = cls.get_agent_release_by_public_id(
-            agent_public_id_str=agent_public_id_str
-        )
+        agent_release = cls.get_agent_release_from_service_dir(service_dir=service_dir)
 
         cls.update_agent_runner(
             target_path=agent_runner_path,
@@ -203,8 +193,8 @@ def get_agent_runner_path(cls, service_dir: Path, agent_public_id_str: str) -> s
         return str(agent_runner_path)
 
 
-def get_agent_runner_path(service_dir: Path, agent_public_id_str: str) -> str:
+def get_agent_runner_path(service_dir: Path) -> str:
     """Get path to the agent runner bin placed."""
     return AgentRunnerManager.get_agent_runner_path(
-        service_dir=service_dir, agent_public_id_str=agent_public_id_str
+        service_dir=service_dir,
     )

operate/services/deployment_runner.py

@@ -306,7 +306,7 @@ def _agent_runner_bin(self) -> str:
         service_dir = self._work_directory.parent
 
         agent_runner_bin = get_agent_runner_path(
-            service_dir=service_dir, agent_public_id_str=agent_publicid_str
+            service_dir=service_dir
         )
         return str(agent_runner_bin)
 

operate/services/service.py

@@ -724,6 +724,7 @@ class Service(LocalResource):
     chain_configs: ChainConfigs
     description: str
     env_variables: EnvVariables
+    agent_release: t.Dict
 
     path: Path
     package_path: Path
@@ -850,6 +851,7 @@ def new(  # pylint: disable=too-many-locals
             path=package_absolute_path.parent,
             package_path=Path(package_absolute_path.name),
             env_variables=service_template["env_variables"],
+            agent_release=service_template["agent_release"],
         )
         service.store()
         return service