naeural-client 2.4.1__tar.gz → 2.4.3__tar.gz

{naeural_client-2.4.1 → naeural_client-2.4.3}/PKG-INFO

@@ -1,10 +1,11 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: naeural_client
-Version: 2.4.1
+Version: 2.4.3
 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
 Author-email: Andrei Ionut Damian <andrei.damian@me.com>, Cristan Bleotiu <cristibleotiu@gmail.com>, Stefan Saraev <saraevstefan@gmail.com>
+License-File: LICENSE
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3

{naeural_client-2.4.1 → naeural_client-2.4.3}/naeural_client/_ver.py

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

{naeural_client-2.4.1 → naeural_client-2.4.3}/naeural_client/bc/ec.py

@@ -233,12 +233,16 @@ class BaseBCEllipticCurveEngine(BaseBlockEngine):
       the pk object.
 
     """
-    simple_address = self._remove_prefix(address)
-    bpublic_key = self._text_to_binary(simple_address)
-    public_key = ec.EllipticCurvePublicKey.from_encoded_point(
-      curve=ec.SECP256K1(), 
-      data=bpublic_key
-    )
+    try:
+      simple_address = self._remove_prefix(address)
+      bpublic_key = self._text_to_binary(simple_address)
+      public_key = ec.EllipticCurvePublicKey.from_encoded_point(
+        curve=ec.SECP256K1(), 
+        data=bpublic_key
+      )
+    except Exception as exp:
+      self.P(f"Error converting address <{address}>to pk: {exp}", color='r')
+      raise exp
     return public_key
   
 
@@ -328,47 +332,6 @@ class BaseBCEllipticCurveEngine(BaseBlockEngine):
     #end if      
     return base64.b64encode(encrypted_data).decode()  # Encode to base64
   
-  
-  def encrypt(
-    self, 
-    plaintext: str, 
-    receiver_address: str, 
-    info: str = BCct.DEFAULT_INFO, 
-    debug: bool = False,
-    **kwargs
-  ):
-    """
-    Encrypts plaintext using the sender's private key and receiver's public key, 
-    then base64 encodes the output.
-
-    Parameters
-    ----------
-    receiver_address : str
-        The receiver's address
-        
-    plaintext : str
-        The plaintext to encrypt.
-        
-    Obsolete:          
-      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.
-    """  
-    return self._encrypt(
-      plaintext=plaintext, 
-      receiver_address=receiver_address, 
-      compressed=True, 
-      embed_compressed=True, 
-      info=info, 
-      debug=debug,      
-    )
     
   
   def _decrypt(
@@ -611,7 +574,59 @@ class BaseBCEllipticCurveEngine(BaseBlockEngine):
       if debug:
         self.P(f"Error decrypting multi scenario: {exc}", color='r')
       return None
-  
+
+
+  def encrypt(
+    self, 
+    plaintext: str, 
+    receiver_address: any, 
+    info: str = BCct.DEFAULT_INFO, 
+    debug: bool = False,
+    **kwargs
+  ):
+    """
+    Encrypts plaintext using the sender's private key and receiver's public key, 
+    then base64 encodes the output.
+
+    Parameters
+    ----------
+    plaintext : str
+        The plaintext to encrypt.
+
+    receiver_address : str or list[str]
+        The receiver's address or list of multiple receivers addresses.
+        
+        
+    Obsolete:          
+      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.
+    """  
+    assert isinstance(receiver_address, (str, list)), "receiver_address must be a string or a list of strings."
+    if isinstance(receiver_address, list):
+      return self.encrypt_for_multi(
+        plaintext=plaintext, 
+        receiver_addresses=receiver_address, 
+        info=info, 
+        debug=debug
+      )      
+    return self._encrypt(
+      plaintext=plaintext, 
+      receiver_address=receiver_address, 
+      compressed=True, 
+      embed_compressed=True, 
+      info=info, 
+      debug=debug,      
+    )
+
+
   def decrypt(  
     self,
     encrypted_data_b64: str,

{naeural_client-2.4.1 → naeural_client-2.4.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "naeural_client"
-version = "2.4.1"
+version = "2.4.3"
 authors = [
   { name="Andrei Ionut Damian", email="andrei.damian@me.com" },
   { name="Cristan Bleotiu", email="cristibleotiu@gmail.com" },

{naeural_client-2.4.1 → naeural_client-2.4.3}/xperimental/multi-enc-dec/multi_test1.py

@@ -48,9 +48,9 @@ if __name__ == '__main__' :
     plaintext=str_data, 
     receiver_address=receivers[0].address, debug=True
   )
-  enc_data1m = eng1.encrypt_for_multi(
+  enc_data1m = eng1.encrypt(
     plaintext=str_data,
-    receiver_addresses=[x.address for x in receivers]
+    receiver_address=[x.address for x in receivers]
   )
   l.P("Encrypted data size: {}".format(len(enc_data1m)), color='b')
   receivers.append(bandit) # bandit inserts itself into the list of receivers