naeural-client 2.3.0__py3-none-any.whl → 2.3.2__py3-none-any.whl

naeural_client/_ver.py

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

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/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,32 +14,77 @@ 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
   for command, subcommands in CLI_COMMANDS.items():
     command_parser = subparsers.add_parser(command, help=f"{command} commands")
-    if isinstance(subcommands, dict):  # Nested subcommands
+
+    if isinstance(subcommands, dict) and "func" not in subcommands:
+      # Nested subcommands
       command_subparsers = command_parser.add_subparsers(dest="subcommand")
-      for subcommand, func in subcommands.items():
+      for subcommand, subcmd_info in subcommands.items():
         subcommand_parser = command_subparsers.add_parser(
-            subcommand, help=f"{subcommand} command"
+          subcommand, help=f"{subcommand} command"
         )
-        subcommand_parser.set_defaults(func=func)
+        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:
-      command_parser.set_defaults(func=subcommands)
+      # 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():
-  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()
+  """
+  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/cli/cli_commands.py

@@ -1,15 +1,42 @@
-from naeural_client.cli.nodes import get_nodes, get_supervisors
+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": get_nodes,
-        "supervisors": get_supervisors,
+        "nodes": {
+            "func": get_nodes,
+            "params": {
+                "--all": "Get all nodes", 
+                "--peered": "Get only peered nodes"
+            }
+        },
+        "supervisors": {
+            "func": get_supervisors,
+        },
     },
     "config": {
-        "show": show_config,
-        "reset": reset_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/cli/nodes.py

@@ -1,7 +1,7 @@
+from naeural_client.utils.config import log_with_color
 
 
-
-def get_nodes():
+def get_nodes(args):
   """
   This function is used to get the information about the nodes and it will perform the following:
   
@@ -10,13 +10,44 @@ 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")
+  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():
+def get_supervisors(args):
   """
   This function is used to get the information about the supervisors.
   """
-  print("Getting supervisors information")
+  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/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/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/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.dist-info → naeural_client-2.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: naeural_client
-Version: 2.3.0
+Version: 2.3.2
 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.dist-info → naeural_client-2.3.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 naeural_client/__init__.py,sha256=UKEDGS0wFYyxwmhEAKJGecO2vYbIfRYUP4SQgnK10IE,578
-naeural_client/_ver.py,sha256=zb8Hzmn-gdMpHg77kLusI381BxnNJ0u_wIk_OIVA5jQ,330
+naeural_client/_ver.py,sha256=CQFz97cZD3BHPUwaDADidkQTqRJjpmc10HSuppTZLKA,330
 naeural_client/base_decentra_object.py,sha256=wXjl65gWxxkhV6Tq48wFfNGITvdYdkKPT-wLurGB5vc,4287
 naeural_client/plugins_manager_mixin.py,sha256=X1JdGLDz0gN1rPnTN_5mJXR8JmqoBFQISJXmPR9yvCo,11106
 naeural_client/base/__init__.py,sha256=hACh83_cIv7-PwYMM3bQm2IBmNqiHw-3PAfDfAEKz9A,259
@@ -15,13 +15,13 @@ naeural_client/base/payload/payload.py,sha256=v50D7mBBD2WwWzvpbRGMSr-X6vv5ie21IY
 naeural_client/bc/__init__.py,sha256=FQj23D1PrY06NUOARiKQi4cdj0-VxnoYgYDEht8lpr8,158
 naeural_client/bc/base.py,sha256=GI9CbI2RVgIBXpOoRjrhXt45tONlBDMrybX_BcL3_Os,29513
 naeural_client/bc/chain.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-naeural_client/bc/ec.py,sha256=eUkdHUDZ-OgmbwjbYx1wmTOJVWLmjvP4Svduocj69Uk,13841
+naeural_client/bc/ec.py,sha256=raIGI7BpSH8xU_Bg7RpKv9KEW3F6PuAdL5miZfvw7iI,14027
 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/cli/README.md,sha256=WPdI_EjzAbUW1aPyj1sSR8rLydcJKZtoiaEtklQrjHo,74
-naeural_client/cli/cli.py,sha256=KlPb6ExUMrrFxBl2j7XRnOQhtH-1s-jFtsca5zcz5qI,1342
-naeural_client/cli/cli_commands.py,sha256=NluWqnsyuabu0EKNM6MDUBtnfloH7oqCOrkfJs8Ajjk,353
-naeural_client/cli/nodes.py,sha256=tOgWGzsCqGhznne1-FRbiYdmIALSXljYz2C8Eub25Ks,619
+naeural_client/cli/cli.py,sha256=puxQ_5acL6tD2YOt8PdO5idiuKT2VUt7YzMigO3IY50,2752
+naeural_client/cli/cli_commands.py,sha256=Sm7_Ig3jxs0P7S9X_vsTrv4jthWfzo9Meb05ufI4pxQ,911
+naeural_client/cli/nodes.py,sha256=0aS9d26DtzEJHcNHiprBxlPPOdEX7B1DXDFyzL9mXVU,1406
 naeural_client/code_cheker/__init__.py,sha256=pwkdeZGVL16ZA4Qf2mRahEhoOvKhL7FyuQbMFLr1E5M,33
 naeural_client/code_cheker/base.py,sha256=lT5DRIFO5rqzsMNCmdMRfkAeevmezozehyfgmhnKpuI,19074
 naeural_client/code_cheker/checker.py,sha256=QWupeM7ToancVIq1tRUxRNUrI8B5l5eoY0kDU4-O5aE,7365
@@ -36,7 +36,7 @@ naeural_client/const/comms.py,sha256=La6JXWHexH8CfcBCKyT4fCIoeaoZlcm7KtZ57ab4ZgU
 naeural_client/const/environment.py,sha256=iytmTDgbOjvORPwHQmc0K0r-xJx7dnnzNnqAJJiFCDA,870
 naeural_client/const/formatter.py,sha256=AW3bWlqf39uaqV4BBUuW95qKYfF2OkkU4f9hy3kSVhM,200
 naeural_client/const/heartbeat.py,sha256=jGHmKfeHTFOXJaKUT3o_ocnQyF-EpcLeunW-ifkYKfU,2534
-naeural_client/const/misc.py,sha256=1ypROmZsOyp_8zG2LARwPeo-YfXuyYqZnml0elTP4kw,211
+naeural_client/const/misc.py,sha256=Y6x00YDtY1_nAk4OvikCLlfp8ggn11WQYTBGYzFlJPk,211
 naeural_client/const/payload.py,sha256=jBzXQZ-jQ1Ft6eRsb8WvT-OPpQd1j4Y-uu_V26-EY0Y,5763
 naeural_client/default/__init__.py,sha256=ozU6CMMuWl0LhG8Ae3LrZ65a6tLrptfscVYGf83zjxM,46
 naeural_client/default/instance/__init__.py,sha256=Itb4l6_DR6CCw8KAxyQKlCmALyzDasNHIfM9VB-Umak,548
@@ -56,7 +56,7 @@ naeural_client/io_formatter/default/a_dummy.py,sha256=qr9eUizQ-NN5jdXVzkaZKMaf9K
 naeural_client/io_formatter/default/aixp1.py,sha256=MX0TeUR4APA-qN3vUC6uzcz8Pssz5lgrQWo7td5Ri1A,3052
 naeural_client/io_formatter/default/default.py,sha256=gEy78cP2D5s0y8vQh4aHuxqz7D10gGfuiKF311QhrpE,494
 naeural_client/logging/__init__.py,sha256=b79X45VC6c37u32flKB2GAK9f-RR0ocwP0JDCy0t7QQ,33
-naeural_client/logging/base_logger.py,sha256=IEhDnR6vn_nMBE4OwzUHO_71wuvAtCXjHHx4yeRxm6s,65880
+naeural_client/logging/base_logger.py,sha256=uyR4rxXQGd9UrdIdRRhS6T7UmnzyEfFooVXikxOsfw4,65951
 naeural_client/logging/small_logger.py,sha256=m12hCb_H4XifJYYfgCAOUDkcXm-h4pSODnFf277OFVI,2937
 naeural_client/logging/logger_mixins/__init__.py,sha256=yQO7umlRvz63FeWpi-F9GRmC_MOHcNW6R6pwvZZBy3A,600
 naeural_client/logging/logger_mixins/class_instance_mixin.py,sha256=xUXE2VZgmrlrSrvw0f6GF1jlTnVLeVkIiG0bhlBfq3o,2741
@@ -78,10 +78,10 @@ naeural_client/logging/tzlocal/win32.py,sha256=zBoj0vFVrGhnCm_f7xmYzGym4-fV-4Ij2
 naeural_client/logging/tzlocal/windows_tz.py,sha256=Sv9okktjZJfRGGUOOppsvQuX_eXyXUxkSKCAFmWT9Hw,34203
 naeural_client/utils/__init__.py,sha256=mAnke3-MeRzz3nhQvhuHqLnpaaCSmDxicd7Ck9uwpmI,77
 naeural_client/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_LtMyCY,1072
-naeural_client/utils/config.py,sha256=eqVhrSte94nC1eJOkRzuUAdIgJUOLoqcV3CZEFS2O6g,2767
+naeural_client/utils/config.py,sha256=t_VzyBnRHJa-Kt71HUu9gXxeDOri1Aqf_-gjO04gAYs,3681
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
-naeural_client-2.3.0.dist-info/METADATA,sha256=7X1taqH_efSawHEHyKlLCRjwh5CLamWnnmW5hDc6Ays,14449
-naeural_client-2.3.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-naeural_client-2.3.0.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
-naeural_client-2.3.0.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.3.0.dist-info/RECORD,,
+naeural_client-2.3.2.dist-info/METADATA,sha256=Nt9IRuxQmbjZt3OgMZdbyqXIwo5FDx6rIyzYNsu0czU,14449
+naeural_client-2.3.2.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+naeural_client-2.3.2.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
+naeural_client-2.3.2.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.3.2.dist-info/RECORD,,