ratio1 3.4.40__tar.gz → 3.4.41__tar.gz

{ratio1-3.4.40 → ratio1-3.4.41}/PKG-INFO

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

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

{ratio1-3.4.40 → ratio1-3.4.41}/ratio1/_ver.py

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

{ratio1-3.4.40 → ratio1-3.4.41}/ratio1/base/generic_session.py

@@ -2883,10 +2883,14 @@ class GenericSession(BaseDecentrAIObject):
           A list of dictionaries defining the endpoint configuration. Defaults to None.
       """
       ngrok_kwargs = {}
-      cloudflare_kwargs = {}
+      cloudflare_kwargs = {}      
 
       if tunnel_engine_enabled:
         if tunnel_engine == "ngrok":
+          if ngrok_edge_label is None:
+            ngrok_edge_label = os.environ.get("EE_NGROK_EDGE_LABEL", None)
+            if ngrok_edge_label is not None:
+              self.P("Using ngrok edge label from environment variable EE_NGROK_EDGE_LABEL", color='g')
           if not isinstance(ngrok_edge_label, str):
             ngrok_edge_label = None
             warn_msg = f"WARNING! Without a pre-defined `ngrok_edge_label`, the URL will be generated automatically, "
@@ -2899,6 +2903,10 @@ class GenericSession(BaseDecentrAIObject):
             "ngrok_use_api": ngrok_use_api,
           }
         elif tunnel_engine == "cloudflare":
+          if cloudflare_token is None:
+            cloudflare_token = os.environ.get("EE_CLOUDFLARE_TOKEN", None)
+            if cloudflare_token is not None:
+              self.P("Using Cloudflare token from environment variable EE_CLOUDFLARE_TOKEN", color='g')
           if not isinstance(cloudflare_token, str):
             raise ValueError(f"`cloudflare` must be a string when using cloudflare tunnel engine. {type(cloudflare_token)} provided.")
           cloudflare_kwargs = {

{ratio1-3.4.40 → ratio1-3.4.41}/tutorials/ex02_part1_deploy_webapi.py

@@ -12,6 +12,7 @@ def run_predict(plugin: CustomPluginTemplate, inputs: list[int], nr_steps: int)
   """
   Here we use the Ratio1 build in basic ML internal API
   """
+  
   preds = plugin.basic_ts_fit_predict(inputs, nr_steps)
   # now we apply some simple heuristic to get the lower and upper bounds
   lower_bound = []
@@ -22,6 +23,7 @@ def run_predict(plugin: CustomPluginTemplate, inputs: list[int], nr_steps: int)
     upper_bound.append(int(pred + abs(pred * heuristic_factor)))
   #endfor
   result = {
+    "server" : plugin.e2_addr,
     "predictions": [round(x,1) for x in preds],
     "lower_bound": lower_bound,
     "upper_bound": upper_bound
@@ -31,30 +33,35 @@ def run_predict(plugin: CustomPluginTemplate, inputs: list[int], nr_steps: int)
 
 if __name__ == '__main__':
   
-  session = Session(silent=True)
+  session = Session(silent=False)
 
-  my_node = "0xai_ApM1AbzLq1VtsLIidmvzt1Nv4Cyl5Wed0fHNMoZv9u4X"
+  my_nodes = [
+    "0xai_A74xZKZJa4LekjvJ6oJz29qxOOs5nLClXAZEhYv59t3Z",
+    "0xai_AgnygSlY8BwnmaCj6mItg36JHlG_Lh3UqqFaTPbuNzy0",
+  ]
 
   # NOTE: When working with SDK please use the nodes internal addresses. While the EVM address of the node
   #       is basically based on the same sk/pk it is in a different format and not directly usable with the SDK
   #       the internal node address is easily spoted as starting with 0xai_ and can be found 
   #       via `docker exec r1node get_node_info` or via the launcher UI
-  
-  app, _ = session.create_custom_webapi(
-    node=my_node,
-    name="ratio1_simple_predict_webapp",
-    endpoints=[
-      {
-        "function": run_predict,
-        "method": "post",
-      },        
-    ]
-  )
-  try:
-    url = app.deploy()
-    print("Webapp deployed at: ", url)
-  except Exception as e:
-    print("Error deploying webapp: ", e)
+  for i, node in enumerate(my_nodes):
+    app, _ = session.create_custom_webapi(
+      node=node,
+      name="ratio1_simple_predict_webapp",
+      tunnel_engine="cloudflare", # set this to "cloudflare" or "ngrok"
+      # assume tokens are either
+      endpoints=[
+        {
+          "function": run_predict,
+          "method": "post",
+        },        
+      ]
+    )
+    try:
+      url = app.deploy()
+      print(f"Webapp deployed on node {i+1}/{len(my_nodes)} at: {url}")
+    except Exception as e:
+      print("Error deploying webapp: ", e)
   
   # Observation:
   #   next code is not mandatory - it is used to keep the session open and cleanup the resources
@@ -63,7 +70,7 @@ if __name__ == '__main__':
   #   in production, you would not need this code as the script can close 
   #   after the pipeline will be sent 
   session.wait(
-    seconds=120,            # we wait the session for 60 seconds
+    seconds=300,            # we wait the session for 60 seconds
     close_pipelines=True,   # we close the pipelines after the session
     close_session=True,     # we close the session after the session
   )