naeural-client 2.6.26__py3-none-any.whl → 2.6.28__py3-none-any.whl

naeural_client/_ver.py

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

naeural_client/bc/base.py

@@ -542,10 +542,63 @@ class BaseBlockEngine:
     except:
       result = False
     return result
-    
   
-  def _load_and_maybe_create_allowed(self):
+  
+  def add_address_to_allowed(self, address : any):
+    """
+    Adds a new address or a list of addresses to the allowed list
+    """
+    changed = False
+    if isinstance(address, str):
+      address = [address]
+    #endif
+    if isinstance(address, list) and len(address) > 0:
+      # self.P(f"Adding addresses to the allowed list:\n{address}", verbosity=1)
+      # now check addresses
+      lst_addresses = []
+      lst_names = []
+      for addr in address:
+        addr = addr.strip()
+        parts = addr.split()
+        if len(parts) == 0:
+          continue
+        addr = parts[0]
+        name = parts[1] if len(parts) > 1 else ""
+        if not self.address_is_valid(addr):
+          self.P("WARNING: address <{}> is not valid. Ignoring.".format(addr), color='r')
+        else:
+          lst_addresses.append(self.maybe_add_prefix(addr))
+          lst_names.append(name)
+        #endif
+      #endfor
+      if len(lst_addresses) > 0:
+        existing_addrs, existing_names = self._load_and_maybe_create_allowed(return_names=True)
+        existing_addrs = [self.maybe_add_prefix(x) for x in existing_addrs]
+        for addr, name in zip(lst_addresses, lst_names):
+          if addr not in existing_addrs:
+            changed = True
+            existing_addrs.append(addr)
+            existing_names.append(name)
+            self.P("Address <{}{}> added to the allowed list.".format(addr, name), color='g')
+          #endif new address
+        #endfor
+        if changed:
+          with self._whitelist_lock:
+            fn = self._get_allowed_file()
+            with open(fn, 'wt') as fh:
+              for addr, name in zip(existing_addrs, existing_names):
+                fh.write("{}{}\n".format(addr, ("  " + name) if len(name)>0 else ""))
+              #endfor each address in modified whitelist
+            #endwith open file
+          #endwith lock
+        #endif changed
+      #endif addresses received ok
+    return changed
+
+
+  def _load_and_maybe_create_allowed(self, return_names=False, return_prefix=False):
     lst_final = []
+    lst_names = []
     with self._whitelist_lock:
       try:
         fn = self._get_allowed_file()
@@ -563,16 +616,21 @@ class BaseBlockEngine:
         lst_lines = []
         errors = False
         for allowed_tuple in lst_allowed:
-          allowed = allowed_tuple.split()[0]
+          parts = allowed_tuple.split()
+          if len(parts) == 0:
+            continue
+          allowed = parts[0]
           allowed = self._remove_prefix(allowed)
+          name = parts[1] if len(parts) > 1 else ""
           if not self.address_is_valid(allowed):
             self.P("WARNING: address <{}> is not valid. Removing {} from allowed list.".format(
               allowed, allowed_tuple), color='r'
             )
             errors = True
           else:
-            lst_final.append(allowed)
+            lst_final.append(self.maybe_add_prefix(allowed))
             lst_lines.append(allowed_tuple)
+            lst_names.append(name)
         if errors:
           with open(fn, 'wt') as fh:
             for line in lst_lines:
@@ -581,6 +639,8 @@ class BaseBlockEngine:
         self.P(f"ERROR: failed to load the allowed list of addresses: {exc}", color='r')
       #endtry
     #endwith
+    if return_names:
+      return lst_final, lst_names
     return lst_final
   
         
@@ -754,12 +814,18 @@ 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
+    str_data = json.dumps(dct_reload, sort_keys=True) 
     return str_data
   
   def _create_new_sk(self):
@@ -900,6 +966,13 @@ class BaseBlockEngine:
     """Returns the allowed command senders for the current node"""
     return self.allowed_list
   
+  @property
+  def whitelist_with_names(self):
+    """
+    Returns a tuple with the allowed list (prefixed) and a list with names
+    """
+    return self._load_and_maybe_create_allowed(return_names=True, return_prefix=True)
+
   
   def maybe_remove_prefix(self, address):
     """

naeural_client/logging/logger_mixins/json_serialization_mixin.py

@@ -233,21 +233,31 @@ 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
       )
+    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, **kwargs
+      )
+    return temp
     
 
   @staticmethod

{naeural_client-2.6.26.dist-info → naeural_client-2.6.28.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=v41SsIkuU8mwgkOit-MvKm8l1U2wH1sGEPmEk-6Qf6Q,331
+naeural_client/_ver.py,sha256=Pe_mSANiKCh62K3Zslijzk6yhTY6gt-guyu3l-q8a9k,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=NafeKetxDoG86-gNls3FPN1M09nzRUP9unCUzEcXlrk,37706
+naeural_client/bc/base.py,sha256=s90pu8-_YJ4yADnQqbWwGoKouXztrHyH1voQCnFl1to,40507
 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
@@ -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=8TAePgqYgwgpaAk6MRfCOqLqA2GIbO3MPOFYHJdaE0g,14937
 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.26.dist-info/METADATA,sha256=jvfB6kdLKoCkEHGyjhFJnTfmrH9Ya8J4fu4Z68ldclE,12354
-naeural_client-2.6.26.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-2.6.26.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
-naeural_client-2.6.26.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.6.26.dist-info/RECORD,,
+naeural_client-2.6.28.dist-info/METADATA,sha256=dPMoifaDaW4iB1xJNRItGFCzafNnZ1jUtcOedmgqbfA,12354
+naeural_client-2.6.28.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-2.6.28.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
+naeural_client-2.6.28.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.6.28.dist-info/RECORD,,