ratio1 3.4.93__tar.gz → 3.4.96__tar.gz

{ratio1-3.4.93 → ratio1-3.4.96}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ratio1
-Version: 3.4.93
+Version: 3.4.96
 Summary: `ratio1` or Ration1 SDK is the Python SDK required for client app development for the Ratio1 ecosystem
 Project-URL: Homepage, https://github.com/Ratio1/ratio1_sdk
 Project-URL: Bug Tracker, https://github.com/Ratio1/ratio1_sdk/issues

{ratio1-3.4.93 → ratio1-3.4.96}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ratio1"
-version = "3.4.93"
+version = "3.4.96"
 authors = [
   { name="Andrei Ionut Damian", email="andrei.damian@ratio1.ai" },
   { name="Cristan Bleotiu", email="cristian.bleotiu@ratio1.ai" },

{ratio1-3.4.93 → ratio1-3.4.96}/ratio1/_ver.py

@@ -1,4 +1,4 @@
-__VER__ = "3.4.93"
+__VER__ = "3.4.96"
 
 if __name__ == "__main__":
   with open("pyproject.toml", "rt") as fd:

{ratio1-3.4.93 → ratio1-3.4.96}/ratio1/bc/evm.py

@@ -1334,29 +1334,40 @@ class _EVMMixin:
 
       # Call the contract function to get details.
       result_tuple = contract.functions.getJobDetails(job_id).call()
-
-      # Unpack the tuple into a dictionary for readability.
-      details = {
-        "network": network,
-        "jobId": result_tuple[0],
-        "projectHash": "0x" + result_tuple[1].hex(),
-        "requestTimestamp": result_tuple[2],
-        "startTimestamp": result_tuple[3],
-        "lastNodesChangeTimestamp": result_tuple[4],
-        "jobType": result_tuple[5],
-        "pricePerEpoch": result_tuple[6],
-        "lastExecutionEpoch": result_tuple[7],
-        "numberOfNodesRequested": result_tuple[8],
-        "balance": result_tuple[9],
-        "lastAllocatedEpoch": result_tuple[10],
-        "activeNodes": result_tuple[11],
-        "escrowAddress": result_tuple[12],
-        "escrowOwner": result_tuple[13],
-      }
+      details = self._format_job_details(result_tuple, network)
       self.P(f"Job Details:\n{json.dumps(details, indent=2)}", verbosity=2)
-
       return details
 
+    def web3_get_all_active_jobs(
+      self,
+      network: str = None
+    ):
+      """
+      Retrieve all active jobs tracked by the PoAI manager.
+
+      Parameters
+      ----------
+      network : str, optional
+          The network to use. Defaults to the current engine network.
+
+      Returns
+      -------
+      list[dict]
+          A list with the job details for every active job.
+      """
+      w3vars = self._get_web3_vars(network)
+      network = w3vars.network
+      contract = w3vars.w3.eth.contract(
+        address=w3vars.poai_manager_address,
+        abi=EVM_ABI_DATA.POAI_MANAGER_ABI
+      )
+
+      self.P(f"`getAllActiveJobs` on {network} via {w3vars.rpc_url}", verbosity=2)
+      raw_jobs = contract.functions.getAllActiveJobs().call()
+      jobs = [self._format_job_details(job, network) for job in raw_jobs]
+      self.P(f"Active jobs found: {len(jobs)}", verbosity=2)
+      return jobs
+
     def web3_submit_node_update(
       self,
       job_id: int,
@@ -1400,7 +1411,7 @@ class _EVMMixin:
       
       # Estimate gas fees for the token transfer.
       gas_price = w3vars.w3.eth.gas_price  # This fetches the current suggested gas price from the network.
-      estimated_gas = 750_000 # Have enough gas to cover all the actions if consensus is reached
+      estimated_gas = 1_000_000 # Have enough gas to cover all the actions if consensus is reached
       gas_cost = estimated_gas * gas_price
       
       # Check that the sender's ETH balance can cover gas costs plus an extra buffer.
@@ -1630,6 +1641,28 @@ class _EVMMixin:
       self.P(f"Last epoch allocated: {result}", verbosity=2)
 
       return result
+    
+    def _format_job_details(self, raw_job_details, network: str):
+      """
+      Normalize the job details tuple returned by the PoAI Manager contract.
+      """
+      return {
+        "network": network,
+        "jobId": raw_job_details[0],
+        "projectHash": "0x" + raw_job_details[1].hex(),
+        "requestTimestamp": raw_job_details[2],
+        "startTimestamp": raw_job_details[3],
+        "lastNodesChangeTimestamp": raw_job_details[4],
+        "jobType": raw_job_details[5],
+        "pricePerEpoch": raw_job_details[6],
+        "lastExecutionEpoch": raw_job_details[7],
+        "numberOfNodesRequested": raw_job_details[8],
+        "balance": raw_job_details[9],
+        "lastAllocatedEpoch": raw_job_details[10],
+        "activeNodes": raw_job_details[11],
+        "escrowAddress": raw_job_details[12],
+        "escrowOwner": raw_job_details[13],
+      }
 
   def get_deeploy_url(self):
     """

{ratio1-3.4.93 → ratio1-3.4.96}/ratio1/const/evm_net.py

@@ -430,6 +430,91 @@ _POAI_MANAGER_ABI = [
     ],
     "stateMutability": "view",
     "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "getAllActiveJobs",
+    "outputs": [
+      {
+        "components": [
+          {
+            "internalType": "uint256",
+            "name": "id",
+            "type": "uint256"
+          },
+          {
+            "internalType": "bytes32",
+            "name": "projectHash",
+            "type": "bytes32"
+          },
+          {
+            "internalType": "uint256",
+            "name": "requestTimestamp",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "startTimestamp",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "lastNodesChangeTimestamp",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "jobType",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "pricePerEpoch",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "lastExecutionEpoch",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "numberOfNodesRequested",
+            "type": "uint256"
+          },
+          {
+            "internalType": "int256",
+            "name": "balance",
+            "type": "int256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "lastAllocatedEpoch",
+            "type": "uint256"
+          },
+          {
+            "internalType": "address[]",
+            "name": "activeNodes",
+            "type": "address[]"
+          },
+          {
+            "internalType": "address",
+            "name": "escrowAddress",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "escrowOwner",
+            "type": "address"
+          }
+        ],
+        "internalType": "struct JobWithAllDetails[]",
+        "name": "",
+        "type": "tuple[]"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
   }
 ]
 

ratio1-3.4.96/xperimental/_checks/w3_all_active_jobs_check.py

@@ -0,0 +1,25 @@
+from ratio1 import Logger
+from ratio1.bc import DefaultBlockEngine
+
+
+if __name__ == '__main__':
+  logger = Logger("ENC")
+  engine = DefaultBlockEngine(
+    log=logger,
+    name="default",
+    user_config=True,
+  )
+
+  engine.reset_network("devnet")
+
+  network = engine.evm_network
+  logger.P(f"Checking all active jobs on {network}", color='b')
+
+  try:
+    jobs = engine.web3_get_all_active_jobs()
+    logger.P(f"Found {len(jobs)} active jobs", color='g')
+    if jobs:
+      first_job = jobs[0]
+      logger.P(f"First job snapshot: {first_job}", color='b')
+  except Exception as exc:
+    logger.P(f"Failed to retrieve active jobs: {exc}", color='r')