naeural-client 3.0.4__py3-none-any.whl → 3.0.6__py3-none-any.whl

naeural_client/_ver.py

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

naeural_client/base/generic_session.py

@@ -1778,6 +1778,7 @@ class GenericSession(BaseDecentrAIObject):
                         on_notification=None,
                         max_wait_time=0,
                         pipeline_type=None,
+                        debug=False,
                         **kwargs) -> Pipeline:
       """
       Create a new pipeline on a node. A pipeline is the equivalent of the "config file" used by the Naeural Edge Protocol edge node team internally.
@@ -1857,6 +1858,7 @@ class GenericSession(BaseDecentrAIObject):
           on_data=on_data,
           on_notification=on_notification,
           is_attached=False,
+          debug=debug,
           **kwargs
       )
       self.own_pipelines.append(pipeline)

naeural_client/base/instance.py

@@ -9,7 +9,19 @@ class Instance():
   The Instance class is a wrapper around a plugin instance. It provides a simple API for sending commands to the instance and updating its configuration.
   """
 
-  def __init__(self, log, pipeline, instance_id, signature, on_data=None, on_notification=None, config={}, is_attached=False, **kwargs):
+  def __init__(
+    self, 
+    log, 
+    pipeline, 
+    instance_id, 
+    signature, 
+    on_data=None, 
+    on_notification=None, 
+    config={}, 
+    is_attached=False, 
+    debug=False,
+    **kwargs
+  ):
     """
     Create a new instance of the plugin.
 
@@ -39,6 +51,7 @@ class Instance():
     self.instance_id = instance_id
     self.signature = signature.upper()
     self.config = {}
+    self.__debug = debug
 
     if is_attached:
       assert len(kwargs) == 0, "When attaching an instance, no additional parameters are allowed"
@@ -61,6 +74,11 @@ class Instance():
       self.on_notification_callbacks.append(on_notification)
 
     return
+  
+  def Pd(self, *args, **kwargs):
+    if self.__debug:
+      self.log.P(*args, **kwargs)
+    return
 
   # Message handling
   if True:
@@ -75,6 +93,7 @@ class Instance():
       data : dict | Payload
           The data received from the instance
       """
+      self.Pd(f"_on_data: {pipeline.name}:{self.signature}:{self.instance_id}")
       for callback in self.on_data_callbacks:
         callback(pipeline, data)
       for callback in self.temporary_on_data_callbacks.values():

naeural_client/base/pipeline.py

@@ -40,6 +40,7 @@ class Pipeline(BaseCodeChecker):
     on_notification=None, 
     is_attached=False, 
     existing_config=None, 
+    debug=False,
     **kwargs
   ) -> None:
     """
@@ -99,6 +100,7 @@ class Pipeline(BaseCodeChecker):
     self.session = session
     self.node_addr = node_addr
     self.name = name
+    self.__debug = debug
 
     self.config = {}
     plugins = config.pop('PLUGINS', plugins)
@@ -148,10 +150,27 @@ class Pipeline(BaseCodeChecker):
 
     self.__init_plugins(plugins, is_attached)
     return
+  
+  def Pd(self, *args, **kwargs):
+    """
+    Print debug message.
+    """
+    if self.__debug:
+      self.P(*args, **kwargs)
+    return
 
   # Utils
   if True:
-    def __init_instance(self, signature, instance_id, config, on_data, on_notification, is_attached):
+    def __init_instance(
+      self, 
+      signature, 
+      instance_id, 
+      config, 
+      on_data, 
+      on_notification, 
+      is_attached,
+      debug=False,
+    ):
       instance_class = None
       str_signature = None
       if isinstance(signature, str):
@@ -160,15 +179,17 @@ class Pipeline(BaseCodeChecker):
       else:
         instance_class = signature
         str_signature = instance_class.signature.upper()
-      instance = instance_class(self.log,
-                                pipeline=self,
-                                signature=str_signature,
-                                instance_id=instance_id,
-                                config=config,
-                                on_data=on_data,
-                                on_notification=on_notification,
-                                is_attached=is_attached
-                                )
+      instance = instance_class(
+        self.log,
+        pipeline=self,
+        signature=str_signature,
+        instance_id=instance_id,
+        config=config,
+        on_data=on_data,
+        on_notification=on_notification,
+        is_attached=is_attached,
+        debug=debug, 
+      )
       self.lst_plugin_instances.append(instance)
       return instance
 
@@ -710,6 +731,7 @@ class Pipeline(BaseCodeChecker):
           The payload of the message.
       """
       # call all self callbacks
+      self.Pd(f"Pipeline <{self.name}> received data from <{signature}:{instance_id}>")
       for callback in self.on_data_callbacks:
         callback(self, signature, instance_id, data)
 
@@ -834,6 +856,7 @@ class Pipeline(BaseCodeChecker):
       config={}, 
       on_data=None, 
       on_notification=None, 
+      debug=False,
       **kwargs
     ) -> Instance:
       """
@@ -884,7 +907,11 @@ class Pipeline(BaseCodeChecker):
 
       # create the new instance and add it to the list
       config = {**config, **kwargs}
-      instance = self.__init_instance(signature, instance_id, config, on_data, on_notification, is_attached=False)
+      instance = self.__init_instance(
+        signature=signature, instance_id=instance_id, config=config, 
+        on_data=on_data, on_notification=on_notification, is_attached=False,
+        debug=debug
+      )
       return instance
 
     def __remove_plugin_instance(self, instance):

naeural_client/ipfs/r1fs.py

@@ -268,8 +268,8 @@ class R1FSEngine:
   
   def _get_unique_or_complete_upload_name(self, fn=None, prefix="r1fs", suffix=""):
     if fn is not None and os.path.dirname(fn) == "":
-      return os.path.join(self.__uploads_dir, fn)
-    return self._get_unique_upload_name(prefix, suffix)
+      return os.path.join(self.__uploads_dir, f"{fn}{suffix}")
+    return self._get_unique_upload_name(prefix, suffix=suffix)
   
   def __set_reprovider_interval(self):
     # Command to set the Reprovider.Interval to 1 minute
@@ -566,6 +566,7 @@ class R1FSEngine:
     msg += f"\n  Download: {self.__downloads_dir}"
     msg += f"\n  Upload:   {self.__uploads_dir}"
     msg += f"\n  SwarmKey: {hidden_base64_swarm_key}"
+    msg += f"\n  Debug:    {self.__debug}"
     self.P(msg, color='d')
     
     ipfs_repo = os.path.expanduser("~/.ipfs")

naeural_client/utils/config.py

@@ -251,7 +251,7 @@ def get_apps(args):
   # 2. Wait for node to appear online
   found = sess.wait_for_node(node)
   if not found:
-    sess.P(f'Node {node} not found. Please check the configuration.', color='r')
+    log_with_color(f'Node {node} not found. Please check the configuration.', color='r')
     return
   # 3. Check if the node is peered with the client
   is_allowed = sess.is_peered(node)

{naeural_client-3.0.4.dist-info → naeural_client-3.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naeural_client
-Version: 3.0.4
+Version: 3.0.6
 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.4.dist-info → naeural_client-3.0.6.dist-info}/RECORD

@@ -1,12 +1,12 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=7HXIMZFlcmBUxEX-K8mK6oifoBKxJTnecJBxWsd8Z3Y,330
+naeural_client/_ver.py,sha256=jz8z7wmDrMakgqysslBMdMWlK_qlzv3qrEQiMJ73AmA,330
 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=VCJb2gni2qtqqrYn68iG0MfaqsSQVBkj_XcHV3dLngg,115453
-naeural_client/base/instance.py,sha256=kcZJmjLBtx8Bjj_ysIOx1JmLA-qSpG7E28j5rq6IYus,20444
-naeural_client/base/pipeline.py,sha256=b4BJlqZ4vsGNqYPjJD9Uzrv5G8CVYG_jbND5rh_s8E0,59702
+naeural_client/base/generic_session.py,sha256=_yokitSejGFQUp8iyMEomUiDGa-c7G9ro6er4R9_GMM,115513
+naeural_client/base/instance.py,sha256=WqCrN5OPKmqgkQEd9jijcZMS2SnfCQ_EO_XHDIQhg78,20721
+naeural_client/base/pipeline.py,sha256=38txaMKmQ8KFBmZR8rr16cAt0AKNYcALTCPJ-HFSo6E,60001
 naeural_client/base/plugin_template.py,sha256=7YAFaND2iXoZLgtunjYkFf_TBGieFr3VdNLO3vCqzmM,138795
 naeural_client/base/responses.py,sha256=ZKBZmRhYDv8M8mQ5C_ahGsQvtWH4b9ImRcuerQdZmNw,6937
 naeural_client/base/transaction.py,sha256=bfs6td5M0fINgPQNxhrl_AUjb1YiilLDQ-Cd_o3OR_E,5146
@@ -62,7 +62,7 @@ naeural_client/io_formatter/default/aixp1.py,sha256=MX0TeUR4APA-qN3vUC6uzcz8Pssz
 naeural_client/io_formatter/default/default.py,sha256=gEy78cP2D5s0y8vQh4aHuxqz7D10gGfuiKF311QhrpE,494
 naeural_client/ipfs/__init__.py,sha256=vXEDLUNUO6lOTMGa8iQ9Zf7ajIQq9GZuvYraAHt3meE,38
 naeural_client/ipfs/ifps_keygen,sha256=PcoYuo4c89_C9FWrKq9K_28ruhKqnxNn1s3nLHiF1tc,879
-naeural_client/ipfs/r1fs.py,sha256=ovBOG81tPdWv3M7bPGZwrJylDDNSzQ8K4t04HNe2EZ0,19328
+naeural_client/ipfs/r1fs.py,sha256=voZSoWN07OB-AmSc0WVEngQqyxogmG5ERFOQLOovPhg,19391
 naeural_client/ipfs/ipfs_setup/ipfs.service,sha256=isTJQsktPy4i1yaDA9AC1OKdlTYvsCCRRAVX-EmGqAs,248
 naeural_client/ipfs/ipfs_setup/launch_service.sh,sha256=GWhZyNqtohLxJg8Q_c8YnNZduu1ddXDU-IFRRMaEyiY,141
 naeural_client/ipfs/ipfs_setup/restart.sh,sha256=9xHMgkUoAMI25jeaoDVFbCa_LjojYm3ubljW58RatKE,22
@@ -93,11 +93,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=lAbWe3UMi40BOdsAIZIb-fYtb4LwG3MIYg0EOA1ITr8,10340
+naeural_client/utils/config.py,sha256=upTCJWpZ-Or8V_71DHrIZ429LKn08KNySKcw0WIADcc,10348
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
 naeural_client/utils/oracle_sync/oracle_tester.py,sha256=X-923ccjkr6_kzbbiuAAcWSIhMtBDOH2VURjTh55apQ,27235
-naeural_client-3.0.4.dist-info/METADATA,sha256=XEDm_E4sQ-1V4izCTEIe__fQKMNLEmImtWQQkJvxn-Q,12353
-naeural_client-3.0.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-3.0.4.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
-naeural_client-3.0.4.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-3.0.4.dist-info/RECORD,,
+naeural_client-3.0.6.dist-info/METADATA,sha256=t896emzhsxe93SJUbJytZxrUIAM8sFhAwryN_FqSXmg,12353
+naeural_client-3.0.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-3.0.6.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
+naeural_client-3.0.6.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-3.0.6.dist-info/RECORD,,