naeural-client 2.6.27__py3-none-any.whl → 2.6.29__py3-none-any.whl

naeural_client/_ver.py

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

naeural_client/bc/base.py

@@ -19,8 +19,9 @@ from ..utils.config import get_user_folder
 from ..const.base import (
   BCctbase, BCct, 
   DAUTH_SUBKEY, DAUTH_URL, DAUTH_ENV_KEY,
-  DAUTH_NONCE, DAUTH_VARS,
+  DAUTH_NONCE, DAUTH_VARS, dAuth,
 )
+
     
   
   
@@ -814,12 +815,19 @@ class BaseBlockEngine:
       dct_safe_data = dct_data
       
     dumps_config = dict(
-      sort_keys=True, 
       cls=_ComplexJsonEncoder, 
       separators=(',',':'),
       ensure_ascii=self.__ensure_ascii_payloads,
     )
+    # we dump the data to a string then we reload and sort as there might
+    # be some issues with the sorting if we have int keys that will be sorted
+    # then recovered as string keys
     str_data = json.dumps(dct_safe_data, **dumps_config)
+    # we reload the data to ensure 
+    dct_reload = json.loads(str_data)
+    # in order to ensure the data is sorted we dump it again to a string
+    # IMPORTANT: we need to use the same dumps_config as before !
+    str_data = json.dumps(dct_reload, sort_keys=True, **dumps_config) 
     return str_data
   
   def _create_new_sk(self):
@@ -1370,9 +1378,18 @@ class BaseBlockEngine:
 
 
   def dauth_autocomplete(self, dauth_endp=None, add_env=True, debug=False, max_tries=5, **kwargs):
+    from naeural_client._ver import __VER__ as sdk_version
+    try:
+      from ver import __VER__ as app_version
+    except:
+      app_version = None
+    try:
+      from naeural_core.main.ver import __VER__ as core_version
+    except:
+      core_version = None
+      
     MIN_LEN = 10
     dct_env = {}
-    dct_result = {}
     done = False
     tries = 0
     in_env = False
@@ -1399,26 +1416,52 @@ class BaseBlockEngine:
           to_send = {
             **kwargs,
             DAUTH_NONCE : str(uuid.uuid4())[:8],
+            dAuth.DAUTH_SENDER_APP_VER  : app_version,
+            dAuth.DAUTH_SENDER_SDK_VER  : sdk_version,
+            dAuth.DAUTH_SENDER_CORE_VER : core_version,
           }
           ######
           if len(kwargs) == 0:
-            to_send['sender_alias'] = 'direct-call'
+            to_send[dAuth.DAUTH_SENDER_ALIAS] = dAuth.DAUTH_SENDER_ALIAS_DEFAULT
           ######
           self.sign(to_send)          
           response = requests.post(url, json={'body' : to_send})
           if response.status_code == 200:
             dct_response = response.json()
-            server_alias = dct_response.get('result', {}).get('server_alias', 'unknown-alias')
-            server_addr = dct_response.get('result', {}).get('EE_SENDER', 'unknown-address')
+            server_alias = dct_response.get('result', {}).get(
+              dAuth.DAUTH_SERVER_ALIAS, dAuth.DAUTH_ALIAS_UNK
+            )
+            server_addr = dct_response.get('result', {}).get(
+              BCctbase.SENDER, dAuth.DAUTH_ADDR_UNK
+            )
             if debug:
               self.P(f"Response received from {server_alias} <{server_addr}>:\n {json.dumps(dct_response, indent=2)}")
             else:
               self.P(f"Response received from {server_alias} <{server_addr}>,")
-            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_')}
+            dct_result = dct_response.get('result', {})
+            dct_dauth = dct_result.get(DAUTH_SUBKEY, {})
+            ver_result = self.verify(dct_result)
+            if ver_result.valid:
+              self.P(f"Signature from {server_alias} <{server_addr}> is valid.", color='g')
+            else:
+              self.P(f"Signature from {server_alias} <{server_addr}> is INVALID: {ver_result}", color='r')
+              return              
+
+            # whitelist
+            whitelist = dct_dauth.pop(dAuth.DAUTH_WHITELIST, [])
+            if isinstance(whitelist, (str, list)) and len(whitelist) > 0:
+              if isinstance(whitelist, str):
+                whitelist = [whitelist]
+              self.P(f"Found {len(whitelist)} whitelist addresses in dAuth response.", color='y')
+              self.add_address_to_allowed(whitelist)
+            else:
+              self.P(f"No whitelist addresses found in dAuth response.", color='d')
+            # end whitelist
+
+            dct_env = {k : v for k,v in dct_dauth.items() if k.startswith(dAuth.DAUTH_ENV_KEYS_PREFIX)}
             self.P("Found {} keys in dAuth response.".format(len(dct_env)), color='g')
             for k, v in dct_env.items():
               try:
@@ -1432,11 +1475,13 @@ class BaseBlockEngine:
                 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
+              #endif add to env
+            #endfor each key in dAuth response
             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')          
+          self.P(f"Error in dAuth URL request: {exc}. Received: {dct_dauth}", color='r')          
         #end try
         tries += 1
         if tries >= max_tries:

naeural_client/const/base.py

@@ -16,6 +16,27 @@ DAUTH_ENV_KEY = 'EE_DAUTH_URL'
 DAUTH_NONCE = 'nonce'
 DAUTH_VARS = [DAUTH_NONCE, BCctbase.SIGN, BCctbase.SENDER, BCctbase.HASH]
 
+class dAuth:
+  DAUTH_SENDER_ALIAS = 'sender_alias'
+  DAUTH_SENDER_ALIAS_DEFAULT = 'direct-call'
+  DAUTH_SENDER_CORE_VER = 'sender_core_ver'
+  DAUTH_SENDER_SDK_VER = 'sender_sdk_ver'
+  DAUTH_SENDER_APP_VER = 'sender_app_ver'
+  
+  DAUTH_ENV_KEYS_PREFIX = 'EE_'
+  
+  DAUTH_ALIAS_UNK = 'unknown-alias'
+  DAUTH_ADDR_UNK =  'unknown-address'
+  
+  DAUTH_SERVER_ALIAS = 'server_alias'
+  
+  DAUTH_WHITELIST = 'whitelist'
+  
+  DAUTH_URL = DAUTH_URL
+  DAUTH_SUBKEY = DAUTH_SUBKEY
+  DAUTH_NONCE = DAUTH_NONCE
+  DAUTH_VARS = DAUTH_VARS
+
 ETH_ENABLED_ENV_KEY = 'EE_ETH_ENABLED'
 
 EE_EPOCH_INTERVALS_KEY = 'EE_EPOCH_INTERVALS'

naeural_client/logging/logger_mixins/json_serialization_mixin.py

@@ -233,21 +233,35 @@ class _JSONSerializationMixin(object):
       # need to replace directly in the received dict if `inplace=True`
       if inplace:
         data = _JSONSerializationMixin.replace_nan(dct, inplace=inplace)
-      return json.dumps(
+      
+      temp = json.dumps(
         data, 
         cls=NPJson, 
-        sort_keys=sort_keys, 
+        sort_keys=False, 
         separators=separators, 
         **kwargs
       )
     else:      
-      return json.dumps(
+      temp = json.dumps(
         data, 
         cls=SimpleNPJson, 
-        sort_keys=sort_keys, 
+        sort_keys=False, 
         separators=separators, 
         **kwargs
       )
+    #endif replace_nan
+    if sort_keys:
+      # we dump the data to a string then we reload and sort as there might
+      # be some issues with the sorting if we have int keys that will be sorted
+      # then recovered as string keys
+      return json.dumps(
+        json.loads(temp), 
+        sort_keys=True, separators=separators, 
+        cls=NPJson if replace_nan else SimpleNPJson,
+        **kwargs
+      )
+    # else we just return the temp
+    return temp
     
 
   @staticmethod

{naeural_client-2.6.27.dist-info → naeural_client-2.6.29.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=Yz-umaskmmy3SGQA4LtCO3eIsBcFLfPh9-24KjHp6hk,331
+naeural_client/_ver.py,sha256=Gc39WsKwXy0wDMk2EefAIcGG0DOMjDF20Wps9zz7C7E,331
 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=FEzIterEL8ZOPO8cwlPQB0g16fY4q9fp8X8YtkJ8PpA,40169
+naeural_client/bc/base.py,sha256=AxdeGI2ma772VRxaIAUPFcuaBGr-jLC3DGWxtotY-Ak,42147
 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
@@ -33,7 +33,7 @@ naeural_client/comm/mqtt_wrapper.py,sha256=Ig3bFZkCbWd4y_Whn2PPa91Z3aLgNbNPau6Tn
 naeural_client/const/README.md,sha256=6OHesr-f5NBuuJGryEoi_TCu2XdlhfQYlDKx_IJoXeg,177
 naeural_client/const/__init__.py,sha256=MM6Zib6i7M2qWcMkLtLx14zqU-lE-u2uPHjNvbh2jAM,478
 naeural_client/const/apps.py,sha256=ePBiJXLuPfFOKuw-LJrT9OWbaodU7QApfDurIPNDoB4,655
-naeural_client/const/base.py,sha256=1ScfnfNd5xeWo7tkkDgQR95vliTpcax025Naj0Lqw38,4574
+naeural_client/const/base.py,sha256=6lHGARkuYbltmjusM-pB7pL8MtZyXowDYlW-Uq-8g1c,5098
 naeural_client/const/comms.py,sha256=La6JXWHexH8CfcBCKyT4fCIoeaoZlcm7KtZ57ab4ZgU,2201
 naeural_client/const/environment.py,sha256=iytmTDgbOjvORPwHQmc0K0r-xJx7dnnzNnqAJJiFCDA,870
 naeural_client/const/formatter.py,sha256=AW3bWlqf39uaqV4BBUuW95qKYfF2OkkU4f9hy3kSVhM,200
@@ -66,7 +66,7 @@ naeural_client/logging/logger_mixins/computer_vision_mixin.py,sha256=TrtG7ayM2ab
 naeural_client/logging/logger_mixins/datetime_mixin.py,sha256=x0l2mhhmNZ6r_SmJ5or7dxAf2e4tQL0LiBsj3RDu6pU,11288
 naeural_client/logging/logger_mixins/download_mixin.py,sha256=8eu3w-H1LI6OmC_ZwzU3WrWMENQKdEZ2HjnQsAixwM0,13500
 naeural_client/logging/logger_mixins/general_serialization_mixin.py,sha256=3glOuN6Whi_GSxb1OiFitzypOqkf_x2RJGfGaO51_WE,7440
-naeural_client/logging/logger_mixins/json_serialization_mixin.py,sha256=7usTqigM221C2llVqr-JgtqMX_XYDgjbjAhXnUNXl8M,14594
+naeural_client/logging/logger_mixins/json_serialization_mixin.py,sha256=j90I8ggh9Ih9WvOtL5OMiVNLWFP6E4e3yM5k6Bhj6r4,15057
 naeural_client/logging/logger_mixins/pickle_serialization_mixin.py,sha256=9BftwBe56e94FXjyf8c8m4GEvIvzNdK_jpQPtIIJbXY,9185
 naeural_client/logging/logger_mixins/process_mixin.py,sha256=ZO7S1mvKWwH_UIqv7JG-NxizcfWMJqngNNW_K-hESdU,1904
 naeural_client/logging/logger_mixins/resource_size_mixin.py,sha256=EdCeFM8Ol8q_OTOmsj5Q2uKPvkqkoNdcXSZjw4FgAh4,2297
@@ -83,8 +83,8 @@ naeural_client/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_L
 naeural_client/utils/config.py,sha256=v7xHikr6Z5Sbvf3opYeMhYzGWD2pe0HlRwa-aGJzUh8,6323
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
 naeural_client/utils/oracle_sync/multiple_requests.py,sha256=GLzROGZ0gI4d1PVWgW_JBUYZjEL4LqZvHvwelxDiPW4,20892
-naeural_client-2.6.27.dist-info/METADATA,sha256=rde6sZu0nzqXIJHVbDh8ZNizuzjDhkdAl3TlzSj8BS0,12354
-naeural_client-2.6.27.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-2.6.27.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
-naeural_client-2.6.27.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.6.27.dist-info/RECORD,,
+naeural_client-2.6.29.dist-info/METADATA,sha256=bpBJvkplMAnW6pC2-03BJqIRVlkqN2rmMpvnqaNCmjw,12354
+naeural_client-2.6.29.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-2.6.29.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
+naeural_client-2.6.29.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.6.29.dist-info/RECORD,,