ratio1 3.4.46__tar.gz → 3.4.48__tar.gz

{ratio1-3.4.46 → ratio1-3.4.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ratio1
-Version: 3.4.46
+Version: 3.4.48
 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.46 → ratio1-3.4.48}/pyproject.toml

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

{ratio1-3.4.46 → ratio1-3.4.48}/ratio1/_ver.py

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

{ratio1-3.4.46 → ratio1-3.4.48}/ratio1/bc/evm.py

@@ -28,6 +28,7 @@ Web3Vars = namedtuple(
     "r1_contract_address", 
     "proxy_contract_address",  
     "controller_contract_address",
+    "poai_manager_address",
     "get_oracles_abi",
   ]
 )
@@ -236,6 +237,7 @@ class _EVMMixin:
       proxy_contract_address = network_data[dAuth.EvmNetData.DAUTH_PROXYAPI_ADDR_KEY]
       str_genesis_date = network_data[dAuth.EvmNetData.EE_GENESIS_EPOCH_DATE_KEY]
       controller_contract_address = network_data[dAuth.EvmNetData.DAUTH_CONTROLLER_ADDR_KEY]
+      poai_manager_address = network_data[dAuth.EvmNetData.DAUTH_POAI_MANAGER_KEY]
       get_oracles_abi = network_data[dAuth.EvmNetData.DAUTH_GET_ORACLES_ABI]
       genesis_date = self.log.str_to_date(str_genesis_date).replace(tzinfo=timezone.utc)
       ep_sec = (
@@ -258,6 +260,7 @@ class _EVMMixin:
         r1_contract_address=r1_contract_address, 
         proxy_contract_address=proxy_contract_address, 
         controller_contract_address=controller_contract_address,
+        poai_manager_address=poai_manager_address,
         get_oracles_abi=get_oracles_abi,
       )
       return result
@@ -1294,6 +1297,62 @@ class _EVMMixin:
 
       return balances
 
+    def web3_get_job_details(
+      self,
+      job_id: int,
+      network: str = None
+    ):      
+      """
+      Retrieve license details for the specified node using getNodeLicenseDetails().
+
+      Parameters
+      ----------
+      job_id : int
+          The job ID to retrieve details for.
+
+      network : str, optional
+          The network to use. If None, defaults to self.evm_network.
+
+
+      Returns
+      -------
+      dict
+          A dictionary containing all job details returned by getJobDetails.
+      """
+      # Validate the job ID.
+      assert isinstance(job_id, int), "Invalid job ID"
+
+      # Retrieve the necessary Web3 variables (pattern consistent with web3_send_r1).
+      w3vars = self._get_web3_vars(network)
+      network = w3vars.network
+      contract = w3vars.w3.eth.contract(
+        address=w3vars.poai_manager_address,
+        abi=EVM_ABI_DATA.GET_JOB_DETAILS
+      )
+
+      self.P(f"`getJobDetails` on {network} via {w3vars.rpc_url}", verbosity=2)
+
+      # 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],
+        "requestTimestamp": result_tuple[1],
+        "startTimestamp": result_tuple[2],
+        "lastNodesChangeTimestamp": result_tuple[3],
+        "jobType": result_tuple[4],
+        "pricePerEpoch": result_tuple[5],
+        "lastExecutionEpoch": result_tuple[6],
+        "numberOfNodesRequested": result_tuple[7],
+        "balance": result_tuple[8],
+        "lastAllocatedEpoch": result_tuple[9],
+        "activeNodes": result_tuple[10],
+      }
+      self.P(f"Job Details:\n{json.dumps(details, indent=2)}", verbosity=2)
+
+      return details
 
   def get_deeploy_url(self):
     """

{ratio1-3.4.46 → ratio1-3.4.48}/ratio1/const/evm_net.py

@@ -9,6 +9,7 @@ class EvmNetData:
   DAUTH_R1_ADDR_KEY = 'EE_DAUTH_R1_ADDR'
   DAUTH_MND_ADDR_KEY = 'EE_DAUTH_MND_ADDR'
   DAUTH_PROXYAPI_ADDR_KEY = 'EE_DAUTH_PROXYAPI_ADDR'
+  DAUTH_POAI_MANAGER_KEY = 'EE_DAUTH_POAI_MANAGER'
   
   DAUTH_CONTROLLER_ADDR_KEY = 'EE_DAUTH_CONTROLLER_ADDR'  
   DAUTH_GET_ORACLES_ABI = 'EE_DAUTH_GET_ORACLES_ABI'
@@ -219,6 +220,85 @@ _GET_ADDRESSES_BALANCES = [
   }
 ]
 
+_GET_JOB_DETAILS_ABI = [
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "jobId",
+        "type": "uint256"
+      }
+    ],
+    "name": "getJobDetails",
+    "outputs": [
+      {
+        "components": [
+          {
+            "internalType": "uint256",
+            "name": "id",
+            "type": "uint256"
+          },
+          {
+            "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": "struct JobDetails",
+        "name": "",
+        "type": "tuple"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  }
+]
+
 # A minimal ERC20 ABI for balanceOf, transfer, and decimals functions.
 _ERC20_ABI = [
   {
@@ -263,6 +343,7 @@ EVM_NET_DATA = {
     EvmNetData.DAUTH_R1_ADDR_KEY                : "0x6444C6c2D527D85EA97032da9A7504d6d1448ecF",
     EvmNetData.DAUTH_MND_ADDR_KEY               : "0x0C431e546371C87354714Fcc1a13365391A549E2",
     EvmNetData.DAUTH_PROXYAPI_ADDR_KEY          : "0xa2fDD4c7E93790Ff68a01f01AA789D619F12c6AC",
+    EvmNetData.DAUTH_POAI_MANAGER_KEY           : "0xTODO",
     EvmNetData.DAUTH_RPC_KEY                    : "https://base-mainnet.public.blastapi.io",
     EvmNetData.EE_GENESIS_EPOCH_DATE_KEY        : "2025-05-23 16:00:00",
     EvmNetData.EE_EPOCH_INTERVALS_KEY           : 24,
@@ -280,6 +361,7 @@ EVM_NET_DATA = {
     EvmNetData.DAUTH_R1_ADDR_KEY                : "0xCC96f389F45Fc08b4fa8e2bC4C7DA9920292ec64",
     EvmNetData.DAUTH_MND_ADDR_KEY               : "0xa8d7FFCE91a888872A9f5431B4Dd6c0c135055c1",
     EvmNetData.DAUTH_PROXYAPI_ADDR_KEY          : "0xd1c7Dca934B37FAA402EB2EC64F6644d6957bE3b",
+    EvmNetData.DAUTH_POAI_MANAGER_KEY           : "0xTODO",
     EvmNetData.DAUTH_RPC_KEY                    : "https://base-sepolia.public.blastapi.io",      
     EvmNetData.EE_GENESIS_EPOCH_DATE_KEY        : "2025-05-23 16:00:00",
     EvmNetData.EE_EPOCH_INTERVALS_KEY           : 24,
@@ -298,6 +380,7 @@ EVM_NET_DATA = {
     EvmNetData.DAUTH_R1_ADDR_KEY                : "0x277CbD0Cf25F4789Bc04035eCd03d811FAf73691",
     EvmNetData.DAUTH_MND_ADDR_KEY               : "0x17B8934dc5833CdBa1eF42D13D65D677C4727748",
     EvmNetData.DAUTH_PROXYAPI_ADDR_KEY          : "0xFcF04c9A67330431Af75a546615E4881BD8bdC78",
+    EvmNetData.DAUTH_POAI_MANAGER_KEY           : "0x9A41f43494fCD592577228fE8E4014f2D75d2aa3",
     EvmNetData.DAUTH_RPC_KEY                    : "https://base-sepolia.public.blastapi.io",
     EvmNetData.EE_GENESIS_EPOCH_DATE_KEY        : "2025-06-30 07:00:00",
     EvmNetData.EE_EPOCH_INTERVALS_KEY           : 1,
@@ -346,5 +429,6 @@ class EVM_ABI_DATA:
   GET_WALLET_NODES = _GET_WALLET_NODES
   GET_ADDRESSES_BALANCES = _GET_ADDRESSES_BALANCES
   IS_NODE_ACTIVE = _DAUTH_ABI_IS_NODE_ACTIVE
+  GET_JOB_DETAILS = _GET_JOB_DETAILS_ABI
   ERC20_ABI = _ERC20_ABI
   

{ratio1-3.4.46 → ratio1-3.4.48}/ratio1/ipfs/r1fs.py

@@ -300,6 +300,7 @@ class R1FSEngine:
       return
 
     def _hash_secret(self, secret: str) -> bytes:
+      secret = str(secret) # to be sure that the passed secret is of string type.
       # Convert text to bytes, then hash with SHA-256 => 32-byte key
       return hashlib.sha256(secret.encode("utf-8")).digest()
 
@@ -510,6 +511,25 @@ class R1FSEngine:
       )
       return result
 
+    # PUBLIC COMMAND
+    def get_ipfs_id_data(self) -> dict:
+      """
+      Get the IPFS peer ID via 'ipfs id' (JSON output).
+      Returns the ipfs ID object.
+      """
+      data = {}
+      output = self.__run_command(["ipfs", "id"])  # this will raise an exception if the command fails
+      try:
+        data = json.loads(output)
+      except json.JSONDecodeError:
+        raise Exception("Failed to parse JSON from 'ipfs id' output.")
+      except Exception as e:
+        msg = f"Error getting IPFS ID: {e}. `ipfs id`:\n{data}"
+        self.P(msg, color='r')
+        raise Exception(f"Error getting IPFS ID: {e}") from e
+      return data
+
+    # END PUBLIC COMMANS
 
     def __run_command(
       self, 
@@ -575,24 +595,15 @@ class R1FSEngine:
       Get the IPFS peer ID via 'ipfs id' (JSON output).
       Returns the 'ID' field as a string.
       """
-      self.__ipfs_address = None
-      output = self.__run_command(["ipfs", "id"]) # this will raise an exception if the command fails
-      try:
-        data = json.loads(output)
-        self.__ipfs_id_result = data
-        self.__ipfs_id = data.get("ID", ERROR_TAG)
-        self.__ipfs_agent = data.get("AgentVersion", ERROR_TAG)
-        addrs = data.get("Addresses", [])
-        if not addrs:
-          self.__ipfs_address = None
-        else:
-          self.__ipfs_address = addrs[1] if len(addrs) > 1 else addrs[0] if len(addrs) else ERROR_TAG
-      except json.JSONDecodeError:
-        raise Exception("Failed to parse JSON from 'ipfs id' output.")
-      except Exception as e:
-        msg = f"Error getting IPFS ID: {e}. `ipfs id`:\n{data}"
-        self.P(msg, color='r')
-        raise Exception(f"Error getting IPFS ID: {e}") from e
+      data = self.get_ipfs_id_data()
+      self.__ipfs_id_result = data
+      self.__ipfs_id = data.get("ID", ERROR_TAG)
+      self.__ipfs_agent = data.get("AgentVersion", ERROR_TAG)
+      addrs = data.get("Addresses", [])
+      if not addrs:
+        self.__ipfs_address = None
+      else:
+        self.__ipfs_address = addrs[1] if len(addrs) > 1 else addrs[0] if len(addrs) else ERROR_TAG
       return self.__ipfs_id
     
 
@@ -657,7 +668,7 @@ class R1FSEngine:
       tempfile=False, 
       show_logs=True,
       raise_on_error=False,
-    ) -> bool:
+    ) -> str:
       """
       Add a YAML object to IPFS.
       """
@@ -884,7 +895,8 @@ class R1FSEngine:
       timeout: int = None,
       pin: bool = True,
       raise_on_error: bool = False,
-      show_logs: bool = True
+      show_logs: bool = True,
+      return_absolute_path: bool = True,
     ) -> str:
       """
       Retrieve an encrypted file from R1FS by CID, decrypt with AES-GCM in streaming mode.
@@ -916,6 +928,9 @@ class R1FSEngine:
       show_logs : bool, optional
         If True, logs steps via self.P / self.Pd. Default True.
 
+      return_absolute_path : bool, optional
+        If True, return the absolute path to the restored plaintext file.
+
       Returns
       -------
       str
@@ -1041,6 +1056,8 @@ class R1FSEngine:
           fin.seek(data_start, os.SEEK_SET)
 
           out_path = os.path.join(local_folder, original_filename)
+          if return_absolute_path:
+            out_path = os.path.abspath(out_path)
           chunk_size = 1024 * 1024
 
           with open(out_path, "wb") as fout:

ratio1-3.4.48/xperimental/_checks/w3_poai_check.py

@@ -0,0 +1,25 @@
+import os
+import json
+
+
+from ratio1 import Logger, const
+from ratio1.bc import DefaultBlockEngine
+
+
+
+if __name__ == '__main__' :
+  
+  l = Logger("ENC")
+  eng = DefaultBlockEngine(
+    log=l, name="default", 
+    user_config=True
+  )
+  
+  eng.reset_network("devnet")
+  
+  l.P(f"Checking web3 API on {eng.evm_network}", color='b')
+  
+  job_id = 1
+  job_details = eng.web3_get_job_details(job_id)
+
+  l.P(f"Job Details for job id {job_id}:\n{json.dumps(job_details, indent=2)}", color='b')