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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: naeural_client
-Version: 2.3.0
+Version: 2.3.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

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

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

{naeural_client-2.3.0 → naeural_client-2.3.3}/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.3/naeural_client/cli/cli.py

@@ -0,0 +1,90 @@
+import argparse
+
+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.
+
+  Returns
+  -------
+  argparse.ArgumentParser
+      Configured argument parser.
+  """
+  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")
+
+  for command, subcommands in CLI_COMMANDS.items():
+    command_parser = subparsers.add_parser(command, help=f"{command} commands")
+
+    if isinstance(subcommands, dict) and "func" not in subcommands:
+      # Nested subcommands
+      command_subparsers = command_parser.add_subparsers(dest="subcommand")
+      for subcommand, subcmd_info in subcommands.items():
+        subcommand_parser = command_subparsers.add_parser(
+          subcommand, help=f"{subcommand} command"
+        )
+        if isinstance(subcmd_info, dict) and "params" in subcmd_info:
+          for param, description in subcmd_info["params"].items():
+            if param.startswith("--"):
+              subcommand_parser.add_argument(
+                param, action="store_true", help=description
+              )
+            else:
+              subcommand_parser.add_argument(
+                param, help=description
+              )
+            #end if
+          #end for
+        #end if
+        subcommand_parser.set_defaults(func=subcmd_info["func"])
+    else:
+      # Single-level commands with parameters
+      if "params" in subcommands:
+        for param, description in subcommands["params"].items():
+          if param.startswith("--"):
+            command_parser.add_argument(
+              param, action="store_true", help=description
+            )
+          else:
+            command_parser.add_argument(
+              param, help=description
+            )
+          #end if
+      command_parser.set_defaults(func=subcommands["func"])
+
+  return parser
+
+
+
+def main():
+  """
+  Main entry point for the CLI.
+  Ensures the configuration is initialized, builds the parser, 
+  and executes the appropriate command function.
+  """
+  try:
+    # Initialize configuration if necessary
+    maybe_init_config()
+
+    # Build the CLI parser
+    parser = build_parser()
+    args = parser.parse_args()
+
+    # Check if a command function is provided
+    if hasattr(args, "func"):
+      args.func(args)  # Pass parsed arguments to the command function
+    else:
+      parser.print_help()
+
+  except Exception as e:
+    # Handle unexpected errors gracefully
+    print(f"Error: {e}")
+
+
+if __name__ == "__main__":
+  main()

naeural_client-2.3.3/naeural_client/cli/cli_commands.py

@@ -0,0 +1,42 @@
+from naeural_client.cli.nodes import (
+  get_nodes, get_supervisors, 
+  restart_node, shutdown_node
+)
+from naeural_client.utils.config import show_config, reset_config
+
+
+# Define the available commands
+CLI_COMMANDS = {
+    "get": {
+        "nodes": {
+            "func": get_nodes,
+            "params": {
+                "--all": "Get all nodes", 
+                "--peered": "Get only peered nodes"
+            }
+        },
+        "supervisors": {
+            "func": get_supervisors,
+        },
+    },
+    "config": {
+        "show": {
+            "func": show_config,
+        },
+        "reset": {
+            "func": reset_config,
+        },
+    },
+    "restart": {
+        "func": restart_node,
+        "params": {
+            "node": "The node to restart"
+        }
+    },
+    "shutdown": {
+        "func": shutdown_node,
+        "params": {
+            "node": "The node to shutdown"
+        }
+    }
+}

naeural_client-2.3.3/naeural_client/cli/nodes.py

@@ -0,0 +1,53 @@
+from naeural_client.utils.config import log_with_color
+
+
+def get_nodes(args):
+  """
+  This function is used to get the information about the nodes and it will perform the following:
+  
+  1. Create a Session object.
+  2. Wait for the first net mon message via Session and show progress. 
+  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.
+  """
+  if args.all:
+    log_with_color("Getting all nodes information", color="b")
+  elif args.peered:
+    log_with_color("Getting peered nodes information", color="b")
+  else:
+    log_with_color("Getting default nodes information", color="b")
+  return
+  
+  
+def get_supervisors(args):
+  """
+  This function is used to get the information about the supervisors.
+  """
+  log_with_color("Getting supervisors information", color='b')
+  return
+
+
+def restart_node(args):
+  """
+  This function is used to restart the node.
+  
+  Parameters
+  ----------
+  args : argparse.Namespace
+      Arguments passed to the function.
+  """
+  log_with_color(f"Restarting node {args.node}", color='b')
+  return
+
+
+def shutdown_node(args):
+  """
+  This function is used to shutdown the node.
+  
+  Parameters
+  ----------
+  args : argparse.Namespace
+      Arguments passed to the function.
+  """
+  log_with_color(f"Shutting down node {args.node}", color='b')
+  return

{naeural_client-2.3.0 → naeural_client-2.3.3}/naeural_client/const/misc.py

@@ -4,7 +4,7 @@ class COLORS:
   TIMERS = 'd'
   STATUS = 'n'
   SERVING = 'm'
-  BIZ = 'b'
+  BIZ = 'c'
   COMM = 'y'
   TIMERS = 'd'
 

{naeural_client-2.3.0 → naeural_client-2.3.3}/naeural_client/const/payload.py

@@ -182,6 +182,9 @@ class PAYLOAD_DATA:
   EE_HASH = BC_CT.HASH
   EE_SIGN = BC_CT.SIGN
   
+  EE_ETH_ADDR = 'EE_ETH_SENDER'
+  EE_ETH_SIGN = 'EE_ETH_SIGN'
+  
   EE_DESTINATION = "EE_DEST"
 
   NOTIFICATION = 'NOTIFICATION'

{naeural_client-2.3.0 → naeural_client-2.3.3}/naeural_client/logging/base_logger.py

@@ -35,6 +35,8 @@ COLORS = {
   'y': "\x1b[1;33m",
   'b': "\x1b[1;34m",
   'm': "\x1b[1;35m",
+  'c': "\x1b[1;36m",  # bright cyan
+  'v': "\x1b[0;36m",  # dim cyan  
   'a': "\x1b[41m",
   'e': "\x1b[41m",
   'w': "\x1b[1;31m", # warning == red

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

@@ -14,6 +14,34 @@ 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': "\x1b[1;34m",  # bright blue
+      'w': '\033[97m',  # Light white
+      'c': "\x1b[1;36m",  # bright cyan
+      '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.
@@ -26,7 +54,7 @@ def get_user_config_file():
   """
   return get_user_folder() / "config"
 
-def reset_config():
+def reset_config(args):
   """
   Resets the configuration by creating a ~/.naeural folder and populating
   ~/.naeural/config with values from a local .env file, if it exists.
@@ -43,26 +71,27 @@ 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():
+def show_config(args):
   """
   Displays the current configuration from ~/.naeural/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 +113,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.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "naeural_client"
-version = "2.3.0"
+version = "2.3.3"
 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.3}/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)))

naeural_client-2.3.0/naeural_client/cli/cli.py

@@ -1,43 +0,0 @@
-import argparse
-
-from naeural_client.utils.config import maybe_init_config
-from naeural_client.cli.cli_commands import CLI_COMMANDS
-
-def build_parser():
-  """
-  Dynamically builds the argument parser based on CLI_COMMANDS.
-
-  Returns
-  -------
-  argparse.ArgumentParser
-      Configured argument parser.
-  """
-  parser = argparse.ArgumentParser(description="nepctl  - CLI for Naeural Edge Protocol SDK package")
-  subparsers = parser.add_subparsers(dest="command", help="Available commands")
-
-  # Iterate over top-level commands
-  for command, subcommands in CLI_COMMANDS.items():
-    command_parser = subparsers.add_parser(command, help=f"{command} commands")
-    if isinstance(subcommands, dict):  # Nested subcommands
-      command_subparsers = command_parser.add_subparsers(dest="subcommand")
-      for subcommand, func in subcommands.items():
-        subcommand_parser = command_subparsers.add_parser(
-            subcommand, help=f"{subcommand} command"
-        )
-        subcommand_parser.set_defaults(func=func)
-    else:
-      command_parser.set_defaults(func=subcommands)
-
-  return parser
-
-def main():
-  maybe_init_config()
-  parser = build_parser()
-  args = parser.parse_args()
-  if hasattr(args, "func"):
-    args.func()  # Call the dynamically loaded function
-  else:
-    parser.print_help()
-
-if __name__ == "__main__":
-  main()

naeural_client-2.3.0/naeural_client/cli/cli_commands.py

@@ -1,15 +0,0 @@
-from naeural_client.cli.nodes import get_nodes, get_supervisors
-from naeural_client.utils.config import show_config, reset_config
-
-
-# Define the available commands
-CLI_COMMANDS = {
-    "get": {
-        "nodes": get_nodes,
-        "supervisors": get_supervisors,
-    },
-    "config": {
-        "show": show_config,
-        "reset": reset_config,
-    },
-}

naeural_client-2.3.0/naeural_client/cli/nodes.py

@@ -1,22 +0,0 @@
-
-
-
-def get_nodes():
-  """
-  This function is used to get the information about the nodes and it will perform the following:
-  
-  1. Create a Session object.
-  2. Wait for the first net mon message via Session and show progress. 
-  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")
-  return
-  
-  
-def get_supervisors():
-  """
-  This function is used to get the information about the supervisors.
-  """
-  print("Getting supervisors information")
-  return