naeural-client 3.0.6__tar.gz → 3.0.8__tar.gz

{naeural_client-3.0.6 → naeural_client-3.0.8}/PKG-INFO

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

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

{naeural_client-3.0.6 → naeural_client-3.0.8}/naeural_client/base/generic_session.py

@@ -89,7 +89,7 @@ class GenericSession(BaseDecentrAIObject):
               on_notification=None,
               on_heartbeat=None,
               debug_silent=True,
-              debug=False,
+              debug=1,
               silent=False,
               verbosity=1,
               dotenv_path=None,
@@ -145,6 +145,7 @@ class GenericSession(BaseDecentrAIObject):
         As arguments, it has a reference to this Session object, the node name, the pipeline, signature and instance, and the payload.
         This callback acts as a default payload processor and will be called even if for a given instance
         the user has defined a specific callback.
+        
     on_notification : Callable[[Session, str, dict], None], optional
         Callback that handles notifications received from this network.
         As arguments, it has a reference to this Session object, the node name and the notification payload.
@@ -153,6 +154,7 @@ class GenericSession(BaseDecentrAIObject):
         This callback will be called when there are notifications related to the node itself, e.g. when the node runs
         low on memory.
         Defaults to None.
+        
     on_heartbeat : Callable[[Session, str, dict], None], optional
         Callback that handles heartbeats received from this network.
         As arguments, it has a reference to this Session object, the node name and the heartbeat payload.
@@ -162,8 +164,12 @@ class GenericSession(BaseDecentrAIObject):
         This flag will disable debug logs, set to 'False` for a more verbose log, by default True
         Observation: Obsolete, will be removed
         
-    debug : bool, optional
-        This flag will enable debug logs, set to 'False` for a more verbose log, by default False
+    debug : bool or int, optional
+        This flag will enable debug logs, set to 'True` or 2 for a more verbose log, by default 1
+        - 0 or False will disable debug logs
+        - 1 will enable level 1
+        - 2 will enable full debug
+        
         
         
     silent : bool, optional
@@ -185,8 +191,11 @@ class GenericSession(BaseDecentrAIObject):
         If True, the SDK will use the home folder as the base folder for the local cache.
         NOTE: if you need to use development style ./_local_cache, set this to False.
     """
-    
     debug = debug or not debug_silent
+    if isinstance(debug, bool):
+      debug = 2 if debug else 0
+    
+    self.__debug = int(debug) > 0
     
     self.__at_least_one_node_peered = False
     self.__at_least_a_netmon_received = False
@@ -278,13 +287,20 @@ class GenericSession(BaseDecentrAIObject):
       
     super(GenericSession, self).__init__(
       log=log, 
-      DEBUG=debug, 
+      DEBUG=int(debug) > 1, 
       create_logger=True,
       silent=self.silent,
       local_cache_base_folder=local_cache_base_folder,
       local_cache_app_folder=local_cache_app_folder,
     )
     return
+  
+  def Pd(self, *args, **kwargs):
+    if self.__debug:
+      kwargs["color"] = 'd' if kwargs.get("color") != 'r' else 'r'
+      self.log.P(*args, **kwargs)
+    return
+  
 
   def startup(self):    
     ## 1st config step - we prepare config via ~/.naeural/config or .env
@@ -830,7 +846,7 @@ class GenericSession(BaseDecentrAIObject):
             if needs_netconfig:
               lst_netconfig_request.append(node_addr)
           # end for each node in network map
-          self.P(f"Net mon from <{sender_addr}> `{ee_id}`:  {len(online_addresses)}/{len(all_addresses)}", color='y')
+          self.Pd(f"Net mon from <{sender_addr}> `{ee_id}`:  {len(online_addresses)}/{len(all_addresses)}")
           if len(lst_netconfig_request) > 0:
             self.__request_pipelines_from_net_config_monitor(lst_netconfig_request)
           # end if needs netconfig
@@ -1607,7 +1623,7 @@ class GenericSession(BaseDecentrAIObject):
       )
       self.bc_engine.sign(msg_to_send, use_digest=True)
       if show_command:
-        self.P(
+        self.Pd(
           "Sending command '{}' to '{}':\n{}".format(command, worker, json.dumps(msg_to_send, indent=2)),
           color='y',
           verbosity=1

{naeural_client-3.0.6 → naeural_client-3.0.8}/naeural_client/base/instance.py

@@ -77,6 +77,7 @@ class Instance():
   
   def Pd(self, *args, **kwargs):
     if self.__debug:
+      kwargs["color"] = 'd' if kwargs.get("color") != 'r' else 'r'
       self.log.P(*args, **kwargs)
     return
 
@@ -522,7 +523,7 @@ class Instance():
           The list of transactions generated, or None if `wait_confirmation` is False.
 
       """
-      self.P(f'Sending command <{command}> to instance <{self.__repr__()}>', color="b")
+      self.Pd(f'Sending command <{command}> to instance <{self.__repr__()}>', color="b")
 
       self.__was_last_operation_successful = None
 

{naeural_client-3.0.6 → naeural_client-3.0.8}/naeural_client/base/pipeline.py

@@ -156,6 +156,7 @@ class Pipeline(BaseCodeChecker):
     Print debug message.
     """
     if self.__debug:
+      kwargs["color"] = 'd' if kwargs.get("color") != 'r' else 'r'
       self.P(*args, **kwargs)
     return
 

{naeural_client-3.0.6 → naeural_client-3.0.8}/naeural_client/cli/cli.py

@@ -1,3 +1,5 @@
+import signal
+import sys
 import argparse
 
 from naeural_client.utils.config import maybe_init_config, log_with_color
@@ -6,6 +8,11 @@ from naeural_client.cli.cli_commands import CLI_COMMANDS
 from naeural_client import version
 import traceback
 
+def handle_sigint(signum, frame):
+  """Handler for the SIGINT signal (Ctrl-C)."""
+  print("Interrupted. Exiting...")
+  sys.exit(1)
+
 
 def create_global_parser():
   """
@@ -96,6 +103,9 @@ def main():
   Ensures the configuration is initialized, builds the parser, 
   and executes the appropriate command function.
   """
+  # Register the SIGINT handler
+  signal.signal(signal.SIGINT, handle_sigint)  
+  
   try:
     # Initialize configuration if necessary
     initialized = maybe_init_config()

{naeural_client-3.0.6 → naeural_client-3.0.8}/pyproject.toml

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

naeural_client-3.0.8/tutorials/ex02_part3_deploy_r1fs_test.py

@@ -0,0 +1,75 @@
+import json
+from naeural_client import Instance, Payload, Pipeline, Session, PAYLOAD_DATA
+
+class SimplePayloadHandler:
+  """ Simple payload handler class build for convenience """
+  def __init__(self):
+    self.n_received = 0
+    return
+  
+  def instance_on_data(self, pipeline: Pipeline, payload: Payload):
+    # we extract the payload and do a minimal processing
+    # this is the payload key sent by the demo plugin
+    R1FS_DEMO_DATA_KEY = "R1FS_DATA" 
+    # next convert to the data object for convenience
+    data = payload.data 
+    # then we extract the sender alias directly from the payload
+    sender_alias = data[PAYLOAD_DATA.EE_ID] 
+    # we extract the r1fs data if it is present
+    r1fs_data = data.get(R1FS_DEMO_DATA_KEY) 
+    if r1fs_data is None:
+      # we ignore the payload if the data is not present
+      return 
+    # we increment the number of received payloads
+    self.n_received += 1
+    # then we extract the R1FS file originator (creator) from the demo data
+    read_file_originator = r1fs_data["owner_id"] 
+    # we print the data 
+    pipeline.P("Data received #{} from worker '{}' from file created by '{}':\n {}".format(
+      self.n_received, sender_alias, read_file_originator, json.dumps(r1fs_data, indent=2)
+    ))
+    return
+
+if __name__ == '__main__':
+
+  session: Session = Session()
+  
+  payload_handler = SimplePayloadHandler()
+  
+  # this code assumes the node have "allowed" the SDK to deploy the pipeline
+  nodes = [
+    '0xai_A2LfyeItL5oEp7nHONlczGgwS3SV8Ims9ujJ0soJ6Anx',
+    '0xai_AqgKnJMNvUvq5n1wIin_GD2i1FbZ4FBTUJaCI6cWf7i4',
+  ]
+
+  for node in nodes:
+    session.P(f"Deploying pipeline to node: {node}")
+    session.wait_for_node(node) # we wait for the node to be ready
+    pipeline: Pipeline = session.create_pipeline(
+      node=node, name='r1fs_demo_pipeline', data_source='Void',
+      debug=True,
+    )
+    # The ideea is that we create a plugin instance that listens for data
+    # on ChainStorage from other plugins/nodes that create R1FS demo files
+    # while itself also creating R1FS demo files
+    instance: Instance = pipeline.create_plugin_instance(
+      signature='R1FS_DEMO', on_data=payload_handler.instance_on_data,
+      instance_id='inst01',
+      debug=True,
+    )
+
+    pipeline.deploy()
+  WAIT_TIME = 150
+  session.P(f"All pipelines deployed, we wait for {WAIT_TIME} seconds...")
+  session.wait(
+    seconds=WAIT_TIME,            # we wait the session for 60 seconds
+    close_pipelines=True,   # we close the pipelines after the session
+    close_session=True,     # we close the session after the session
+  )
+  
+  session.P("Session closed. A total of {} payloads were received.".format(
+    payload_handler.n_received
+  ))
+  if payload_handler.n_received == 0:
+    session.P("No payloads were received. Probably your nodes do not cooperate ('allow') with each other.")
+  session.P("Main thread exiting...")

{naeural_client-3.0.6 → naeural_client-3.0.8}/xperimental/_checks/ora_check.py

@@ -4,10 +4,10 @@ import pandas as pd
 
 if __name__ == "__main__":
   N = 4
-  DEBUG = True
+  DEBUG = False
 
   # the provided url, note: if this does not return json directly, it might need adjustment
-  url = "https://naeural-oracle.ngrok.app/active_nodes_list"
+  url = "https://devnet-oracle.ratio1.ai/active_nodes_list"
   server_alias_counts = {}
 
   for i in range(N):

naeural_client-3.0.6/tutorials/ex02_part3_deploy_r1fs_test.py

@@ -1,43 +0,0 @@
-import json
-from naeural_client import Instance, Payload, Pipeline, Session
-
-def instance_on_data(pipeline: Pipeline, data: Payload):
-  data = data.data
-  print(f"Data received: {json.dumps(data, indent=2)}")
-  return
-
-if __name__ == '__main__':
-
-  session: Session = Session()
-  
-  # this code assumes the node have "allowed" the SDK to deploy the pipeline
-  nodes = [
-    '0xai_A2LfyeItL5oEp7nHONlczGgwS3SV8Ims9ujJ0soJ6Anx',
-    '0xai_AqgKnJMNvUvq5n1wIin_GD2i1FbZ4FBTUJaCI6cWf7i4',
-  ]
-
-  for node in nodes:
-    session.P(f"Deploying pipeline to node: {node}")
-    session.wait_for_node(node) # we wait for the node to be ready
-    pipeline: Pipeline = session.create_pipeline(
-      node=node,
-      name='r1fs_demo_pipeline',
-      data_source='Void',
-      debug=True,
-    )
-
-    instance: Instance = pipeline.create_plugin_instance(
-      signature='R1FS_DEMO',
-      on_data=instance_on_data,
-      instance_id='inst01',
-      debug=True,
-    )
-
-    pipeline.deploy()
-
-  session.wait(
-    seconds=300,            # we wait the session for 60 seconds
-    close_pipelines=True,   # we close the pipelines after the session
-    close_session=True,     # we close the session after the session
-  )
-  session.P("Main thread exiting...")