ratio1 3.4.92__py3-none-any.whl → 3.4.94__py3-none-any.whl

ratio1/_ver.py

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

ratio1/base/generic_session.py

@@ -3130,6 +3130,186 @@ class GenericSession(BaseDecentrAIObject):
         **kwargs
       )
 
+    def create_worker_web_app(
+      self,
+      *,
+      node,
+      name="Ratio1 Worker Web App",
+      tunnel_engine_enabled=True,
+      tunnel_engine="cloudflare",
+      cloudflare_token=None,
+      ngrok_edge_label=None,
+      extra_debug=False,
+      summary="Ratio1 Worker WebApp created via SDK",
+      description=None,
+      # Worker app specific parameters
+      vcs_data=None,
+      image="node:22",
+      build_and_run_commands=None,
+      cr_data=None,
+      env=None,
+      dynamic_env=None,
+      port=None,
+      endpoint_url=None,
+      endpoint_poll_interval=30,
+      container_resources=None,
+      volumes=None,
+      file_volumes=None,
+      restart_policy="always",
+      image_pull_policy="always",
+      image_poll_interval=300,
+      vcs_poll_interval=60,
+      **kwargs
+    ):
+      """
+      Create a new worker web app on a node.
+
+      Parameters
+      ----------
+
+      node : str
+          Address or Name of the ratio1 Edge Protocol edge node that will handle this web app.
+
+      name : str
+          Name of the worker web app.
+
+      tunnel_engine : str, optional
+          The tunnel engine to use for exposing the web app. Defaults to "cloudflare".
+          It can also be "ngrok" for ngrok tunnel.
+
+      tunnel_engine_enabled : bool, optional
+          If True, will use the specified tunnel engine to expose the web app. Defaults to True.
+
+      ngrok_edge_label : str, optional
+          The label of the edge node that will be used to expose the HTTP server. Defaults to None.
+
+      cloudflare_token : str, optional
+          The Cloudflare token to use for exposing the web app. Defaults to None.
+
+      vcs_data : dict, required
+          Version control system data containing:
+          - PROVIDER: "github" (currently only GitHub is supported)
+          - USERNAME: GitHub username for cloning (if private repo)
+          - TOKEN: GitHub personal access token for cloning (if private repo)
+          - REPO_OWNER: GitHub repository owner (user or org)
+          - REPO_NAME: GitHub repository name
+          - BRANCH: branch to monitor for updates (defaults to "main")
+          - POLL_INTERVAL: seconds between Git commit checks (defaults to 60)
+
+      image : str, optional
+          Docker image to use for the container. Defaults to "node:22".
+
+      build_and_run_commands : list, optional
+          List of commands to run in the container for building and running the app.
+          Defaults to ["npm install", "npm run build", "npm start"].
+
+      cr_data : dict, optional
+          Container registry data containing:
+          - SERVER: container registry URL (defaults to 'docker.io')
+          - USERNAME: registry username
+          - PASSWORD: registry password or token
+
+      env : dict, optional
+          Environment variables for the container.
+
+      dynamic_env : dict, optional
+          Dynamic environment variables for the container.
+
+      port : int, optional
+          Internal container port if it's a web app.
+
+      endpoint_url : str, optional
+          Endpoint to poll for health checks, e.g., "/health" or "/edgenode".
+
+      endpoint_poll_interval : int, optional
+          Seconds between endpoint health checks. Defaults to 30.
+
+      container_resources : dict, optional
+          Container resource limits containing:
+          - cpu: CPU limit (e.g., "0.5" for half a CPU, "1.0" for one CPU core)
+          - gpu: GPU limit (defaults to 0)
+          - memory: Memory limit (e.g., "512m" for 512MB)
+          - ports: List of container ports or dict of host_port: container_port mappings
+
+      volumes : dict, optional
+          Dictionary mapping host paths to container paths for directory volumes.
+          Example: {"/host/data": "/container/data"}
+
+      file_volumes : dict, optional
+          Dictionary mapping logical names to file configurations for creating and mounting
+          files with dynamic content. Each entry should contain:
+          - content: String content to write to the file
+          - mounting_point: Full path where file will be mounted in container
+          Example: {"config": {"content": "port=8080", "mounting_point": "/app/config.txt"}}
+
+      restart_policy : str, optional
+          Container restart policy. Defaults to "always".
+
+      image_pull_policy : str, optional
+          Image pull policy. Defaults to "always".
+
+      image_poll_interval : int, optional
+          Seconds between Docker image checks. Defaults to 300.
+
+      vcs_poll_interval : int, optional
+          Seconds between Git commit checks. Defaults to 60.
+
+      """
+      if vcs_data is None:
+        raise ValueError("vcs_data is required for worker web apps. Please provide repository information.")
+
+      # Set default values
+      if build_and_run_commands is None:
+        build_and_run_commands = ["npm install", "npm run build", "npm start"]
+      
+      if cr_data is None:
+        cr_data = {"SERVER": "docker.io", "USERNAME": None, "PASSWORD": None}
+      
+      if container_resources is None:
+        container_resources = {"cpu": 1, "gpu": 0, "memory": "512m", "ports": []}
+
+      # Prepare worker app specific configuration
+      worker_config = {
+        "VCS_DATA": {**vcs_data, "POLL_INTERVAL": vcs_poll_interval},
+        "IMAGE": image,
+        "BUILD_AND_RUN_COMMANDS": build_and_run_commands,
+        "CR_DATA": cr_data,
+        "ENV": env or {},
+        "DYNAMIC_ENV": dynamic_env or {},
+        "PORT": port,
+        "ENDPOINT_URL": endpoint_url,
+        "ENDPOINT_POLL_INTERVAL": endpoint_poll_interval,
+        "CONTAINER_RESOURCES": container_resources,
+        "VOLUMES": volumes or {},
+        "FILE_VOLUMES": file_volumes or {},
+        "RESTART_POLICY": restart_policy,
+        "IMAGE_PULL_POLICY": image_pull_policy,
+        "IMAGE_POLL_INTERVAL": image_poll_interval,
+        "CAR_VERBOSE": 100,
+      }
+
+      kwargs = self.maybe_clean_kwargs(
+        _kwargs=kwargs,
+        caller_method_name="create_worker_web_app",
+        solver_method_name="create_web_app",
+        parameters_to_remove=["signature"]
+      )
+      
+      return self.create_web_app(
+        node=node,
+        name=name,
+        signature=PLUGIN_SIGNATURES.WORKER_APP_RUNNER,
+        tunnel_engine=tunnel_engine,
+        tunnel_engine_enabled=tunnel_engine_enabled,
+        cloudflare_token=cloudflare_token,
+        ngrok_edge_label=ngrok_edge_label,
+        extra_debug=extra_debug,
+        summary=summary,
+        description=description,
+        **worker_config,
+        **kwargs
+      )
+
     def deeploy_launch_container_app(
         self,
         docker_image: str,

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,
@@ -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/const/apps.py

@@ -14,6 +14,7 @@ class PLUGIN_SIGNATURES:
   TELEGRAM_CONVERSATIONAL_BOT_01 = 'TELEGRAM_CONVERSATIONAL_BOT_01'
   NET_CONFIG_MONITOR = 'NET_CONFIG_MONITOR'
   CONTAINER_APP_RUNNER = 'CONTAINER_APP_RUNNER'
+  WORKER_APP_RUNNER = 'WORKER_APP_RUNNER'
   # INSERT_NEW_PLUGIN_HERE
   
   

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.92.dist-info → ratio1-3.4.94.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ratio1
-Version: 3.4.92
+Version: 3.4.94
 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.92.dist-info → ratio1-3.4.94.dist-info}/RECORD

@@ -1,10 +1,10 @@
 ratio1/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-ratio1/_ver.py,sha256=jr82AXwgHwGADT5iLJq0XMsii56EJRQuow9NbIZHlb8,331
+ratio1/_ver.py,sha256=SmMEkehFX9-G0oMXyGGpAX6VXjy25KstgcmRgX66Iy8,331
 ratio1/base_decentra_object.py,sha256=iXvAAf6wPnGWzeeiRfwLojVoan-m1e_VsyPzjUQuENo,4492
 ratio1/plugins_manager_mixin.py,sha256=X1JdGLDz0gN1rPnTN_5mJXR8JmqoBFQISJXmPR9yvCo,11106
 ratio1/base/__init__.py,sha256=hACh83_cIv7-PwYMM3bQm2IBmNqiHw-3PAfDfAEKz9A,259
 ratio1/base/distributed_custom_code_presets.py,sha256=cvz5R88P6Z5V61Ce1vHVVh8bOkgXd6gve_vdESDNAsg,2544
-ratio1/base/generic_session.py,sha256=kTO5VIGQ4ZgGlN6JtZ82TGT9u-l-wX3s6JM__VtCwbU,188158
+ratio1/base/generic_session.py,sha256=Gbygyd_5rX_JoD05pdbp1Ji_77BLSiAZ-vxXeOJ2Jt0,194670
 ratio1/base/instance.py,sha256=oQvwzzRvir7851wyhDx_BwN6y_VgsNWwYo53vN33QI4,21914
 ratio1/base/pipeline.py,sha256=szoHrk1qBdY6NKPUk3tUTsJx3XzYp5C2GTOlzRiQi48,62489
 ratio1/base/plugin_template.py,sha256=Gs438cSkhvxPujE4CRH_32pcuZaVwI9kia8E4VDRpSU,138794
@@ -17,7 +17,7 @@ ratio1/bc/__init__.py,sha256=BI5pcqHdhwnMdbWTYDLW1cVP_844VtLra-lz7xprgsk,171
 ratio1/bc/base.py,sha256=g7tARNgi_0N1p9HpvqRDWDVYxuqU7W6S0q3ARC6oxKk,45870
 ratio1/bc/chain.py,sha256=HCTQGnmuKqTvUo95OKdg8rL2jhKfSMwrich2e_7Nyms,2336
 ratio1/bc/ec.py,sha256=FwlkWmJvQ9aHuf_BZX1CWSUAxw6OZ9jBparLIWcs_e4,18933
-ratio1/bc/evm.py,sha256=E_W6mjmk1-rBrRaCaYE5mM0LItHwkCTpjAEWR9JgmAM,52511
+ratio1/bc/evm.py,sha256=OP68eZ3Zr62gljVtyLmvDnJZvdUCdWUc7FS-xNzm_PU,53631
 ratio1/certs/51.15.142.167.crt,sha256=rLxkwDIQm-u6Kw570NmdSFgjSChcdSJvXPxr4Mj-EU8,1167
 ratio1/certs/72.60.187.24.crt,sha256=R_7KRS9zLONRxk6FpB72674Z45rKG5prKOd5MZGKk1E,1164
 ratio1/certs/72.60.81.67.crt,sha256=1Lw19spbXnswqKoQVih78xuZe5NxP5z9HS6bh3-0U_g,1159
@@ -40,11 +40,11 @@ ratio1/comm/base_comm_wrapper.py,sha256=oJwMtQYGumxZz1lKvDEgFwLhC1LzZFsGTP9hxBH7
 ratio1/comm/mqtt_wrapper.py,sha256=tOlKD8NUOUdMZ-FK7XZonxQydKmD0sHrugqb8YsRBaI,14397
 ratio1/const/README.md,sha256=6OHesr-f5NBuuJGryEoi_TCu2XdlhfQYlDKx_IJoXeg,177
 ratio1/const/__init__.py,sha256=mcSaDgSYV2xbOS8Api72dDPO6kPBRjnYjBPAh9cAgaU,558
-ratio1/const/apps.py,sha256=0NiuoAPak0HjEULF3fs3xaUH8IRSZ0i4fZw7T2fEd_g,785
+ratio1/const/apps.py,sha256=MD4SRTNId663D3SX78_GJa40BI_H1mdcNbL2gy_Hio0,827
 ratio1/const/base.py,sha256=QIeRH6X-u8DbezQCGipI3isL1LGComBQC5hLedO1jrQ,6042
 ratio1/const/comms.py,sha256=qEYX4ciYg8SYWSDZZTUYxzpR1--2a7UusrWzAq0hxo8,2259
 ratio1/const/environment.py,sha256=632L5GrcNqF3-JhvrC6kXzXwLMcihRgMlOkLurnOwGY,1031
-ratio1/const/evm_net.py,sha256=v53s5Cm_0iZqHdBjkR-3FLYKElB2_PKikHltqZz_H3s,17013
+ratio1/const/evm_net.py,sha256=55R7nr4PgAZ8ae22SgyP7wExP91G_XbTVJ8U3-DPB3s,19141
 ratio1/const/formatter.py,sha256=AW3bWlqf39uaqV4BBUuW95qKYfF2OkkU4f9hy3kSVhM,200
 ratio1/const/heartbeat.py,sha256=Z_n87yI-L4vlBmlHZhkruysEJV5JVbXLQlGI26R42C4,3197
 ratio1/const/misc.py,sha256=VDCwwpf5bl9ltx9rzT2WPVP8B3mZFRufU1tSS5MO240,413
@@ -105,8 +105,8 @@ ratio1/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_LtMyCY,10
 ratio1/utils/config.py,sha256=Elfkl7W4aDMvB5WZLiYlPXrecBncgTxb4hcKhQedMzI,10111
 ratio1/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
 ratio1/utils/oracle_sync/oracle_tester.py,sha256=aJOPcZhtbw1XPqsFG4qYpfv2Taj5-qRXbwJzrPyeXDE,27465
-ratio1-3.4.92.dist-info/METADATA,sha256=LBq9it3rOtn9ztF0CeGxauX8HCght4h4k_2oR0t7NhI,12255
-ratio1-3.4.92.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ratio1-3.4.92.dist-info/entry_points.txt,sha256=DR_olREzU1egwmgek3s4GfQslBi-KR7lXsd4ap0TFxE,46
-ratio1-3.4.92.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-ratio1-3.4.92.dist-info/RECORD,,
+ratio1-3.4.94.dist-info/METADATA,sha256=R1XSSnC0u0dcGfdr097tXmG7vOJuSolXVcwliaCPMHQ,12255
+ratio1-3.4.94.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ratio1-3.4.94.dist-info/entry_points.txt,sha256=DR_olREzU1egwmgek3s4GfQslBi-KR7lXsd4ap0TFxE,46
+ratio1-3.4.94.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+ratio1-3.4.94.dist-info/RECORD,,