acp-plugin-gamesdk 0.1.13__tar.gz → 0.1.15__tar.gz

{acp_plugin_gamesdk-0.1.13 → acp_plugin_gamesdk-0.1.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: acp-plugin-gamesdk
-Version: 0.1.13
+Version: 0.1.15
 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.13 → acp_plugin_gamesdk-0.1.15}/acp_plugin_gamesdk/acp_plugin.py

@@ -13,7 +13,6 @@ 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 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
@@ -22,7 +21,7 @@ from acp_plugin_gamesdk.interface import AcpJobPhasesDesc, IDeliverable, IInvent
 class AcpPluginOptions:
     api_key: str
     acp_token_client: AcpToken
-    twitter_plugin: TwitterPlugin | GameTwitterPlugin = None
+    twitter_plugin: TwitterPlugin  = None
     cluster: Optional[str] = None
     evaluator_cluster: Optional[str] = None
     on_evaluate: Optional[Callable[[IDeliverable], Tuple[bool, str]]] = None
@@ -168,7 +167,7 @@ class AcpPlugin:
             self.deliver_job,
         ]
         
-        def get_environment(_e, __) -> Dict[str, Any]:
+        def get_environment() -> Dict[str, Any]:
             environment = data.get_environment() if hasattr(data, "get_environment") else {}
             return {
                 **environment,
@@ -335,8 +334,14 @@ class AcpPlugin:
         try:
             state = self.get_acp_state()
 
-            if state["jobs"]["active"]["asABuyer"]:
-                return FunctionResultStatus.FAILED, "You already have an active job as a buyer", {}
+            existing_job = next(
+                (job for job in state["jobs"]["active"]["asABuyer"]
+                 if job["providerAddress"] == sellerWalletAddress),
+                None
+            )
+
+            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", {}  
             
             if not sellerWalletAddress:
                 return FunctionResultStatus.FAILED, "Missing seller wallet address - specify the agent you want to buy from", {}
@@ -365,8 +370,8 @@ class AcpPlugin:
             )
             
             if (hasattr(self, 'twitter_plugin') and self.twitter_plugin is not None and tweetContent is not None):
-                post_tweet_fn = self.twitter_plugin.get_function('post_tweet')
-                tweet_id = post_tweet_fn(tweetContent, None).get('data', {}).get('id')
+                post_tweet_fn = self.twitter_plugin.twitter_client.create_tweet
+                tweet_id = post_tweet_fn(text=tweetContent).get('data', {}).get('id')
                 if (tweet_id is not None):
                     self.acp_client.add_tweet(job_id, tweet_id, tweetContent)
                     print("Tweet has been posted")
@@ -454,8 +459,8 @@ class AcpPlugin:
                 tweet_history = job.get("tweetHistory", [])
                 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,tweetContent, None).get('data', {}).get('id')
+                    reply_tweet_fn = self.twitter_plugin.twitter_client.create_tweet
+                    tweet_id = reply_tweet_fn(in_reply_to_tweet_id=tweet_id, text=tweetContent).get('data', {}).get('id')
                     if (tweet_id is not None):
                         self.acp_client.add_tweet(jobId ,tweet_id, tweetContent)
                         print("Tweet has been posted")
@@ -541,8 +546,8 @@ class AcpPlugin:
                 tweet_history = job.get("tweetHistory", [])
                 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,tweetContent, None).get('data', {}).get('id')
+                    reply_tweet_fn = self.twitter_plugin.twitter_client.create_tweet
+                    tweet_id = reply_tweet_fn(in_reply_to_tweet_id=tweet_id, text=tweetContent).get('data', {}).get('id')
                     if (tweet_id is not None):
                         self.acp_client.add_tweet(jobId ,tweet_id, tweetContent)
                         print("Tweet has been posted")
@@ -646,8 +651,8 @@ class AcpPlugin:
                 tweet_history = job.get("tweetHistory", [])
                 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,tweetContent, None).get('data', {}).get('id')
+                    reply_tweet_fn = self.twitter_plugin.twitter_client.create_tweet
+                    tweet_id = reply_tweet_fn(in_reply_to_tweet_id=tweet_id, text=tweetContent).get('data', {}).get('id')
                     if (tweet_id is not None):
                         self.acp_client.add_tweet(jobId ,tweet_id, tweetContent)
                         print("Tweet has been posted")

{acp_plugin_gamesdk-0.1.13 → acp_plugin_gamesdk-0.1.15}/acp_plugin_gamesdk/interface.py

@@ -73,22 +73,26 @@ class ITweet:
 @dataclass
 class AcpJob:
     jobId: Optional[int]
+    clientName : Optional[str]
+    providerName: Optional[str]
     desc: str
     price: str
+    providerAddress: Optional[str]
     phase: AcpJobPhasesDesc
     memo: List[AcpRequestMemo]
-    lastUpdated: int
     tweetHistory : ITweet | List
     lastUpdated: int
 
     def __repr__(self) -> str:
         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"Phase: {self.phase.value}, "
             f"Memo: {self.memo}, "
-            f"Last Updated: {self.lastUpdated})"
             f"Tweet History: {self.tweetHistory}, "
             f"Last Updated: {self.lastUpdated})"
         ) 
@@ -98,10 +102,13 @@ class AcpJob:
 class IDeliverable:
     type: str
     value: str
-
+    clientName: Optional[str]
+    providerName: Optional[str]
 @dataclass
 class IInventory(IDeliverable):
     jobId: int
+    clientName: Optional[str]
+    providerName: Optional[str]
 
 @dataclass
 class AcpJobsSection:

{acp_plugin_gamesdk-0.1.13 → acp_plugin_gamesdk-0.1.15}/pyproject.toml

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