naeural-client 2.3.0__tar.gz → 2.3.1__tar.gz

{naeural_client-2.3.0 → naeural_client-2.3.1}/PKG-INFO

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

{naeural_client-2.3.0 → naeural_client-2.3.1}/naeural_client/_ver.py

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

{naeural_client-2.3.0 → naeural_client-2.3.1}/naeural_client/bc/ec.py

@@ -480,13 +480,17 @@ class BaseBCEllipticCurveEngine(BaseBlockEngine):
     message_hash = self.eth_hash_message(types, values, as_hex=False)
     signable_message = encode_defunct(primitive=message_hash)
     signed_message = Account.sign_message(signable_message, private_key=self.eth_account.key)
+    if hasattr(signed_message, "message_hash"): # backward compatibility
+      signed_message_hash = signed_message.message_hash
+    else:
+      signed_message_hash = signed_message.messageHash
     return {
         "message_hash": message_hash.hex(),
         "r": hex(signed_message.r),
         "s": hex(signed_message.s),
         "v": signed_message.v,
         "signature": signed_message.signature.hex(),
-        "signed_message": signed_message.message_hash.hex(),
+        "signed_message": signed_message_hash.hex(),
         "sender" : self.eth_address,
     }
     

{naeural_client-2.3.0 → naeural_client-2.3.1}/naeural_client/cli/cli.py

@@ -1,8 +1,10 @@
 import argparse
 
-from naeural_client.utils.config import maybe_init_config
+from naeural_client.utils.config import maybe_init_config, log_with_color
 from naeural_client.cli.cli_commands import CLI_COMMANDS
 
+from naeural_client import version
+
 def build_parser():
   """
   Dynamically builds the argument parser based on CLI_COMMANDS.
@@ -12,7 +14,10 @@ def build_parser():
   argparse.ArgumentParser
       Configured argument parser.
   """
-  parser = argparse.ArgumentParser(description="nepctl  - CLI for Naeural Edge Protocol SDK package")
+  descr = f"nepctl v{version} - CLI for Naeural Edge Protocol SDK package"
+  
+ 
+  parser = argparse.ArgumentParser(description=descr)
   subparsers = parser.add_subparsers(dest="command", help="Available commands")
 
   # Iterate over top-level commands

{naeural_client-2.3.0 → naeural_client-2.3.1}/naeural_client/cli/nodes.py

@@ -1,4 +1,4 @@
-
+from naeural_client.utils.config import log_with_color
 
 
 def get_nodes():
@@ -10,7 +10,7 @@ def get_nodes():
   3. Wait for the second net mon message via Session and show progress.  
   4. Get the active nodes union via Session and display the nodes marking those peered vs non-peered.
   """
-  print("Getting nodes information")
+  log_with_color("Getting nodes information", color="b")
   return
   
   
@@ -18,5 +18,5 @@ def get_supervisors():
   """
   This function is used to get the information about the supervisors.
   """
-  print("Getting supervisors information")
+  log_with_color("Getting supervisors information", color='b')
   return

{naeural_client-2.3.0 → naeural_client-2.3.1}/naeural_client/utils/config.py

@@ -14,6 +14,33 @@ EE_SECURED=true
 TARGET_NODE=
 """
 
+def log_with_color(s, color='n'):
+  """
+  Prints the string `s` to the console in the specified color.
+
+  Parameters
+  ----------
+  s : str
+      The string to be logged.
+  color : str, optional
+      The color code: 
+      'r' for red, 'g' for green, 'y' for yellow, 
+      'b' for blue, 'w' for light white, 'n' for dark white (default).
+  """
+  color_codes = {
+      'r': '\033[31m',  # Red
+      'g': '\033[32m',  # Green
+      'y': '\033[33m',  # Yellow
+      'b': '\033[34m',  # Blue
+      'w': '\033[97m',  # Light white
+      'n': '\033[37m',  # Dark white (default)
+  }
+
+  reset_code = '\033[0m'  # Reset color
+  color_code = color_codes.get(color, color_codes['n'])
+  print(f"{color_code}{s}{reset_code}", flush=True)
+
+
 def get_user_folder():
   """
   Returns the user folder.
@@ -43,12 +70,12 @@ def reset_config():
   if current_env_file.exists():
     # Copy .env content to ~/.naeural/config
     shutil.copy(current_env_file, config_file)
-    print(f"Configuration has been reset using {current_env_file} into {config_file}")
+    log_with_color(f"Configuration has been reset using {current_env_file} into {config_file}", color='y')
   else:
     # Create an empty config file
     with config_file.open("wt") as file:
       file.write(ENV_TEMPLATE)
-    print(f"Configuration has been reset to default in {config_file}:\n{ENV_TEMPLATE}")
+    log_with_color(f"Configuration has been reset to default in {config_file}:\n{ENV_TEMPLATE}", color='y')
 
 
 def show_config():
@@ -58,11 +85,12 @@ def show_config():
   config_file = get_user_config_file()
 
   if config_file.exists():
-    print(f"Current configuration ({config_file}):")
+    log_with_color(f"Current configuration ({config_file}):")
     with config_file.open("r") as file:
-      print(file.read())
+      log_with_color(file.read())
   else:
-    print(f"No configuration found at {config_file}. Please run `reset_config` first.")
+    log_with_color(f"No configuration found at {config_file}. Please run `reset_config` first.", color="r")
+  return
     
 
 def load_user_defined_config(verbose=False):
@@ -84,10 +112,10 @@ def load_user_defined_config(verbose=False):
             result = True
           os.environ[key.strip()] = value
     if verbose:
-      print(f"Configuration from {config_file} has been loaded into the environment.")
+      log_with_color(f"Configuration from {config_file} has been loaded into the environment.", color='b')
   else:
     if verbose:
-      print(f"No configuration file found at {config_file}. Please run `reset_config` first.")
+      log_with_color(f"No configuration file found at {config_file}. Please run `reset_config` first.", color="r")
   return result
   
 

{naeural_client-2.3.0 → naeural_client-2.3.1}/pyproject.toml

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

{naeural_client-2.3.0 → naeural_client-2.3.1}/xperimental/eth/eth_sign.py

@@ -41,24 +41,23 @@ if __name__ == '__main__' :
   types = ["string", "uint256[]", "uint256[]"]
   values = [node, epochs, epochs_vals]
   
-  # hash1 = eng1.eth_sign_message(types, values)
   
-  # from web3 import Web3
-  # from eth_account import Account
-  # from eth_account.messages import encode_defunct
+  from web3 import Web3
+  from eth_account import Account
+  from eth_account.messages import encode_defunct
   
-  # message_hash = Web3.solidity_keccak(types, values)
-  # signable_message = encode_defunct(primitive=message_hash)
-  # signed_message = Account.sign_message(signable_message, private_key=private_key)
+  message_hash = Web3.solidity_keccak(types, values)
+  signable_message = encode_defunct(primitive=message_hash)
+  signed_message = Account.sign_message(signable_message, private_key=private_key)
   
-  # results = {
-  #   "sender" : eng1.eth_address,
-  #   "message_hash": message_hash.hex(),
-  #   "signature": signed_message.signature.hex(),
-  #   "signed_message": signed_message.message_hash.hex(),
-  # }
-  # l.P("Signable message: {}".format(signable_message))
-  # l.P("Results:\n{}".format(json.dumps(results, indent=2)))
+  results = {
+    "sender" : eng1.eth_address,
+    "message_hash": message_hash.hex(),
+    "signature": signed_message.signature.hex(),
+    "signed_message": signed_message.message_hash.hex(),
+  }
+  l.P("Signable message: {}".format(signable_message))
+  l.P("Results:\n{}".format(json.dumps(results, indent=2)))
   
   s2 = eng1.eth_sign_message(types, values)
   l.P("Results:\n{}".format(json.dumps(s2, indent=2)))