naeural-client 2.1.4__py3-none-any.whl → 2.2.1__py3-none-any.whl

naeural_client/_ver.py

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

naeural_client/base/generic_session.py

@@ -9,7 +9,7 @@ from time import time as tm
 
 from ..base_decentra_object import BaseDecentrAIObject
 from ..bc import DefaultBlockEngine
-from ..const import COMMANDS, ENVIRONMENT, HB, PAYLOAD_DATA, STATUS_TYPE, PLUGIN_SIGNATURES
+from ..const import COMMANDS, ENVIRONMENT, HB, PAYLOAD_DATA, STATUS_TYPE, PLUGIN_SIGNATURES, BLOCKCHAIN_CONFIG
 from ..const import comms as comm_ct
 from ..io_formatter import IOFormatterWrapper
 from ..logging import Logger
@@ -44,11 +44,6 @@ class GenericSession(BaseDecentrAIObject):
       "CERT_PATH": None,
   }
 
-  BLOCKCHAIN_CONFIG = {
-      "PEM_FILE": "_pk_sdk.pem",
-      "PASSWORD": None,
-      "PEM_LOCATION": "data"
-  }
 
   def __init__(self, *,
                host=None,

naeural_client/bc/base.py

@@ -39,6 +39,7 @@ class BCct:
   DEFAULT_INFO = '0xai handshake data'
   
   
+  
 class _DotDict(dict):
   __getattr__ = dict.__getitem__
   __setattr__ = dict.__setitem__
@@ -269,7 +270,7 @@ class BaseBlockEngine:
   _lock: Lock = Lock()
   __instances = {}
   
-  def __new__(cls, name, config, log, ensure_ascii_payloads=False, verbosity=1):
+  def __new__(cls, name, log, config, ensure_ascii_payloads=False, verbosity=1):
     with cls._lock:
       if name not in cls.__instances:
         instance = super(BaseBlockEngine, cls).__new__(cls)

naeural_client/bc/ec.py

@@ -2,6 +2,7 @@ import base64
 import hashlib
 import os
 import binascii
+import zlib
 
 from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.primitives.asymmetric import ec
@@ -266,7 +267,15 @@ class BaseBCEllipticCurveEngine(BaseBlockEngine):
       print('derived-shared_key: ', base64.b64encode(derived_key))
     return derived_key
 
-  def encrypt(self, plaintext: str, receiver_address: str, info: str = BCct.DEFAULT_INFO, debug: bool = False):
+  def encrypt(
+    self, 
+    plaintext: str, 
+    receiver_address: str, 
+    compressed: bool = True,
+    embed_compressed: bool = True,
+    info: str = BCct.DEFAULT_INFO, 
+    debug: bool = False
+  ):
     """
     Encrypts plaintext using the sender's private key and receiver's public key, 
     then base64 encodes the output.
@@ -278,23 +287,53 @@ class BaseBCEllipticCurveEngine(BaseBlockEngine):
         
     plaintext : str
         The plaintext to encrypt.
+        
+    compressed : bool, optional
+        Whether to compress the plaintext before encryption. The default is True.
+        
+    embed_compressed : bool, optional
+        Whether to embed the compressed flag in the encrypted data. The default is True.
 
     Returns
     -------
     str
         The base64 encoded nonce and ciphertext.
     """
+    if compressed:
+      to_encrypt_data = zlib.compress(plaintext.encode())
+      compressed_flag = (1).to_bytes(1)
+    else:
+      to_encrypt_data = plaintext.encode()
+      compressed_flag = (0).to_bytes(1)
+      
     receiver_pk = self._address_to_pk(receiver_address)
     shared_key = self.__derive_shared_key(receiver_pk, info=info, debug=debug)
     aesgcm = AESGCM(shared_key)
     nonce = os.urandom(12)  # Generate a unique nonce for each encryption
-    ciphertext = aesgcm.encrypt(nonce, plaintext.encode(), None)
-    encrypted_data = nonce + ciphertext  # Prepend the nonce to the ciphertext
+    ciphertext = aesgcm.encrypt(nonce, to_encrypt_data, None)
+    if embed_compressed:
+      encrypted_data = nonce + compressed_flag + ciphertext
+    else:
+      encrypted_data = nonce + ciphertext  # Prepend the nonce to the ciphertext
+    #end if      
     return base64.b64encode(encrypted_data).decode()  # Encode to base64
 
-  def decrypt(self, encrypted_data_b64 : str, sender_address : str, info: str = BCct.DEFAULT_INFO, debug: bool = False):
+  def decrypt(
+    self, 
+    encrypted_data_b64 : str, 
+    sender_address : str, 
+    decompress: bool = False, # decompress is only used if embed_compressed is False
+    embed_compressed: bool = True,
+    info: str = BCct.DEFAULT_INFO, 
+    debug: bool = False
+  ):
     """
     Decrypts base64 encoded encrypted data using the receiver's private key.
+    
+    The structure of the encrypted data is:
+    - 12 bytes nonce
+    - 1 byte compressed flag 
+    - 13:... The ciphertext
 
     Parameters
     ----------        
@@ -303,7 +342,14 @@ class BaseBCEllipticCurveEngine(BaseBlockEngine):
         
     sender_address : str
         The sender's address.
-
+        
+    decompress : bool, optional
+        Whether to decompress the plaintext after decryption. The default is False as the decompression flag is embedded in the encrypted data.
+        
+    embed_compressed : bool, optional
+        Whether the compressed flag is embedded in the encrypted data. The default is True.
+        
+        
     Returns
     -------
     str
@@ -311,13 +357,27 @@ class BaseBCEllipticCurveEngine(BaseBlockEngine):
 
     """
     try:
+        
       sender_pk = self._address_to_pk(sender_address)
       encrypted_data = base64.b64decode(encrypted_data_b64)  # Decode from base64
-      nonce = encrypted_data[:12]  # Extract the nonce
-      ciphertext = encrypted_data[12:]  # The rest is the ciphertext
+      nonce = encrypted_data[:12]  # Extract the nonce      
+
+      if embed_compressed:
+        start_data = 13
+        compressed_flag_byte = encrypted_data[12:13]
+        compressed_flag = int.from_bytes(compressed_flag_byte, byteorder='big')
+      else:
+        start_data = 12
+        compressed_flag = None      
+
+      ciphertext = encrypted_data[start_data:]  # The rest is the ciphertext
       shared_key = self.__derive_shared_key(sender_pk, info=info, debug=debug)
       aesgcm = AESGCM(shared_key)
       plaintext = aesgcm.decrypt(nonce, ciphertext, None)
+            
+      if (embed_compressed and compressed_flag) or (not embed_compressed and decompress):
+        plaintext = zlib.decompress(plaintext)          
+      
       result = plaintext.decode()
     except Exception as exc:
       result = None

naeural_client/const/__init__.py

@@ -4,7 +4,7 @@ from . import base as BASE_CT
 from . import payload as PAYLOAD_CT
 from .formatter import FORMATTER_DATA
 from .payload import STATUS_TYPE, PAYLOAD_DATA, COMMANDS, NOTIFICATION_CODES
-from .base import CONFIG_STREAM, BIZ_PLUGIN_DATA, PLUGIN_INFO
+from .base import CONFIG_STREAM, BIZ_PLUGIN_DATA, PLUGIN_INFO, BLOCKCHAIN_CONFIG
 from . import heartbeat as HB
 from .environment import ENVIRONMENT
 from .apps import PLUGIN_SIGNATURES

naeural_client/const/base.py

@@ -1,6 +1,11 @@
 EE_ID = 'EE_ID'
 SB_ID = 'SB_ID'  # change to SB_ID = EE_ID post mod from sb to ee
 
+BLOCKCHAIN_CONFIG = {
+    "PEM_FILE": "_pk_sdk.pem",
+    "PASSWORD": None,
+    "PEM_LOCATION": "data"
+}
 
 class DCT_TYPES:
   VOID_PIPELINE = 'Void'

{naeural_client-2.1.4.dist-info → naeural_client-2.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: naeural_client
-Version: 2.1.4
+Version: 2.2.1
 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/Naeural Edge ProtocolEdgeProtocol/naeural_client
 Project-URL: Bug Tracker, https://github.com/Naeural Edge ProtocolEdgeProtocol/naeural_client/issues

{naeural_client-2.1.4.dist-info → naeural_client-2.2.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
 naeural_client/__init__.py,sha256=UKEDGS0wFYyxwmhEAKJGecO2vYbIfRYUP4SQgnK10IE,578
-naeural_client/_ver.py,sha256=xBEfgRn61jifjfZ85domduA0fNz-XprciKiFP-TRh_M,330
+naeural_client/_ver.py,sha256=Uvmgeu264AN0yopEhDq75F2YIR2-oX5FrZrNpQN9x6Q,330
 naeural_client/base_decentra_object.py,sha256=qDBpitcyhr1eEXPD8cGFtcNPNf71fqNRsmOEcCpx4sM,4180
 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=BtpuXJFZgFESHwvzJp1XYw687u2OiP72A-NBaLRFN7s,75929
+naeural_client/base/generic_session.py,sha256=QbaRWvC5XeWSdYWYg7kZXSYX4jUHH7aVcDcFLRQ9I5o,75834
 naeural_client/base/instance.py,sha256=kcZJmjLBtx8Bjj_ysIOx1JmLA-qSpG7E28j5rq6IYus,20444
 naeural_client/base/pipeline.py,sha256=KwcPWD2XMvHotWFMpcnIycFhqiNnZuyUTUWiLU0PM5Y,57519
 naeural_client/base/plugin_template.py,sha256=qGaXByd_JZFpjvH9GXNbT7KaitRxIJB6-1IhbKrZjq4,138123
@@ -13,9 +13,9 @@ naeural_client/base/transaction.py,sha256=bfs6td5M0fINgPQNxhrl_AUjb1YiilLDQ-Cd_o
 naeural_client/base/payload/__init__.py,sha256=y8fBI8tG2ObNfaXFWjyWZXwu878FRYj_I8GIbHT4GKE,29
 naeural_client/base/payload/payload.py,sha256=v50D7mBBD2WwWzvpbRGMSr-X6vv5ie21IY1aDxTqe1c,2275
 naeural_client/bc/__init__.py,sha256=FQj23D1PrY06NUOARiKQi4cdj0-VxnoYgYDEht8lpr8,158
-naeural_client/bc/base.py,sha256=QK6QdONTpT9N--H7CHk8pwRxwJUGK4nvhNTfKxQeztQ,28328
+naeural_client/bc/base.py,sha256=nAFL4z9kyFcmrilHWCia69xMWi65VzjoQ_mo-yCQhGA,28331
 naeural_client/bc/chain.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-naeural_client/bc/ec.py,sha256=8ryEvc3__lVXSoYxd1WoTy9c8uC5Q_8R1uME7CeloIg,8578
+naeural_client/bc/ec.py,sha256=rtIayhYle70HKznRkTdZf2aGzhzHSXGu_qA8IthZY6s,10336
 naeural_client/certs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 naeural_client/certs/r9092118.ala.eu-central-1.emqxsl.com.crt,sha256=y-6io0tseyx9-a4Pmde1z1gPULtJNSYUpG_YFkYaMKU,1337
 naeural_client/code_cheker/__init__.py,sha256=pwkdeZGVL16ZA4Qf2mRahEhoOvKhL7FyuQbMFLr1E5M,33
@@ -25,9 +25,9 @@ naeural_client/comm/__init__.py,sha256=za3B2HUKNXzYtjElMgGM9xbxNsdQfFY4JB_YzdyFk
 naeural_client/comm/amqp_wrapper.py,sha256=hzj6ih07DnLQy2VSfA88giDIFHaCp9uSdGLTA-IFE4s,8535
 naeural_client/comm/mqtt_wrapper.py,sha256=Ig3bFZkCbWd4y_Whn2PPa91Z3aLgNbNPau6Tn5yLPZ8,16167
 naeural_client/const/README.md,sha256=6OHesr-f5NBuuJGryEoi_TCu2XdlhfQYlDKx_IJoXeg,177
-naeural_client/const/__init__.py,sha256=G7Fa50SpEhAPOnL8_mxgVmJ0Xq1qEncWd75pg2BkiG4,416
+naeural_client/const/__init__.py,sha256=kpvYRwTmNol7cnFKWyzRQQ8pGvFYHUaODWAHQCMcB0Q,435
 naeural_client/const/apps.py,sha256=TJpbD7-1tIKxMdpVgZMHOka1k7a6vtW45rQL87K-jvE,507
-naeural_client/const/base.py,sha256=HrvXVYS1HMEh0zKZ3VUue-hTdcXEFZ1ukhlbP9kbVWE,2996
+naeural_client/const/base.py,sha256=-NeZPwE0JrbTHmlI9BOmgzaGu5jUZHl9vOZ4hhh_QQo,3100
 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
@@ -75,7 +75,7 @@ naeural_client/logging/tzlocal/windows_tz.py,sha256=Sv9okktjZJfRGGUOOppsvQuX_eXy
 naeural_client/utils/__init__.py,sha256=mAnke3-MeRzz3nhQvhuHqLnpaaCSmDxicd7Ck9uwpmI,77
 naeural_client/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_LtMyCY,1072
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
-naeural_client-2.1.4.dist-info/METADATA,sha256=dG-mroHJtnAAOf0uWeUbCHLqcojvpZUA_dIBoaBKQ-w,14457
-naeural_client-2.1.4.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-naeural_client-2.1.4.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.1.4.dist-info/RECORD,,
+naeural_client-2.2.1.dist-info/METADATA,sha256=M74RRLcp_vKpKDJ8etHzvgOgR8LYMG2oheC8ynNMMg0,14457
+naeural_client-2.2.1.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+naeural_client-2.2.1.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.2.1.dist-info/RECORD,,