acp-plugin-gamesdk 0.1.24__py3-none-any.whl → 0.1.26__py3-none-any.whl

acp_plugin_gamesdk/interface.py

@@ -1,51 +1,15 @@
-from dataclasses import dataclass
-from enum import Enum, IntEnum
-from typing import Any, Callable, Dict, List, Literal, Optional, Union
+from enum import Enum
+from typing import Optional, List, Literal, Dict, Any
+from pydantic import BaseModel
 
+from virtuals_acp.models import ACPJobPhase
 
-@dataclass
-class AcpOffering:
+class AcpOffering(BaseModel):
     name: str
     price: float
 
     def __str__(self) -> str:
-        output = (
-            f"Offering(name={self.name}, price={self.price})"
-        )
-        return output
-
-
-@dataclass
-class AcpAgent:
-    id: str
-    name: str
-    twitter_handle: str
-    description: str
-    wallet_address: str
-    offerings: Optional[List[AcpOffering]]
-
-    def __str__(self) -> str:
-        offer = ""
-        if self.offerings:
-            for index, off in enumerate(self.offerings):
-                offer += f"{index + 1}. {str(off)}\n"
-
-        output = (
-            f"😎 Agent ID={self.id}\n"
-            f"Name={self.name}, Description={self.description}, Wallet={self.wallet_address}\n"
-            f"Offerings:\n{offer}"
-        )
-        return output
-
-
-class AcpJobPhases(IntEnum):
-    REQUEST = 0
-    NEGOTIATION = 1
-    TRANSACTION = 2
-    EVALUATION = 3
-    COMPLETED = 4
-    REJECTED = 5
-
+        return f"Offering(name={self.name}, price={self.price})"
 
 class AcpJobPhasesDesc(str, Enum):
     REQUEST = "request"
@@ -55,133 +19,130 @@ class AcpJobPhasesDesc(str, Enum):
     COMPLETED = "completed"
     REJECTED = "rejected"
 
-
-@dataclass
-class AcpRequestMemo:
+ACP_JOB_PHASE_MAP: Dict[ACPJobPhase, AcpJobPhasesDesc] = {
+    ACPJobPhase.REQUEST: AcpJobPhasesDesc.REQUEST,
+    ACPJobPhase.NEGOTIATION: AcpJobPhasesDesc.NEGOTIATION,
+    ACPJobPhase.TRANSACTION: AcpJobPhasesDesc.TRANSACTION,
+    ACPJobPhase.EVALUATION: AcpJobPhasesDesc.EVALUATION,
+    ACPJobPhase.COMPLETED: AcpJobPhasesDesc.COMPLETED,
+    ACPJobPhase.REJECTED: AcpJobPhasesDesc.REJECTED,
+}
+
+ACP_JOB_PHASE_REVERSE_MAP: Dict[str, ACPJobPhase] = {
+    "request": ACPJobPhase.REQUEST,
+    "pending_payment": ACPJobPhase.NEGOTIATION,
+    "in_progress": ACPJobPhase.TRANSACTION,
+    "evaluation": ACPJobPhase.EVALUATION,
+    "completed": ACPJobPhase.COMPLETED,
+    "rejected": ACPJobPhase.REJECTED,
+}
+
+class AcpRequestMemo(BaseModel):
     id: int
-    createdAt: int
 
     def __repr__(self) -> str:
-        output = f"Memo(ID: {self.id}, created at: {self.createdAt})"
-        return output
-
-
-@dataclass
-class ITweet:
+        return f"Memo(ID: {self.id})"
+    
+class ITweet(BaseModel):
     type: Literal["buyer", "seller"]
     tweet_id: str
     content: str
     created_at: int
 
-
-@dataclass
-class AcpJob:
+class IAcpJob(BaseModel):
     jobId: Optional[int]
     clientName: Optional[str]
     providerName: Optional[str]
-    desc: Optional[str]
+    desc: str
     price: str
     providerAddress: Optional[str]
-    clientAddress: Optional[str]
     phase: AcpJobPhasesDesc
     memo: List[AcpRequestMemo]
-    tweetHistory: ITweet | List
-    lastUpdated: int
-    getAgentByWalletAddress: Optional[Callable[[str], AcpAgent]]
+    tweetHistory: Optional[List[Optional[ITweet]]]
 
     def __repr__(self) -> str:
-        output = (
+        return (
             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})"
+            f"Tweet History: {self.tweetHistory}"
         )
-        return output
-
 
-@dataclass
-class IDeliverable:
+class IDeliverable(BaseModel):
     type: str
-    value: Union[str, Dict[str, Any], List[Any]]
+    value: str
     clientName: Optional[str]
     providerName: Optional[str]
 
 
-@dataclass
 class IInventory(IDeliverable):
     jobId: int
     clientName: Optional[str]
     providerName: Optional[str]
 
-
-@dataclass
-class AcpJobsSection:
-    asABuyer: List[AcpJob]
-    asASeller: List[AcpJob]
+class AcpJobsSection(BaseModel):
+    asABuyer: List[IAcpJob]
+    asASeller: List[IAcpJob]
 
     def __str__(self) -> str:
-        buyer_jobs = ""
-        for index, job in enumerate(self.asABuyer):
-            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"
-
-        output = (
-            f"As Buyer:\n{buyer_jobs}\n"
-            f"As Seller:\n{seller_jobs}\n"
-        )
-        return output
-
+        buyer_jobs = "\n".join([f"#{i+1} {str(job)}" for i, job in enumerate(self.asABuyer)])
+        seller_jobs = "\n".join([f"#{i+1} {str(job)}" for i, job in enumerate(self.asASeller)])
+        return f"As Buyer:\n{buyer_jobs}\n\nAs Seller:\n{seller_jobs}"
 
-@dataclass
-class AcpJobs:
+class AcpJobs(BaseModel):
     active: AcpJobsSection
-    completed: List[AcpJob]
-    cancelled: List[AcpJob]
+    completed: List[IAcpJob]
+    cancelled: List[IAcpJob]
 
     def __str__(self) -> str:
-        output = (
+        return (
             f"💻 Jobs\n"
             f"🌕 Active Jobs:\n{self.active}\n"
             f"🟢 Completed:\n{self.completed}\n"
-            f"🔴 Cancelled:\n{self.cancelled}\n"
+            f"🔴 Cancelled:\n{self.cancelled}"
         )
-        return output
-
-
-@dataclass
-class AcpInventory:
+    
+class AcpInventory(BaseModel):
     acquired: List[IInventory]
     produced: Optional[List[IInventory]]
 
     def __str__(self) -> str:
-        output = (
+        return (
             f"💼 Inventory\n"
             f"Acquired: {self.acquired}\n"
-            f"Produced: {self.produced}\n"
+            f"Produced: {self.produced}"
         )
-        return output
-
 
-@dataclass
-class AcpState:
+class AcpState(BaseModel):
     inventory: AcpInventory
     jobs: AcpJobs
 
     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"
+        return (
+            f"🤖 Agent State".center(50, '=') + "\n"
+            f"{str(self.inventory)}\n"
+            f"{str(self.jobs)}\n"
+            f"State End".center(50, '=')
         )
-        return output
+
+def to_serializable_dict(obj: Any) -> Any:
+    if isinstance(obj, Enum):
+        return obj.value
+    elif isinstance(obj, dict):
+        return {k: to_serializable_dict(v) for k, v in obj.items()}
+    elif isinstance(obj, list):
+        return [to_serializable_dict(item) for item in obj]
+    elif hasattr(obj, "__dict__"):
+        return {
+            k: to_serializable_dict(v)
+            for k, v in vars(obj).items()
+            if not k.startswith("_")
+        }
+    else:
+        return obj
+    

{acp_plugin_gamesdk-0.1.24.dist-info → acp_plugin_gamesdk-0.1.26.dist-info}/METADATA

@@ -1,30 +1,20 @@
 Metadata-Version: 2.3
 Name: acp-plugin-gamesdk
-Version: 0.1.24
+Version: 0.1.26
 Summary: ACP Plugin for Python SDK for GAME by Virtuals
 Author: Steven Lee Soon Fatt
 Author-email: steven@virtuals.io
-Requires-Python: >=3.9,<3.13
+Requires-Python: >=3.10,<3.13
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: aiohttp (>=3.11.14,<4.0.0)
 Requires-Dist: dacite (>=1.9.2,<2.0.0)
-Requires-Dist: eth-account (>=0.13.6,<0.14.0)
-Requires-Dist: eth-typing (>=5.2.0,<6.0.0)
-Requires-Dist: eth-utils (>=5.2.0,<6.0.0)
 Requires-Dist: game-sdk (>=0.1.5)
-Requires-Dist: pydantic (>=2.10.6,<3.0.0)
 Requires-Dist: python-dotenv (>=1.1.0,<2.0.0)
-Requires-Dist: python-socketio (>=5.11.1,<6.0.0)
-Requires-Dist: requests (>=2.32.3,<3.0.0)
 Requires-Dist: rich (>=13.9.4,<15.0.0)
-Requires-Dist: twitter-plugin-gamesdk (>=0.2.2,<0.2.4)
-Requires-Dist: virtuals-sdk (>=0.1.6,<0.2.0)
-Requires-Dist: web3 (>=7.9.0,<8.0.0)
-Requires-Dist: websocket-client (>=1.7.0,<2.0.0)
+Requires-Dist: twitter-plugin-gamesdk (>=0.2.10,<0.3.0)
+Requires-Dist: virtuals-acp (>=0.1.13)
 Description-Content-Type: text/markdown
 
 # ACP Plugin

acp_plugin_gamesdk-0.1.26.dist-info/RECORD

@@ -0,0 +1,6 @@
+acp_plugin_gamesdk/acp_plugin.py,sha256=0mh1lFLIm-BN9mlHQif1yIpyNfB7J1_KZpu7OV4vLW4,26673
+acp_plugin_gamesdk/env.py,sha256=_1UQtONrfC9hkO2yGYfxawEk71nF_0GXC_79a0RVyv0,1367
+acp_plugin_gamesdk/interface.py,sha256=4IdKjTJMH8Rmoz55Jv0vCgdu4wqgw3wqqK1C8JBHldM,4262
+acp_plugin_gamesdk-0.1.26.dist-info/METADATA,sha256=qWf864Ss4sNNBH4m26QXQj2flZTwo6N7OLUmIb0jotE,12345
+acp_plugin_gamesdk-0.1.26.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+acp_plugin_gamesdk-0.1.26.dist-info/RECORD,,

acp_plugin_gamesdk/acp_client.py

@@ -1,307 +0,0 @@
-import time
-import traceback
-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.acp_token import AcpToken, MemoType
-from acp_plugin_gamesdk.interface import (
-    AcpAgent,
-    AcpJobPhases,
-    AcpJobPhasesDesc,
-    AcpOffering,
-    AcpState,
-)
-
-
-class AcpClient:
-    def __init__(self, api_key: str, acp_token: AcpToken):
-        self.api_key = api_key
-        self.acp_token = acp_token
-        self.web3 = Web3()
-
-        self.acp_base_url = self.acp_token.acp_base_url
-        self.base_url = self.acp_token.game_api_url + "/acp"
-
-    @property
-    def agent_wallet_address(self) -> str:
-        return self.acp_token.get_agent_wallet_address()
-
-    def get_state(self) -> AcpState:
-        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}))
-        return result
-
-    def browse_agents(
-            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 = {
-            "search": query,
-            "filters[cluster]": cluster,
-            "filters[walletAddress][$notIn]": self.agent_wallet_address,
-            "rerank": "true" if rerank else "false",
-            "top_k": top_k,
-        }
-        response = requests.get(url, params=params)
-
-        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"
-            )
-
-        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,
-                )
-            )
-
-        return result
-
-    def create_job(
-            self,
-            provider_address: str,
-            price: float,
-            job_description: str,
-            evaluator_address: str,
-            expired_at: datetime,
-    ) -> int:
-        tx_result = self.acp_token.create_job(
-            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)
-        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
-
-            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)
-                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
-        )
-
-        payload = {
-            "jobId": job_id,
-            "clientAddress": self.agent_wallet_address,
-            "providerAddress": provider_address,
-            "description": job_description,
-            "price": price,
-            "expiredAt": expired_at.astimezone(timezone.utc).isoformat(),
-            "evaluatorAddress": evaluator_address
-        }
-
-        requests.post(
-            self.base_url,
-            json=payload,
-            headers={
-                "Accept": "application/json",
-                "Content-Type": "application/json",
-                "x-api-key": self.api_key
-            }
-        )
-
-        return job_id
-
-    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(
-                job_id=job_id,
-                content=f"Job {job_id} accepted. {reasoning}",
-                memo_type=MemoType.MESSAGE,
-                is_secured=False,
-                next_phase=AcpJobPhases.TRANSACTION
-            )
-        else:
-            return self.acp_token.create_memo(
-                job_id=job_id,
-                content=f"Job {job_id} rejected. {reasoning}",
-                memo_type=MemoType.MESSAGE,
-                is_secured=False,
-                next_phase=AcpJobPhases.REJECTED
-            )
-
-    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)
-        time.sleep(5)
-        self.acp_token.sign_memo(memo_id, True, reason)
-        time.sleep(5)
-        return self.acp_token.create_memo(
-            job_id=job_id,
-            content=f"Payment of {amount} made {reason}",
-            memo_type=MemoType.MESSAGE,
-            is_secured=False,
-            next_phase=AcpJobPhases.EVALUATION
-        )
-
-    def deliver_job(self, job_id: int, deliverable: str):
-        return self.acp_token.create_memo(
-            job_id=job_id,
-            content=deliverable,
-            memo_type=MemoType.MESSAGE,
-            is_secured=False,
-            next_phase=AcpJobPhases.COMPLETED
-        )
-
-    def add_tweet(self, job_id: int, tweet_id: str, content: str):
-        payload = {
-            "tweetId": tweet_id,
-            "content": content
-        }
-
-        response = requests.post(
-            f"{self.base_url}/{job_id}/tweets/{self.agent_wallet_address}",
-            json=payload,
-            headers={
-                "Accept": "application/json",
-                "Content-Type": "application/json",
-                "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"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"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) -> Optional[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 = []
-
-        if len(response_json.get("data", [])) == 0:
-            return None
-
-        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,
-                )
-            )
-        return result[0]