ratio1 3.4.39__py3-none-any.whl → 3.4.40__py3-none-any.whl

ratio1/_ver.py

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

ratio1/base/generic_session.py

@@ -2696,7 +2696,7 @@ class GenericSession(BaseDecentrAIObject):
       node = self.__get_node_address(node)
       return node in self._dct_online_nodes_pipelines
 
-    def is_peered(self, node):
+    def is_peered(self, node, return_full_address=False):
       """
       Public method for checking if a node is peered with the current session.
       Parameters
@@ -2709,8 +2709,10 @@ class GenericSession(BaseDecentrAIObject):
       bool
           True if the node is peered, False otherwise.
       """
-      node = self.__get_node_address(node)
-      return self._dct_can_send_to_node.get(node, False)
+      node_addr = self.__get_node_address(node)
+      if return_full_address:
+        return self._dct_can_send_to_node.get(node_addr, False), node_addr
+      return self._dct_can_send_to_node.get(node_addr, False)
 
     def get_last_seen_time(self, node, *, default_value=0):
       """

ratio1/cli/nodes.py

@@ -209,52 +209,39 @@ def get_apps(args):
   return
 
 def _send_command_to_node(args, command, ignore_not_found=False):
+  from ratio1 import Session
+
   node = args.node
   silent = not args.verbose   
   ignore_peering = args.ignore_peering
 
   t1 = time()
-  df, _, _, _, _, sess = _get_netstats(
-    silent=silent, online_only=True, return_session=True, all_info=True,
-    wait_for_node=node
-  )
-  
-  peered = None
-  selection = (df.Alias == node) | (df.Address == node)
-  if 'ETH Address' in df.columns:
-    selection = selection | (df['ETH Address'] == node)
-  found = selection.any()
-  node_addr = None
-  alias = None
-  df_found =  df[selection]
-  if found:
-    alias = df_found.Alias.values[0]
-    peered = df_found.Peered.values[0]
-    node_addr = df_found.Address.values[0]   
-    log_with_color(f"{df_found}")
-  else:
-    log_with_color("Node '{}' <{}> not found in network (total {} nodes, {} peered).".format(
-      node, node_addr, df.shape[0], df.Peered.sum()), color='r'
-    )
-    node_addr = node
+  sess = Session(silent=silent)
+
+  peered, node_addr = sess.is_peered(node, return_full_address=True)
+  found = False
 
-  if not peered and not ignore_peering:
-    log_with_color(f"Node '{node}' <{node_addr}> not peered, exiting...", color='r')
-    return
+  if not ignore_peering:
+    found = sess.wait_for_node(node_addr, timeout=30)
+    sess.P(f"Node {node_addr} is online.")
 
+  # Display peering status.
   if not peered:
+    if not ignore_peering:
+      log_with_color(f"Node <{node_addr}> is not peered. Exiting...", color='r')
+      return
+
     if found:
       log_with_color(f"Node '{node}' <{node_addr}> is not peered.", color='r')
     else:
       log_with_color(f"Node '{node}' <{node_addr}> may not accept this command.", color='r')
 
-  # TODO: currently this is based on node alias, but we should be based on node address
-  #       and maybe even node alias
-  if (found and peered) or ignore_not_found:
-    if found and peered:
-      log_with_color(f"Sending '{command}' to node '{alias}' <{node_addr}>", color='b')
-    else:
-      log_with_color(f"Sending blind '{command}' to node '{alias}' <{node_addr}>", color='b')      
+  if found and peered:
+    log_with_color(f"Sending '{command}' to node <{node_addr}>", color='b')
+  else:
+    log_with_color(f"Sending blind '{command}' to node <{node_addr}>", color='b')
+
+  if (found and peered) or ignore_not_found or ignore_peering:
     if command == COMMANDS.RESTART:
       sess._send_command_restart_node(node_addr)
     elif command == COMMANDS.STOP:
@@ -262,7 +249,12 @@ def _send_command_to_node(args, command, ignore_not_found=False):
     else:
       log_with_color(f"Command '{command}' not supported.", color='r')
       return
-  elapsed = time() - t1  
+
+  sess.close()
+  log_with_color(f"Command successfully sent.")
+  elapsed = time() - t1
+  if not silent:
+    log_with_color(f"Command '{command}' seinging took {elapsed}s.", color='b')
   return  
 
 def restart_node(args):

{ratio1-3.4.39.dist-info → ratio1-3.4.40.dist-info}/METADATA

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

@@ -1,10 +1,10 @@
 ratio1/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-ratio1/_ver.py,sha256=ABDRSXrsWdo9F3E_13s2gVLWdHtO1ykuvzBGeSroSHg,331
+ratio1/_ver.py,sha256=zlrigFbgf6eJq1eow1kVyGQ8QOgt1xZpjWDhUjft6tY,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=CaDFbcAd7oefVCQFKYA0r-H5FU6FTxG3By-eQDvt1qU,185384
+ratio1/base/generic_session.py,sha256=LsZaQTg9IyG0jXMmFhXQqxOCGCPvAPXZoVvom8cWfCc,185526
 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
@@ -26,7 +26,7 @@ ratio1/certs/s624dbd4.ala.us-east-1.emqxsl.com.crt,sha256=y-6io0tseyx9-a4Pmde1z1
 ratio1/cli/README.md,sha256=YsT23YcZBRyTKReNZPxD762YqstSWKWz4iZe_UJELPc,73
 ratio1/cli/cli.py,sha256=D8UCtdTQKi1IqB_PAi3k2FfaM-rnfxmlrOzM4OJBOsA,4352
 ratio1/cli/cli_commands.py,sha256=aoPnASJ3uPHWqABLCL-E6J3U0npK7kxX8U07s_aR9qA,6290
-ratio1/cli/nodes.py,sha256=0QjAbAhn_KrrjiGUXQ0GhnxCM-Zvxhx32FNcQd9hhHI,14237
+ratio1/cli/nodes.py,sha256=EZxjw8G8Kj0PPMHtUJoefm4QootrU50GHlpaJOiHxJo,13787
 ratio1/cli/oracles.py,sha256=HTQAKEwe-j0E00JKKPCH1GXjelyy0IAjzLZIx8qtimU,11141
 ratio1/cli/package_update.py,sha256=uRMPW5XV3fBdB_eZfoQDA1SKnJzTJvyfpRJA6T3ZZlQ,4000
 ratio1/code_cheker/__init__.py,sha256=pwkdeZGVL16ZA4Qf2mRahEhoOvKhL7FyuQbMFLr1E5M,33
@@ -103,8 +103,8 @@ ratio1/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_LtMyCY,10
 ratio1/utils/config.py,sha256=IMXAN9bpHePKEuTFGRRqFJXz_vBa-wi7s9gLhFEheRY,9953
 ratio1/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
 ratio1/utils/oracle_sync/oracle_tester.py,sha256=aJOPcZhtbw1XPqsFG4qYpfv2Taj5-qRXbwJzrPyeXDE,27465
-ratio1-3.4.39.dist-info/METADATA,sha256=Ox5xn1ySF8iu38F1QY5yDslBg4rkNNpQ6k2uolDFD5I,12248
-ratio1-3.4.39.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ratio1-3.4.39.dist-info/entry_points.txt,sha256=DR_olREzU1egwmgek3s4GfQslBi-KR7lXsd4ap0TFxE,46
-ratio1-3.4.39.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-ratio1-3.4.39.dist-info/RECORD,,
+ratio1-3.4.40.dist-info/METADATA,sha256=oOOOjfuuQspNmWwiwIt2Gz4hRgES9vpgmcBS3ldtd_o,12248
+ratio1-3.4.40.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ratio1-3.4.40.dist-info/entry_points.txt,sha256=DR_olREzU1egwmgek3s4GfQslBi-KR7lXsd4ap0TFxE,46
+ratio1-3.4.40.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+ratio1-3.4.40.dist-info/RECORD,,