acp-plugin-gamesdk 0.1.18__py3-none-any.whl → 0.1.20__py3-none-any.whl

acp_plugin_gamesdk/acp_client.py

@@ -1,15 +1,20 @@
-import json
-import requests
 import time
 import traceback
-
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timezone
 from typing import List, Optional
+
+import requests
+from dacite import Config, from_dict
 from web3 import Web3
 
-from acp_plugin_gamesdk.interface import AcpAgent, AcpJobPhases, AcpOffering, AcpState, AcpJobPhasesDesc
 from acp_plugin_gamesdk.acp_token import AcpToken, MemoType
-from dacite import from_dict, Config
+from acp_plugin_gamesdk.interface import (
+    AcpAgent,
+    AcpJobPhases,
+    AcpJobPhasesDesc,
+    AcpOffering,
+    AcpState,
+)
 
 
 class AcpClient:
@@ -26,22 +31,23 @@ class AcpClient:
         return self.acp_token.get_agent_wallet_address()
 
     def get_state(self) -> AcpState:
-        response =  requests.get(
+        response = requests.get(
             f"{self.base_url}/states/{self.agent_wallet_address}",
             headers={"x-api-key": self.api_key}
         )
         payload = response.json()
-        result = from_dict(data_class=AcpState, data=payload, config=Config(type_hooks={AcpJobPhasesDesc: AcpJobPhasesDesc}))
+        result = from_dict(data_class=AcpState, data=payload,
+                           config=Config(type_hooks={AcpJobPhasesDesc: AcpJobPhasesDesc}))
         return result
 
     def browse_agents(
-        self,
-        cluster: Optional[str] = None,
-        query: Optional[str] = None,
-        rerank: Optional[bool] = True,
-        top_k: Optional[int] = 1,
+            self,
+            cluster: Optional[str] = None,
+            query: Optional[str] = None,
+            rerank: Optional[bool] = True,
+            top_k: Optional[int] = 1,
     ) -> List[AcpAgent]:
-        
+
         url = f"{self.acp_base_url}/agents"
 
         params = {
@@ -55,22 +61,22 @@ class AcpClient:
 
         if response.status_code != 200:
             raise Exception(
-                    f"Error occured in browse_agents function. Failed to browse agents.\n" 
-                    f"Response status code: {response.status_code}\n"
-                    f"Response description: {response.text}\n"
-                )
-        
+                f"Error occured in browse_agents function. Failed to browse agents.\n"
+                f"Response status code: {response.status_code}\n"
+                f"Response description: {response.text}\n"
+            )
 
         response_json = response.json()
-        
+
         result = []
-        
+
         for agent in response_json.get("data", []):
             if agent["offerings"]:
-                offerings = [AcpOffering(name=offering["name"], price=offering["price"]) for offering in agent["offerings"]]
+                offerings = [AcpOffering(name=offering["name"], price=offering["price"]) for offering in
+                             agent["offerings"]]
             else:
                 offerings = None
-                
+
             result.append(
                 AcpAgent(
                     id=agent["id"],
@@ -83,7 +89,7 @@ class AcpClient:
                     explanation=agent["explanation"]
                 )
             )
-            
+
         return result
 
     def create_job(
@@ -95,53 +101,53 @@ class AcpClient:
             expired_at: datetime,
     ) -> int:
         tx_result = self.acp_token.create_job(
-            provider_address = provider_address,
-            evaluator_address = evaluator_address,
-            expire_at = expired_at
+            provider_address=provider_address,
+            evaluator_address=evaluator_address,
+            expire_at=expired_at
         )
-        
+
         job_id = None
         retry_count = 3
         retry_delay = 3
-        
-        time.sleep(retry_delay) 
+
+        time.sleep(retry_delay)
         for attempt in range(retry_count):
             try:
                 response = self.acp_token.validate_transaction(tx_result["txHash"])
                 data = response.get("data", {})
                 if not data:
                     raise Exception("Invalid tx_hash!")
-                
+
                 if data.get("status") == "retry":
                     raise Exception("Transaction failed, retrying...")
-                
+
                 if data.get("status") == "failed":
                     break
-                
+
                 if data.get("status") == "success":
                     job_id = int(data.get("result").get("jobId"))
-                    
+
                 if job_id is not None and job_id != "":
-                    break  
-                
+                    break
+
             except Exception as e:
                 print(f"Error in create_job function: {e}")
                 print(traceback.format_exc())
                 if attempt < retry_count - 1:
-                    time.sleep(retry_delay) 
+                    time.sleep(retry_delay)
                 else:
                     raise
-        
+
         if job_id is None or job_id == "":
             raise Exception("Failed to create job")
-        
+
         self.acp_token.create_memo(
-                    job_id=job_id,
-                    content=job_description,
-                    memo_type=MemoType.MESSAGE,
-                    is_secured=False,
-                    next_phase=AcpJobPhases.NEGOTIATION
-                )
+            job_id=job_id,
+            content=job_description,
+            memo_type=MemoType.MESSAGE,
+            is_secured=False,
+            next_phase=AcpJobPhases.NEGOTIATION
+        )
 
         payload = {
             "jobId": job_id,
@@ -169,7 +175,7 @@ class AcpClient:
         if accept:
             self.acp_token.sign_memo(memo_id, accept, reasoning)
             time.sleep(5)
-            
+
             return self.acp_token.create_memo(
                 job_id=job_id,
                 content=f"Job {job_id} accepted. {reasoning}",
@@ -189,7 +195,7 @@ class AcpClient:
     def make_payment(self, job_id: int, amount: float, memo_id: int, reason: str):
         # Convert amount to Wei (smallest ETH unit)
         amount_wei = self.web3.to_wei(amount, 'ether')
-        
+
         self.acp_token.set_budget(job_id, amount_wei)
         time.sleep(5)
         self.acp_token.approve_allowance(amount_wei)
@@ -218,7 +224,7 @@ class AcpClient:
             "tweetId": tweet_id,
             "content": content
         }
-        
+
         response = requests.post(
             f"{self.base_url}/{job_id}/tweets/{self.agent_wallet_address}",
             json=payload,
@@ -228,39 +234,75 @@ class AcpClient:
                 "x-api-key": self.api_key
             }
         )
-        
+
         if response.status_code != 200 and response.status_code != 201:
             raise Exception(
-                f"Error occured in add_tweet function. Failed to add tweet.\n" 
+                f"Error occured in add_tweet function. Failed to add tweet.\n"
                 f"Response status code: {response.status_code}\n"
                 f"Response description: {response.text}\n"
             )
-        
-        
+
         return response.json()
-    
+
     def reset_state(self) -> None:
         response = requests.delete(
             f"{self.base_url}/states/{self.agent_wallet_address}",
             headers={"x-api-key": self.api_key}
         )
-        
+
         if response.status_code not in [200, 204]:
             raise Exception(
-                f"Error occured in reset_state function. Failed to reset state\n" 
+                f"Error occured in reset_state function. Failed to reset state\n"
                 f"Response status code: {response.status_code}\n"
                 f"Response description: {response.text}\n"
             )
-        
+
     def delete_completed_job(self, job_id: int) -> None:
         response = requests.delete(
             f"{self.base_url}/{job_id}/wallet/{self.agent_wallet_address}",
             headers={"x-api-key": self.api_key}
         )
-        
+
         if response.status_code not in [200, 204]:
             raise Exception(
                 f"Error occurred in delete_completed_job function. Failed to delete job.\n"
                 f"Response status code: {response.status_code}\n"
                 f"Response description: {response.text}\n"
             )
+
+    def get_agent_by_wallet_address(self, wallet_address: str) -> AcpAgent:
+        url = f"{self.acp_base_url}/agents?filters[walletAddress]={wallet_address}"
+
+        response = requests.get(
+            url,
+        )
+
+        if response.status_code != 200:
+            raise Exception(
+                f"Failed to get agent: {response.status_code} {response.text}"
+            )
+
+        response_json = response.json()
+
+        result = []
+
+        for agent in response_json.get("data", []):
+            if agent["offerings"]:
+                offerings = [AcpOffering(name=offering["name"], price=offering["price"]) for offering in
+                             agent["offerings"]]
+            else:
+                offerings = None
+
+            result.append(
+                AcpAgent(
+                    id=agent["id"],
+                    name=agent["name"],
+                    twitter_handle=agent["twitterHandle"],
+                    description=agent["description"],
+                    wallet_address=agent["walletAddress"],
+                    offerings=offerings,
+                    score=0,
+                    explanation=""
+                )
+            )
+        return result[0]

acp_plugin_gamesdk/acp_plugin.py

@@ -1,22 +1,27 @@
-from collections.abc import Callable
+import json
 import signal
 import sys
-from typing import List, Dict, Any, Optional,Tuple
-import json
-from dataclasses import dataclass, asdict
-from datetime import datetime, timezone, timedelta
 import traceback
+from collections.abc import Callable
+from dataclasses import asdict, dataclass
+from datetime import datetime, timedelta, timezone
+from typing import Any, Dict, List, Optional, Tuple
 
 import socketio
-import socketio.client
-
 from game_sdk.game.agent import WorkerConfig
 from game_sdk.game.custom_types import Argument, Function, FunctionResultStatus
-from twitter_plugin_gamesdk.twitter_plugin import TwitterPlugin
 from twitter_plugin_gamesdk.game_twitter_plugin import GameTwitterPlugin
+from twitter_plugin_gamesdk.twitter_plugin import TwitterPlugin
+
 from acp_plugin_gamesdk.acp_client import AcpClient
 from acp_plugin_gamesdk.acp_token import AcpToken
-from acp_plugin_gamesdk.interface import AcpJobPhasesDesc, IDeliverable, IInventory, AcpJob
+from acp_plugin_gamesdk.interface import (
+    AcpJob,
+    AcpJobPhasesDesc,
+    IDeliverable,
+    IInventory,
+)
+
 
 @dataclass
 class AcpPluginOptions:
@@ -28,16 +33,17 @@ class AcpPluginOptions:
     on_evaluate: Optional[Callable[[IDeliverable], Tuple[bool, str]]] = None
     on_phase_change: Optional[Callable[[AcpJob], None]] = None
     job_expiry_duration_mins: Optional[int] = None
-    
+
 
 SocketEvents = {
     "JOIN_EVALUATOR_ROOM": "joinEvaluatorRoom",
-    "LEAVE_EVALUATOR_ROOM": "leaveEvaluatorRoom", 
+    "LEAVE_EVALUATOR_ROOM": "leaveEvaluatorRoom",
     "ON_EVALUATE": "onEvaluate",
-    "ROOM_JOINED" : "roomJoined",
+    "ROOM_JOINED": "roomJoined",
     "ON_PHASE_CHANGE": "onPhaseChange"
 }
 
+
 class AcpPlugin:
     def __init__(self, options: AcpPluginOptions):
         print("Initializing AcpPlugin")
@@ -65,7 +71,7 @@ class AcpPlugin:
         self.twitter_plugin = None
         if options.twitter_plugin is not None:
             self.twitter_plugin = options.twitter_plugin
-            
+
         self.produced_inventory: List[IInventory] = []
         self.acp_base_url = self.acp_token_client.acp_base_url
         if options.on_evaluate is not None or options.on_phase_change is not None:
@@ -74,12 +80,14 @@ class AcpPlugin:
             if options.on_evaluate is not None:
                 self.on_evaluate = options.on_evaluate
             if options.on_phase_change is not None:
-                self.on_phase_change = options.on_phase_change
+                def phase_change_wrapper(job: AcpJob):
+                    job["getAgentByWalletAddress"] = self.acp_client.get_agent_by_wallet_address
+                    return options.on_phase_change(job)
+
+                self.on_phase_change = phase_change_wrapper
             self.initialize_socket()
         self.job_expiry_duration_mins = options.job_expiry_duration_mins if options.job_expiry_duration_mins is not None else 1440
-        
-        
-        
+
     def initialize_socket(self) -> Tuple[bool, str]:
         """
         Initialize socket connection for real-time communication.
@@ -87,37 +95,36 @@ class AcpPlugin:
         """
         try:
             self.socket = socketio.Client()
-                
+
             # Set up authentication before connecting
             self.socket.auth = {
                 "evaluatorAddress": self.acp_token_client.agent_wallet_address
             }
-            
+
             # Connect socket to GAME SDK dev server
             self.socket.connect(self.acp_client.base_url, auth=self.socket.auth)
-            
+
             if self.socket.connected:
                 self.socket.emit(SocketEvents["JOIN_EVALUATOR_ROOM"], self.acp_token_client.agent_wallet_address)
-        
-            
+
             # Set up event handler for evaluation requests
             @self.socket.on(SocketEvents["ON_EVALUATE"])
             def on_evaluate(data):
                 if self.on_evaluate:
                     deliverable = data.get("deliverable")
                     memo_id = data.get("memoId")
-                    
+
                     is_approved, reasoning = self.on_evaluate(deliverable)
-                    
+
                     self.acp_token_client.sign_memo(memo_id, is_approved, reasoning)
-                    
-                        # Set up event handler for phase changes
+
+                    # Set up event handler for phase changes
+
             @self.socket.on(SocketEvents["ON_PHASE_CHANGE"])
             def on_phase_change(data):
                 if hasattr(self, 'on_phase_change') and self.on_phase_change:
-                    print(f"on_phase_change: {data}")
                     self.on_phase_change(data)
-            
+
             # Set up cleanup function for graceful shutdown
             def cleanup():
                 if self.socket:
@@ -125,34 +132,31 @@ class AcpPlugin:
                     import time
                     time.sleep(1)
                     self.socket.disconnect()
-                    
-                    
-            
+
             def signal_handler(_sig, _frame):
                 cleanup()
                 sys.exit(0)
-                
+
             signal.signal(signal.SIGINT, signal_handler)
             signal.signal(signal.SIGTERM, signal_handler)
-            
+
             return True, "Socket initialized successfully"
-            
+
         except Exception as e:
             return False, f"Failed to initialize socket: {str(e)}"
-    
-    
+
     def set_on_phase_change(self, on_phase_change: Callable[[AcpJob], None]) -> None:
         self.on_phase_change = on_phase_change
 
     def add_produce_item(self, item: IInventory) -> None:
         self.produced_inventory.append(item)
-        
+
     def reset_state(self) -> None:
         self.acp_client.reset_state()
-        
+
     def delete_completed_job(self, job_id: int) -> None:
         self.acp_client.delete_completed_job(job_id)
-        
+
     def get_acp_state(self) -> Dict:
         server_state = self.acp_client.get_state()
         server_state.inventory.produced = self.produced_inventory
@@ -167,7 +171,7 @@ class AcpPlugin:
             self.pay_job,
             self.deliver_job,
         ]
-        
+
         def get_environment(_function_result, _current_state) -> Dict[str, Any]:
             environment = data.get_environment() if hasattr(data, "get_environment") else {}
             return {
@@ -182,7 +186,7 @@ class AcpPlugin:
             get_state_fn=get_environment,
             instruction=data.get("instructions") if data else None
         )
-        
+
         return worker_config
 
     @property
@@ -201,8 +205,8 @@ class AcpPlugin:
           - Each job tracks:
             * phase: request (seller should response to accept/reject to the job) → pending_payment (as a buyer to make the payment for the service) → in_progress (seller to deliver the service) → evaluation → completed/rejected
         """
-        
-    def _search_agents_executable(self,reasoning: str, keyword: str) -> Tuple[FunctionResultStatus, str, dict]:
+
+    def _search_agents_executable(self, reasoning: str, keyword: str) -> Tuple[FunctionResultStatus, str, dict]:
         if not reasoning:
             return FunctionResultStatus.FAILED, "Reasoning for the search must be provided. This helps track your decision-making process for future reference.", {}
 
@@ -289,21 +293,22 @@ class AcpPlugin:
             type="string",
             description="Detailed specifications for service-based items",
         )
-        
+
         require_evaluation_arg = Argument(
             name="require_evaluation",
             type="boolean",
             description="Decide if your job request is complex enough to spend money for evaluator agent to assess the relevancy of the output. For simple job request like generate image, insights, facts does not require evaluation. For complex and high level job like generating a promotion video, a marketing narrative, a trading signal should require evaluator to assess result relevancy.",
         )
-        
+
         evaluator_keyword_arg = Argument(
             name="evaluator_keyword",
             type="string",
             description="Keyword to search for a evaluator",
         )
 
-        args = [seller_wallet_address_arg, price_arg, reasoning_arg, service_requirements_arg, require_evaluation_arg, evaluator_keyword_arg]
-        
+        args = [seller_wallet_address_arg, price_arg, reasoning_arg, service_requirements_arg, require_evaluation_arg,
+                evaluator_keyword_arg]
+
         if hasattr(self, 'twitter_plugin') and self.twitter_plugin is not None:
             tweet_content_arg = Argument(
                 name="tweet_content",
@@ -311,7 +316,7 @@ class AcpPlugin:
                 description="Tweet content that will be posted about this job. Must include the seller's Twitter handle (with @ symbol) to notify them",
             )
             args.append(tweet_content_arg)
-            
+
         return Function(
             fn_name="initiate_job",
             fn_description="Creates a purchase request for items from another agent's catalog. Only for use when YOU are the buyer. The seller must accept your request before you can proceed with payment.",
@@ -319,7 +324,9 @@ class AcpPlugin:
             executable=self._initiate_job_executable
         )
 
-    def _initiate_job_executable(self, seller_wallet_address: str, price: str, reasoning: str, service_requirements: str, require_evaluation: str, evaluator_keyword: str, tweet_content: Optional[str] = None) -> Tuple[FunctionResultStatus, str, dict]:
+    def _initiate_job_executable(self, seller_wallet_address: str, price: str, reasoning: str,
+                                 service_requirements: str, require_evaluation: str, evaluator_keyword: str,
+                                 tweet_content: Optional[str] = None) -> Tuple[FunctionResultStatus, str, dict]:
         if isinstance(require_evaluation, str):
             require_evaluation = require_evaluation.lower() == 'true'
         elif isinstance(require_evaluation, bool):
@@ -329,10 +336,10 @@ class AcpPlugin:
 
         if not price:
             return FunctionResultStatus.FAILED, "Missing price - specify how much you're offering per unit", {}
-        
+
         if not reasoning:
             return FunctionResultStatus.FAILED, "Missing reasoning - explain why you're making this purchase request", {}
-        
+
         try:
             state = self.get_acp_state()
 
@@ -343,24 +350,25 @@ class AcpPlugin:
             )
 
             if existing_job:
-                return FunctionResultStatus.FAILED, f"You already have an active job as a buyer with {existing_job['providerAddress']} - complete the current job before initiating a new one", {}  
-            
+                return FunctionResultStatus.FAILED, f"You already have an active job as a buyer with {existing_job['providerAddress']} - complete the current job before initiating a new one", {}
+
             if not seller_wallet_address:
                 return FunctionResultStatus.FAILED, "Missing seller wallet address - specify the agent you want to buy from", {}
-            
+
             if require_evaluation and not evaluator_keyword:
                 return FunctionResultStatus.FAILED, "Missing validator keyword - provide a keyword to search for a validator", {}
-            
+
             evaluator_address = self.acp_token_client.get_agent_wallet_address()
-            
+
             if require_evaluation:
-                validators = self.acp_client.browse_agents(self.evaluator_cluster, evaluator_keyword, rerank=True, top_k=1)
-                
+                validators = self.acp_client.browse_agents(self.evaluator_cluster, evaluator_keyword, rerank=True,
+                                                           top_k=1)
+
                 if len(validators) == 0:
                     return FunctionResultStatus.FAILED, "No evaluator found - try a different keyword", {}
 
                 evaluator_address = validators[0].wallet_address
-            
+
             # ... Rest of validation logic ...
             expired_at = datetime.now(timezone.utc) + timedelta(minutes=self.job_expiry_duration_mins)
             job_id = self.acp_client.create_job(
@@ -408,9 +416,9 @@ class AcpPlugin:
             type="string",
             description="Why you made this decision",
         )
-        
+
         args = [job_id_arg, decision_arg, reasoning_arg]
-        
+
         if hasattr(self, 'twitter_plugin') and self.twitter_plugin is not None:
             tweet_content_arg = Argument(
                 name="tweet_content",
@@ -426,19 +434,20 @@ class AcpPlugin:
             executable=self._respond_job_executable
         )
 
-    def _respond_job_executable(self, job_id: int, decision: str, reasoning: str, tweet_content: Optional[str] = None) -> Tuple[FunctionResultStatus, str, dict]:
+    def _respond_job_executable(self, job_id: int, decision: str, reasoning: str,
+                                tweet_content: Optional[str] = None) -> Tuple[FunctionResultStatus, str, dict]:
         if not job_id:
             return FunctionResultStatus.FAILED, "Missing job ID - specify which job you're responding to", {}
-        
+
         if not decision or decision not in ["ACCEPT", "REJECT"]:
             return FunctionResultStatus.FAILED, "Invalid decision - must be either 'ACCEPT' or 'REJECT'", {}
-            
+
         if not reasoning:
             return FunctionResultStatus.FAILED, "Missing reasoning - explain why you made this decision", {}
 
         try:
             state = self.get_acp_state()
-            
+
             job = next(
                 (c for c in state["jobs"]["active"]["asASeller"] if c["jobId"] == job_id),
                 None
@@ -488,7 +497,7 @@ class AcpPlugin:
         )
 
         args = [job_id_arg, amount_arg, reasoning_arg]
-        
+
         if hasattr(self, 'twitter_plugin') and self.twitter_plugin is not None:
             tweet_content_arg = Argument(
                 name="tweet_content",
@@ -504,7 +513,8 @@ class AcpPlugin:
             executable=self._pay_job_executable
         )
 
-    def _pay_job_executable(self, job_id: int, amount: float, reasoning: str, tweet_content: Optional[str] = None) -> Tuple[FunctionResultStatus, str, dict]:
+    def _pay_job_executable(self, job_id: int, amount: float, reasoning: str, tweet_content: Optional[str] = None) -> \
+            Tuple[FunctionResultStatus, str, dict]:
         if not job_id:
             return FunctionResultStatus.FAILED, "Missing job ID - specify which job you're paying for", {}
 
@@ -516,7 +526,7 @@ class AcpPlugin:
 
         try:
             state = self.get_acp_state()
-            
+
             job = next(
                 (c for c in state["jobs"]["active"]["asABuyer"] if c["jobId"] == job_id),
                 None
@@ -528,7 +538,6 @@ class AcpPlugin:
             if job["phase"] != AcpJobPhasesDesc.NEGOTIATION:
                 return FunctionResultStatus.FAILED, f"Cannot pay - job is in '{job['phase']}' phase, must be in 'negotiation' phase", {}
 
-
             self.acp_client.make_payment(
                 job_id,
                 amount,
@@ -568,7 +577,7 @@ class AcpPlugin:
         )
 
         args = [job_id_arg, deliverable_arg, reasoning_arg]
-        
+
         if hasattr(self, 'twitter_plugin') and self.twitter_plugin is not None:
             tweet_content_arg = Argument(
                 name="tweet_content",
@@ -584,19 +593,20 @@ class AcpPlugin:
             executable=self._deliver_job_executable
         )
 
-    def _deliver_job_executable(self, job_id: int, deliverable: str, reasoning: str, tweet_content: Optional[str] = None) -> Tuple[FunctionResultStatus, str, dict]:
+    def _deliver_job_executable(self, job_id: int, deliverable: str, reasoning: str,
+                                tweet_content: Optional[str] = None) -> Tuple[FunctionResultStatus, str, dict]:
         if not job_id:
             return FunctionResultStatus.FAILED, "Missing job ID - specify which job you're delivering for", {}
-            
+
         if not reasoning:
             return FunctionResultStatus.FAILED, "Missing reasoning - explain why you're making this delivery", {}
-            
+
         if not deliverable:
             return FunctionResultStatus.FAILED, "Missing deliverable - specify what you're delivering", {}
 
         try:
             state = self.get_acp_state()
-            
+
             job = next(
                 (c for c in state["jobs"]["active"]["asASeller"] if c["jobId"] == job_id),
                 None
@@ -609,7 +619,8 @@ class AcpPlugin:
                 return FunctionResultStatus.FAILED, f"Cannot deliver - job is in '{job['phase']}' phase, must be in 'transaction' phase", {}
 
             produced = next(
-                (i for i in self.produced_inventory if (i["jobId"] if isinstance(i, dict) else i.jobId) == job["jobId"]),
+                (i for i in self.produced_inventory if
+                 (i["jobId"] if isinstance(i, dict) else i.jobId) == job["jobId"]),
                 None
             )
 
@@ -643,7 +654,7 @@ class AcpPlugin:
             tweet_id = tweet_history[-1].get("tweetId") if tweet_history else None
             if tweet_id is not None:
                 reply_tweet_fn = self.twitter_plugin.get_function('reply_tweet')
-                tweet_id = reply_tweet_fn(tweet_id,tweet_content, None).get('data', {}).get('id')
+                tweet_id = reply_tweet_fn(tweet_id, tweet_content, None).get('data', {}).get('id')
                 if tweet_id is not None:
-                    self.acp_client.add_tweet(job.get("jobId") ,tweet_id, tweet_content)
+                    self.acp_client.add_tweet(job.get("jobId"), tweet_id, tweet_content)
                     print("Tweet has been posted")

acp_plugin_gamesdk/acp_token.py

@@ -1,15 +1,18 @@
-from enum import IntEnum
+import json
 import time
-from typing import Optional, Tuple, TypedDict
+import traceback
 from datetime import datetime
-from acp_plugin_gamesdk.configs import ACPContractConfig
-from web3 import Web3
-from eth_account import Account
-from acp_plugin_gamesdk.acp_token_abi import ACP_TOKEN_ABI
+from enum import IntEnum
+from typing import Optional, Tuple, TypedDict
+
 import requests
+from eth_account import Account
 from eth_account.messages import encode_defunct
-import json
-import traceback
+from web3 import Web3
+
+from acp_plugin_gamesdk.acp_token_abi import ACP_TOKEN_ABI
+from acp_plugin_gamesdk.configs import ACPContractConfig
+
 
 class MemoType(IntEnum):
     MESSAGE = 0
@@ -19,6 +22,7 @@ class MemoType(IntEnum):
     OBJECT_URL = 4
     TXHASH = 5
 
+
 class IMemo(TypedDict):
     content: str
     memoType: MemoType
@@ -28,6 +32,7 @@ class IMemo(TypedDict):
     numApprovals: int
     sender: str
 
+
 class IJob(TypedDict):
     id: int
     client: str
@@ -39,14 +44,16 @@ class IJob(TypedDict):
     expiredAt: int
     evaluatorCount: int
 
+
 JobResult = Tuple[int, str, str, str, str, str, str, str, int]
 
+
 class AcpToken:
     def __init__(
-        self,
-        wallet_private_key: str,
-        agent_wallet_address: str,
-        config: ACPContractConfig,
+            self,
+            wallet_private_key: str,
+            agent_wallet_address: str,
+            config: ACPContractConfig,
     ):
         self.web3 = Web3(Web3.HTTPProvider(config.rpc_url))
         self.account = Account.from_key(wallet_private_key)
@@ -68,7 +75,7 @@ class AcpToken:
                     },
                     {
                         "internalType": "uint256",
-                        "name": "amount", 
+                        "name": "amount",
                         "type": "uint256"
                     }
                 ],
@@ -86,101 +93,103 @@ class AcpToken:
         )
         self.acp_base_url = config.acp_api_url
         self.game_api_url = config.game_api_url
-    
+
     def get_agent_wallet_address(self) -> str:
         return self.agent_wallet_address
-        
+
     def get_contract_address(self) -> str:
         return self.contract_address
 
     def validate_transaction(self, hash_value: str) -> object:
         try:
-            response = requests.post(f"{self.acp_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(traceback.format_exc())
             raise Exception(f"Failed to get job_id {error}")
 
     def create_job(
-        self,
-        provider_address: str,
-        evaluator_address: str,
-        expire_at: datetime
+            self,
+            provider_address: str,
+            evaluator_address: str,
+            expire_at: datetime
     ) -> dict:
         try:
             provider_address = Web3.to_checksum_address(provider_address)
             evaluator_address = Web3.to_checksum_address(evaluator_address)
             expire_timestamp = int(expire_at.timestamp())
-        
+
             # Sign the transaction
             trx_data, signature = self._sign_transaction(
-                "createJob", 
+                "createJob",
                 [provider_address, evaluator_address, expire_timestamp]
             )
-                
+
             # Prepare payload
             payload = {
                 "agentWallet": self.get_agent_wallet_address(),
                 "trxData": trx_data,
                 "signature": signature
             }
-            
+
             # Submit to custom API
             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')}")
-            
+                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", "")}
-        
+
         except Exception as e:
             raise
 
     def approve_allowance(self, price_in_wei: int) -> str:
         try:
             trx_data, signature = self._sign_transaction(
-                "approve", 
+                "approve",
                 [self.contract_address, price_in_wei],
                 self.virtuals_token_address
             )
-            
+
             payload = {
                 "agentWallet": self.get_agent_wallet_address(),
                 "trxData": trx_data,
                 "signature": signature
             }
-            
+
             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 approve allowance {response.json().get('error').get('status')}, Message: {response.json().get('error').get('message')}")
-            
+                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 e:
             print(f"An error occurred while approving allowance: {e}")
             raise
 
     def create_memo(
-        self,
-        job_id: int,
-        content: str,
-        memo_type: MemoType,
-        is_secured: bool,
-        next_phase: int
+            self,
+            job_id: int,
+            content: str,
+            memo_type: MemoType,
+            is_secured: bool,
+            next_phase: int
     ) -> dict:
         retries = 3
         error = None
         while retries > 0:
             try:
                 trx_data, signature = self._sign_transaction(
-                    "createMemo", 
+                    "createMemo",
                     [job_id, content, memo_type, is_secured, next_phase]
                 )
-                
+
                 payload = {
                     "agentWallet": self.get_agent_wallet_address(),
                     "trxData": trx_data,
@@ -189,99 +198,104 @@ class AcpToken:
 
                 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 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", "")}
+                    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 e:
                 print(f"{e}")
                 print(traceback.format_exc())
                 error = e
                 retries -= 1
                 time.sleep(2 * (3 - retries))
-                
+
             if error:
                 raise Exception(f"{error}")
 
-    def _sign_transaction(self, method_name: str, args: list, contract_address: Optional[str] = None) -> Tuple[dict, str]:
+    def _sign_transaction(self, method_name: str, args: list, contract_address: Optional[str] = None) -> Tuple[
+        dict, str]:
         if contract_address:
             encoded_data = self.virtuals_token_contract.encode_abi(method_name, args=args)
         else:
             encoded_data = self.contract.encode_abi(method_name, args=args)
-        
+
         trx_data = {
             "target": contract_address if contract_address else self.get_contract_address(),
             "value": "0",
             "data": encoded_data
         }
-        
+
         message_json = json.dumps(trx_data, separators=(",", ":"), sort_keys=False)
         message_bytes = message_json.encode()
-        
+
         # Sign the transaction
         message = encode_defunct(message_bytes)
         signature = "0x" + self.account.sign_message(message).signature.hex()
-        
+
         return trx_data, signature
 
     def sign_memo(
-        self,
-        memo_id: int,
-        is_approved: bool,
-        reason: Optional[str] = ""
+            self,
+            memo_id: int,
+            is_approved: bool,
+            reason: Optional[str] = ""
     ) -> str:
         retries = 3
         error = None
         while retries > 0:
             try:
                 trx_data, signature = self._sign_transaction(
-                    "signMemo", 
+                    "signMemo",
                     [memo_id, is_approved, reason]
                 )
-                
+
                 payload = {
                     "agentWallet": self.get_agent_wallet_address(),
                     "trxData": trx_data,
                     "signature": signature
                 }
-                
+
                 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 sign memo {response.json().get('error').get('status')}, Message: {response.json().get('error').get('message')}")
-                
+                    raise Exception(
+                        f"Failed to sign memo {response.json().get('error').get('status')}, Message: {response.json().get('error').get('message')}")
+
                 return response.json()
-                
+
             except Exception as e:
                 error = e
                 print(f"{error}")
                 print(traceback.format_exc())
                 retries -= 1
                 time.sleep(2 * (3 - retries))
-                
+
         raise Exception(f"Failed to sign memo {error}")
 
     def set_budget(self, job_id: int, budget: int) -> str:
         try:
             trx_data, signature = self._sign_transaction(
-                "setBudget", 
+                "setBudget",
                 [job_id, budget]
             )
-            
+
             payload = {
                 "agentWallet": self.get_agent_wallet_address(),
                 "trxData": trx_data,
                 "signature": signature
             }
-            
+
             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 set budget {response.json().get('error').get('status')}, Message: {response.json().get('error').get('message')}")
-            
+                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:
             raise Exception(f"{error}")
@@ -289,10 +303,10 @@ class AcpToken:
     def get_job(self, job_id: int) -> Optional[IJob]:
         try:
             job_data = self.contract.functions.jobs(job_id).call()
-            
+
             if not job_data:
                 return None
-                
+
             return {
                 'id': job_data[0],
                 'client': job_data[1],
@@ -308,13 +322,13 @@ class AcpToken:
             raise Exception(f"{error}")
 
     def get_memo_by_job(
-        self,
-        job_id: int,
-        memo_type: Optional[MemoType] = None
+            self,
+            job_id: int,
+            memo_type: Optional[MemoType] = None
     ) -> Optional[IMemo]:
         try:
             memos = self.contract.functions.getAllMemos(job_id).call()
-            
+
             if memo_type is not None:
                 filtered_memos = [m for m in memos if m['memoType'] == memo_type]
                 return filtered_memos[-1] if filtered_memos else None
@@ -324,14 +338,14 @@ class AcpToken:
             raise Exception(f"Failed to get memo by job {error}")
 
     def get_memos_for_phase(
-        self,
-        job_id: int,
-        phase: int,
-        target_phase: int
+            self,
+            job_id: int,
+            phase: int,
+            target_phase: int
     ) -> Optional[IMemo]:
         try:
             memos = self.contract.functions.getMemosForPhase(job_id, phase).call()
-            
+
             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:

acp_plugin_gamesdk/configs.py

@@ -3,6 +3,7 @@ from typing import Literal
 
 ChainEnv = Literal["base-sepolia", "base"]
 
+
 @dataclass
 class ACPContractConfig:
     chain_env: ChainEnv
@@ -13,6 +14,7 @@ class ACPContractConfig:
     acp_api_url: str
     game_api_url: str
 
+
 # Configuration for Base Sepolia
 BASE_SEPOLIA_CONFIG = ACPContractConfig(
     chain_env="base-sepolia",
@@ -27,16 +29,16 @@ BASE_SEPOLIA_CONFIG = ACPContractConfig(
 # Configuration for Base Mainnet
 BASE_MAINNET_CONFIG = ACPContractConfig(
     chain_env="base",
-    rpc_url="https://mainnet.base.org", 
+    rpc_url="https://mainnet.base.org",
     chain_id=8453,
     contract_address="0x6a1FE26D54ab0d3E1e3168f2e0c0cDa5cC0A0A4A",
     virtuals_token_address="0x0b3e328455c4059EEb9e3f84b5543F74E24e7E1b",
-    acp_api_url="https://acpx.virtuals.io/api", # PROD
+    acp_api_url="https://acpx.virtuals.io/api",  # PROD
     game_api_url="https://sdk.game.virtuals.io"
 )
 
 # Define the default configuration for the SDK
 # For a production-ready SDK, this would typically be BASE_MAINNET_CONFIG.
 # For initial development/testing, BASE_SEPOLIA_CONFIG might be more appropriate.
-DEFAULT_CONFIG = BASE_MAINNET_CONFIG 
+DEFAULT_CONFIG = BASE_MAINNET_CONFIG
 # Or: DEFAULT_CONFIG = BASE_SEPOLIA_CONFIG

acp_plugin_gamesdk/interface.py

@@ -1,6 +1,7 @@
 from dataclasses import dataclass
-from enum import IntEnum, Enum
-from typing import List, Literal, Optional
+from enum import Enum, IntEnum
+from typing import Any, Callable, Dict, List, Literal, Optional, Union
+
 
 @dataclass
 class AcpOffering:
@@ -12,7 +13,8 @@ class AcpOffering:
             f"Offering(name={self.name}, price={self.price})"
         )
         return output
-    
+
+
 @dataclass
 class AcpAgent:
     id: str
@@ -28,7 +30,7 @@ class AcpAgent:
         offer = ""
         if self.offerings:
             for index, off in enumerate(self.offerings):
-                offer += f"{index+1}. {str(off)}\n"
+                offer += f"{index + 1}. {str(off)}\n"
 
         output = (
             f"😎 Agent ID={self.id}\n"
@@ -38,7 +40,8 @@ class AcpAgent:
             f"Explanation:\n{self.explanation}"
         )
         return output
-    
+
+
 class AcpJobPhases(IntEnum):
     REQUEST = 0
     NEGOTIATION = 1
@@ -47,6 +50,7 @@ class AcpJobPhases(IntEnum):
     COMPLETED = 4
     REJECTED = 5
 
+
 class AcpJobPhasesDesc(str, Enum):
     REQUEST = "request"
     NEGOTIATION = "pending_payment"
@@ -55,6 +59,7 @@ class AcpJobPhasesDesc(str, Enum):
     COMPLETED = "completed"
     REJECTED = "rejected"
 
+
 @dataclass
 class AcpRequestMemo:
     id: int
@@ -63,7 +68,8 @@ class AcpRequestMemo:
     def __repr__(self) -> str:
         output = f"Memo(ID: {self.id}, created at: {self.createdAt})"
         return output
-    
+
+
 @dataclass
 class ITweet:
     type: Literal["buyer", "seller"]
@@ -71,46 +77,54 @@ class ITweet:
     content: str
     created_at: int
 
+
 @dataclass
 class AcpJob:
     jobId: Optional[int]
-    clientName : Optional[str]
+    clientName: Optional[str]
     providerName: Optional[str]
     desc: str
     price: str
     providerAddress: Optional[str]
+    clientAddress: Optional[str]
     phase: AcpJobPhasesDesc
     memo: List[AcpRequestMemo]
-    tweetHistory : ITweet | List
+    tweetHistory: ITweet | List
     lastUpdated: int
+    getAgentByWalletAddress: Optional[Callable[[str], AcpAgent]]
 
     def __repr__(self) -> str:
-        output =(
+        output = (
             f"Job ID: {self.jobId}, "
             f"Client Name: {self.clientName}, "
             f"Provider Name: {self.providerName}, "
             f"Description: {self.desc}, "
             f"Price: {self.price}, "
             f"Provider Address: {self.providerAddress}, "
+            f"Client Address: {self.clientAddress}, "
             f"Phase: {self.phase.value}, "
             f"Memo: {self.memo}, "
             f"Tweet History: {self.tweetHistory}, "
             f"Last Updated: {self.lastUpdated})"
-        ) 
+        )
         return output
 
+
 @dataclass
 class IDeliverable:
     type: str
-    value: str
+    value: Union[str, Dict[str, Any], List[Any]]
     clientName: Optional[str]
     providerName: Optional[str]
+
+
 @dataclass
 class IInventory(IDeliverable):
     jobId: int
     clientName: Optional[str]
     providerName: Optional[str]
 
+
 @dataclass
 class AcpJobsSection:
     asABuyer: List[AcpJob]
@@ -119,11 +133,11 @@ class AcpJobsSection:
     def __str__(self) -> str:
         buyer_jobs = ""
         for index, job in enumerate(self.asABuyer):
-            buyer_jobs += f"#{index+1} {str(job)} \n"
+            buyer_jobs += f"#{index + 1} {str(job)} \n"
 
         seller_jobs = ""
         for index, job in enumerate(self.asASeller):
-            seller_jobs += f"#{index+1} {str(job)} \n"
+            seller_jobs += f"#{index + 1} {str(job)} \n"
 
         output = (
             f"As Buyer:\n{buyer_jobs}\n"
@@ -131,6 +145,7 @@ class AcpJobsSection:
         )
         return output
 
+
 @dataclass
 class AcpJobs:
     active: AcpJobsSection
@@ -145,7 +160,8 @@ class AcpJobs:
             f"🔴 Cancelled:\n{self.cancelled}\n"
         )
         return output
-    
+
+
 @dataclass
 class AcpInventory:
     acquired: List[IInventory]
@@ -159,6 +175,7 @@ class AcpInventory:
         )
         return output
 
+
 @dataclass
 class AcpState:
     inventory: AcpInventory
@@ -166,9 +183,9 @@ class AcpState:
 
     def __str__(self) -> str:
         output = (
-            f"🤖 Agent State".center(50, '=') + "\n" + \
-            f"{str(self.inventory)}\n" + \
-            f"{str(self.jobs)}\n" + \
-            f"State End".center(50, '=') + "\n"
+                f"🤖 Agent State".center(50, '=') + "\n" + \
+                f"{str(self.inventory)}\n" + \
+                f"{str(self.jobs)}\n" + \
+                f"State End".center(50, '=') + "\n"
         )
-        return output
+        return output

{acp_plugin_gamesdk-0.1.18.dist-info → acp_plugin_gamesdk-0.1.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: acp-plugin-gamesdk
-Version: 0.1.18
+Version: 0.1.20
 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.20.dist-info/RECORD

@@ -0,0 +1,9 @@
+acp_plugin_gamesdk/acp_client.py,sha256=fsSByXElEJuzFdhJTphHmtRv8Tqhs5eXuCGRm2l2JtM,10167
+acp_plugin_gamesdk/acp_plugin.py,sha256=4-flS9WnQqvwX1mhJJ2SiDmGuQs_sIiec-1fFlipGHk,27022
+acp_plugin_gamesdk/acp_token.py,sha256=uOeQ6_azL50sJekDlWYjwAtd2YxedDXjRuoCRLFZJ8Q,11804
+acp_plugin_gamesdk/acp_token_abi.py,sha256=nllh9xOuDXxFFdhLklTTdtZxWZd2LcUTBoOP2d9xDTA,22319
+acp_plugin_gamesdk/configs.py,sha256=4rLOOMbRPqf2RM-Lz5Az7mbUI_a5kgmySZlBiMkB3Mo,1406
+acp_plugin_gamesdk/interface.py,sha256=0u3exP_MXHjTF4rrAPQAkGAtSGCaOvhfXewepDr9Hb8,4549
+acp_plugin_gamesdk-0.1.20.dist-info/METADATA,sha256=Uh-DfnSzyRgxWJnite0txHh2Qqhz9KKDdOioEiB4pGc,12791
+acp_plugin_gamesdk-0.1.20.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+acp_plugin_gamesdk-0.1.20.dist-info/RECORD,,

acp_plugin_gamesdk-0.1.18.dist-info/RECORD

@@ -1,9 +0,0 @@
-acp_plugin_gamesdk/acp_client.py,sha256=gaTZ6H7tRlz0dDyodhb-KhbzcYQj-KwPJA8YTAqvYWk,9221
-acp_plugin_gamesdk/acp_plugin.py,sha256=g-DHfhiWmFmvKlXYlNaLaKmQLjXnJ42zDSafONKtJic,27205
-acp_plugin_gamesdk/acp_token.py,sha256=LE60bHpJDsR0F-5mKxrhXVMyHIEHG0-BvjCRLaJoUJI,11954
-acp_plugin_gamesdk/acp_token_abi.py,sha256=nllh9xOuDXxFFdhLklTTdtZxWZd2LcUTBoOP2d9xDTA,22319
-acp_plugin_gamesdk/configs.py,sha256=YS8DSLC7kC_BwydhXi6gohtB-aJfK6yaDYYNf92CMJM,1405
-acp_plugin_gamesdk/interface.py,sha256=jC6xXDsL8agw9flbszkYPxd01qER2vR2ukQnLJMHYKI,4316
-acp_plugin_gamesdk-0.1.18.dist-info/METADATA,sha256=fkFk_092a90AHCUzQHmQSkc44bp_KE9p028KbtOHOhM,12791
-acp_plugin_gamesdk-0.1.18.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-acp_plugin_gamesdk-0.1.18.dist-info/RECORD,,