naeural-client 2.7.9__py3-none-any.whl → 2.7.11__py3-none-any.whl

naeural_client/_ver.py

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

naeural_client/base/generic_session.py

@@ -1063,6 +1063,37 @@ class GenericSession(BaseDecentrAIObject):
 
       return
 
+
+    def close_pipeline(self, node_addr : str, pipeline_name : str):
+      """
+      Close a pipeline created by this session.
+
+      Parameters
+      ----------
+      node_addr : str
+          The address of the edge node that owns the pipeline.
+          
+      pipeline_name : str
+          The name of the pipeline to close.
+      """
+      pipeline : Pipeline = self._dct_online_nodes_pipelines.get(node_addr, {}).get(pipeline_name, None)
+      if pipeline is not None:
+        self.P(
+          f"Closing known pipeline <{pipeline_name}> from <{node_addr}>",
+          color='y'
+        )
+        pipeline.close()
+      else:
+        self.P(
+          "No known pipeline found. Sending close to <{}> for <{}>".format(
+            node_addr, pipeline_name
+          ),
+          color='y'
+        )
+        self._send_command_archive_pipeline(node_addr, pipeline_name)        
+      return
+
+
     def _connect(self) -> None:
       """
       Connect to the communication server using the credentials provided when creating this instance.
@@ -1504,11 +1535,12 @@ class GenericSession(BaseDecentrAIObject):
       ----------
       command : str
           The command to send.
+          
       worker : str
           The name of the Naeural Edge Protocol edge node that will receive the command.
           
-          Observation: this approach will be deprecated soon in favor of the direct use of the address that
-          will not require the node to be already "seend" by the session.
+          Observation: this approach will be deprecated soon in favor of the direct use of 
+          the address that will not require the node to be already "seen" by the session.
           
       payload : dict
           The payload to send.

naeural_client/cli/nodes.py

@@ -12,11 +12,19 @@ def _get_netstats(
   supervisors_only=False,
   return_session=False,
   eth=False,
-  all_info=False
+  all_info=False,
+  wait_for_node=None
 ):
   t1 = time()
   from naeural_client import Session
   sess = Session(silent=silent)
+  found = None
+  if wait_for_node:
+    sess.P("Waiting for node '{}' to appear...".format(wait_for_node), color='y')
+    found = sess.wait_for_node(wait_for_node, timeout=30)
+    if not found:
+      sess.P("Node '{}' not found.".format(wait_for_node), color='r')
+
   dct_info = sess.get_network_known_nodes(
     online_only=online_only, allowed_only=allowed_only, supervisor=supervisor,
     supervisors_only=supervisors_only,
@@ -95,14 +103,17 @@ def get_supervisors(args):
     log_with_color(f"{df}")
   return
 
-def _send_command_to_node(args, command):
+def _send_command_to_node(args, command, ignore_not_found=False):
   node = args.node
   silent = not args.verbose   
+
   
   t1 = time()
   df, _, _, _, _, sess = _get_netstats(
-    silent=silent, online_only=True, return_session=True    
+    silent=silent, online_only=True, return_session=True,
+    wait_for_node=node
   )
+  
   peered = None
   selection = df.Alias == node
   found = selection.any()
@@ -113,20 +124,28 @@ def _send_command_to_node(args, command):
     node_addr = df_found.Address.values[0]   
     log_with_color(f"{df_found}")
   if not found:
-    log_with_color(f"Node '{node}' <{node_addr}> not found in network.", color='r')
-    return
+    log_with_color("Node '{}' <{}> not found in network (toal {} nodes, {} peered).".format(
+      node, node_addr, df.shape[0], df.Peered.sum()), color='r'
+    )
+    
   if not peered:
-    log_with_color(f"Node '{node}' <{node_addr}> does not accept commands from this SDK.", 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 command == COMMANDS.RESTART:
-    sess._send_command_restart_node(node)
-  elif command == COMMANDS.SHUTDOWN:
-    sess._send_command_stop_node(node)
-  else:
-    log_with_color(f"Command '{command}' not supported.", color='r')
-    return
+  if (found and peered) or ignore_not_found:
+    if ignore_not_found:
+      log_with_color(f"Sending blind '{command}' to node <{node}>", color='b')
+    if command == COMMANDS.RESTART:
+      sess._send_command_restart_node(node)
+    elif command == COMMANDS.STOP:
+      sess._send_command_stop_node(node)
+    else:
+      log_with_color(f"Command '{command}' not supported.", color='r')
+      return
   elapsed = time() - t1  
   return  
 
@@ -141,7 +160,7 @@ def restart_node(args):
   """
   node = args.node
   log_with_color(f"Attempting to restart node <{node}>", color='b')
-  _send_command_to_node(args, COMMANDS.RESTART)
+  _send_command_to_node(args, COMMANDS.RESTART, ignore_not_found=True)
   return
 
 
@@ -156,6 +175,6 @@ def shutdown_node(args):
   """
   node = args.node
   log_with_color(f"Attempting to shutdown node <{node}>", color='b')
-  _send_command_to_node(args, COMMANDS.SHUTDOWN)
+  _send_command_to_node(args, COMMANDS.STOP, ignore_not_found=True)
   return
 

naeural_client/const/evm_net.py

@@ -33,10 +33,10 @@ EVM_NET_DATA = {
   
   'devnet' : {
     EvmNetData.DAUTH_URL_KEY                    : "https://dauth-devnet.ratio1.ai/get_auth_data",
-    EvmNetData.DAUTH_ND_ADDR_KEY                : "0xE20198EE2B76eED916A568a47cdea9681f7c79BF",
+    EvmNetData.DAUTH_ND_ADDR_KEY                : "TO_BE_DEFINED",
     EvmNetData.DAUTH_RPC_KEY                    : "https://base-sepolia.public.blastapi.io",
-    EvmNetData.EE_GENESIS_EPOCH_DATE_KEY        : "2025-02-05 16:00:00",
-    EvmNetData.EE_EPOCH_INTERVALS_KEY           : 24,
+    EvmNetData.EE_GENESIS_EPOCH_DATE_KEY        : "2025-01-11 16:00:00",
+    EvmNetData.EE_EPOCH_INTERVALS_KEY           : 1,
     EvmNetData.EE_EPOCH_INTERVAL_SECONDS_KEY    : 3600,
     EvmNetData.EE_SUPERVISOR_MIN_AVAIL_PRC_KEY  : 0.6,
   },

naeural_client/utils/config.py

@@ -179,18 +179,19 @@ def show_address(args):
   log_with_color(f"{sess.get_client_address()}", color='b')
   return
 
-def show_version():
+def show_version(silent=True):
   from naeural_client import Session
   sess = Session(
-    silent=True
+    silent=silent
   )  
   
   user_folder = get_user_folder()  
 
-  log_with_color(f"Ratio1 selected network: {get_network()}", color='b')
-  log_with_color(f"SDK folder: {user_folder}", color='b')
-  log_with_color(f"SDK version: {version}", color='b')
-  log_with_color(f"SDK Client address: {sess.get_client_address()}", color='b')
+  log_with_color(f"SDK folder:     {user_folder}", color='b')
+  log_with_color(f"SDK version:    {version}", color='b')
+  log_with_color(f"Ratio1 network: {get_network()}", color='b')
+  log_with_color(f"SDK addr:       {sess.get_client_address()}", color='b')
+  log_with_color(f"SDK ETH addr:   {sess.bc_engine.eth_address}", color='b')
   return
   
 
@@ -198,17 +199,16 @@ def show_config(args):
   """
   Displays the current configuration from ~/.naeural/config.
   """
-  show_version()
+  show_version(silent=not args.verbose)
   config_file = get_user_config_file()
   if config_file.exists():
+    keys = []
     with config_file.open("r") as file:
-      log_with_color(f"Current configuration ({config_file}):\n{file.read()}", color='d')
+      lines = file.readlines()
+      keys = [line.strip().split("=")[0] for line in lines if "=" in line]
+    log_with_color(f"Current config {config_file} has {len(keys)} keys: {keys}", color='d')
   else:
     log_with_color(f"No configuration found at {config_file}. Please run `reset_config` first.", color="r")
-  log_with_color("Current environment variables:", color='b')
-  for k in os.environ:
-    if k.startswith("EE_"):
-      log_with_color(f"{k}={os.environ[k]}", color='b')
   return
     
 

{naeural_client-2.7.9.dist-info → naeural_client-2.7.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naeural_client
-Version: 2.7.9
+Version: 2.7.11
 Summary: `naeural_client` is the Python SDK required for client app development for the Naeural Edge Protocol Edge Protocol framework
 Project-URL: Homepage, https://github.com/NaeuralEdgeProtocol/naeural_client
 Project-URL: Bug Tracker, https://github.com/NaeuralEdgeProtocol/naeural_client/issues

{naeural_client-2.7.9.dist-info → naeural_client-2.7.11.dist-info}/RECORD

@@ -1,10 +1,10 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=RxS-goK_0TushM31dt1Xwef54molpj9g6fHoISGRH68,330
+naeural_client/_ver.py,sha256=9fH_GG66dJFC2t8_1TezUY50f0vo3VcJj683fVJXRZg,331
 naeural_client/base_decentra_object.py,sha256=C4iwZTkhKNBS4VHlJs5DfElRYLo4Q9l1V1DNVSk1fyQ,4412
 naeural_client/plugins_manager_mixin.py,sha256=X1JdGLDz0gN1rPnTN_5mJXR8JmqoBFQISJXmPR9yvCo,11106
 naeural_client/base/__init__.py,sha256=hACh83_cIv7-PwYMM3bQm2IBmNqiHw-3PAfDfAEKz9A,259
 naeural_client/base/distributed_custom_code_presets.py,sha256=cvz5R88P6Z5V61Ce1vHVVh8bOkgXd6gve_vdESDNAsg,2544
-naeural_client/base/generic_session.py,sha256=BdM28wRfDIqzAMOD3Msrtm8b-foDBo6X825MjyXGI5g,109812
+naeural_client/base/generic_session.py,sha256=9NpJKlN7SSYvcroIgigjs9VbJUTTF-nxemHdRVighrM,110720
 naeural_client/base/instance.py,sha256=kcZJmjLBtx8Bjj_ysIOx1JmLA-qSpG7E28j5rq6IYus,20444
 naeural_client/base/pipeline.py,sha256=SNl0QLJTbaP_mlwVm1p9Vwxo72Q1Bp2ls3rt1WGPg7c,58828
 naeural_client/base/plugin_template.py,sha256=7YAFaND2iXoZLgtunjYkFf_TBGieFr3VdNLO3vCqzmM,138795
@@ -23,7 +23,7 @@ naeural_client/certs/s624dbd4.ala.us-east-1.emqxsl.com.crt,sha256=y-6io0tseyx9-a
 naeural_client/cli/README.md,sha256=WPdI_EjzAbUW1aPyj1sSR8rLydcJKZtoiaEtklQrjHo,74
 naeural_client/cli/cli.py,sha256=EC7-ehOMQJ_Dq7R9TTrajpvQWwdalAOgb1JAeBGHF50,3830
 naeural_client/cli/cli_commands.py,sha256=dW7br6XaejTfOaTZZeU8xDbFgg4qZPYGoRJqz_Afsno,3195
-naeural_client/cli/nodes.py,sha256=A-MqGjI_ufZ7SnlVyMOzlqWQASRvKvF6cz9AGxlbYx4,5037
+naeural_client/cli/nodes.py,sha256=53-Ht42Xiq3rJEVA2ErZHLLC9OUjh6-rNGrc2RA-U8o,5733
 naeural_client/cli/oracles.py,sha256=Y_PzHshfSERS_Utjjtw5d_BsQRdGr6P4L6uW8yTdA0M,4809
 naeural_client/code_cheker/__init__.py,sha256=pwkdeZGVL16ZA4Qf2mRahEhoOvKhL7FyuQbMFLr1E5M,33
 naeural_client/code_cheker/base.py,sha256=lT5DRIFO5rqzsMNCmdMRfkAeevmezozehyfgmhnKpuI,19074
@@ -37,7 +37,7 @@ naeural_client/const/apps.py,sha256=ePBiJXLuPfFOKuw-LJrT9OWbaodU7QApfDurIPNDoB4,
 naeural_client/const/base.py,sha256=uq1HrxBsrFFiMP0yL0TcDANuxiSPafSx1Yh5ZyxRubE,5633
 naeural_client/const/comms.py,sha256=La6JXWHexH8CfcBCKyT4fCIoeaoZlcm7KtZ57ab4ZgU,2201
 naeural_client/const/environment.py,sha256=RpdDhDgB8NgRoFTk28eODigf9y0WcT9lul6mBOD029w,879
-naeural_client/const/evm_net.py,sha256=Uido0Bbb1oUZhlRVAn26mDOac1_nAFvu3mK5qjhCpd4,2598
+naeural_client/const/evm_net.py,sha256=CGzHXRtqfhWow6AQbyaj6kFjtIIfLgNrCg4GnBMti3A,2568
 naeural_client/const/formatter.py,sha256=AW3bWlqf39uaqV4BBUuW95qKYfF2OkkU4f9hy3kSVhM,200
 naeural_client/const/heartbeat.py,sha256=xHZBX_NzHTklwA2_AEKR0SGdlbavMT4nirqjQg8WlTU,2550
 naeural_client/const/misc.py,sha256=VDCwwpf5bl9ltx9rzT2WPVP8B3mZFRufU1tSS5MO240,413
@@ -82,11 +82,11 @@ naeural_client/logging/tzlocal/win32.py,sha256=zBoj0vFVrGhnCm_f7xmYzGym4-fV-4Ij2
 naeural_client/logging/tzlocal/windows_tz.py,sha256=Sv9okktjZJfRGGUOOppsvQuX_eXyXUxkSKCAFmWT9Hw,34203
 naeural_client/utils/__init__.py,sha256=mAnke3-MeRzz3nhQvhuHqLnpaaCSmDxicd7Ck9uwpmI,77
 naeural_client/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_LtMyCY,1072
-naeural_client/utils/config.py,sha256=QDrVywnhmf1k-sAb5jIBHZ_80TjNZk02uRG-t8mYLKQ,7413
+naeural_client/utils/config.py,sha256=XX3CxzA7resB33hodyNAcj6AyKiLF94NwnY3rqCVTPw,7473
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
 naeural_client/utils/oracle_sync/oracle_tester.py,sha256=GmZwu2JM9_UB2K-4rKB3o0RgWLqM-7Im6HwBnQLXmHI,25312
-naeural_client-2.7.9.dist-info/METADATA,sha256=nPlDJRYH1_RsZ-c9ibXVBUgDPYIHUfZEJQHvvkWuJ0M,12353
-naeural_client-2.7.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-2.7.9.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
-naeural_client-2.7.9.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.7.9.dist-info/RECORD,,
+naeural_client-2.7.11.dist-info/METADATA,sha256=qyrVvcuLJ1ySRP8UMezroxvuPNofli9mMWj6RUsuAGs,12354
+naeural_client-2.7.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-2.7.11.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
+naeural_client-2.7.11.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.7.11.dist-info/RECORD,,