Fix data model

Author: schoibs-virtuals

virtuals_acp/client.py

@@ -328,7 +328,7 @@ def handle_new_task(self, data) -> None:
                 payable_details=memo.get("payableDetails"),
                 txn_hash=memo.get("txHash"),
                 signed_txn_hash=memo.get("signedTxHash"),
-                state=ACPMemoState(memo.get("state")),
+                state=ACPMemoState(memo.get("state")) if memo.get("state") else None,
             )
             for memo in data["memos"]
         ]
@@ -359,6 +359,7 @@ def handle_new_task(self, data) -> None:
             context=context,
             contract_address=data.get("contractAddress"),
             net_payable_amount=data.get("netPayableAmount"),
+            deliverable=data.get("deliverable"),
         )
         if self.on_new_task:
             self.on_new_task(job, memo_to_sign)
@@ -383,7 +384,7 @@ def handle_evaluate(self, data) -> None:
                 payable_details=memo.get("payableDetails"),
                 txn_hash=memo.get("txHash"),
                 signed_txn_hash=memo.get("signedTxHash"),
-                state=ACPMemoState(memo.get("state")),
+                state=ACPMemoState(memo.get("state")) if memo.get("state") else None,
             )
             for memo in data["memos"]
         ]
@@ -408,6 +409,7 @@ def handle_evaluate(self, data) -> None:
             context=context,
             contract_address=data.get("contractAddress"),
             net_payable_amount=data.get("netPayableAmount"),
+            deliverable=data.get("deliverable"),
         )
         self.on_evaluate(job)
 
@@ -770,7 +772,7 @@ def _hydrate_jobs(
                         payable_details=memo.get("payableDetails"),
                         txn_hash=memo.get("txHash"),
                         signed_txn_hash=memo.get("signedTxHash"),
-                        state=ACPMemoState(memo.get("state")),
+                        state=ACPMemoState(memo.get("state")) if memo.get("state") else None,
                     )
                     for memo in job.get("memos", [])
                 ]
@@ -796,6 +798,7 @@ def _hydrate_jobs(
                         context=context,
                         contract_address=job.get("contractAddress"),
                         net_payable_amount=job.get("netPayableAmount"),
+                        deliverable=job.get("deliverable"),
                     )
                 )
 
@@ -856,7 +859,7 @@ def get_job_by_onchain_id(self, onchain_job_id: int) -> "ACPJob":
                         payable_details=memo.get("payableDetails"),
                         txn_hash=memo.get("txHash"),
                         signed_txn_hash=memo.get("signedTxHash"),
-                        state=ACPMemoState(memo.get("state")),
+                        state=ACPMemoState(memo.get("state")) if memo.get("state") else None,
                     )
                 )
 
@@ -881,6 +884,7 @@ def get_job_by_onchain_id(self, onchain_job_id: int) -> "ACPJob":
                 context=context,
                 contract_address=job.get("contractAddress"),
                 net_payable_amount=job.get("netPayableAmount"),
+                deliverable=data.get("deliverable"),
             )
         except Exception as e:
             raise ACPApiError(f"Failed to get job by onchain ID: {e}")
@@ -915,7 +919,7 @@ def get_memo_by_id(self, onchain_job_id: int, memo_id: int) -> "ACPMemo":
                 payable_details=memo.get("payableDetails"),
                 txn_hash=memo.get("txHash"),
                 signed_txn_hash=memo.get("signedTxHash"),
-                state=ACPMemoState(memo.get("state")),
+                state=ACPMemoState(memo.get("state")) if memo.get("state") else None,
             )
 
         except Exception as e:

virtuals_acp/job.py

@@ -50,6 +50,7 @@ class ACPJob(BaseModel):
     context: Dict[str, Any] | None
     contract_address: Optional[str] = None
     net_payable_amount: Optional[float] = None
+    deliverable: Optional[DeliverablePayload] = None # TODO: turn this into private attr
 
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
@@ -58,7 +59,6 @@ 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:
@@ -744,7 +744,7 @@ 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
+        deliverable = self.deliverable
         if not deliverable:
             return None