naeural-client 2.7.10__tar.gz → 2.7.11__tar.gz

{naeural_client-2.7.10 → naeural_client-2.7.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naeural_client
-Version: 2.7.10
+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.10 → naeural_client-2.7.11}/naeural_client/_ver.py

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

{naeural_client-2.7.10 → naeural_client-2.7.11}/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-2.7.10 → naeural_client-2.7.11}/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-2.7.10 → naeural_client-2.7.11}/naeural_client/utils/config.py

@@ -187,11 +187,11 @@ def show_version(silent=True):
   
   user_folder = get_user_folder()  
 
-  log_with_color(f"SDK folder:  {user_folder}", color='b')
-  log_with_color(f"SDK version: {version}", color='b')
-  log_with_color(f"Ratio1 selected network: {get_network()}", color='b')
-  log_with_color(f"SDK Client address:      {sess.get_client_address()}", color='b')
-  log_with_color(f"SDK Client ETH address:  {sess.bc_engine.eth_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
   
 
@@ -206,7 +206,7 @@ def show_config(args):
     with config_file.open("r") as file:
       lines = file.readlines()
       keys = [line.strip().split("=")[0] for line in lines if "=" in line]
-    log_with_color(f"Current configuration ({config_file}) has {keys}", color='d')
+    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")
   return

{naeural_client-2.7.10 → naeural_client-2.7.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "naeural_client"
-version = "2.7.10"
+version = "2.7.11"
 authors = [
   { name="Andrei Ionut Damian", email="andrei.damian@me.com" },
   { name="Cristan Bleotiu", email="cristibleotiu@gmail.com" },

{naeural_client-2.7.10 → naeural_client-2.7.11}/tutorials/ex10_telegram_echo_bot.py

@@ -15,6 +15,8 @@ def reply(plugin: CustomPluginTemplate, message: str, user: str):
 
 
 if __name__ == "__main__":   
+  # Note: in order correctly setup the deployment you have to create the Session
+  #       object that will configure the execution environment
   session = Session() 
 
   # NOTE: When working with SDK please use the nodes internal addresses. While the EVM address of the node
@@ -24,8 +26,6 @@ if __name__ == "__main__":
 
   # this tutorial assumes you have started your own local node for dev-testing purposes
   # you can either supply the node address via env or directly here
-  # Note: in order to get the environment variable first you have to create the Session
-  #       object that will load the environment variables
   my_node = os.getenv("EE_TARGET_NODE", "0xai_my_own_node_address") 
 
   session.wait_for_node(my_node) 
@@ -38,7 +38,7 @@ if __name__ == "__main__":
   pipeline, _ = session.create_telegram_simple_bot(
     node=my_node,
     name="telegram_bot_echo",
-    telegram_bot_token="your_token_goes_here",  # we use the token directly
+    # telegram_bot_token="your_token_goes_here",  # we use the token directly
     message_handler=reply,
   )
   
@@ -51,7 +51,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 120 seconds
+    seconds=60,            # we wait the session for 120 seconds
     close_pipelines=True,   # we close the pipelines after the session
     close_session=True,     # we close the session after the session
   )

naeural_client-2.7.11/xperimental/pipelines/start.py

@@ -0,0 +1,30 @@
+import os
+import time
+
+from naeural_client import Session, CustomPluginTemplate, PLUGIN_TYPES
+
+def reply(plugin: CustomPluginTemplate, message: str, user: str):
+  """
+  This function is used to reply to a message. The given parameters are mandatory
+  """
+  plugin.obj_cache["users"][user] = self.time()
+  plugin.int_cache[user] += 1 # int_cache is a default dict that allows persistence in the plugin
+  plugin.P(f"Replying to the {plugin.int_cache[user]} msg of '{user}' on message '{message}'")
+  result = f"The answer to your {plugin.int_cache[user]} question is in the question itself: {message}"
+  return result
+
+
+if __name__ == "__main__":   
+  session = Session() 
+  my_node = os.getenv("EE_TARGET_NODE") 
+  assert my_node
+
+  session.wait_for_node(my_node) 
+  pipeline, _ = session.create_telegram_simple_bot(
+    node=my_node,
+    name="telegram_bot_echo",
+    message_handler=reply,
+  )
+  
+  pipeline.deploy() # we deploy the pipeline
+  session.close() # close the session, leave the pipeline on

naeural_client-2.7.11/xperimental/pipelines/stop.py

@@ -0,0 +1,12 @@
+import os
+from naeural_client import Session
+
+
+if __name__ == "__main__":
+  session = Session()
+  
+  my_node = os.getenv("EE_TARGET_NODE", "0xai_my_own_node_address") 
+  my_pipeline = "telegram_bot_echo"
+  
+  session.close_pipeline(my_node, my_pipeline)
+  session.close()