naeural-client 2.6.0__py3-none-any.whl → 2.6.2__py3-none-any.whl

naeural_client/_ver.py

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

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/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/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/logging/base_logger.py

@@ -335,7 +335,7 @@ class BaseLogger(object):
     return False
   
   @staticmethod
-  def replace_secrets(dct_config, pattern='$EE_'):
+  def replace_secrets(dct_config, pattern='$EE_', allow_missing=False):
     matches = []
     missing = []
     stack = [dct_config]
@@ -349,6 +349,8 @@ class BaseLogger(object):
             env_var_name = value[1:] 
             if env_var_name not in os.environ:
               missing.append(env_var_name)
+              if allow_missing:
+                current[key] = None
             else:
               current[key] = os.environ[env_var_name]
           elif isinstance(value, (dict, list)):
@@ -358,9 +360,13 @@ class BaseLogger(object):
           if isinstance(item, (dict, list)):
             stack.append(item)
     if len(missing) > 0:
-      raise ValueError('Required environment configuration for keys {} was not found in current envirnoment. Please setup your docker or bare-metal config to provide this missing key(s)'.format(
+      msg = 'Required environment configuration for keys {} was not found in current envirnoment. Please setup your docker or bare-metal config to provide this missing key(s)'.format(
         ",".join(['"' + x + '"' for x in missing])
-      ))
+      )
+      if allow_missing:
+        BaseLogger.print_color(msg, color='r')
+      else:
+        raise ValueError(msg)
     return matches  
   
   
@@ -1087,7 +1093,7 @@ class BaseLogger(object):
       **self.__init_config_data,
     }
     
-    matches = self.replace_secrets(self.config_data)
+    matches = self.replace_secrets(self.config_data, allow_missing=True)
     if not self.silent:    
       if len(matches) > 0:
         print("  Config modified with following env vars: {}".format(matches))

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.0.dist-info → naeural_client-2.6.2.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=8l5htl3vbgo8TfOaTMzZk4pKVa_lEaGc7XDdqAOdqCI,330
+naeural_client/_ver.py,sha256=AbybJH5c6eadgP3bkXR3ov9QJDoxs0clx8-41oDO_Pc,330
 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
@@ -14,14 +14,14 @@ naeural_client/base/webapp_pipeline.py,sha256=QmPLVmhP0CPdi0YuvbZEH4APYz2Amtw3gy
 naeural_client/base/payload/__init__.py,sha256=y8fBI8tG2ObNfaXFWjyWZXwu878FRYj_I8GIbHT4GKE,29
 naeural_client/base/payload/payload.py,sha256=x-au7l67Z_vfn_4R2C_pjZCaFuUVXHngJiGOfIAYVdE,2690
 naeural_client/bc/__init__.py,sha256=FQj23D1PrY06NUOARiKQi4cdj0-VxnoYgYDEht8lpr8,158
-naeural_client/bc/base.py,sha256=gKpwivIyxBeuTdbNTfAJEWTi5U6a4XAV63tD3QsuhYE,34280
+naeural_client/bc/base.py,sha256=Egi9g_uW49QiRHx5xHr3GboM5Po3UG06VlOFnRXGcd0,34511
 naeural_client/bc/chain.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 naeural_client/bc/ec.py,sha256=qI8l7YqiS4MNftlx-tF7IZUswrSeQc7KMn5OZ0fEaJs,23370
 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=Lo5qsANtjvWP0CG2BxIdYF8QLSpUQoLmYIgCGCVZp9Y,3808
-naeural_client/cli/cli_commands.py,sha256=Y81oKz5Rx8qxYgzEzCwI9eB8iVL6iET7dETLVygs_VE,1686
+naeural_client/cli/cli.py,sha256=c0ZavVwArQEGv8tueTnz3aGKTuUe6Sqmm5oTUFUVIUE,3816
+naeural_client/cli/cli_commands.py,sha256=VffU1tpG1CGae6z4GtcAdktAlEAfIiXq9n2oHAx1kAI,1944
 naeural_client/cli/nodes.py,sha256=Oq7bh7kkU79doBLEa8ANU6OiWv83mJvyjFyZqwpKx1s,4595
 naeural_client/code_cheker/__init__.py,sha256=pwkdeZGVL16ZA4Qf2mRahEhoOvKhL7FyuQbMFLr1E5M,33
 naeural_client/code_cheker/base.py,sha256=lT5DRIFO5rqzsMNCmdMRfkAeevmezozehyfgmhnKpuI,19074
@@ -57,7 +57,7 @@ naeural_client/io_formatter/default/a_dummy.py,sha256=qr9eUizQ-NN5jdXVzkaZKMaf9K
 naeural_client/io_formatter/default/aixp1.py,sha256=MX0TeUR4APA-qN3vUC6uzcz8Pssz5lgrQWo7td5Ri1A,3052
 naeural_client/io_formatter/default/default.py,sha256=gEy78cP2D5s0y8vQh4aHuxqz7D10gGfuiKF311QhrpE,494
 naeural_client/logging/__init__.py,sha256=b79X45VC6c37u32flKB2GAK9f-RR0ocwP0JDCy0t7QQ,33
-naeural_client/logging/base_logger.py,sha256=himUkM_48-YXS4u0zJ_5jSd564PeXNpa8uttpgKkljA,66032
+naeural_client/logging/base_logger.py,sha256=K3pFqtM8bjQ8w9LqKXbDZodh77ZO-stTW_wN5KVe14U,66242
 naeural_client/logging/small_logger.py,sha256=m12hCb_H4XifJYYfgCAOUDkcXm-h4pSODnFf277OFVI,2937
 naeural_client/logging/logger_mixins/__init__.py,sha256=yQO7umlRvz63FeWpi-F9GRmC_MOHcNW6R6pwvZZBy3A,600
 naeural_client/logging/logger_mixins/class_instance_mixin.py,sha256=xUXE2VZgmrlrSrvw0f6GF1jlTnVLeVkIiG0bhlBfq3o,2741
@@ -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=JfW2gMQMYx9NzF2M4mJpioXawDHcOQ3deJprpCRtdOI,5874
+naeural_client/utils/config.py,sha256=v7xHikr6Z5Sbvf3opYeMhYzGWD2pe0HlRwa-aGJzUh8,6323
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
-naeural_client-2.6.0.dist-info/METADATA,sha256=BduegOU9wXWNr2DsNAurIRJjBgf2l4o6X12UmlOiipY,14618
-naeural_client-2.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-2.6.0.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
-naeural_client-2.6.0.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.6.0.dist-info/RECORD,,
+naeural_client-2.6.2.dist-info/METADATA,sha256=msLG-t5YoIqHlVFX12bvBF6TaPgiyg6HGT_bfI_3kG4,14618
+naeural_client-2.6.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-2.6.2.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
+naeural_client-2.6.2.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.6.2.dist-info/RECORD,,