ratio1 3.4.104__py3-none-any.whl → 3.4.106__py3-none-any.whl

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

@@ -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.dist-info → ratio1-3.4.106.dist-info}/RECORD

@@ -1,5 +1,5 @@
 ratio1/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-ratio1/_ver.py,sha256=ifnFzHWR-j5DQzRyIzuoGsp1XnbfkaWHwmvpvAU80Pk,332
+ratio1/_ver.py,sha256=y8KCFvH3bq-nBTxAYnmG3uMdgKdHLmuP_PRfYryodaw,332
 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
@@ -31,9 +31,9 @@ ratio1/certs/r9092118.ala.eu-central-1.emqxsl.com.crt,sha256=y-6io0tseyx9-a4Pmde
 ratio1/certs/s624dbd4.ala.us-east-1.emqxsl.com.crt,sha256=y-6io0tseyx9-a4Pmde1z1gPULtJNSYUpG_YFkYaMKU,1337
 ratio1/cli/README.md,sha256=YsT23YcZBRyTKReNZPxD762YqstSWKWz4iZe_UJELPc,73
 ratio1/cli/cli.py,sha256=D8UCtdTQKi1IqB_PAi3k2FfaM-rnfxmlrOzM4OJBOsA,4352
-ratio1/cli/cli_commands.py,sha256=6_iNKsyui7rtjBNaIFkb-BjlQ-VwbtXyLPxoTtEcgs0,6614
+ratio1/cli/cli_commands.py,sha256=p2VQOdl2V0NuYPOfUZv6cRkH6falqMMBCG0nYJooZ0o,6706
 ratio1/cli/nodes.py,sha256=VkqjKef8ByWNyO7zr3nBEWUZrAlaDQ_9yMgChQPschE,13942
-ratio1/cli/oracles.py,sha256=b6ziUerZl0hZIk6-0SKaqCu6xxB6L9Z6n4_0bpo8Nk0,12269
+ratio1/cli/oracles.py,sha256=yWzyQl0j1wa6Ob2anII9yanjKmAWlsNYI9mTJN9sejM,14519
 ratio1/cli/package_update.py,sha256=uRMPW5XV3fBdB_eZfoQDA1SKnJzTJvyfpRJA6T3ZZlQ,4000
 ratio1/code_cheker/__init__.py,sha256=pwkdeZGVL16ZA4Qf2mRahEhoOvKhL7FyuQbMFLr1E5M,33
 ratio1/code_cheker/base.py,sha256=GrvKyb8uVKChtnXp2drQ62kdqIj3jZZZ7jaOCfsEOLc,19068
@@ -109,8 +109,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.104.dist-info/METADATA,sha256=sxYnwiLr81mwsgXs3QKZfm4DzSdEl9uymyhl0-GMNYY,12256
-ratio1-3.4.104.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ratio1-3.4.104.dist-info/entry_points.txt,sha256=DR_olREzU1egwmgek3s4GfQslBi-KR7lXsd4ap0TFxE,46
-ratio1-3.4.104.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-ratio1-3.4.104.dist-info/RECORD,,
+ratio1-3.4.106.dist-info/METADATA,sha256=TkflNCPVG-aE-rKVG9NYqetf6l5Mp97E0YaT4q00Bg0,12256
+ratio1-3.4.106.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ratio1-3.4.106.dist-info/entry_points.txt,sha256=DR_olREzU1egwmgek3s4GfQslBi-KR7lXsd4ap0TFxE,46
+ratio1-3.4.106.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+ratio1-3.4.106.dist-info/RECORD,,