naeural-client 2.5.21__tar.gz → 2.5.23__tar.gz

{naeural_client-2.5.21 → naeural_client-2.5.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naeural_client
-Version: 2.5.21
+Version: 2.5.23
 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
@@ -35,6 +35,13 @@ This packet depends on the following packets: `pika`, `paho-mqtt`, `numpy`, `pyo
 python -m pip install naeural_client
 ```
 
+### Development installation
+
+```shell
+git clone https://github.com/NaeuralEdgeProtocol/naeural_client
+pip install -e .
+```
+
 ## Documentation
 
 Minimal documentation will be presented here. The complete documentation is

{naeural_client-2.5.21 → naeural_client-2.5.23}/README.md

@@ -12,6 +12,13 @@ This packet depends on the following packets: `pika`, `paho-mqtt`, `numpy`, `pyo
 python -m pip install naeural_client
 ```
 
+### Development installation
+
+```shell
+git clone https://github.com/NaeuralEdgeProtocol/naeural_client
+pip install -e .
+```
+
 ## Documentation
 
 Minimal documentation will be presented here. The complete documentation is

{naeural_client-2.5.21 → naeural_client-2.5.23}/naeural_client/_ver.py

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

{naeural_client-2.5.21 → naeural_client-2.5.23}/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
@@ -254,10 +254,14 @@ class GenericSession(BaseDecentrAIObject):
     self.P(msg, color='y')
     self._connect()
 
-    self.P("Created {} comms session '{}' from <{}> SDKv{}.".format(
-      "decrypted" if not self.encrypt_comms else "encrypted", 
-      self.name, self.bc_engine.address, self.log.version
-    ))
+    msg = f"Created comms session '{self.name}'"
+    msg += f"\n - SDK:     {self.log.version}"
+    msg += f"\n - Address: {self.bc_engine.address}"
+    msg += f"\n - Server:  {self._config[comm_ct.HOST]}:{self._config[comm_ct.PORT]}"
+    msg += f"\n - Secured: {self._config[comm_ct.SECURED]}"
+    msg += f"\n - User:    {self._config[comm_ct.USER]}"
+    msg += f"\n - Encrypt: {'YES' if self.encrypt_comms else 'NO'}"
+    self.P(msg, color='g')
     
     if not self.encrypt_comms:
       self.P(
@@ -2320,10 +2324,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
@@ -2364,10 +2369,10 @@ 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,
       })
       return dct_result

{naeural_client-2.5.21 → naeural_client-2.5.23}/naeural_client/bc/base.py

@@ -359,7 +359,7 @@ class BaseBlockEngine:
       s = "<BC:{}> ".format(self.__name) + s
     return self.log.P(
       s, 
-      color='g' if (color is None or color.lower() not in ['r', 'red', 'error']) else color, 
+      color=color or 'd', 
       boxed=boxed, 
       **kwargs
     )
@@ -375,8 +375,7 @@ class BaseBlockEngine:
 
   def _init(self):
     self.P(
-      f"Initializing BC-engine (ETH_ENABLED={self.__eth_enabled})...", 
-      boxed=True, box_char='*', verbosity=1
+      f"Initializing BC-engine (ETH_ENABLED={self.__eth_enabled})...", verbosity=1
     )
 
     if True:
@@ -414,9 +413,12 @@ class BaseBlockEngine:
     self.__eth_account = self._get_eth_account()
     ### end Ethereum
     if self.__eth_enabled:
-      self.P("Address: {} / ETH: {}".format(self.address, self.eth_address), boxed=True, verbosity=1)
+      self.P(
+        "Address: {} / ETH: {}".format(self.address, self.eth_address), boxed=True, verbosity=1,
+        color='g'
+      )
     else:
-      self.P("Address: {}".format(self.address), boxed=True, verbosity=1)
+      self.P("Address: {}".format(self.address), boxed=True, color='g', verbosity=1)
     self.P("Allowed list of senders: {}".format(self.allowed_list), verbosity=1)
     return
   
@@ -702,7 +704,7 @@ class BaseBlockEngine:
 
     """
     if from_file and os.path.isfile(source):
-      self.P("Reading SK from '{}'".format(source), color='g', verbosity=1)
+      self.P("Reading SK from '{}'".format(source), verbosity=1)
       with open(source, 'rt') as fh:
         data = fh.read()
     else:

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

@@ -0,0 +1,103 @@
+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:
+  
+  1. Create a Session object.
+  2. Wait for the first net mon message via Session and show progress. 
+  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(f"Getting nodes from supervisor <{supervisor_addr}>...", color='b')
+
+  res = _get_netstats(
+    silent=not args.verbose,
+    online_only=args.online or args.peered,
+    allowed_only=args.peered,
+    supervisor=supervisor_addr,
+  )
+  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
+  
+  
+def get_supervisors(args):
+  """
+  This function is used to get the information about the supervisors.
+  """
+  if args.verbose:
+    log_with_color("Getting supervisors...", color='b')
+
+  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
+
+
+def restart_node(args):
+  """
+  This function is used to restart the node.
+  
+  Parameters
+  ----------
+  args : argparse.Namespace
+      Arguments passed to the function.
+  """
+  log_with_color(f"Restarting node {args.node} NOT IMPLEMENTED", color='r')
+  return
+
+
+def shutdown_node(args):
+  """
+  This function is used to shutdown the node.
+  
+  Parameters
+  ----------
+  args : argparse.Namespace
+      Arguments passed to the function.
+  """
+  log_with_color(f"Shutting down node {args.node} NOT IMPLEMENTED", color='r')
+  return

{naeural_client-2.5.21 → naeural_client-2.5.23}/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-2.5.21 → naeural_client-2.5.23}/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-2.5.21 → naeural_client-2.5.23}/naeural_client/utils/config.py

@@ -83,11 +83,12 @@ def get_user_config_file():
   """
   return get_user_folder() / "config"
 
-def reset_config(args, *larg, **kwargs):
+def reset_config(*larg, **kwargs):
   """
   Resets the configuration by creating a ~/.naeural folder and populating
   ~/.naeural/config with values from a local .env file, if it exists.
   """
+  log_with_color("Resetting the configuration...", color='y')
   # Define the target config folder and file
   config_dir = get_user_folder()
   config_file = get_user_config_file()
@@ -186,4 +187,4 @@ def maybe_init_config():
   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 load_user_defined_config()

{naeural_client-2.5.21 → naeural_client-2.5.23}/pyproject.toml

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

naeural_client-2.5.23/xperimental/multi-enc-dec/multi_test2.py

@@ -0,0 +1,44 @@
+import json
+
+from naeural_client import Logger, const
+from naeural_client.bc import DefaultBlockEngine
+
+
+
+if __name__ == '__main__' :
+  l = Logger("ENC", base_folder=".", app_folder="_local_cache")
+  
+  
+  data = {
+  "EE_IS_ENCRYPTED": True,
+  "EE_ENCRYPTED_DATA": "fwcctxETcji64z/KAYFmyWE8RDrJwm2BToMMZD9uesGtWatmDA1nadqpaAwlQajJg9SYb6jeadwxeIqg15VlDmNO9X2dxSiu151Dos900kx2Y8dM3q/S7A==",
+  "EE_ID": "0xai_A9gulGoLPxo7hOo05GIeSvfld_IF_CucTnP00CznjmJN",
+  "SESSION_ID": "SolisClient_bf2d",
+  "INITIATOR_ID": "SolisClient_bf2d",
+  "EE_SENDER": "0xai_Ag28FO6Yg254w-RHsBtODc_WLq7jz4SwfUAW7S7zP0U1",
+  "TIME": "2025-01-07 00:37:16.291005",
+  "EE_SIGN": "MEQCIH9T4_zB4v8cgjhUAwOvELrthGCUZ4v87LR-5DnFetkuAiAm2nOoZIitma10skQbuf12Yp9l_M7zyAcG9mWScuPZGw==",
+  "EE_HASH": "7d7d49f39d1f870af74bece27262d9b050b5358a15c71b249150d04a712ce72c"
+  }
+  
+  
+  eng1 = DefaultBlockEngine(
+    log=l, name="test1", 
+    config={
+        "PEM_FILE"     : "stg-0.pem",
+        "PASSWORD"     : None,      
+        "PEM_LOCATION" : "data"
+      }
+  )
+  
+  
+  ver = eng1.verify(data)
+  
+  eng1.P(f"Signature: {'OK' if ver.valid else 'ERROR'}, {ver}", color='g' if ver.valid else 'r')
+  
+  decr = eng1.decrypt(
+    encrypted_data_b64=data["EE_ENCRYPTED_DATA"],
+    sender_address=data["EE_SENDER"],
+    debug=True,
+  )
+  eng1.P(f"Decrypted: {decr}")

naeural_client-2.5.21/naeural_client/cli/nodes.py

@@ -1,76 +0,0 @@
-from naeural_client.utils.config import log_with_color
-
-
-def get_nodes(args):
-  """
-  This function is used to get the information about the nodes and it will perform the following:
-  
-  1. Create a Session object.
-  2. Wait for the first net mon message via Session and show progress. 
-  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(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
-  )
-  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}")    
-  return
-  
-  
-def get_supervisors(args):
-  """
-  This function is used to get the information about the supervisors.
-  """
-  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}")
-  return
-
-
-def restart_node(args):
-  """
-  This function is used to restart the node.
-  
-  Parameters
-  ----------
-  args : argparse.Namespace
-      Arguments passed to the function.
-  """
-  log_with_color(f"Restarting node {args.node} NOT IMPLEMENTED", color='r')
-  return
-
-
-def shutdown_node(args):
-  """
-  This function is used to shutdown the node.
-  
-  Parameters
-  ----------
-  args : argparse.Namespace
-      Arguments passed to the function.
-  """
-  log_with_color(f"Shutting down node {args.node} NOT IMPLEMENTED", color='r')
-  return