From bd51eec3c29555c2c29ed3d4827573b670c6de05 Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Fri, 20 Dec 2024 13:00:41 +0100 Subject: [PATCH 1/6] chore: update hash --- frontend/constants/serviceTemplates.ts | 4 ++-- templates/memeooorr.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/constants/serviceTemplates.ts b/frontend/constants/serviceTemplates.ts index a6e8666f..ad1d9577 100644 --- a/frontend/constants/serviceTemplates.ts +++ b/frontend/constants/serviceTemplates.ts @@ -159,11 +159,11 @@ export const SERVICE_TEMPLATES: ServiceTemplate[] = [ { agentType: AgentType.Memeooorr, name: 'Memeooorr', - hash: 'bafybeid5qvhhn3t7eaiaarurijsjejhcogt6r3dfm7eid25to4vaivfrti', + hash: 'bafybeidt5vao63jarowkqzjtrwiw6b42gponznwzesll3vdcmtcmpffc5u', description: 'Memeooorr @twitter_handle', // should be overwritten with twitter username image: 'https://gateway.autonolas.tech/ipfs/QmQYDGMg8m91QQkTWSSmANs5tZwKrmvUCawXZfXVVWQPcu', - service_version: 'v0.2.0-alpha13', + service_version: 'v0.2.0-alpha14', home_chain: MiddlewareChain.BASE, configurations: { [MiddlewareChain.BASE]: { diff --git a/templates/memeooorr.yaml b/templates/memeooorr.yaml index bffd2aca..23bc5aa4 100644 --- a/templates/memeooorr.yaml +++ b/templates/memeooorr.yaml @@ -1,8 +1,8 @@ name: "Memeooorr" description: "Memeooorr @twitter_handle" -hash: bafybeid5qvhhn3t7eaiaarurijsjejhcogt6r3dfm7eid25to4vaivfrti +hash: bafybeidt5vao63jarowkqzjtrwiw6b42gponznwzesll3vdcmtcmpffc5u image: https://gateway.autonolas.tech/ipfs/QmQYDGMg8m91QQkTWSSmANs5tZwKrmvUCawXZfXVVWQPcu -service_version: v0.2.0-alpha13 +service_version: v0.2.0-alpha14 home_chain: "base" configurations: base: From a3f83051ca2a447afb812d7c14faec7dc85f654a Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Fri, 20 Dec 2024 13:02:40 +0100 Subject: [PATCH 2/6] chore: patch for Windows --- operate/services/deployment_runner.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/operate/services/deployment_runner.py b/operate/services/deployment_runner.py index cd435a56..9b39a784 100644 --- a/operate/services/deployment_runner.py +++ b/operate/services/deployment_runner.py @@ -258,7 +258,8 @@ def _start_agent(self) -> None: env["PYTHONIOENCODING"] = "utf8" env = {**os.environ, **env} process = subprocess.Popen( # pylint: disable=consider-using-with # nosec - args=[self._aea_bin, "run"], + # TODO: Patch for Windows failing hash. Revert once it's fixed on OpenAutonomy / OpenAEA + args=[self._aea_bin, "run", "-s"] if platform.system() == "Windows" else [self._aea_bin, "run"], cwd=working_dir / "agent", stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, From a96c3a7d2597441c2ba1549d5aabb0b5ec732645 Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Fri, 20 Dec 2024 13:10:09 +0100 Subject: [PATCH 3/6] release: v0.2.0-rc50 --- package.json | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e2bb824f..4226da54 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "start:frontend": "cd frontend && yarn start", "test:frontend": "cd frontend && yarn test" }, - "version": "0.2.0-rc49", + "version": "0.2.0-rc50", "engine": { "node": ">=20", "yarn": ">=1.22.0", diff --git a/pyproject.toml b/pyproject.toml index d00ba838..cb6008d5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "olas-operate-middleware" -version = "0.2.0-rc49" +version = "0.2.0-rc50" description = "" authors = ["David Vilela ", "Viraj Patel "] readme = "README.md" From 1cbbd442432b26c409af7dc302717d6a47c237b7 Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Fri, 20 Dec 2024 14:10:25 +0100 Subject: [PATCH 4/6] chore: fix --- operate/services/deployment_runner.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/operate/services/deployment_runner.py b/operate/services/deployment_runner.py index 9b39a784..d39715e2 100644 --- a/operate/services/deployment_runner.py +++ b/operate/services/deployment_runner.py @@ -97,7 +97,8 @@ class BaseDeploymentRunner(AbstractDeploymentRunner, metaclass=ABCMeta): def _run_aea(self, *args: str, cwd: Path) -> Any: """Run aea command.""" - return self._run_cmd(args=[self._aea_bin, *args], cwd=cwd) + # TODO: Patch for Windows failing hash (add -s). Revert once it's fixed on OpenAutonomy / OpenAEA + return self._run_cmd(args=[self._aea_bin, "-s", *args], cwd=cwd) @staticmethod def _run_cmd(args: t.List[str], cwd: t.Optional[Path] = None) -> None: @@ -258,8 +259,7 @@ def _start_agent(self) -> None: env["PYTHONIOENCODING"] = "utf8" env = {**os.environ, **env} process = subprocess.Popen( # pylint: disable=consider-using-with # nosec - # TODO: Patch for Windows failing hash. Revert once it's fixed on OpenAutonomy / OpenAEA - args=[self._aea_bin, "run", "-s"] if platform.system() == "Windows" else [self._aea_bin, "run"], + args=[self._aea_bin, "run"], cwd=working_dir / "agent", stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, From 6a464ce4e7cb860a9b37c590d64fe86b42bf3d94 Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Fri, 20 Dec 2024 15:44:07 +0100 Subject: [PATCH 5/6] chore: update -s flag --- operate/services/deployment_runner.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/operate/services/deployment_runner.py b/operate/services/deployment_runner.py index d39715e2..6a0ba495 100644 --- a/operate/services/deployment_runner.py +++ b/operate/services/deployment_runner.py @@ -98,6 +98,8 @@ class BaseDeploymentRunner(AbstractDeploymentRunner, metaclass=ABCMeta): def _run_aea(self, *args: str, cwd: Path) -> Any: """Run aea command.""" # TODO: Patch for Windows failing hash (add -s). Revert once it's fixed on OpenAutonomy / OpenAEA + # The fix is also implemented in PyInstallerHostDeploymentRunner._start_agent and + # on HostPythonHostDeploymentRunner._start_agent return self._run_cmd(args=[self._aea_bin, "-s", *args], cwd=cwd) @staticmethod @@ -259,7 +261,7 @@ def _start_agent(self) -> None: env["PYTHONIOENCODING"] = "utf8" env = {**os.environ, **env} process = subprocess.Popen( # pylint: disable=consider-using-with # nosec - args=[self._aea_bin, "run"], + args=[self._aea_bin, "run", "-s"], # TODO: Patch for Windows failing hash cwd=working_dir / "agent", stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, @@ -343,7 +345,7 @@ def _start_agent(self) -> None: env["PYTHONIOENCODING"] = "utf8" process = subprocess.Popen( # pylint: disable=consider-using-with # nosec - args=[self._aea_bin, "run"], + args=[self._aea_bin, "run", "-s"], # TODO: Patch for Windows failing hash cwd=str(working_dir / "agent"), env={**os.environ, **env}, creationflags=( From c2f98327a6c77b4616a5b0eb42bdcf53612d4da0 Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Fri, 20 Dec 2024 15:50:50 +0100 Subject: [PATCH 6/6] chore: fix -s placement --- operate/services/deployment_runner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/operate/services/deployment_runner.py b/operate/services/deployment_runner.py index 6a0ba495..ee56a434 100644 --- a/operate/services/deployment_runner.py +++ b/operate/services/deployment_runner.py @@ -261,7 +261,7 @@ def _start_agent(self) -> None: env["PYTHONIOENCODING"] = "utf8" env = {**os.environ, **env} process = subprocess.Popen( # pylint: disable=consider-using-with # nosec - args=[self._aea_bin, "run", "-s"], # TODO: Patch for Windows failing hash + args=[self._aea_bin, "-s", "run"], # TODO: Patch for Windows failing hash cwd=working_dir / "agent", stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, @@ -345,7 +345,7 @@ def _start_agent(self) -> None: env["PYTHONIOENCODING"] = "utf8" process = subprocess.Popen( # pylint: disable=consider-using-with # nosec - args=[self._aea_bin, "run", "-s"], # TODO: Patch for Windows failing hash + args=[self._aea_bin, "-s", "run"], # TODO: Patch for Windows failing hash cwd=str(working_dir / "agent"), env={**os.environ, **env}, creationflags=(