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

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

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

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

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

@@ -1218,6 +1218,7 @@ class BaseBlockEngine:
 
   def dauth_autocomplete(self, dauth_endp=None, add_env=True, debug=False, max_tries=5):
     dct_env = {}
+    dct_result = {}
     done = False
     tries = 0
     in_env = False
@@ -1242,28 +1243,31 @@ class BaseBlockEngine:
           }
           self.sign(nonce_data)
           response = requests.post(url, json={'body' : nonce_data})
-          dct_response = response.json()
-          if debug:
-            self.P(f"Response:\n {json.dumps(dct_response, indent=2)}")
-          dct_result = dct_response.get('result', {}).get(DAUTH_SUBKEY, {})
-          error = dct_response.get('error', None)
-          if error is not None:
-            self.P(f"Error in dAuth response: {dct_response}", color='r')
-          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) + ' ({})'.format(type(v).__name__) if debug else ''}` to env.", color='y')
-            else:
-              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
+          if response.status_code == 200:
+            dct_response = response.json()
+            if debug:
+              self.P(f"Response:\n {json.dumps(dct_response, indent=2)}")
+            dct_result = dct_response.get('result', {}).get(DAUTH_SUBKEY, {})
+            error = dct_response.get('error', None)
+            if error is not None:
+              self.P(f"Error in dAuth response: {dct_response}", color='r')
+            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) + ' ({})'.format(type(v).__name__) if debug else ''}` to env.", color='y')
+              else:
+                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
+          else:
+            self.P(f"Error in dAuth response: {response.status_code} - {response.text}", color='r')
         except Exception as exc:
           self.P(f"Error in dAuth URL request: {exc}. Received: {dct_result}", color='r')          
         #end try

{naeural_client-2.6.2 → naeural_client-2.6.4}/naeural_client/logging/base_logger.py

@@ -335,7 +335,13 @@ class BaseLogger(object):
     return False
   
   @staticmethod
-  def replace_secrets(dct_config, pattern='$EE_', allow_missing=False):
+  def replace_secrets(dct_config, pattern='$EE_', allow_missing=True, missing_default=None):
+    """
+    TODO: maybe move to Jinja2 style     
+    "{{ some_variable | default('my_default') }}"
+    
+    
+    """
     matches = []
     missing = []
     stack = [dct_config]
@@ -350,7 +356,7 @@ class BaseLogger(object):
             if env_var_name not in os.environ:
               missing.append(env_var_name)
               if allow_missing:
-                current[key] = None
+                current[key] = missing_default
             else:
               current[key] = os.environ[env_var_name]
           elif isinstance(value, (dict, list)):

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

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