naeural-client 2.5.7__tar.gz → 2.5.8__tar.gz

{naeural_client-2.5.7 → naeural_client-2.5.8}/PKG-INFO

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

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

{naeural_client-2.5.7 → naeural_client-2.5.8}/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-2.5.7 → naeural_client-2.5.8}/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-2.5.7 → naeural_client-2.5.8}/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-2.5.7 → naeural_client-2.5.8}/naeural_client/cli/nodes.py

@@ -10,21 +10,25 @@ 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.
   """
-  if args.verbose:
-    log_with_color("Getting nodes...", color='b')
+  supervisor_addr = args.supervisor  
+  # 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
   

{naeural_client-2.5.7 → naeural_client-2.5.8}/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 → naeural_client-2.5.8}/pyproject.toml

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