naeural-client 2.5.7__py3-none-any.whl → 2.5.9__py3-none-any.whl

naeural_client/_ver.py

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

naeural_client/base/generic_session.py

@@ -24,7 +24,9 @@ from .payload import Payload
 from .pipeline import Pipeline
 from .webapp_pipeline import WebappPipeline
 from .transaction import Transaction
-from ..utils.config import load_user_defined_config, get_user_config_file, get_user_folder
+from ..utils.config import (
+  load_user_defined_config, get_user_config_file, get_user_folder, seconds_to_short_format
+)
 
 # from ..default.instance import PLUGIN_TYPES # circular import
 
@@ -571,7 +573,7 @@ class GenericSession(BaseDecentrAIObject):
         sender_addr = dict_msg.get(PAYLOAD_DATA.EE_SENDER, None)
         path = dict_msg.get(PAYLOAD_DATA.EE_PAYLOAD_PATH, [None, None, None, None])
         ee_id = dict_msg.get(PAYLOAD_DATA.EE_ID, None)
-        current_network = dict_msg.get(PAYLOAD_DATA.NETMON_CURRENT_NETWORK, {})
+        current_network = dict_msg.get(PAYLOAD_DATA.NETMON_CURRENT_NETWORK, {})        
         if current_network:
           all_addresses = [
             x[PAYLOAD_DATA.NETMON_ADDRESS] for x in current_network.values()
@@ -1881,14 +1883,16 @@ class GenericSession(BaseDecentrAIObject):
       """
 
       ngrok_use_api = True
-      use_ngrok=True,
+      use_ngrok = True
+      kwargs.pop('use_ngrok', None)
+      kwargs.pop('ngrok_use_api', None)
       
       # if isinstance(signature, str):
       
       pipelines, instances = [], []
       
       for node in nodes:
-        self.P("Creating web app on node {}...".format(node), color='y')
+        self.P("Creating web app on node {}...".format(node), color='b')
         pipeline: WebappPipeline = self.create_pipeline(
           node=nodes[0],
           name=name,
@@ -2230,7 +2234,14 @@ class GenericSession(BaseDecentrAIObject):
     def client_address(self):
       return self.get_client_address()
     
-    def get_network_known_nodes(self, timeout=10, online_only=False, supervisors_only=False):
+    def get_network_known_nodes(
+      self, 
+      timeout=10, 
+      online_only=False, 
+      supervisors_only=False,
+      min_supervisors=2,
+      supervisor=None,
+    ):
       """
       This function will return a Pandas dataframe  known nodes in the network based on
       all the net-mon messages received so far.
@@ -2238,10 +2249,10 @@ class GenericSession(BaseDecentrAIObject):
       mapping = OrderedDict({
         'Address': PAYLOAD_DATA.NETMON_ADDRESS,
         'Alias'  : PAYLOAD_DATA.NETMON_EEID,
+        'Seen ago' : PAYLOAD_DATA.NETMON_LAST_SEEN,
         'Last state': PAYLOAD_DATA.NETMON_STATUS_KEY,
-        'Ago (s)' : PAYLOAD_DATA.NETMON_LAST_SEEN,
         'Last probe' : PAYLOAD_DATA.NETMON_LAST_REMOTE_TIME,
-        'Node zone' : PAYLOAD_DATA.NETMON_NODE_UTC,
+        'Zone' : PAYLOAD_DATA.NETMON_NODE_UTC,
         'Supervisor' : PAYLOAD_DATA.NETMON_IS_SUPERVISOR,
       })
       reverse_mapping = {v: k for k, v in mapping.items()}
@@ -2249,8 +2260,12 @@ class GenericSession(BaseDecentrAIObject):
       for k in mapping:
         res[k] = []
       start = tm()      
+  
       while (tm() - start) < timeout:
-        if len(self.__current_network_statuses) > 0:
+        if supervisor is not None:
+          if supervisor in self.__current_network_statuses:
+            break
+        elif len(self.__current_network_statuses) >= min_supervisors:
           break
         sleep(0.1)
       # end while
@@ -2273,10 +2288,15 @@ class GenericSession(BaseDecentrAIObject):
             val = node_info.get(key, None)
             if key == PAYLOAD_DATA.NETMON_LAST_REMOTE_TIME:
               # val hols a string '2024-12-23 23:50:16.462155' and must be converted to a datetime
-              val = dt.strptime(val, '%Y-%m-%d %H:%M:%S.%f')
-              # strip the microseconds
-              val = val.replace(microsecond=0)
+              val = dt.strptime(val, '%Y-%m-%d %H:%M:%S.%f')              
+              val = val.replace(microsecond=0) # strip the microseconds
+            elif key == PAYLOAD_DATA.NETMON_LAST_SEEN:
+              # convert val (seconds) to a human readable format
+              val = seconds_to_short_format(val)
+            elif key == PAYLOAD_DATA.NETMON_ADDRESS:
+              val = self.bc_engine._add_prefix(val)
             res[column].append(val)          
         # end for
       # end if
+      pd.options.display.float_format = '{:.1f}'.format
       return pd.DataFrame(res), best_super

naeural_client/cli/cli.py

@@ -52,9 +52,14 @@ def build_parser():
         if isinstance(subcmd_info, dict) and "params" in subcmd_info:
           for param, description in subcmd_info["params"].items():
             if param.startswith("--"):
-              subcommand_parser.add_argument(
-                param, action="store_true", help=description
-              )
+              if description.upper().endswith("FLAG"):
+                subcommand_parser.add_argument(
+                  param, action="store_true", help=description
+                )
+              else:
+                subcommand_parser.add_argument(
+                  param, help=description, type=str
+                )
             else:
               subcommand_parser.add_argument(
                 param, help=description

naeural_client/cli/cli_commands.py

@@ -11,9 +11,10 @@ CLI_COMMANDS = {
         "nodes": {
             "func": get_nodes,
             "params": {
-                "--all": "Get all known nodes",  # DONE
-                "--online" : "Get only online nodes", # DONE
+                "--all": "Get all known nodes flag",  # DONE
+                "--online" : "Get only online nodes flag", # DONE
                 # "--peered": "Get only peered nodes"
+                "--supervisor" : "Use a specific supervisor node"
             }
         },
         "supervisors": {

naeural_client/cli/nodes.py

@@ -10,21 +10,26 @@ def get_nodes(args):
   3. Wait for the second net mon message via Session and show progress.  
   4. Get the active nodes union via Session and display the nodes marking those peered vs non-peered.
   """
+  supervisor_addr = args.supervisor  
   if args.verbose:
-    log_with_color("Getting nodes...", color='b')
+    log_with_color(f"Getting nodes from supervisor <{supervisor_addr}>...", color='b')
   from naeural_client import Session
   sess = Session(silent=not args.verbose)
   if args.all:
-    df, supervisor = sess.get_network_known_nodes()
-    log_with_color(f"Network historical map as seen by <{supervisor}>:", color='b')
+    df, supervisor = sess.get_network_known_nodes(supervisor=supervisor_addr)
+    log_with_color(f"Network full map reported by <{supervisor}>:", color='b')
     log_with_color(f"{df}")    
   elif args.online:
-    df, supervisor = sess.get_network_known_nodes(online_only=True)
-    log_with_color(f"Online nodes as seen by <{supervisor}>:", color='b')
+    df, supervisor = sess.get_network_known_nodes(
+      online_only=True, supervisor=supervisor_addr
+    )
+    log_with_color(f"Online nodes reported by <{supervisor}>:", color='b')
     log_with_color(f"{df}")    
   else:
-    df, supervisor = sess.get_network_known_nodes(online_only=True)
-    log_with_color(f"Online nodes as seen by <{supervisor}>:", color='b')
+    df, supervisor = sess.get_network_known_nodes(
+      online_only=True, supervisor=supervisor_addr
+    )
+    log_with_color(f"Online nodes reported by <{supervisor}>:", color='b')
     log_with_color(f"{df}")    
   return
   
@@ -38,7 +43,8 @@ def get_supervisors(args):
   from naeural_client import Session  
   sess = Session(silent=not args.verbose)
   df, supervisor = sess.get_network_known_nodes(online_only=True, supervisors_only=True)
-  log_with_color(f"Supervisors reported by <{supervisor}>:\n{df}")
+  log_with_color(f"Supervisors reported by <{supervisor}>", color='b')
+  log_with_color(f"{df}")
   return
 
 

naeural_client/utils/config.py

@@ -14,6 +14,34 @@ EE_SECURED=true
 TARGET_NODE=
 """
 
+def seconds_to_short_format(seconds):
+  """
+  Converts a duration in seconds into a short human-readable format: "Xd HH:MM:SS".
+
+  Parameters
+  ----------
+  seconds : int
+      The total duration in seconds.
+
+  Returns
+  -------
+  str
+      Short human-readable duration in "Xd HH:MM:SS" format.
+  """
+  days = int(seconds / (24 * 3600))
+  seconds %= (24 * 3600)
+  hours = int(seconds / 3600)
+  seconds %= 3600
+  minutes = int(seconds / 60)
+  seconds %= 60
+  seconds = int(seconds)
+
+  # Format the result
+  if days > 0:
+    return f"{days}d {hours:02}:{minutes:02}:{seconds:02}"
+  else:
+    return f"{hours:02}:{minutes:02}:{seconds:02}"
+
 def log_with_color(s, color='n'):
   """
   Prints the string `s` to the console in the specified color.

{naeural_client-2.5.7.dist-info → naeural_client-2.5.9.dist-info}/METADATA

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

@@ -1,10 +1,10 @@
 naeural_client/__init__.py,sha256=GP8WSrn87sjTPO-QRNL2PG8JK5Mixbiea_HrtbG8RAQ,592
-naeural_client/_ver.py,sha256=jOQZvRuqptt966hnBzZbnuoTu3k1fouYmsXFZj-qrkE,330
+naeural_client/_ver.py,sha256=l2hQhFUtxGvo4zX1x7oPvnNzaZHD797T0pCICqMPFRM,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=cM6mYBfc-PcTzjg8JQmgb2gPWQ_qN9FFJ2M80J35fJQ,85035
+naeural_client/base/generic_session.py,sha256=3pvPZCIiygD-QWggmWUOZWj52o6la5koEYd2R-OF9YQ,85692
 naeural_client/base/instance.py,sha256=kcZJmjLBtx8Bjj_ysIOx1JmLA-qSpG7E28j5rq6IYus,20444
 naeural_client/base/pipeline.py,sha256=b4uNHrEIOlAtw4PGUx20dxwBhDck5__SrVXaHcSi8ZA,58251
 naeural_client/base/plugin_template.py,sha256=qGaXByd_JZFpjvH9GXNbT7KaitRxIJB6-1IhbKrZjq4,138123
@@ -20,9 +20,9 @@ naeural_client/bc/ec.py,sha256=mWjodWCRgC3omVXOA9jtNdtPVNn2kMKV3Dcjt9oFUCQ,22974
 naeural_client/certs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 naeural_client/certs/r9092118.ala.eu-central-1.emqxsl.com.crt,sha256=y-6io0tseyx9-a4Pmde1z1gPULtJNSYUpG_YFkYaMKU,1337
 naeural_client/cli/README.md,sha256=WPdI_EjzAbUW1aPyj1sSR8rLydcJKZtoiaEtklQrjHo,74
-naeural_client/cli/cli.py,sha256=jSOXre7-Kx0ctoYc7iTSv0hKJKmIiCSUppJbjDrbox8,3553
-naeural_client/cli/cli_commands.py,sha256=_oPGZ4nq24qNmXHknkYO8Hb2-SSCRgsR5L_Ac-7dxsM,1316
-naeural_client/cli/nodes.py,sha256=gmc-9ETnSB3eSX_lPv3XkZ1jM1aUFsQzInwqCqUY_bQ,2155
+naeural_client/cli/cli.py,sha256=GyQhw16LrCbXU0JLH0HlbyYvKqa15K5RIhQ-Pgi7Gy4,3752
+naeural_client/cli/cli_commands.py,sha256=BtByinaxFvThyQdeu8Moz2aMioR5MW5GTiI1bGjbfwQ,1392
+naeural_client/cli/nodes.py,sha256=Q26sJpDCOd0oqpNonqEoCc1EcLVnf2CaGFzrG1wyzhA,2363
 naeural_client/code_cheker/__init__.py,sha256=pwkdeZGVL16ZA4Qf2mRahEhoOvKhL7FyuQbMFLr1E5M,33
 naeural_client/code_cheker/base.py,sha256=lT5DRIFO5rqzsMNCmdMRfkAeevmezozehyfgmhnKpuI,19074
 naeural_client/code_cheker/checker.py,sha256=QWupeM7ToancVIq1tRUxRNUrI8B5l5eoY0kDU4-O5aE,7365
@@ -79,10 +79,10 @@ 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=Ltagd1qI3EpqwhAVVpTXAWoVlO8ca8hKVk5cmAQBV9k,4563
+naeural_client/utils/config.py,sha256=aUVyi5rZjvnbUwM5mmj0E2IHvURdrlHSgleqZvJBNuU,5202
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
-naeural_client-2.5.7.dist-info/METADATA,sha256=H9c1FxCBno3sc89FdawdgEoVH7fsBZKZYYCUioUIbFQ,14493
-naeural_client-2.5.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-2.5.7.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
-naeural_client-2.5.7.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.5.7.dist-info/RECORD,,
+naeural_client-2.5.9.dist-info/METADATA,sha256=96hKd3KQ2t71LFr44aKxSpBfta5f2CYAcWcvA6Vx1x8,14493
+naeural_client-2.5.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-2.5.9.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
+naeural_client-2.5.9.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.5.9.dist-info/RECORD,,