naeural-client 2.5.12__tar.gz → 2.5.14__tar.gz

{naeural_client-2.5.12 → naeural_client-2.5.14}/PKG-INFO

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

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

{naeural_client-2.5.12 → naeural_client-2.5.14}/naeural_client/base/generic_session.py

@@ -10,7 +10,7 @@ from time import sleep
 from time import time as tm
 
 from ..base_decentra_object import BaseDecentrAIObject
-from ..bc import DefaultBlockEngine
+from ..bc import DefaultBlockEngine, _DotDict
 from ..const import (
   COMMANDS, ENVIRONMENT, HB, PAYLOAD_DATA, STATUS_TYPE, 
   PLUGIN_SIGNATURES, DEFAULT_PIPELINES,
@@ -2272,7 +2272,12 @@ class GenericSession(BaseDecentrAIObject):
       -------
       
       dict
-          A dictionary containing the report, the reporter and the number of supervisors.
+          A "doct-dict" dictionary containing the report, the reporter and the number of supervisors.
+            .report : DataFrame - The report containing the known nodes in the network.
+            .reporter : str - The reporter of the report.
+            .reporter_alias : str - The alias of the reporter.
+            .nr_super : int - The number of supervisors.
+            .elapsed : float - The elapsed time.
           
 
       
@@ -2348,11 +2353,11 @@ class GenericSession(BaseDecentrAIObject):
         # end for
       # end if
       pd.options.display.float_format = '{:.1f}'.format
-      dct_result ={
+      dct_result = _DotDict({
         'report' : pd.DataFrame(res),
         'reporter' : best_super,
         'reporter_alias' : best_super_alias,
         'nr_super' : len(self.__current_network_statuses),
         'elapsed' : elapsed,
-      }
+      })
       return dct_result

{naeural_client-2.5.12 → naeural_client-2.5.14}/naeural_client/cli/cli.py

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

{naeural_client-2.5.12 → naeural_client-2.5.14}/naeural_client/cli/cli_commands.py

@@ -11,11 +11,11 @@ CLI_COMMANDS = {
         "nodes": {
             "func": get_nodes,
             "params": {
-              ### use "flag" to indicate a boolean flag otherwise it will be 
-              ### treated as a str parameter
-              "--all": "Get all known nodes flag",  # DONE
-              "--online" : "Get only online nodes flag", # DONE
-              "--peered": "Get only peered nodes flag",  # DONE
+              ### use "(flag)" at the end of the description to indicate a boolean flag 
+              ### otherwise it will be treated as a str parameter
+              "--all": "Get all known nodes including those that have been gone missing (flag)",  # DONE
+              "--online" : "Get only online nodes as seen by a active supervisor (flag)", # DONE
+              "--peered": "Get only peered nodes - ie nodes that can be used by current client address (flag)",  # DONE
               "--supervisor" : "Use a specific supervisor node"
             }
         },

{naeural_client-2.5.12 → naeural_client-2.5.14}/nepctl.MD

@@ -47,6 +47,7 @@ Retrieve information about network nodes.
 **Options**:
 - `--all`: Get all known nodes.
 - `--online`: Get only online nodes.
+- `--peered`: Get only peered nodes - ie the nodes that allow the current client to connect to them and give them workloads
 - `--supervisor="addr"`: Query nodes using a specific supervisor address.
 
 **Examples**:

{naeural_client-2.5.12 → naeural_client-2.5.14}/pyproject.toml

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

{naeural_client-2.5.12 → naeural_client-2.5.14}/tutorials/ex01_part1_connect.py

@@ -63,6 +63,10 @@ if __name__ == '__main__':
   )
 
   session.P("Client address is: {}".format(session.get_client_address()), color='g')
+  
+  # lets see top 5 online nodes
+  netinfo = session.get_network_known_nodes(online_only=True)
+  session.P(f"Online nodes reported by {netinfo.reporter}:\n{netinfo.report}")
 
   # Observation:
   #   next code is not mandatory - it is used to keep the session open and cleanup the resources

{naeural_client-2.5.12 → naeural_client-2.5.14}/tutorials/ex01_part2_filter.py

@@ -126,6 +126,11 @@ if __name__ == '__main__':
       on_payload=filterer.on_data,
       silent=False,
   )
+  
+  # lets see top 5 online nodes
+  netinfo = session.get_network_known_nodes(online_only=True)
+  session.P(f"Online nodes reported by {netinfo.reporter}:\n{netinfo.report}")
+  
 
   # Observation:
   #   next code is not mandatory - it is used to keep the session open and cleanup the resources

{naeural_client-2.5.12 → naeural_client-2.5.14}/tutorials/ex01_part3_adv_filter.py

@@ -139,5 +139,5 @@ if __name__ == '__main__':
   )
   session.P("Main thread exiting...")
   
-  df_net, supervisor = session.get_network_known_nodes()
-  print(f"Network known nodes by the supervisor: '{supervisor}'\n{df_net}")
+  netinfo = session.get_network_known_nodes()  
+  print(f"Supervisor <{netinfo.reporter}> '{netinfo.reporter_alias}' ({netinfo.nr_super} supervisors total) reports:\n{netinfo.report}")