Private deliverable memo content

Author: schoibs-virtuals

virtuals_acp/client.py

@@ -945,6 +945,14 @@ def get_agent(self, wallet_address: str, *, show_hidden_offerings: bool = False)
         except Exception as e:
             raise ACPError(f"An unexpected error occurred while getting agent: {e}")
 
+    def get_memo_content(self, url: str) -> str:
+        response = self.acp_client.request("GET", url)
+
+        if not response:
+            raise ACPApiError("Failed to get memo content")
+
+        return response["content"]
+
 
 # Rebuild the AcpJob model after VirtualsACP is defined
 ACPJob.model_rebuild()

virtuals_acp/job.py

@@ -1,7 +1,8 @@
-from datetime import datetime, timezone, timedelta
+import json
+import re
 import time
+from datetime import datetime, timezone, timedelta
 from typing import TYPE_CHECKING, List, Optional, Dict, Any, Union, Literal
-
 from pydantic import BaseModel, Field, ConfigDict, PrivateAttr
 
 from virtuals_acp.account import ACPAccount
@@ -57,6 +58,7 @@ class ACPJob(BaseModel):
     _requirement: Optional[Union[str, Dict[str, Any]]] = PrivateAttr(default=None)
     _price_type: PriceType = PrivateAttr(default=PriceType.FIXED)
     _price_value: float = PrivateAttr(default=0.0)
+    _deliverable: Optional[DeliverablePayload] = PrivateAttr(default=None)
 
     def model_post_init(self, __context: Any) -> None:
         if self.acp_client:
@@ -139,18 +141,6 @@ def base_fare(self) -> Fare:
     def account(self) -> Optional[ACPAccount]:
         return self.acp_client.get_account_by_job_id(self.id, self.acp_contract_client)
 
-    @property
-    def deliverable(self) -> Optional[str]:
-        """Get the deliverable from the completed memo"""
-        memo = next(
-            (
-                m
-                for m in self.memos
-                if ACPJobPhase(m.next_phase) == ACPJobPhase.COMPLETED
-            ),
-            None,
-        )
-        return memo.content if memo else None
 
     @property
     def rejection_reason(self) -> Optional[str]:
@@ -474,7 +464,7 @@ def latest_memo(self) -> Optional[ACPMemo]:
         """Get the latest memo in the job"""
         return self.memos[-1] if self.memos else None
 
-    def _get_memo_by_id(self, memo_id) -> Optional[ACPMemo]:
+    def _get_memo_by_id(self, memo_id: int) -> Optional[ACPMemo]:
         return next((m for m in self.memos if m.id == memo_id), None)
 
     def deliver(self, deliverable: DeliverablePayload) -> str | None:
@@ -747,4 +737,21 @@ def _deliver_cross_chain_payable(self, client_address: str, amount: FareAmountBa
 
         self.acp_contract_client.handle_operation([create_memo_op])
 
+    def get_deliverable(self) -> Optional[DeliverablePayload]:
+        deliverable = self._deliverable
+        if not deliverable:
+            return None
+
+        if not isinstance(deliverable, str):
+            return deliverable
+
+        if not re.search(r"api/memo-contents/([0-9]+)$", deliverable):
+            return deliverable
 
+        content = self.acp_client.get_memo_content(deliverable)
+
+        try:
+            return json.loads(content)
+        except (json.JSONDecodeError, TypeError):
+            return content
+