naeural-client 2.5.14__py3-none-any.whl → 2.5.16__py3-none-any.whl

naeural_client/_ver.py

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

naeural_client/base/generic_session.py

@@ -86,6 +86,7 @@ class GenericSession(BaseDecentrAIObject):
               local_cache_base_folder=None,
               local_cache_app_folder='_local_cache',
               use_home_folder=False,
+              eth_enabled=True,
               **kwargs
             ) -> None:
     """
@@ -169,6 +170,8 @@ class GenericSession(BaseDecentrAIObject):
     self.log = log
     self.name = name
     self.silent = silent
+    
+    self.__eth_enabled = eth_enabled
 
     self._verbosity = verbosity
     self.encrypt_comms = encrypt_comms
@@ -655,6 +658,7 @@ class GenericSession(BaseDecentrAIObject):
     def __start_blockchain(self, bc_engine, blockchain_config, user_config=False):
       if bc_engine is not None:
         self.bc_engine = bc_engine
+        self.bc_engine.set_eth_flat(self.__eth_enabled)
         return
 
       try:
@@ -664,6 +668,7 @@ class GenericSession(BaseDecentrAIObject):
           config=blockchain_config,
           verbosity=self._verbosity,
           user_config=user_config,
+          eth_enabled=self.__eth_enabled,
         )
       except:
         raise ValueError("Failure in private blockchain setup:\n{}".format(traceback.format_exc()))

naeural_client/bc/base.py

@@ -21,9 +21,7 @@ class BCctbase:
   
   ETH_SIGN  = 'EE_ETH_SIGN'
   ETH_SENDER= 'EE_ETH_SENDER'
-  
-  # TODO: generate automaticall the NON_DATA_FIELDS
-  
+    
 
 class BCct:
   SIGN        = BCctbase.SIGN
@@ -52,7 +50,7 @@ class BCct:
   AUTHORISED_ADDRS = 'authorized_addrs'
   
   DEFAULT_INFO = '0xai handshake data'
-  
+    
   
   
 class _DotDict(dict):
@@ -68,7 +66,12 @@ class VerifyMessage(_DotDict):
     self.sender = None
     
     
-NON_DATA_FIELDS = [val for key, val in BCctbase.__dict__.items() if key[0] != '_']
+ALL_NON_DATA_FIELDS = [val for key, val in BCctbase.__dict__.items() if key[0] != '_']
+
+NO_ETH_NON_DATA_FIELDS = [
+  val for key, val in BCctbase.__dict__.items() 
+  if key[0] != '_' and not key.startswith('ETH_')
+]
 
 def replace_nan_inf(data, inplace=False):
   assert isinstance(data, (dict, list)), "Only dictionaries and lists are supported"
@@ -295,7 +298,8 @@ class BaseBlockEngine:
     config, 
     ensure_ascii_payloads=False, 
     verbosity=1, 
-    user_config=False
+    user_config=False,   
+    eth_enabled=True, 
   ):
     with cls._lock:
       if name not in cls.__instances:
@@ -305,6 +309,7 @@ class BaseBlockEngine:
           ensure_ascii_payloads=ensure_ascii_payloads,
           verbosity=verbosity,
           user_config=user_config,
+          eth_enabled=eth_enabled,
         )
         cls.__instances[name] = instance
       else:
@@ -319,6 +324,7 @@ class BaseBlockEngine:
       ensure_ascii_payloads=False,
       verbosity=1,
       user_config=False,
+      eth_enabled=True,
     ):
 
     self.__name = name
@@ -332,6 +338,8 @@ class BaseBlockEngine:
     self.__config = config
     self.__ensure_ascii_payloads = ensure_ascii_payloads
     
+    self.__eth_enabled = eth_enabled
+    
     if user_config:
       user_folder = get_user_folder()
       pem_fn = str(user_folder / '_naeural.pem')
@@ -356,6 +364,11 @@ class BaseBlockEngine:
       **kwargs
     )
   
+  
+  @property
+  def eth_enabled(self):
+    return self.__eth_enabled
+  
   @property
   def name(self):
     return self.__name
@@ -376,8 +389,7 @@ class BaseBlockEngine:
           from_file=True,
           password=self.__password,
         )
-        self.P("  Loaded sk from {}".format(full_path), verbosity=1)
-        os.environ[BCct.K_USER_CONFIG_PEM_FILE] = self.__pem_file
+        self.P("  Loaded sk from {}".format(full_path), verbosity=1)        
       except:
         self.P("  Failed to load sk from {}".format(full_path), color='r', verbosity=1)
 
@@ -389,6 +401,9 @@ class BaseBlockEngine:
         password=self.__password,
         fn=self.__pem_file,
       )
+      
+    os.environ[BCct.K_USER_CONFIG_PEM_FILE] = self.__pem_file      
+    
     self.__public_key = self._get_pk(private_key=self.__private_key)    
     self.__address = self._pk_to_address(self.__public_key)
     ### Ethereum
@@ -947,7 +962,11 @@ class BaseBlockEngine:
     The dict will be modified inplace to replace NaN and Inf with None.
     """
     assert isinstance(dct_data, dict), "Cannot compute hash on non-dict data"
-    dct_only_data = {k:dct_data[k] for k in dct_data if k not in NON_DATA_FIELDS}
+    if self.eth_enabled:
+      dct_only_data = {k:dct_data[k] for k in dct_data if k not in ALL_NON_DATA_FIELDS}
+    else:
+      dct_only_data = {k:dct_data[k] for k in dct_data if k not in NO_ETH_NON_DATA_FIELDS}
+    #endif
     str_data = self._dict_to_json(
       dct_only_data, 
       replace_nan=replace_nan, 
@@ -1032,18 +1051,20 @@ class BaseBlockEngine:
     # finally sign either full or just hash
     result = self._sign(data=bdata, private_key=self.__private_key, text=True)
     if add_data:
-      # not populate dict
+      # now populate dict
       dct_data[BCct.SIGN] = result
       dct_data[BCct.SENDER] = self.address
-      dct_data[BCct.ETH_SENDER] = self.eth_address
-      ### add eth signature
-      dct_data[BCct.ETH_SIGN] = "0xBEEF"
-      if eth_sign:
-        eth_sign_info = self.eth_sign_text(text_data, signature_only=False)
-        # can be replaced with dct_data[BCct.ETH_SIGN] = self.eth_sign_text(bdata.decode(), signature_only=True)
-        eth_sign = eth_sign_info.get('signature')
-        dct_data[BCct.ETH_SIGN] = eth_sign
-      ### end eth signature
+      
+      if self.__eth_enabled:
+        dct_data[BCct.ETH_SENDER] = self.eth_address
+        ### add eth signature
+        dct_data[BCct.ETH_SIGN] = "0xBEEF"
+        if eth_sign:
+          eth_sign_info = self.eth_sign_text(text_data, signature_only=False)
+          # can be replaced with dct_data[BCct.ETH_SIGN] = self.eth_sign_text(bdata.decode(), signature_only=True)
+          eth_sign = eth_sign_info.get('signature')
+          dct_data[BCct.ETH_SIGN] = eth_sign
+        ### end eth signature
       if use_digest:
         dct_data[BCct.HASH] = hexdigest
     return result
@@ -1059,7 +1080,7 @@ class BaseBlockEngine:
       verify_allowed=False,
       replace_nan=True,
       log_hash_sign_fails=True,
-    ) -> bool:
+    ):
     """
     Verifies the signature validity of a given text message
 
@@ -1090,7 +1111,8 @@ class BaseBlockEngine:
     Returns
     -------
     bool / VerifyMessage
-      returns `True` if signature verifies else `False`. returns `VerifyMessage` if return_full_info
+      returns `True` if signature verifies else `False`. 
+      returns `VerifyMessage` structure if return_full_info (default `True`)
 
     """
     result = False
@@ -1202,6 +1224,9 @@ class BaseBlockEngine:
   
   ### Ethereum
   
+  def set_eth_flag(self, value):
+    self.__eth_enabled = value
+  
   @property
   def eth_address(self):
     return self.__eth_address

{naeural_client-2.5.14.dist-info → naeural_client-2.5.16.dist-info}/METADATA

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

@@ -1,10 +1,10 @@
 naeural_client/__init__.py,sha256=GP8WSrn87sjTPO-QRNL2PG8JK5Mixbiea_HrtbG8RAQ,592
-naeural_client/_ver.py,sha256=OvfE4D7AkISBE0Zs9LfE87m_VMS_4nmmTptsG5gPTvc,331
+naeural_client/_ver.py,sha256=9JnALNUqZ3QODUr1I52PZI08N_bOplIgmTXGQ3trsrw,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
 naeural_client/base/distributed_custom_code_presets.py,sha256=cvz5R88P6Z5V61Ce1vHVVh8bOkgXd6gve_vdESDNAsg,2544
-naeural_client/base/generic_session.py,sha256=BCxmu9Q7HCnLbDYvXa_6cNBPwZhv-3MPloIQ6h4wjb0,88440
+naeural_client/base/generic_session.py,sha256=Jymz_4ML2pkvKDWSRoalZuXB95NCyBYmhnJSc7tUpNU,88612
 naeural_client/base/instance.py,sha256=kcZJmjLBtx8Bjj_ysIOx1JmLA-qSpG7E28j5rq6IYus,20444
 naeural_client/base/pipeline.py,sha256=b4uNHrEIOlAtw4PGUx20dxwBhDck5__SrVXaHcSi8ZA,58251
 naeural_client/base/plugin_template.py,sha256=qGaXByd_JZFpjvH9GXNbT7KaitRxIJB6-1IhbKrZjq4,138123
@@ -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=Uzpv0_YAM-lVV0mRJkt2cCy3z107BI50R-xWf-i32hw,32184
+naeural_client/bc/base.py,sha256=lj9onY7dKw0oz23RZu5Gp1kSFz5zhjVIx1Sg_XTP5ZY,32779
 naeural_client/bc/chain.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 naeural_client/bc/ec.py,sha256=mWjodWCRgC3omVXOA9jtNdtPVNn2kMKV3Dcjt9oFUCQ,22974
 naeural_client/certs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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=aUVyi5rZjvnbUwM5mmj0E2IHvURdrlHSgleqZvJBNuU,5202
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
-naeural_client-2.5.14.dist-info/METADATA,sha256=gjw552PambsqYitLB5RGMu1F9tAzY0MCNpjsGTmf6v0,14494
-naeural_client-2.5.14.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-2.5.14.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
-naeural_client-2.5.14.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.5.14.dist-info/RECORD,,
+naeural_client-2.5.16.dist-info/METADATA,sha256=qbAaVDb1IOH-s44Wd4w7grQ-hpet7oxiWaKd3jPvvnU,14494
+naeural_client-2.5.16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-2.5.16.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
+naeural_client-2.5.16.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.5.16.dist-info/RECORD,,