naeural-client 2.5.22__py3-none-any.whl → 2.5.24__py3-none-any.whl

naeural_client/_ver.py

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

naeural_client/base/generic_session.py

@@ -14,7 +14,7 @@ from ..bc import DefaultBlockEngine, _DotDict
 from ..const import (
   COMMANDS, ENVIRONMENT, HB, PAYLOAD_DATA, STATUS_TYPE, 
   PLUGIN_SIGNATURES, DEFAULT_PIPELINES,
-  BLOCKCHAIN_CONFIG
+  BLOCKCHAIN_CONFIG, SESSION_CT
 )
 from ..const import comms as comm_ct
 from ..io_formatter import IOFormatterWrapper
@@ -2255,6 +2255,7 @@ class GenericSession(BaseDecentrAIObject):
       min_supervisors=2,
       allowed_only=False,
       supervisor=None,
+      df_only=False,
     ):
       """
       This function will return a Pandas dataframe  known nodes in the network based on
@@ -2282,6 +2283,9 @@ class GenericSession(BaseDecentrAIObject):
       supervisor : str, optional  
           The supervisor to wait for. Defaults to None.
           
+      df_only : bool, optional
+          If True, will return only the Pandas dataframe. Defaults to False.
+          
       Returns
       -------
       
@@ -2324,10 +2328,11 @@ class GenericSession(BaseDecentrAIObject):
       elapsed = tm() - start
       # end while
       # done waiting for supervisors
+      best_super = 'ERROR'
+      best_super_alias = 'ERROR'
       
       if len(self.__current_network_statuses) > 0:
         best_info = {}
-        best_super = None
         for supervisor, net_info in self.__current_network_statuses.items():
           if len(net_info) > len(best_info):
             best_info = net_info
@@ -2368,10 +2373,12 @@ class GenericSession(BaseDecentrAIObject):
       # end if
       pd.options.display.float_format = '{:.1f}'.format
       dct_result = _DotDict({
-        'report' : pd.DataFrame(res),
-        'reporter' : best_super,
-        'reporter_alias' : best_super_alias,
-        'nr_super' : len(self.__current_network_statuses),
-        'elapsed' : elapsed,
+        SESSION_CT.NETSTATS_REPORT : pd.DataFrame(res),
+        SESSION_CT.NETSTATS_REPORTER : best_super,
+        SESSION_CT.NETSTATS_REPORTER_ALIAS : best_super_alias,
+        SESSION_CT.NETSTATS_NR_SUPERVISORS : len(self.__current_network_statuses),
+        SESSION_CT.NETSTATS_ELAPSED : elapsed,
       })
+      if df_only:
+        return dct_result[SESSION_CT.NETSTATS_REPORT]
       return dct_result

naeural_client/cli/cli.py

@@ -98,17 +98,18 @@ def main():
   """
   try:
     # Initialize configuration if necessary
-    maybe_init_config()
-
-    # Build the CLI parser
-    parser = build_parser()
-    args = parser.parse_args()
-
-    # Check if a command function is provided
-    if hasattr(args, "func"):
-      args.func(args)  # Pass parsed arguments to the command function
-    else:
-      parser.print_help()
+    initialized = maybe_init_config()
+    
+    if initialized:
+      # Build the CLI parser
+      parser = build_parser()
+      args = parser.parse_args()
+
+      # Check if a command function is provided
+      if hasattr(args, "func"):
+        args.func(args)  # Pass parsed arguments to the command function
+      else:
+        parser.print_help()
 
   except Exception as e:
     # Handle unexpected errors gracefully

naeural_client/cli/nodes.py

@@ -1,6 +1,30 @@
+from time import time
 from naeural_client.utils.config import log_with_color
+from naeural_client.const import SESSION_CT
 
 
+def _get_netstats(
+  silent=True,
+  online_only=False, 
+  allowed_only=False, 
+  supervisor=None,
+  supervisors_only=False,
+):
+  t1 = time()
+  from naeural_client import Session
+  sess = Session(silent=silent)
+  dct_info = sess.get_network_known_nodes(
+    online_only=online_only, allowed_only=allowed_only, supervisor=supervisor,
+    supervisors_only=supervisors_only,
+  )
+  df = dct_info[SESSION_CT.NETSTATS_REPORT]
+  supervisor = dct_info[SESSION_CT.NETSTATS_REPORTER]
+  super_alias = dct_info[SESSION_CT.NETSTATS_REPORTER_ALIAS]
+  nr_supers = dct_info[SESSION_CT.NETSTATS_NR_SUPERVISORS]
+  _elapsed = dct_info[SESSION_CT.NETSTATS_ELAPSED] # computed on call
+  elapsed = time() - t1 # elapsed=_elapsed
+  return df, supervisor, super_alias, nr_supers, elapsed
+
 def get_nodes(args):
   """
   This function is used to get the information about the nodes and it will perform the following:
@@ -13,22 +37,21 @@ def get_nodes(args):
   supervisor_addr = args.supervisor  
   if args.verbose:
     log_with_color(f"Getting nodes from supervisor <{supervisor_addr}>...", color='b')
-  from naeural_client import Session
-  sess = Session(silent=not args.verbose)
-  online_only = args.online or args.peered
-  allowed_only = args.peered
-  
-  dct_info = sess.get_network_known_nodes(
-    online_only=online_only, allowed_only=allowed_only, supervisor=supervisor_addr
+
+  res = _get_netstats(
+    silent=not args.verbose,
+    online_only=args.online or args.peered,
+    allowed_only=args.peered,
+    supervisor=supervisor_addr,
   )
-  df = dct_info['report']
-  supervisor = dct_info['reporter']
-  super_alias = dct_info['reporter_alias']
-  nr_supers = dct_info['nr_super']
-  elapsed = dct_info['elapsed']
-  prefix = "Online n" if online_only else "N"
-  log_with_color(f"{prefix}odes reported by <{supervisor}> '{super_alias}' in {elapsed:.1f}s ({nr_supers} supervisors seen):", color='b')
-  log_with_color(f"{df}")    
+  df, supervisor, super_alias, nr_supers, elapsed = res
+
+  prefix = "Online n" if (args.online or args.peered) else "N"
+  if supervisor == "ERROR":
+    log_with_color(f"No supervisors or no comms available in {elapsed:.1f}s. Please check your settings.", color='r')
+  else:
+    log_with_color(f"{prefix}odes reported by <{supervisor}> '{super_alias}' in {elapsed:.1f}s ({nr_supers} supervisors seen):", color='b')
+    log_with_color(f"{df}")    
   return
   
   
@@ -38,15 +61,19 @@ def get_supervisors(args):
   """
   if args.verbose:
     log_with_color("Getting supervisors...", color='b')
-  from naeural_client import Session  
-  sess = Session(silent=not args.verbose)
-  dct_info = sess.get_network_known_nodes(online_only=True, supervisors_only=True)
-  df = dct_info['report']
-  supervisor = dct_info['reporter']
-  super_alias = dct_info['reporter_alias']
-  elapsed = dct_info['elapsed']  
-  log_with_color(f"Supervisors reported by <{supervisor}> '{super_alias}' in {elapsed:.1f}s", color='b')
-  log_with_color(f"{df}")
+
+  res = _get_netstats(
+    silent=not args.verbose,
+    online_only=True,
+    supervisors_only=True,
+  )
+  df, supervisor, super_alias, nr_supers, elapsed = res
+  
+  if supervisor == "ERROR":
+    log_with_color(f"No supervisors or no comms available in {elapsed:.1f}s. Please check your settings.", color='r')
+  else:
+    log_with_color(f"Supervisors reported by <{supervisor}> '{super_alias}' in {elapsed:.1f}s", color='b')
+    log_with_color(f"{df}")
   return
 
 

naeural_client/const/__init__.py

@@ -1,4 +1,4 @@
-from .misc import COLORS, WEEKDAYS_SHORT
+from .misc import COLORS, WEEKDAYS_SHORT, SESSION_CT
 from . import comms as COMMS
 from . import base as BASE_CT
 from . import payload as PAYLOAD_CT

naeural_client/const/misc.py

@@ -18,3 +18,13 @@ WEEKDAYS_SHORT = [
   'SAT',
   'SUN'
 ]
+
+
+class SESSION_CT:
+  NETSTATS_REPORT = 'report'
+  NETSTATS_REPORTER = 'reporter'
+  NETSTATS_REPORTER_ALIAS = 'reporter_alias'
+  NETSTATS_NR_SUPERVISORS = 'nr_super'
+  NETSTATS_ELAPSED = 'elapsed'
+  
+  

naeural_client/utils/config.py

@@ -181,10 +181,12 @@ def load_user_defined_config(verbose=False):
 def maybe_init_config():
   """
   Initializes the configuration if it doesn't exist yet.
+  
+  TODO: in v3+ this will be migrated to a online authentication process.
   """
   config_file = get_user_config_file()
-
   if not config_file.exists():
     log_with_color(f"No configuration file found at {config_file}. Initializing configuration...", color="y") 
     reset_config()
-  load_user_defined_config()
+    return False
+  return load_user_defined_config()

{naeural_client-2.5.22.dist-info → naeural_client-2.5.24.dist-info}/METADATA

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

@@ -1,10 +1,10 @@
 naeural_client/__init__.py,sha256=GP8WSrn87sjTPO-QRNL2PG8JK5Mixbiea_HrtbG8RAQ,592
-naeural_client/_ver.py,sha256=hAQqRW-VZgezlnLQtLAB_kXl-vLNgz3ubPhqfDOIrVg,331
+naeural_client/_ver.py,sha256=uGIO8Y2Ti2ygzfAD39SyFQ38eg8DPnoMAKuoyqc1ddo,331
 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=rKOTBmreGwjoEG7CRAAKePNOdl0masfF66ORC-a0vjY,89170
+naeural_client/base/generic_session.py,sha256=Yo65LwSS3R3-ahQlAtXoNsnQHMAEYCFtPGrvYumwgHs,89524
 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=Yni8USLNK9g9G-l8_XomppZ5tKhduvA8wS4xOw3KODc,3754
+naeural_client/cli/cli.py,sha256=Lo5qsANtjvWP0CG2BxIdYF8QLSpUQoLmYIgCGCVZp9Y,3808
 naeural_client/cli/cli_commands.py,sha256=Y81oKz5Rx8qxYgzEzCwI9eB8iVL6iET7dETLVygs_VE,1686
-naeural_client/cli/nodes.py,sha256=aCbSDFhTnub18LdrOPzu3kvx6acaBqHRgmyAdgqblP8,2459
+naeural_client/cli/nodes.py,sha256=lC6M2ODPyt_ciGIAqz0IJOm9s5PpGWy-gpFdRYlvNuI,3248
 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
@@ -30,14 +30,14 @@ naeural_client/comm/__init__.py,sha256=za3B2HUKNXzYtjElMgGM9xbxNsdQfFY4JB_YzdyFk
 naeural_client/comm/amqp_wrapper.py,sha256=hzj6ih07DnLQy2VSfA88giDIFHaCp9uSdGLTA-IFE4s,8535
 naeural_client/comm/mqtt_wrapper.py,sha256=Ig3bFZkCbWd4y_Whn2PPa91Z3aLgNbNPau6Tn5yLPZ8,16167
 naeural_client/const/README.md,sha256=6OHesr-f5NBuuJGryEoi_TCu2XdlhfQYlDKx_IJoXeg,177
-naeural_client/const/__init__.py,sha256=OtrSiHyTzrie5dyC1gWrYXYmg5cVMdwe0gxAlrHXCLg,466
+naeural_client/const/__init__.py,sha256=MM6Zib6i7M2qWcMkLtLx14zqU-lE-u2uPHjNvbh2jAM,478
 naeural_client/const/apps.py,sha256=gIONTZUkqPveu3DwelyJWpbFMeIR9l6DlaNg-xEfK1A,611
 naeural_client/const/base.py,sha256=-NeZPwE0JrbTHmlI9BOmgzaGu5jUZHl9vOZ4hhh_QQo,3100
 naeural_client/const/comms.py,sha256=La6JXWHexH8CfcBCKyT4fCIoeaoZlcm7KtZ57ab4ZgU,2201
 naeural_client/const/environment.py,sha256=iytmTDgbOjvORPwHQmc0K0r-xJx7dnnzNnqAJJiFCDA,870
 naeural_client/const/formatter.py,sha256=AW3bWlqf39uaqV4BBUuW95qKYfF2OkkU4f9hy3kSVhM,200
 naeural_client/const/heartbeat.py,sha256=jGHmKfeHTFOXJaKUT3o_ocnQyF-EpcLeunW-ifkYKfU,2534
-naeural_client/const/misc.py,sha256=Y6x00YDtY1_nAk4OvikCLlfp8ggn11WQYTBGYzFlJPk,211
+naeural_client/const/misc.py,sha256=VDCwwpf5bl9ltx9rzT2WPVP8B3mZFRufU1tSS5MO240,413
 naeural_client/const/payload.py,sha256=vHKxSrPXnfBTBwD_xp9Aw7nue0_gxz4r01YjXRYiTIM,6479
 naeural_client/default/__init__.py,sha256=ozU6CMMuWl0LhG8Ae3LrZ65a6tLrptfscVYGf83zjxM,46
 naeural_client/default/instance/__init__.py,sha256=w1de6OMj9a5GPGF-Wl1b_I_YAy9fWBEss2QnyPPyaB0,546
@@ -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=mFqzz69UQAZN9oblxoTqWS52F2p8AnXmzDtdf2SoDz4,5258
+naeural_client/utils/config.py,sha256=m1O6D7jE_vVpWM7kd2ZEs9JOKlM9yMDy5YDcf8vElWo,5357
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
-naeural_client-2.5.22.dist-info/METADATA,sha256=PGQE3We4_RODRS6YsHEyMspcTRDBZZGLuJUsegEB8Ds,14619
-naeural_client-2.5.22.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-2.5.22.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
-naeural_client-2.5.22.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.5.22.dist-info/RECORD,,
+naeural_client-2.5.24.dist-info/METADATA,sha256=9a21TM1JGOIB0I-xmF0eOpBtbqVpKdHNogqAIZ-Novs,14619
+naeural_client-2.5.24.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-2.5.24.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
+naeural_client-2.5.24.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.5.24.dist-info/RECORD,,