acp-plugin-gamesdk 0.1.1__tar.gz → 0.1.2__tar.gz

{acp_plugin_gamesdk-0.1.1 → acp_plugin_gamesdk-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: acp-plugin-gamesdk
-Version: 0.1.1
+Version: 0.1.2
 Summary: ACP Plugin for Python SDK for GAME by Virtuals
 Author: Steven Lee Soon Fatt
 Author-email: steven@virtuals.io

{acp_plugin_gamesdk-0.1.1 → acp_plugin_gamesdk-0.1.2}/acp_plugin_gamesdk/acp_client.py

@@ -2,20 +2,18 @@ from datetime import datetime, timedelta
 from typing import List, Optional
 from web3 import Web3
 import requests
-import sys
-import os
-sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "../../../")))
-from .interface import AcpAgent, AcpJobPhases, AcpState
-from .acp_token import AcpToken, MemoType
+from acp_plugin_gamesdk.interface import AcpAgent, AcpJobPhases, AcpState
+from acp_plugin_gamesdk.acp_token import AcpToken, MemoType
 import time
 
 
 class AcpClient:
-    def __init__(self, api_key: str, acp_token: AcpToken):
+    def __init__(self, api_key: str, acp_token: AcpToken, acp_base_url: Optional[str] = None):
         self.base_url = "https://sdk-dev.game.virtuals.io/acp"
         self.api_key = api_key
         self.acp_token = acp_token
         self.web3 = Web3()
+        self.acp_base_url = acp_base_url if acp_base_url else "https://acpx-staging.virtuals.io/api"
 
     @property
     def agent_wallet_address(self) -> str:
@@ -29,16 +27,18 @@ class AcpClient:
         return response.json()
 
     def browse_agents(self, cluster: Optional[str] = None, query: Optional[str] = None) -> List[AcpAgent]:
-        url = "https://acpx.virtuals.gg/api/agents"
+        url = f"{self.acp_base_url}/agents"
         
-        params = {}
+        # Build URL with query parameters
         if query:
-            params["search"] = query
+            url += f"?search={requests.utils.quote(query)}"
             
         if cluster:
-            params["filters[cluster]"] = cluster
+            # Add & if there's already a parameter, otherwise add ?
+            separator = "&" if query else "?"
+            url += f"{separator}filters[cluster]={requests.utils.quote(cluster)}"
 
-        response = requests.get(url, params=params)
+        response = requests.get(url)
         
         if response.status_code != 200:
             raise Exception(f"Failed to browse agents: {response.text}")
@@ -74,7 +74,7 @@ class AcpClient:
         time.sleep(retry_delay) 
         for attempt in range(retry_count):
             try:
-                response = self.acp_token.await_transaction(tx_result["txHash"])
+                response = self.acp_token.validate_transaction(tx_result["txHash"])
                 data = response.get("data", {})
                 if not data:
                     raise Exception("Invalid tx_hash!")

{acp_plugin_gamesdk-0.1.1 → acp_plugin_gamesdk-0.1.2}/acp_plugin_gamesdk/acp_plugin.py

@@ -5,13 +5,11 @@ from datetime import datetime
 
 from game_sdk.game.agent import WorkerConfig
 from game_sdk.game.custom_types import Function, FunctionResultStatus
-from twitter_plugin_gamesdk.twitter_plugin import TwitterPlugin
-
 from twitter_plugin_gamesdk.twitter_plugin import TwitterPlugin
 from twitter_plugin_gamesdk.game_twitter_plugin import GameTwitterPlugin
-from .acp_client import AcpClient
-from .acp_token import AcpToken
-from .interface import AcpJobPhasesDesc, IInventory
+from acp_plugin_gamesdk.acp_client import AcpClient
+from acp_plugin_gamesdk.acp_token import AcpToken
+from acp_plugin_gamesdk.interface import AcpJobPhasesDesc, IInventory
 
 @dataclass
 class AcpPluginOptions:
@@ -19,12 +17,13 @@ class AcpPluginOptions:
     acp_token_client: AcpToken
     twitter_plugin: TwitterPlugin | GameTwitterPlugin = None
     cluster: Optional[str] = None
+    acp_base_url: Optional[str] = None
+
 
 class AcpPlugin:
     def __init__(self, options: AcpPluginOptions):
         print("Initializing AcpPlugin")
-        self.acp_client = AcpClient(options.api_key, options.acp_token_client)
-        
+        self.acp_client = AcpClient(options.api_key, options.acp_token_client, options.acp_base_url)
         self.id = "acp_worker"
         self.name = "ACP Worker"
         self.description = """
@@ -45,6 +44,8 @@ class AcpPlugin:
         self.cluster = options.cluster
         self.twitter_plugin = options.twitter_plugin
         self.produced_inventory: List[IInventory] = []
+        self.acp_base_url = options.acp_base_url
+
 
     def add_produce_item(self, item: IInventory) -> None:
         self.produced_inventory.append(item)

{acp_plugin_gamesdk-0.1.1 → acp_plugin_gamesdk-0.1.2}/acp_plugin_gamesdk/acp_token.py

@@ -4,10 +4,7 @@ from typing import Optional, Tuple, TypedDict
 from datetime import datetime
 from web3 import Web3
 from eth_account import Account
-import sys
-import os
-sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "../../../")))
-from .acp_token_abi import ACP_TOKEN_ABI
+from acp_plugin_gamesdk.acp_token_abi import ACP_TOKEN_ABI
 import requests
 from eth_account.messages import encode_defunct
 import json
@@ -48,9 +45,9 @@ class AcpToken:
         wallet_private_key: str,
         agent_wallet_address: str,
         network_url: str,
+        acp_base_url: Optional[str] = None,
         contract_address: str = "0x2422c1c43451Eb69Ff49dfD39c4Dc8C5230fA1e6",
         virtuals_token_address: str = "0xbfAB80ccc15DF6fb7185f9498d6039317331846a",
-        base_url: str = "https://acpx.virtuals.gg/api"
     ):
         self.web3 = Web3(Web3.HTTPProvider(network_url))
         self.account = Account.from_key(wallet_private_key)
@@ -88,17 +85,16 @@ class AcpToken:
                 "type": "function"
             }]
         )
-        self.base_url = base_url
-
+        self.acp_base_url = acp_base_url if acp_base_url else "https://acpx-staging.virtuals.io/api"
     def get_agent_wallet_address(self) -> str:
         return self.agent_wallet_address
         
     def get_contract_address(self) -> str:
         return self.contract_address
 
-    def await_transaction(self, hash_value: str) -> object:
+    def validate_transaction(self, hash_value: str) -> object:
         try:
-            response = requests.post(f"{self.base_url}/acp-agent-wallets/trx-result", json={"userOpHash": hash_value})
+            response = requests.post(f"{self.acp_base_url}/acp-agent-wallets/trx-result", json={"userOpHash": hash_value})
             return response.json()
         except Exception as error:
             print(f"Error getting job_id: {error}")
@@ -128,7 +124,7 @@ class AcpToken:
             }
             
             # Submit to custom API
-            api_url = f"{self.base_url}/acp-agent-wallets/transactions"
+            api_url = f"{self.acp_base_url}/acp-agent-wallets/transactions"
             response = requests.post(api_url, json=payload)
                 
             # Return transaction hash or response ID
@@ -152,7 +148,7 @@ class AcpToken:
                 "signature": signature
             }
             
-            api_url = f"{self.base_url}/acp-agent-wallets/transactions"
+            api_url = f"{self.acp_base_url}/acp-agent-wallets/transactions"
             response = requests.post(api_url, json=payload)
             
             if (response.status_code != 200):
@@ -185,7 +181,7 @@ class AcpToken:
                     "signature": signature
                 }
 
-                api_url = f"{self.base_url}/acp-agent-wallets/transactions"
+                api_url = f"{self.acp_base_url}/acp-agent-wallets/transactions"
                 response = requests.post(api_url, json=payload)
                 
                 if (response.status_code != 200):
@@ -240,13 +236,13 @@ class AcpToken:
                     "signature": signature
                 }
                 
-                api_url = f"{self.base_url}/acp-agent-wallets/transactions"
+                api_url = f"{self.acp_base_url}/acp-agent-wallets/transactions"
                 response = requests.post(api_url, json=payload)
                 
                 if (response.status_code != 200):
                     raise Exception("Failed to sign memo")
                 
-                return response.json().get("txHash", response.json().get("id", ""))
+                return response.json()
                 
             except Exception as error:
                 print(f"Error signing memo: {error}")
@@ -268,7 +264,7 @@ class AcpToken:
                 "signature": signature
             }
             
-            api_url = f"{self.base_url}/acp-agent-wallets/transactions"
+            api_url = f"{self.acp_base_url}/acp-agent-wallets/transactions"
             response = requests.post(api_url, json=payload)
             
             if (response.status_code != 200):

{acp_plugin_gamesdk-0.1.1 → acp_plugin_gamesdk-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "acp-plugin-gamesdk"
-version = "0.1.1"
+version = "0.1.2"
 description = "ACP Plugin for Python SDK for GAME by Virtuals"
 authors = ["Steven Lee Soon Fatt <steven@virtuals.io>"]
 readme = "README.md"