ratio1 3.4.40__tar.gz → 3.4.42__tar.gz

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

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

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ratio1"
-version = "3.4.40"
+version = "3.4.42"
 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.42}/ratio1/_ver.py

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

{ratio1-3.4.40 → ratio1-3.4.42}/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.42}/ratio1/const/base.py

@@ -172,6 +172,8 @@ class CONFIG_STREAM:
 
   LAST_UPDATE_TIME = 'LAST_UPDATE_TIME'
 
+  IS_DEEPLOYED = 'IS_DEEPLOYED'
+
   URL = K_URL
   TYPE = K_TYPE
   RECONNECTABLE = K_RECONNECTABLE

{ratio1-3.4.40 → ratio1-3.4.42}/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
   )

{ratio1-3.4.40 → ratio1-3.4.42}/tutorials/ex21_telegram_community_bot.py

@@ -29,13 +29,14 @@ def loop_processing(plugin: CustomPluginTemplate):
   # Define cache keys and file names for storing epoch review data and watched wallets
   epoch_review_cache_key = f"ratio1_epoch_review"
   watched_wallets_cache_key = f"ratio1_watched_wallets"
+  watched_wallets_loops_delay_cache_key = f"ratio1_watched_wallets_loops_delay"
   alert_cache_key = f"ratio1_node_alerts"
   cache_already_read_key = f"ratio1_epoch_review_already_read"
   diskapi_epoch_review_file_name = "ratio1_epoch_review_data.pkl"
   diskapi_watched_wallets_file_name = "ratio1_watched_wallets_data.pkl"
 
   def get_erc721_total_supply(contract_address: str) -> int:
-    return int(plugin.requests.post("https://base.drpc.org", json={
+    return int(plugin.requests.post("https://base-mainnet.public.blastapi.io", json={
       "jsonrpc": "2.0",
       "method": "eth_call",
       "params": [
@@ -83,32 +84,37 @@ def loop_processing(plugin: CustomPluginTemplate):
     plugin.obj_cache[epoch_review_cache_key] = plugin.diskapi_load_pickle_from_data(diskapi_epoch_review_file_name) or {}
     plugin.obj_cache[watched_wallets_cache_key] = plugin.diskapi_load_pickle_from_data(diskapi_watched_wallets_file_name) or {}
     plugin.obj_cache[alert_cache_key] = {}
+    plugin.obj_cache[watched_wallets_loops_delay_cache_key] = 30
     plugin.obj_cache[cache_already_read_key] = True # We use this flag to read the cache only once at the first run
 
   # Check users' watched wallets and notify if any node is offline
-  watched_wallets = plugin.obj_cache.get(watched_wallets_cache_key)
-  if watched_wallets is not None:
-    for user, wallets in watched_wallets.items():
-      for wallet in wallets:
-        wallet_nodes = plugin.bc.get_wallet_nodes(wallet)
-        for node in wallet_nodes:
-          if node == "0x0000000000000000000000000000000000000000":
-            continue
+  if plugin.obj_cache.get(watched_wallets_loops_delay_cache_key) == 30:
+    watched_wallets = plugin.obj_cache.get(watched_wallets_cache_key)
+    if watched_wallets is not None:
+      for user, wallets in watched_wallets.items():
+        for wallet in wallets:
+          wallet_nodes = plugin.bc.get_wallet_nodes(wallet)
+          for node in wallet_nodes:
+            if node == "0x0000000000000000000000000000000000000000":
+              continue
 
-          node_alert_cache_key = f"{user}-{node}"
-          node_internal_addr = plugin.bc.eth_addr_to_internal_addr(node)
-          node_is_online = plugin.netmon.network_node_is_online(node_internal_addr)
-          if node_is_online:
-            if plugin.obj_cache[alert_cache_key].get(node_alert_cache_key) is not None:
-              # Node was previously offline, now it is back online, we notify the user
-              message = f"✅ Node {plugin.netmon.network_node_eeid(node_internal_addr)} ({node}) is back online."
+            node_alert_cache_key = f"{user}-{node}"
+            node_internal_addr = plugin.bc.eth_addr_to_internal_addr(node)
+            node_is_online = plugin.netmon.network_node_is_online(node_internal_addr)
+            if node_is_online:
+              if plugin.obj_cache[alert_cache_key].get(node_alert_cache_key) is not None:
+                # Node was previously offline, now it is back online, we notify the user
+                message = f"✅ Node {plugin.netmon.network_node_eeid(node_internal_addr)} ({node}) is back online."
+                plugin.send_message_to_user(user_id=user, text=message)
+                plugin.obj_cache[alert_cache_key][node_alert_cache_key] = None
+            elif plugin.obj_cache[alert_cache_key].get(node_alert_cache_key) is None:
+              # Node is offline and we haven't notified the user yet
+              plugin.obj_cache[alert_cache_key][node_alert_cache_key] = True
+              message = f"⚠️ Node {plugin.netmon.network_node_eeid(node_internal_addr)} ({node}) is offline. Please check your node status."
               plugin.send_message_to_user(user_id=user, text=message)
-              plugin.obj_cache[alert_cache_key][node_alert_cache_key] = None
-          elif plugin.obj_cache[alert_cache_key].get(node_alert_cache_key) is None:
-            # Node is offline and we haven't notified the user yet
-            plugin.obj_cache[alert_cache_key][node_alert_cache_key] = True
-            message = f"⚠️ Node {plugin.netmon.network_node_eeid(node_internal_addr)} ({node}) is offline. Please check your node status."
-            plugin.send_message_to_user(user_id=user, text=message)
+    plugin.obj_cache[watched_wallets_loops_delay_cache_key] = 0
+  else:
+    plugin.obj_cache[watched_wallets_loops_delay_cache_key] += 1
 
   # Check if the epoch review has already been processed for the last epoch
   if plugin.obj_cache.get(epoch_review_cache_key) is not None:
@@ -145,7 +151,8 @@ def loop_processing(plugin: CustomPluginTemplate):
   message += f"🔄 Circulating R1 Supply: {circulating_supply:,.0f} R1\n"
   message += f"💎 Total R1 Supply: {total_supply:,.0f} R1\n"
   message += f"🎁 Last Epoch PoA Mining: {(last_epoch_nd_mining):,.2f} R1\n"
-  message += f"🔥 Last Epoch Burn: {(burned_last_epoch):,.2f} R1\n"
+  if burned_last_epoch > 0:
+    message += f"🔥 Last Epoch Burn: {(burned_last_epoch):,.2f} R1\n"
   message += f"🔥 Total Burn: {(current_burn):,.2f} R1\n"
   plugin.send_message_to_user(user_id=plugin.cfg_chat_id, text=message)
 
@@ -222,6 +229,24 @@ def reply(plugin: CustomPluginTemplate, message: str, user: str, chat_id: str):
       message += f"- {wallet}\n"
     return message
   
+  def handle_nodes():
+    user_watched_wallets = plugin.obj_cache.get(watched_wallets_cache_key).get(chat_id, [])
+    if not user_watched_wallets:
+      return "You are not watching any wallet. Use /watch <wallet_address> to start watching a wallet."
+    message = "You are currently watching the following wallets and their nodes:\n"
+    for wallet in user_watched_wallets:
+      wallet_nodes = plugin.bc.get_wallet_nodes(wallet)
+      message += f"- {wallet}:\n"
+      for node in wallet_nodes:
+        if node == "0x0000000000000000000000000000000000000000":
+          continue
+        node_internal_addr = plugin.bc.eth_addr_to_internal_addr(node)
+        node_alias = plugin.netmon.network_node_eeid(node_internal_addr)
+        node_is_online = plugin.netmon.network_node_is_online(node_internal_addr)
+        short_node = node[:6] + "..." + node[-4:]
+        message += f"  - {'🟢' if node_is_online else '🔴'} {node_alias} ({short_node})\n"
+    return message
+  
   def handle_start():
     return "Welcome to the Ratio1 Bot! Use /watch <wallet_address> to start watching your nodes. You will receive notifications when your nodes are offline."
 
@@ -238,6 +263,8 @@ def reply(plugin: CustomPluginTemplate, message: str, user: str, chat_id: str):
     return handle_unwatchall()
   if message.startswith("/unwatch"):
     return handle_unwatch()
+  if message.startswith("/nodes"):
+    return handle_nodes()
   if message.startswith("/start"):
     return handle_start()