naeural-client 2.6.1__tar.gz → 2.6.2__tar.gz

{naeural_client-2.6.1 → naeural_client-2.6.2}/PKG-INFO

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

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

{naeural_client-2.6.1 → naeural_client-2.6.2}/naeural_client/bc/base.py

@@ -1252,15 +1252,20 @@ class BaseBlockEngine:
           dct_env = {k : v for k,v in dct_result.items() if k.startswith('EE_')}
           self.P("Found {} keys in dAuth response.".format(len(dct_env)), color='g')
           for k, v in dct_env.items():
+            try:
+              if not isinstance(v, str):
+                v = json.dumps(v)
+            except:
+              v = str(v)
             if k not in os.environ:
-              self.P(f"  Adding key `{k}{'=' + str(v) if debug else ''}` to env.", color='y')
+              self.P(f"  Adding key `{k}{'=' + str(v) + ' ({})'.format(type(v).__name__) if debug else ''}` to env.", color='y')
             else:
-              self.P(f"  Overwrite  `{k}{'=' + str(v) if debug else ''}` in env.", color='y')
+              self.P(f"  Overwrite  `{k}{'=' + str(v) + ' ({})'.format(type(v).__name__) if debug else ''}` in env.", color='y')
             if add_env:
               os.environ[k] = v
           done = True
         except Exception as exc:
-          self.P(f"Error in dAuth URL request: {exc}", color='r')          
+          self.P(f"Error in dAuth URL request: {exc}. Received: {dct_result}", color='r')          
         #end try
         tries += 1
         if tries >= max_tries:

{naeural_client-2.6.1 → naeural_client-2.6.2}/naeural_client/cli/cli.py

@@ -34,7 +34,7 @@ def build_parser():
   """
   global_parser = create_global_parser()  # Add global parameters
   
-  title = f"nepctl v{version} - CLI for Naeural Edge Protocol SDK package"
+  title = f"nepctl for SDK v{version} - CLI for Naeural Edge Protocol SDK package"
   parser = argparse.ArgumentParser(description=title, parents=[global_parser])
   subparsers = parser.add_subparsers(dest="command", help="Available commands")
 

{naeural_client-2.6.1 → naeural_client-2.6.2}/naeural_client/cli/cli_commands.py

@@ -31,6 +31,11 @@ CLI_COMMANDS = {
         "reset": {
             "func": reset_config, # DONE
             "description": "Reset the configuration to default",
+            # "params": {
+            #   ### use "(flag)" at the end of the description to indicate a boolean flag 
+            #   ### otherwise it will be treated as a str parameter
+            #   "--force": "Force reset (flag)",  # DONE
+            # }
         },
         "addr": {
             "func": show_address, # DONE

{naeural_client-2.6.1 → naeural_client-2.6.2}/naeural_client/utils/config.py

@@ -3,6 +3,7 @@ from pathlib import Path
 import shutil
 
 from naeural_client.const.base import BCct
+from naeural_client._ver import __VER__ as version
 
 
 CONFIG_FILE = "config"
@@ -70,7 +71,9 @@ def log_with_color(s, color='n'):
       'b': "\033[36m",  # bright cyan
       'w': '\033[97m',  # Light white
       'c': "\033[36m",  # bright cyan
-      'n': '\033[37m',  # Dark white (default)
+      'n': '\033[37m',  # white (default)
+      'd': "\033[90m",  # dark gray
+      
   }
 
   reset_code = '\033[0m'  # Reset color
@@ -90,7 +93,7 @@ def get_user_config_file():
   """
   return get_user_folder() / CONFIG_FILE
 
-def reset_config(*larg, **kwargs):
+def reset_config(*larg, keep_existing=False, **kwargs):
   """
   Resets the configuration by creating a ~/.naeural folder and populating
   ~/.naeural/config with values from a local .env file, if it exists.
@@ -130,7 +133,12 @@ def reset_config(*larg, **kwargs):
     log_with_color(f"Copying local PEM file {local_pem} to {target_pem}", color='y')
     shutil.copy(local_pem, target_pem)
   else:
-    log_with_color(f"No local PEM file found at {local_pem}. A default private key will be generated.", color='r')
+    log_with_color(f"No local PEM file found locally {local_pem}.", color='r')
+    if target_pem.exists():
+      log_with_color(f"Found already existing {target_pem}.", color='y')
+      if not keep_existing:
+        target_pem.unlink()        
+        log_with_color(f"Deleted {target_pem}. A default key will be generated.", color='b')
   return
 
 def show_address(args):
@@ -144,25 +152,29 @@ def show_address(args):
   log_with_color(f"{sess.get_client_address()}", color='b')
   return
 
-
-def show_config(args):
-  """
-  Displays the current configuration from ~/.naeural/config.
-  """
+def show_version():
   from naeural_client import Session
   sess = Session(
     silent=True
-  )
+  )  
   
-  user_folder = get_user_folder()
-  config_file = get_user_config_file()
+  user_folder = get_user_folder()  
 
   log_with_color(f"NEP SDK folder: {user_folder}", color='b')
+  log_with_color(f"NEP SDK version: {version}", color='b')
   log_with_color(f"SDK Client address: {sess.get_client_address()}", color='b')
+  return
+  
+
+def show_config(args):
+  """
+  Displays the current configuration from ~/.naeural/config.
+  """
+  show_version()
+  config_file = get_user_config_file()
   if config_file.exists():
-    log_with_color(f"Current configuration ({config_file}):", color='y')
     with config_file.open("r") as file:
-      log_with_color(file.read())
+      log_with_color(f"Current configuration ({config_file}):\n{file.read()}", color='d')
   else:
     log_with_color(f"No configuration found at {config_file}. Please run `reset_config` first.", color="r")
   return
@@ -202,7 +214,7 @@ def maybe_init_config():
   """
   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()
+    log_with_color(f"No configuration file found at {config_file}. Initializing configuration...", color="y")     
+    reset_config(keep_existing=True)
     return False
   return load_user_defined_config()

{naeural_client-2.6.1 → naeural_client-2.6.2}/pyproject.toml

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