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

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

@@ -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.dist-info → naeural_client-2.6.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=AbybJH5c6eadgP3bkXR3ov9QJDoxs0clx8-41oDO_Pc,330
+naeural_client/_ver.py,sha256=PjIkiMwxccYumKTmIilKwwr-ukjI-vjW09AHPfEu9BM,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,7 +14,7 @@ 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=Egi9g_uW49QiRHx5xHr3GboM5Po3UG06VlOFnRXGcd0,34511
+naeural_client/bc/base.py,sha256=Nlt-8PQrUcN5W2j67hZYmUNRZVQh-QXTqya06rwlFoA,34733
 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
@@ -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=K3pFqtM8bjQ8w9LqKXbDZodh77ZO-stTW_wN5KVe14U,66242
+naeural_client/logging/base_logger.py,sha256=9H4ShdG4gsUCyznwficU4iym_kLZdNaxRAD_INfLV68,66392
 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
@@ -81,8 +81,8 @@ naeural_client/utils/__init__.py,sha256=mAnke3-MeRzz3nhQvhuHqLnpaaCSmDxicd7Ck9uw
 naeural_client/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_LtMyCY,1072
 naeural_client/utils/config.py,sha256=v7xHikr6Z5Sbvf3opYeMhYzGWD2pe0HlRwa-aGJzUh8,6323
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
-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,,
+naeural_client-2.6.4.dist-info/METADATA,sha256=pK2L5nmZU0IwXd8W6th-0_e5Qg4R73bFX9tbI0m3UoE,14618
+naeural_client-2.6.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-2.6.4.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
+naeural_client-2.6.4.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.6.4.dist-info/RECORD,,