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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: acp-plugin-gamesdk
-Version: 0.1.1
+Version: 0.1.3
 Summary: ACP Plugin for Python SDK for GAME by Virtuals
 Author: Steven Lee Soon Fatt
 Author-email: steven@virtuals.io
@@ -109,7 +109,7 @@ acp_plugin = AcpPlugin(
 ```
 
  > Note: 
- > - Your ACP token for your buyer and seller should be different.
+ > - Your agent wallet address for your buyer and seller should be different.
  > - Speak to a DevRel (Celeste/John) to get a GAME Dev API key
 
  > To Whitelist your Wallet: 

{acp_plugin_gamesdk-0.1.1 → acp_plugin_gamesdk-0.1.3}/README.md

@@ -84,7 +84,7 @@ acp_plugin = AcpPlugin(
 ```
 
  > Note: 
- > - Your ACP token for your buyer and seller should be different.
+ > - Your agent wallet address for your buyer and seller should be different.
  > - Speak to a DevRel (Celeste/John) to get a GAME Dev API key
 
  > To Whitelist your Wallet: 

{acp_plugin_gamesdk-0.1.1 → acp_plugin_gamesdk-0.1.3}/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, AcpOffering, 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,17 @@ 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 = {}
         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}")
@@ -49,24 +48,25 @@ class AcpClient:
         
         for agent in response_json.get("data", []):
             result.append(
-                {
-                "id": agent["id"],
-                "name": agent["name"],
-                "description": agent["description"],
-                "walletAddress": agent["walletAddress"]
-                }
+                AcpAgent(
+                    id=agent["id"],
+                    name=agent["name"],
+                    description=agent["description"],
+                    wallet_address=agent["walletAddress"],
+                    offerings=[AcpOffering(name=offering["name"], price=offering["price"]) for offering in agent["offerings"]]
+                )
             )
             
         return result
 
     def create_job(self, provider_address: str, price: float, job_description: str) -> int:
         expire_at = datetime.now() + timedelta(days=1)
-        
         tx_result =  self.acp_token.create_job(
             provider_address=provider_address,
             evaluator_address=provider_address,
             expire_at=expire_at
         )
+        
         job_id = None
         retry_count = 3
         retry_delay = 3
@@ -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!")
@@ -133,7 +133,6 @@ class AcpClient:
     def response_job(self, job_id: int, accept: bool, memo_id: int, reasoning: str):
         if accept:
             self.acp_token.sign_memo(memo_id, accept, reasoning)
-            
             time.sleep(5)
             
             return self.acp_token.create_memo(
@@ -162,7 +161,7 @@ class AcpClient:
         time.sleep(5)
         return self.acp_token.sign_memo(memo_id, True, reason)
 
-    def deliver_job(self, job_id: int, deliverable: str, memo_id: int, reason: str):
+    def deliver_job(self, job_id: int, deliverable: str):
         return self.acp_token.create_memo(
             job_id=int(job_id),
             content=deliverable,
@@ -172,17 +171,6 @@ class AcpClient:
         )
 
     def add_tweet(self, job_id: int, tweet_id: str, content: str):
-        """
-        Add a tweet to a job.
-        
-        Args:
-            job_id: The ID of the job
-            tweet_id: The ID of the tweet
-            content: The content of the tweet
-        
-        Raises:
-            Exception: If the request fails
-        """
         payload = {
             "tweetId": tweet_id,
             "content": content

{acp_plugin_gamesdk-0.1.1 → acp_plugin_gamesdk-0.1.3}/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,9 @@ 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 if options.acp_base_url else "https://acpx-staging.virtuals.io/api"
+
+
 
     def add_produce_item(self, item: IInventory) -> None:
         self.produced_inventory.append(item)
@@ -108,9 +110,9 @@ class AcpPlugin:
         
         if not agents:
             return FunctionResultStatus.FAILED, "No other trading agents found in the system. Please try again later when more agents are available.", {}
-            
+        
         return FunctionResultStatus.DONE, json.dumps({
-            "availableAgents": agents,
+            "availableAgents": [{"id": agent.id, "name": agent.name, "description": agent.description, "wallet_address": agent.wallet_address, "offerings": [{"name": offering.name, "price": offering.price} for offering in agent.offerings]} for agent in agents],
             "totalAgentsFound": len(agents),
             "timestamp": datetime.now().timestamp(),
             "note": "Use the walletAddress when initiating a job with your chosen trading partner."
@@ -439,8 +441,6 @@ class AcpPlugin:
             self.acp_client.deliver_job(
                 int(jobId),
                 json.dumps(deliverable),
-                job["memo"][0]["id"],
-                reasoning
             )
             
             if (self.twitter_plugin is not None):

{acp_plugin_gamesdk-0.1.1 → acp_plugin_gamesdk-0.1.3}/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,21 +85,19 @@ 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}")
-            raise Exception("Failed to get job_id")
+            raise Exception(f"Failed to get job_id {error}")
 
     def create_job(
         self,
@@ -128,15 +123,18 @@ 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)
-                
+            
+            
+            if response.json().get("error"):
+                raise Exception(f"Failed to create job {response.json().get('error').get('status')}, Message: {response.json().get('error').get('message')}")
+            
             # Return transaction hash or response ID
-            return { "txHash": response.json().get("data", {}).get("userOpHash", "")}
+            return {"txHash": response.json().get("data", {}).get("userOpHash", "")}
         
         except Exception as error:
-            print(f"Error creating job: {error}")
-            raise Exception("Failed to create job")
+            raise Exception(f"{error}")
 
     def approve_allowance(self, price_in_wei: int) -> str:
         try:
@@ -152,16 +150,15 @@ 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 approve allowance")
+            if (response.json().get("error")):
+                raise Exception(f"Failed to approve allowance {response.json().get('error').get('status')}, Message: {response.json().get('error').get('message')}")
             
             return response.json()
         except Exception as error:
-            print(f"Error approving allowance: {error}")
-            raise Exception("Failed to approve allowance")
+            raise Exception(f"{error}")
 
     def create_memo(
         self,
@@ -185,19 +182,19 @@ 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 create memo")
+                if (response.json().get("error")):
+                    raise Exception(f"Failed to create memo {response.json().get('error').get('status')}, Message: {response.json().get('error').get('message')}")
                 
                 return { "txHash": response.json().get("txHash", response.json().get("id", "")), "memoId": response.json().get("memoId", "")}
             except Exception as error:
-                print(f"Error creating memo: {error}")
+                print(f"{error}")
                 retries -= 1
                 time.sleep(2 * (3 - retries))
                 
-        raise Exception("Failed to create memo")
+        raise Exception(f"{error}")
 
     def _sign_transaction(self, method_name: str, args: list, contract_address: Optional[str] = None) -> Tuple[dict, str]:
         if contract_address:
@@ -240,20 +237,20 @@ 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")
+                if (response.json().get("error")):
+                    raise Exception(f"Failed to sign memo {response.json().get('error').get('status')}, Message: {response.json().get('error').get('message')}")
                 
-                return response.json().get("txHash", response.json().get("id", ""))
+                return response.json()
                 
             except Exception as error:
-                print(f"Error signing memo: {error}")
+                print(f"{error}")
                 retries -= 1
                 time.sleep(2 * (3 - retries))
                 
-        raise Exception("Failed to sign memo")
+        raise Exception(f"Failed to sign memo {error}")
 
     def set_budget(self, job_id: int, budget: int) -> str:
         try:
@@ -268,16 +265,15 @@ 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 set budget")
+            if (response.json().get("error")):
+                raise Exception(f"Failed to set budget {response.json().get('error').get('status')}, Message: {response.json().get('error').get('message')}")
             
             return response.json()
         except Exception as error:
-            print(f"Error setting budget: {error}")
-            raise Exception("Failed to set budget")
+            raise Exception(f"{error}")
 
     def get_job(self, job_id: int) -> Optional[IJob]:
         try:
@@ -298,8 +294,7 @@ class AcpToken:
                 'evaluatorCount': int(job_data[8])
             }
         except Exception as error:
-            print(f"Error getting job: {error}")
-            raise Exception("Failed to get job")
+            raise Exception(f"{error}")
 
     def get_memo_by_job(
         self,
@@ -315,8 +310,7 @@ class AcpToken:
             else:
                 return memos[-1] if memos else None
         except Exception as error:
-            print(f"Error getting memo: {error}")
-            raise Exception("Failed to get memo")
+            raise Exception(f"Failed to get memo by job {error}")
 
     def get_memos_for_phase(
         self,
@@ -330,5 +324,4 @@ class AcpToken:
             target_memos = [m for m in memos if m['nextPhase'] == target_phase]
             return target_memos[-1] if target_memos else None
         except Exception as error:
-            print(f"Error getting memos: {error}")
-            raise Exception("Failed to get memos")
+            raise Exception(f"Failed to get memos for phase {error}")

{acp_plugin_gamesdk-0.1.1 → acp_plugin_gamesdk-0.1.3}/acp_plugin_gamesdk/interface.py

@@ -2,13 +2,18 @@ from dataclasses import dataclass
 from enum import IntEnum, Enum
 from typing import List, Dict
 
+@dataclass
+class AcpOffering:
+    name: str
+    price: float
 @dataclass
 class AcpAgent:
     id: str
     name: str
     description: str
     wallet_address: str
-
+    offerings: List[AcpOffering]
+    
 class AcpJobPhases(IntEnum):
     REQUEST = 0
     NEGOTIATION = 1

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

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