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

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/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,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/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/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.dist-info → naeural_client-2.3.1.dist-info}/METADATA

@@ -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.dist-info → naeural_client-2.3.1.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=31pw4Zp2s9RPTWeYsyGqbi2Dc3lW0dqZ4WsTZckfaww,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.py,sha256=eKzO8hu_436e3svGPNSpn6q4EiEcaTIKPhgn5QOJJVw,1426
 naeural_client/cli/cli_commands.py,sha256=NluWqnsyuabu0EKNM6MDUBtnfloH7oqCOrkfJs8Ajjk,353
-naeural_client/cli/nodes.py,sha256=tOgWGzsCqGhznne1-FRbiYdmIALSXljYz2C8Eub25Ks,619
+naeural_client/cli/nodes.py,sha256=y3yKKLzyZe-zu4H-cgqDqmZ8jt1s4RA6QdqeUD7z4i0,713
 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
@@ -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=0IngDOJjtopdi06VdtKPRv6qCBOTEt_Ww4l4MIBKhZw,3624
 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.1.dist-info/METADATA,sha256=qrRjlmz_8n-D5mCQuYYArpPEzcmQ8CY4b0RkUT_VuIM,14449
+naeural_client-2.3.1.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+naeural_client-2.3.1.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
+naeural_client-2.3.1.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.3.1.dist-info/RECORD,,