ratio1 3.4.104__tar.gz → 3.4.106__tar.gz

{ratio1-3.4.104 → ratio1-3.4.106}/PKG-INFO

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

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

{ratio1-3.4.104 → ratio1-3.4.106}/ratio1/_ver.py

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

{ratio1-3.4.104 → ratio1-3.4.106}/ratio1/cli/cli_commands.py

@@ -148,6 +148,7 @@ CLI_COMMANDS = {
         "params": {
             "--skip-seeds": "Skip the seed nodes in the rollout (flag)",
             "--skip-oracles": "Skip the oracle nodes in the rollout (flag)",
+            "--skip-workers": "Skip the remaining edge worker nodes in the rollout (flag)",
             "--no-timeout": "Do not wait between nodes restarts (flag)",
         }
     },

{ratio1-3.4.104 → ratio1-3.4.106}/ratio1/cli/oracles.py

@@ -221,7 +221,36 @@ if True:
     silent = not args.verbose
     skip_seeds = args.skip_seeds
     skip_oracles = args.skip_oracles
+    skip_workers = getattr(args, "skip_workers", False)
     no_timeout = args.no_timeout
+    run_seed_nodes = not skip_seeds
+    run_oracle_nodes = not skip_oracles
+    run_edge_nodes = not skip_workers
+
+    # Adjust these values to tweak pauses and restart pacing across node groups.
+    pause_after_seed_seconds = 60
+    pause_after_oracle_seconds = 60
+    worker_timeout_min_seconds = 5
+    worker_timeout_max_seconds = 25
+
+    restart_groups = []
+    if run_seed_nodes:
+      restart_groups.append("Seed Nodes")
+    if run_oracle_nodes:
+      restart_groups.append("Oracle Nodes")
+    if run_edge_nodes:
+      restart_groups.append("Worker Edge Nodes")
+    skipped_groups = []
+    if not run_seed_nodes:
+      skipped_groups.append("Seed Nodes")
+    if not run_oracle_nodes:
+      skipped_groups.append("Oracle Nodes")
+    if not run_edge_nodes:
+      skipped_groups.append("Worker Edge Nodes")
+
+    if not restart_groups:
+      log_with_color("All node groups were skipped; nothing to restart.", color='y')
+      return
 
     log_with_color("======================================================", color='b')
     log_with_color("Starting Oracle Rollout...", color='g')
@@ -232,15 +261,24 @@ if True:
     current_network = session.bc_engine.current_evm_network
     session.close()
 
+    restart_plan_display = " -> ".join(restart_groups)
+    confirmation_keyword = "RESTART ALL" if len(restart_groups) == 3 else f"RESTART {', '.join(restart_groups)}"
+    confirmation_phrase = f"{confirmation_keyword} on {current_network}"
+
     log_with_color(f"ATTENTION! Current network: {current_network}", color='y')
-    log_with_color(f"Are you sure you want to restart ALL nodes on the network {current_network}?", color='b')
-    if skip_seeds:
-      log_with_color("During this run seed nodes will be skipped...", color='b')
-    if skip_oracles:
-      log_with_color("During this run oracle nodes will be skipped...", color='b')
-    user_confirmation = input(f"Write down 'RESTART ALL on {current_network}' in order to proceed...\n >")
-
-    if user_confirmation != f"RESTART ALL on {current_network}":
+    if len(restart_groups) == 3:
+      log_with_color(f"Are you sure you want to restart ALL node groups on the network {current_network}?", color='b')
+    else:
+      log_with_color(
+        f"Are you sure you want to restart the following node groups on {current_network}: {restart_plan_display}?",
+        color='b'
+      )
+    log_with_color(f"Planned restart sequence: {restart_plan_display}", color='b')
+    if skipped_groups:
+      log_with_color(f"Explicitly skipped groups: {', '.join(skipped_groups)}", color='y')
+    user_confirmation = input(f"Write down '{confirmation_phrase}' in order to proceed...\n >")
+
+    if user_confirmation != confirmation_phrase:
       log_with_color("Aborted by user...", color='y')
       return
 
@@ -257,17 +295,28 @@ if True:
       if node['address'] not in seed_nodes_addresses
     ]
 
-    if not (skip_seeds or skip_oracles):
+    restarted_seed_nodes_count = 0
+    restarted_oracle_nodes_count = 0
+    restarted_edge_nodes_count = 0
+
+    if run_seed_nodes:
       # 1. Send restart command to Seed Nodes.
       log_with_color(f"Sending restart commands to {len(seed_nodes_addresses)} seed nodes: {seed_nodes_addresses}",
                      color='b')
       _send_restart_command(session=session, nodes=seed_nodes_addresses)
+      restarted_seed_nodes_count = len(seed_nodes_addresses)
 
       # Remove seed node addresses from all_nodes_addresses
-      log_with_color(
-        f"Seed nodes restarted. Waiting 30 seconds before sending restart commands to all Oracle nodes, except seed nodes.",
-        color='g')
-      sleep(30)
+      if run_oracle_nodes or run_edge_nodes:
+        if pause_after_seed_seconds > 0:
+          log_with_color(
+            f"Seed nodes restarted. Waiting {pause_after_seed_seconds} seconds before sending restart commands to the next group of nodes.",
+            color='g')
+          sleep(pause_after_seed_seconds)
+        else:
+          log_with_color(
+            "Seed nodes restarted. Continuing without wait before the next group of nodes.",
+            color='g')
     else:
       log_with_color("Skipping Seed Nodes restart as per user request.", color='y')
 
@@ -278,12 +327,23 @@ if True:
       if node['oracle'] == True
     ]
 
-    if not skip_oracles:
+    if run_oracle_nodes:
       log_with_color(
         f"Sending restart commands to {len(oracle_nodes_addresses)} Non-Seed Oracle nodes, except seed nodes: {remaining_nodes}",
         color='b')
 
       _send_restart_command(session=session, nodes=oracle_nodes_addresses)
+      restarted_oracle_nodes_count = len(oracle_nodes_addresses)
+      if run_edge_nodes:
+        if pause_after_oracle_seconds > 0:
+          log_with_color(
+            f"Oracle nodes restarted. Waiting {pause_after_oracle_seconds} seconds before sending restart commands to remaining edge nodes.",
+            color='g')
+          sleep(pause_after_oracle_seconds)
+        else:
+          log_with_color(
+            "Oracle nodes restarted. Continuing without wait before remaining edge nodes.",
+            color='g')
     else:
       log_with_color("Skipping Oracle Nodes restart as per user request.", color='y')
 
@@ -294,29 +354,23 @@ if True:
       if node['address'] not in oracle_nodes_addresses
     ]
 
-    log_with_color(
-      f"Oracles restarted. Waiting 30 seconds before sending restart commands to all Oracle nodes, except seed nodes.",
-      color='g')
-    sleep(30)
-
-    # 3. Send restart command to all remaining edge nodes.
-    log_with_color(f"Sending restart commands to {len(remaining_nodes_addresses)} remaining edge nodes: {remaining_nodes_addresses}", color='b')
+    if run_edge_nodes:
+      # 3. Send restart command to all remaining edge nodes.
+      log_with_color(f"Sending restart commands to {len(remaining_nodes_addresses)} remaining edge nodes: {remaining_nodes_addresses}", color='b')
+
+      timeout_min = 0
+      timeout_max = 0
+      if not no_timeout:
+        timeout_min = worker_timeout_min_seconds
+        timeout_max = worker_timeout_max_seconds
+      _send_restart_command(session=session, nodes=remaining_nodes_addresses, timeout_min=timeout_min, timeout_max=timeout_max)
+      restarted_edge_nodes_count = len(remaining_nodes_addresses)
+    else:
+      log_with_color("Skipping Edge Nodes restart as per user request.", color='y')
 
-    timeout_min = 0
-    timeout_max = 0
-    if not no_timeout:
-      timeout_min = 5
-      timeout_max = 25
-    _send_restart_command(session=session, nodes=remaining_nodes_addresses, timeout_min=timeout_min, timeout_max=timeout_max)
-    restarted_seed_nodes_count = 0
-    restarted_oracle_nodes_count = 0
-    if not (skip_seeds or skip_oracles):
-        restarted_seed_nodes_count = len(seed_nodes_addresses)
-    if not skip_oracles:
-      restarted_oracle_nodes_count = len(oracle_nodes_addresses)
-    restarted_edge_nodes_count = len(remaining_nodes_addresses)
     total_restarted_nodes_count = restarted_seed_nodes_count + restarted_oracle_nodes_count + restarted_edge_nodes_count
-    log_with_color(f"All nodes restarted successfully.", color='g')
+    completion_msg = "All node groups restarted successfully." if len(restart_groups) == 3 else "Selected node groups restarted successfully."
+    log_with_color(completion_msg, color='g')
     log_with_color("======================================================", color='b')
     log_with_color(f"Total restarted {total_restarted_nodes_count} Nodes", color='b')
     log_with_color(f"Restarted {restarted_seed_nodes_count} Seed Oracle Nodes", color='b')

{ratio1-3.4.104 → ratio1-3.4.106}/tutorials/ex21_telegram_community_bot.py

@@ -34,6 +34,7 @@ def loop_processing(plugin: CustomPluginTemplate):
   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"
+  diskapi_alerts_file_name = "ratio1_offline_node_alerts_data.pkl"
 
   need_last_epoch_info = "need_last_epoch_info"
 
@@ -78,16 +79,20 @@ def loop_processing(plugin: CustomPluginTemplate):
   if plugin.obj_cache.get(cache_already_read_key) is None:
     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[alert_cache_key] = plugin.diskapi_load_pickle_from_data(diskapi_alerts_file_name) or {}
+    plugin.obj_cache[watched_wallets_loops_delay_cache_key] = 10
     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
-  if plugin.obj_cache.get(watched_wallets_loops_delay_cache_key) == 30:
+  if plugin.obj_cache.get(watched_wallets_loops_delay_cache_key) == 10:
+    alert_changes = False
     watched_wallets = plugin.obj_cache.get(watched_wallets_cache_key)
+    offline_node_min_seens = plugin.cfg_offline_node_min_seens
     if watched_wallets is not None:
       for user, wallets in watched_wallets.items():
+        new_online_nodes = []
+        new_offline_nodes = []
         for wallet in wallets:
           wallet_nodes = plugin.bc.get_wallet_nodes(wallet)
           for node in wallet_nodes:
@@ -97,17 +102,56 @@ def loop_processing(plugin: CustomPluginTemplate):
             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)
+            node_cache_value = plugin.obj_cache[alert_cache_key].get(node_alert_cache_key)
             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)
+              if node_cache_value is not None:
+                # Node was previously offline
+                if node_cache_value >= offline_node_min_seens:
+                  # If we had notified the user, we notify them that the node is back online
+                  new_online_nodes.append(node)
                 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)
+                alert_changes = True
+            else:
+              # Node is offline
+              if node_cache_value is None:
+                plugin.obj_cache[alert_cache_key][node_alert_cache_key] = 1
+                alert_changes = True
+                if offline_node_min_seens == 1:
+                  # We need to notify the user
+                  new_offline_nodes.append(node)
+              elif node_cache_value < offline_node_min_seens:
+                # The node was already offline but we have not notified the user yet
+                new_value = node_cache_value + 1
+                plugin.obj_cache[alert_cache_key][node_alert_cache_key] = new_value
+                alert_changes = True
+                if new_value >= offline_node_min_seens:
+                  # We need to notify the user
+                  new_offline_nodes.append(node)
+          # endfor wallet_nodes
+        # endfor wallets
+        if len(new_online_nodes) > 0:
+          if len(new_online_nodes) == 1:
+            message = f"✅ Node {plugin.netmon.network_node_eeid(node_internal_addr)} ({new_online_nodes[0]}) is back online."
+          else:
+            message = f"✅ The following nodes are back online:\n"
+            for node in new_online_nodes:
+              message += f"- {plugin.netmon.network_node_eeid(plugin.bc.eth_addr_to_internal_addr(node))} ({node})\n"
+          plugin.send_message_to_user(user_id=user, text=message)
+        # endif new_online_nodes
+        if len(new_offline_nodes) > 0:
+          if len(new_offline_nodes) == 1:
+            message = f"⚠️ Node {plugin.netmon.network_node_eeid(node_internal_addr)} ({new_offline_nodes[0]}) is offline. Please check your node status."
+          else:
+            message = f"⚠️ The following nodes are offline:\n"
+            for node in new_offline_nodes:
+              message += f"- {plugin.netmon.network_node_eeid(plugin.bc.eth_addr_to_internal_addr(node))} ({node})\n"
+            message += "Please check your nodes status."
+          plugin.send_message_to_user(user_id=user, text=message)
+        # endif new_offline_nodes
+      # endfor user, wallets
+      if alert_changes:
+        plugin.diskapi_save_pickle_to_data(plugin.obj_cache.get(alert_cache_key), diskapi_alerts_file_name)
+    # endif watched_wallets is not None
     plugin.obj_cache[watched_wallets_loops_delay_cache_key] = 0
   else:
     plugin.obj_cache[watched_wallets_loops_delay_cache_key] += 1
@@ -144,6 +188,8 @@ def loop_processing(plugin: CustomPluginTemplate):
   burned_nd_last_epoch = float(apiResponse["epochNdBurnR1"])
   burned_poai_last_epoch = float(apiResponse["epochPoaiBurnR1"])
   poai_usdc_last_epoch = float(apiResponse["epochPoaiRewardsUsdc"])
+  token_burn_last_epoch = float(apiResponse["dailyTokenBurn"])
+  ecosystem_token_burn_last_epoch = token_burn_last_epoch - burned_nd_last_epoch - burned_poai_last_epoch
   total_burn = float(apiResponse["totalBurn"])
 
   nd_supply = get_erc721_total_supply("0xE658DF6dA3FB5d4FBa562F1D5934bd0F9c6bd423")
@@ -163,6 +209,8 @@ def loop_processing(plugin: CustomPluginTemplate):
   if burned_poai_last_epoch > 0:
     message += f"🎁 Last Epoch PoAI Rewards: {(poai_usdc_last_epoch):,.2f} USDC\n"
     message += f"🔥 Last Epoch PoAI Burn: {(burned_poai_last_epoch):,.2f} R1\n"
+  if ecosystem_token_burn_last_epoch > 0:
+    message += f"🔥 Last Epoch Ecosystem Burn: {(ecosystem_token_burn_last_epoch):,.2f} R1\n"
   message += f"🔥 Total Burn: {(total_burn):,.2f} R1\n"
   plugin.send_message_to_user(user_id=plugin.cfg_chat_id, text=message)
 
@@ -327,6 +375,7 @@ if __name__ == "__main__":
         message_handler=reply,
         processing_handler=loop_processing,
         admins=['401110073', '683223680'],
+        offline_node_min_seens=2,
         process_delay=10,
       )
       pipeline.deploy()