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

naeural_client/_ver.py

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

naeural_client/base/generic_session.py

@@ -17,9 +17,12 @@ from ..utils import load_dotenv
 from .payload import Payload
 from .pipeline import Pipeline
 from .transaction import Transaction
+from ..utils.config import load_user_defined_config, get_user_config_file
 
 # TODO: add support for remaining commands from EE
 
+DEBUG_MQTT_SERVER = "r9092118.ala.eu-central-1.emqxsl.com"
+
 
 class GenericSession(BaseDecentrAIObject):
   """
@@ -59,7 +62,8 @@ class GenericSession(BaseDecentrAIObject):
                on_payload=None,
                on_notification=None,
                on_heartbeat=None,
-               silent=True,
+               debug_silent=True,
+               silent=False,
                verbosity=1,
                dotenv_path=None,
                show_commands=False,
@@ -120,8 +124,14 @@ class GenericSession(BaseDecentrAIObject):
         Callback that handles heartbeats received from this network.
         As arguments, it has a reference to this Session object, the node name and the heartbeat payload.
         Defaults to None.
-    silent : bool, optional
+        
+    debug_silent : bool, optional
         This flag will disable debug logs, set to 'False` for a more verbose log, by default True
+        
+    silent : bool, optional
+        This flag will disable all logs, set to 'False` for a more verbose log, by default False
+        The logs will still be recored in the log file even if this flag is set to True.
+        
     dotenv_path : str, optional
         Path to the .env file, by default None. If None, the path will be searched in the current working directory and in the directories of the files from the call stack.
     root_topic : str, optional
@@ -142,6 +152,7 @@ class GenericSession(BaseDecentrAIObject):
 
     self.log = log
     self.name = name
+    self.silent = silent
 
     self._verbosity = verbosity
     self.encrypt_comms = encrypt_comms
@@ -158,7 +169,10 @@ class GenericSession(BaseDecentrAIObject):
     pwd = pwd or kwargs.get('password', kwargs.get('pass', None))
     user = user or kwargs.get('username', None)
     host = host or kwargs.get('hostname', None)
+    
+    ## now we prepare config via ~/.naeural/config or .env
     self.__fill_config(host, port, user, pwd, secured, dotenv_path)
+    ## end config
 
     self.custom_on_payload = on_payload
     self.custom_on_heartbeat = on_heartbeat
@@ -180,15 +194,30 @@ class GenericSession(BaseDecentrAIObject):
     self.__open_transactions_lock = Lock()
 
     self.__create_user_callback_threads()
-    super(GenericSession, self).__init__(log=log, DEBUG=not silent, create_logger=True)
+    super(GenericSession, self).__init__(
+      log=log, 
+      DEBUG=not debug_silent, 
+      create_logger=True,
+      silent=self.silent,
+    )
     return
 
   def startup(self):
-    self.__start_blockchain(self.__bc_engine, self.__blockchain_config)
+    # start the blockchain engine assuming config is already set
+    self.__start_blockchain(
+      self.__bc_engine, self.__blockchain_config, 
+      user_config=self.__user_config_loaded,
+    )
+    # end bc_engine
     self.formatter_wrapper = IOFormatterWrapper(self.log, plugin_search_locations=self.__formatter_plugins_locations)
 
     self._connect()
 
+    self.P("Created {} comms session '{}' from <{}> SDKv{}.".format(
+      "decrypted" if not self.encrypt_comms else "encrypted", 
+      self.name, self.bc_engine.address, self.log.version
+    ))
+    
     if not self.encrypt_comms:
       self.P(
         "Warning: Emitted messages will not be encrypted.\n"
@@ -546,7 +575,7 @@ class GenericSession(BaseDecentrAIObject):
 
   # Main loop
   if True:
-    def __start_blockchain(self, bc_engine, blockchain_config):
+    def __start_blockchain(self, bc_engine, blockchain_config, user_config=False):
       if bc_engine is not None:
         self.bc_engine = bc_engine
         return
@@ -557,6 +586,7 @@ class GenericSession(BaseDecentrAIObject):
           name=self.name,
           config=blockchain_config,
           verbosity=self._verbosity,
+          user_config=user_config,
         )
       except:
         raise ValueError("Failure in private blockchain setup:\n{}".format(traceback.format_exc()))
@@ -780,15 +810,19 @@ class GenericSession(BaseDecentrAIObject):
       host : str
           The hostname of the server.
           Can be retrieved from the environment variables AIXP_HOSTNAME, AIXP_HOST
+          
       port : int
           The port.
           Can be retrieved from the environment variable AIXP_PORT
+          
       user : str
           The user name.
           Can be retrieved from the environment variables AIXP_USERNAME, AIXP_USER
+          
       pwd : str
           The password.
           Can be retrieved from the environment variables AIXP_PASSWORD, AIXP_PASS, AIXP_PWD
+          
       dotenv_path : str, optional
           Path to the .env file, by default None. If None, the path will be searched in the current working directory and in the directories of the files from the call stack.
 
@@ -798,11 +832,21 @@ class GenericSession(BaseDecentrAIObject):
           Missing credentials
       """
 
-      # this method will search for the credentials in the environment variables
-      # the path to env file, if not specified, will be search in the following order:
-      #  1. current working directory
-      #  2-N. directories of the files from the call stack
-      load_dotenv(dotenv_path=dotenv_path, verbose=False)
+      # if the ~/.naeural/config file exists, load the credentials from there else try to load them from .env
+      if not load_user_defined_config():        
+        # this method will search for the credentials in the environment variables
+        # the path to env file, if not specified, will be search in the following order:
+        #  1. current working directory
+        #  2-N. directories of the files from the call stack
+        load_dotenv(dotenv_path=dotenv_path, verbose=False)
+        if not self.silent:
+          print("Loaded credentials from environment variables.", flush=True)
+        self.__user_config_loaded = False
+      else:
+        if not self.silent:
+          print(f"Loaded credentials from `{get_user_config_file()}`.", flush=True)
+        self.__user_config_loaded = True
+      # endif config loading from ~ or ./.env
 
       possible_user_values = [
         user,
@@ -849,7 +893,7 @@ class GenericSession(BaseDecentrAIObject):
         os.getenv(ENVIRONMENT.EE_HOST),
         os.getenv(ENVIRONMENT.EE_MQTT_HOST),
         self._config.get(comm_ct.HOST),
-        "r9092118.ala.eu-central-1.emqxsl.com",
+        DEBUG_MQTT_SERVER,
       ]
 
       host = next((x for x in possible_host_values if x is not None), None)

naeural_client/base_decentra_object.py

@@ -24,6 +24,7 @@ class BaseDecentrAIObject(object):
                show_prefixes=False,
                prefix_log=None,
                log_at_startup=False,
+               silent=False,
                **kwargs):
 
     super(BaseDecentrAIObject, self).__init__()
@@ -32,7 +33,13 @@ class BaseDecentrAIObject(object):
       if not create_logger:
         raise ValueError("Logger object is invalid: {}".format(log))
       else:
-        log = Logger("DEF", DEBUG=DEBUG, base_folder='.', app_folder='_local_cache')
+        log = Logger(
+          "DEF", 
+          DEBUG=DEBUG, 
+          base_folder='.', 
+          app_folder='_local_cache',
+          silent=silent,
+        )
     # endif
 
     self.log = log
@@ -79,7 +86,6 @@ class BaseDecentrAIObject(object):
         msg = "{} {}".format(self.prefix_log, s)
       # endif
     # endif
-
     _r = self.log.P(msg, show_time=t, color=color, **kwargs)
     return _r
 

naeural_client/bc/base.py

@@ -12,6 +12,8 @@ from copy import deepcopy
 
 from cryptography.hazmat.primitives import serialization
 
+from ..utils.config import get_user_folder
+
 
 class BCct:
   SIGN      = 'EE_SIGN'
@@ -21,6 +23,7 @@ class BCct:
   ADDR_PREFIX_OLD = "aixp_"
   ADDR_PREFIX   = "0xai_"
   
+  K_USER_CONFIG_PEM_FILE = 'NAEURAL_PEM_FILE'
   K_PEM_FILE = 'PEM_FILE'
   K_PASSWORD = 'PASSWORD'
   K_PEM_LOCATION = 'PEM_LOCATION'
@@ -270,7 +273,7 @@ class BaseBlockEngine:
   _lock: Lock = Lock()
   __instances = {}
   
-  def __new__(cls, name, log, config, ensure_ascii_payloads=False, verbosity=1):
+  def __new__(cls, name, log, config, ensure_ascii_payloads=False, verbosity=1, user_config=False):
     with cls._lock:
       if name not in cls.__instances:
         instance = super(BaseBlockEngine, cls).__new__(cls)
@@ -278,6 +281,7 @@ class BaseBlockEngine:
           name=name, log=log, config=config, 
           ensure_ascii_payloads=ensure_ascii_payloads,
           verbosity=verbosity,
+          user_config=user_config,
         )
         cls.__instances[name] = instance
       else:
@@ -291,6 +295,7 @@ class BaseBlockEngine:
       log=None, 
       ensure_ascii_payloads=False,
       verbosity=1,
+      user_config=False,
     ):
 
     self.__name = name
@@ -304,11 +309,15 @@ class BaseBlockEngine:
     self.__config = config
     self.__ensure_ascii_payloads = ensure_ascii_payloads
     
-    pem_name = config.get(BCct.K_PEM_FILE, '_pk.pem')
-    pem_folder = config.get(BCct.K_PEM_LOCATION, 'data')
-    pem_fn = os.path.join(log.get_target_folder(pem_folder), pem_name)
+    if user_config:
+      user_folder = get_user_folder()
+      pem_fn = str(user_folder / '_naeural.pem')
+    else:
+      pem_name = config.get(BCct.K_PEM_FILE, '_pk.pem')
+      pem_folder = config.get(BCct.K_PEM_LOCATION, 'data')
+      pem_fn = os.path.join(log.get_target_folder(pem_folder), pem_name)
+    #endif pem is defined in ~/.naeural/config
     self.__pem_file = pem_fn
-    
     self._init()
     return
   
@@ -353,9 +362,13 @@ class BaseBlockEngine:
         password=self.__password,
         fn=self.__pem_file,
       )
-    self.__public_key = self._get_pk(private_key=self.__private_key)
+    self.__public_key = self._get_pk(private_key=self.__private_key)    
     self.__address = self._pk_to_address(self.__public_key)
-    self.P("Current address: {}".format(self.address), boxed=True, verbosity=1)
+    ### Ethereum
+    self.__eth_address = self._get_eth_address()
+    self.__eth_account = self._get_eth_account()
+    ### end Ethereum
+    self.P("Address: {} / ETH: {}".format(self.address, self.eth_address), boxed=True, verbosity=1)
     self.P("Allowed list of senders: {}".format(self.allowed_list), verbosity=1)
     return
   
@@ -363,6 +376,11 @@ class BaseBlockEngine:
   def private_key(self):
     return self.__private_key
   
+  
+  @property
+  def public_key(self):
+    return self.private_key.public_key()
+  
  
   @staticmethod
   def _compute_hash(data : bytes, method='SHA256'):
@@ -717,6 +735,32 @@ class BaseBlockEngine:
 
     """
     raise NotImplementedError()  
+  
+  
+  def _get_eth_address(self):
+    """
+    Returns the Ethereum address for the current pk
+
+    Returns
+    -------
+    eth_address : str
+      the Ethereum address.
+
+    """
+    raise NotImplementedError()
+  
+  
+  def _get_eth_acccount(self):
+    """
+    Returns the Ethereum account for the current sk
+
+    Returns
+    -------
+    eth_account : str
+      the Ethereum account.
+
+    """
+    raise NotImplementedError()
     
       
   
@@ -1045,3 +1089,15 @@ class BaseBlockEngine:
     """
     raise NotImplementedError()
   
+  
+  ### Ethereum
+  
+  @property
+  def eth_address(self):
+    return self.__eth_address
+  
+  @property
+  def eth_account(self):
+    return self.__eth_account
+  
+  ### end Ethereum

naeural_client/bc/ec.py

@@ -11,6 +11,11 @@ from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.ciphers.aead import AESGCM
 from cryptography.hazmat.primitives.kdf.hkdf import HKDF
 
+from web3 import Web3
+from eth_account import Account
+from eth_utils import keccak, to_checksum_address
+from eth_account.messages import encode_defunct
+
 from .base import BaseBlockEngine, VerifyMessage, BCct
 
 
@@ -18,6 +23,7 @@ from .base import BaseBlockEngine, VerifyMessage, BCct
 class BaseBCEllipticCurveEngine(BaseBlockEngine):
   MAX_ADDRESS_VALUE = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141
   
+  
   def _get_pk(self, private_key : ec.EllipticCurvePrivateKey) -> ec.EllipticCurvePublicKey:
     """
     Simple wrapper to generate pk from sk
@@ -233,6 +239,7 @@ class BaseBCEllipticCurveEngine(BaseBlockEngine):
       data=bpublic_key
     )
     return public_key
+  
 
   def __derive_shared_key(self, peer_public_key : str, info : str = BCct.DEFAULT_INFO, debug : bool = False):
     """
@@ -266,6 +273,7 @@ class BaseBCEllipticCurveEngine(BaseBlockEngine):
     if debug:
       print('derived-shared_key: ', base64.b64encode(derived_key))
     return derived_key
+  
 
   def encrypt(
     self, 
@@ -380,5 +388,140 @@ class BaseBCEllipticCurveEngine(BaseBlockEngine):
       
       result = plaintext.decode()
     except Exception as exc:
+      if debug:
+        self.P("Error decrypting from <{}> (compressed_flag `{}`): {}".format(
+          sender_address, compressed_flag, exc), color='r'
+        )
       result = None
-    return result
+    return result
+  
+  
+  
+  ### ETH
+
+  def _get_eth_address(self, pk=None):
+    if pk is None:
+      pk = self.public_key
+    raw_public_key = pk.public_numbers()
+
+    # Compute Ethereum-compatible address
+    x = raw_public_key.x.to_bytes(32, 'big')
+    y = raw_public_key.y.to_bytes(32, 'big')
+    uncompressed_key = b'\x04' + x + y
+    keccak_hash = keccak(uncompressed_key[1:])  # Remove 0x04 prefix
+    eth_address = "0x" + keccak_hash[-20:].hex()
+    eth_address = to_checksum_address(eth_address)
+    return eth_address    
+  
+  def _get_eth_account(self):
+    private_key_bytes = self.private_key.private_numbers().private_value.to_bytes(32, 'big')
+    return Account.from_key(private_key_bytes)
+  
+  
+  def node_address_to_eth_address(self, address):
+    """
+    Converts a node address to an Ethereum address.
+
+    Parameters
+    ----------
+    address : str
+        The node address convert.
+
+    Returns
+    -------
+    str
+        The Ethereum address.
+    """
+    public_key = self._address_to_pk(address)
+    return self._get_eth_address(pk=public_key)
+    
+
+  
+  def eth_hash_message(self, types, values, as_hex=False):
+    """
+    Hashes a message using the keccak256 algorithm.
+
+    Parameters
+    ----------
+    types : list
+        The types of the values.
+        
+    values : list of any
+        The values to hash.
+
+    Returns
+    -------
+    bytes
+        The hash of the message in hexadecimal format.
+    """
+    message = Web3.solidity_keccak(types, values)
+    if as_hex:
+      return message.hex()
+    return message
+  
+  
+  def eth_sign_message(self, types, values):
+    """
+    Signs a message using the private key.
+
+    Parameters
+    ----------
+    types : list
+        The types of the values.
+        
+    values : list of any
+        The values to sign.
+
+    Returns
+    -------
+    str
+        The signature of the message.
+    """
+    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_hash.hex(),
+        "sender" : self.eth_address,
+    }
+    
+  def eth_sign_node_epochs(self, node, epochs, epochs_vals, signature_only=True):
+    """
+    Signs the node availability
+
+    Parameters
+    ----------
+    node : str
+        The node address.
+        
+    epochs : list of int
+        The epochs to sign.
+        
+    epochs_vals : list of int
+        The values for each epoch.
+        
+    signature_only : bool, optional
+        Whether to return only the signature. The default is True.
+
+    Returns
+    -------
+    str
+        The signature of the message.
+    """
+    types = ["string", "uint256[]", "uint256[]"]
+    values = [node, epochs, epochs_vals]
+    result = self.eth_sign_message(types, values)
+    if signature_only:
+      return result["signature"]
+    return result
+  
+  

naeural_client/cli/README.md

@@ -0,0 +1,7 @@
+# The Naeural Edge Protocol CLI 
+
+## Develop
+
+```bash
+pip install -e .
+```

naeural_client/cli/cli.py

@@ -0,0 +1,48 @@
+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")
+
+  # 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/cli/cli_commands.py

@@ -0,0 +1,15 @@
+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/cli/nodes.py

@@ -0,0 +1,22 @@
+from naeural_client.utils.config import log_with_color
+
+
+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.
+  """
+  log_with_color("Getting nodes information", color="b")
+  return
+  
+  
+def get_supervisors():
+  """
+  This function is used to get the information about the supervisors.
+  """
+  log_with_color("Getting supervisors information", color='b')
+  return

naeural_client/logging/base_logger.py

@@ -78,7 +78,8 @@ class BaseLogger(object):
               DEBUG=True,
               data_config_subfolder=None,
               check_additional_configs=False,
-              append_spaces=True,
+              append_spaces=True,    
+              silent=False,          
               default_color='n',
               ):
 
@@ -91,6 +92,7 @@ class BaseLogger(object):
     self.no_folders_no_save = no_folders_no_save
     self.max_lines = max_lines
     self.HTML = HTML
+    self.silent = silent
     self.DEBUG = DEBUG
     self.log_suffix = lib_name
     self.default_color = default_color
@@ -145,13 +147,15 @@ class BaseLogger(object):
     
     # START: bundling -- se also properties
     if getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS'):
+      if not self.silent:
         print('  Running in a PyInstaller bundle')
-        self.__is_bundled = True
-        self.__bundle_path = sys._MEIPASS
+      self.__is_bundled = True
+      self.__bundle_path = sys._MEIPASS
     else:
+      if not self.silent:
         print('  Running in a normal Python process')
-        self.__is_bundled = False
-        self.__bundle_path = None
+      self.__is_bundled = False
+      self.__bundle_path = None
     # END: bundling -- se also properties
     
     self.analyze_processor_platform()
@@ -187,7 +191,7 @@ class BaseLogger(object):
       color='green',
       boxed=True,
     )
-    self.verbose_log("  Timezone: {}.".format(self.timezone),color='green')
+    self.P("  Timezone: {}.".format(self.timezone),color='green')
 
 
     if self.DEBUG:
@@ -634,10 +638,10 @@ class BaseLogger(object):
                     
 
 
-  def _logger(self, logstr, show=True, noprefix=False, show_time=False, color=None):
+  def _logger(self, logstr, show=None, noprefix=False, show_time=False, color=None):
     """
     log processing method
-    """
+    """    
     with self.managed_lock_logger():
       # now that we have locking in place we no longer need to cancel in-thread logging    
       # if not self.is_main_thread:
@@ -722,7 +726,9 @@ class BaseLogger(object):
     # endfor
     return
 
-  def _add_log(self, logstr, show=True, noprefix=False, show_time=False, color=None):
+  def _add_log(self, logstr, show=None, noprefix=False, show_time=False, color=None):
+    if show is None:
+      show = not self.silent    
     if type(logstr) != str:
       logstr = str(logstr)
     if logstr == "":
@@ -741,23 +747,24 @@ class BaseLogger(object):
       logstr = logstr[1:]
       prefix = "\n" + prefix
     res_log = logstr
-    if len(logstr) == 0 or logstr[0] != '[':
+    if (len(logstr) == 0 or logstr[0] != '[') and not noprefix:
       prefix = prefix + ' '
     logstr = prefix + logstr
     if show_time:
       logstr += " [{:.2f}s]".format(elapsed)
     print_logstr = logstr
+    if color is None:
+      color = self.default_color
+      if not self.__first_print and show:
+        if not self.silent:
+          BaseLogger.print_color("<Logging with default color: {}>".format(color), color=color)
+        self.__first_print = True
     if show:
       if self.append_spaces:
         spaces = " " * max(60 - len(print_logstr), 0)
       else:
         spaces = ''
       print_logstr = print_logstr + spaces
-      if color is None:
-        color = self.default_color
-        if not self.__first_print:
-          BaseLogger.print_color("<Logging with default color: {}>".format(color), color=color)
-          self.__first_print = True
       #endif use default color
       BaseLogger.print_color(print_logstr, color=color)
     if color.lower()[0] in ['e', 'r']:
@@ -841,16 +848,36 @@ class BaseLogger(object):
       )
       return
 
-  def verbose_log(self, str_msg, show_time=False, noprefix=False, color=None):
+  def verbose_log(self, str_msg, show_time=False, noprefix=False, color=None, show=None):
     return self._logger(
       str_msg,
-      show=True,
+      show=show,
       show_time=show_time,
       noprefix=noprefix, color=color
     )
 
-  def P(self, str_msg, show_time=False, noprefix=False, color=None, boxed=False, **kwargs):
-    return self.p(str_msg, show_time=show_time, noprefix=noprefix, color=color, boxed=boxed, **kwargs)
+  def P(
+    self, 
+    str_msg, 
+    show_time=False, 
+    noprefix=False, 
+    color=None, 
+    boxed=False, 
+    show=None, 
+    **kwargs
+  ):
+    """
+    Will print & log a message. If show is None it will be set to not self.silent.
+    """
+    return self.p(
+      str_msg, 
+      show_time=show_time, 
+      noprefix=noprefix, 
+      color=color, 
+      boxed=boxed, 
+      show=show,
+      **kwargs
+    )
 
   def D(self, str_msg, show_time=False, noprefix=False, color=None, **kwargs):
     if False:
@@ -891,17 +918,18 @@ class BaseLogger(object):
 
     return msg
 
-  def p(self, str_msg, show_time=False, noprefix=False, color=None, boxed=False, **kwargs):
+  def p(self, str_msg, show_time=False, noprefix=False, color=None, boxed=False, show=None, **kwargs):
     if boxed:
       msg = self.__convert_to_box(str_msg, **kwargs)
-      self._logger(msg, show=True, noprefix=noprefix, color=color)
+      self._logger(msg, show=show, noprefix=noprefix, color=color)
     else:
       return self._logger(
         str_msg,
-        show=True,
+        show=show,
         show_time=show_time,
         noprefix=noprefix, color=color
       )
+      
 
   def Pmd(self, s=''):
     print_func = None
@@ -955,10 +983,10 @@ class BaseLogger(object):
     if type(str_text) != str:
       str_text = str(str_text)
     str_final = str_msg + "\n" + textwrap.indent(str_text, n * " ")
-    self._logger(str_final, show=True, show_time=False)
+    self._logger(str_final, show=None, show_time=False)
     return
 
-  def log(self, str_msg, show=False, show_time=False, color=None):
+  def log(self, str_msg, show=None, show_time=False, color=None):
     return self._logger(str_msg, show=show, show_time=show_time, color=color)
 
   def _generate_log_path(self):
@@ -1037,7 +1065,8 @@ class BaseLogger(object):
         self._app_folder = self.config_data["APP_FOLDER"]
       #endif no defaults for base/app folders
 
-      print("Loaded config [{}]".format(config_file), flush=True)
+      if not self.silent:
+        print("Loaded config [{}]".format(config_file), flush=True)
       self.config_file = config_file
     else:
       self.config_data = {
@@ -1045,6 +1074,8 @@ class BaseLogger(object):
         'APP_FOLDER' : self._app_folder
       }
       self.config_file = "default_config.txt"
+      if not self.silent:
+        print("No config file provided. Using default config.", flush=True)
     #endif have or not config file
     
     self.config_data = {
@@ -1053,13 +1084,18 @@ class BaseLogger(object):
     }
     
     matches = self.replace_secrets(self.config_data)
-    print("  Config modified with following env vars: {}".format(matches))
+    if not self.silent:    
+      if len(matches) > 0:
+        print("  Config modified with following env vars: {}".format(matches))
+      else:
+        print("  No secrets/template found in config")
 
     self._base_folder = self.expand_tilda(self._base_folder)
     self._base_folder = self._get_cloud_base_folder(self._base_folder)
     self._root_folder = os.path.abspath(self._base_folder)
     self._base_folder = os.path.join(self._base_folder, self._app_folder)
-    print("BASE: {}".format(self._base_folder), flush=True)
+    if not self.silent:
+      print("BASE: {}".format(self._base_folder), flush=True)
 
     self._normalize_path_sep()
 

naeural_client/logging/small_logger.py

@@ -41,6 +41,7 @@ class Logger(
                max_lines=None,
                HTML=False,
                DEBUG=True,
+               silent=False,
                data_config_subfolder=None,
                check_additional_configs=False,
                default_color='n',
@@ -58,6 +59,7 @@ class Logger(
       max_lines=max_lines,
       HTML=HTML,
       DEBUG=DEBUG,
+      silent=silent,
       data_config_subfolder=data_config_subfolder,
       check_additional_configs=check_additional_configs,
       default_color=default_color,

naeural_client/utils/config.py

@@ -0,0 +1,130 @@
+import os
+from pathlib import Path
+import shutil
+
+ENV_TEMPLATE = """
+
+EE_MQTT_HOST=r9092118.ala.eu-central-1.emqxsl.com
+EE_MQTT_PORT=8883
+EE_MQTT_USER=
+EE_MQTT=
+
+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.
+  """
+  return Path.home() / ".naeural"
+
+def get_user_config_file():
+  """
+  Returns the user configuration file.
+  """
+  return get_user_folder() / "config"
+
+def reset_config():
+  """
+  Resets the configuration by creating a ~/.naeural folder and populating
+  ~/.naeural/config with values from a local .env file, if it exists.
+  """
+  # Define the target config folder and file
+  config_dir = get_user_folder()
+  config_file = get_user_config_file()
+  
+  # Create the ~/.naeural folder if it doesn't exist
+  config_dir.mkdir(parents=True, exist_ok=True)
+
+  # Check if the current folder has a .env file
+  current_env_file = Path(".env")
+  if current_env_file.exists():
+    # Copy .env content to ~/.naeural/config
+    shutil.copy(current_env_file, 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)
+    log_with_color(f"Configuration has been reset to default in {config_file}:\n{ENV_TEMPLATE}", color='y')
+
+
+def show_config():
+  """
+  Displays the current configuration from ~/.naeural/config.
+  """
+  config_file = get_user_config_file()
+
+  if config_file.exists():
+    log_with_color(f"Current configuration ({config_file}):")
+    with config_file.open("r") as file:
+      log_with_color(file.read())
+  else:
+    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):
+  """
+  Loads the ~/.naeural/config file into the current environment.
+  """
+  config_file = get_user_config_file()
+  result = False
+
+  if config_file.exists():
+    with config_file.open("r") as file:
+      for line in file:
+        # Ignore comments and empty lines
+        if line.strip() and not line.strip().startswith("#"):
+          key, value = line.strip().split("=", 1)
+          value = value.strip()
+          # if at least one key-value pair is found, set the result to True
+          if value != "":
+            result = True
+          os.environ[key.strip()] = value
+    if verbose:
+      log_with_color(f"Configuration from {config_file} has been loaded into the environment.", color='b')
+  else:
+    if verbose:
+      log_with_color(f"No configuration file found at {config_file}. Please run `reset_config` first.", color="r")
+  return result
+  
+
+def maybe_init_config():
+  """
+  Initializes the configuration if it doesn't exist yet.
+  """
+  config_file = get_user_config_file()
+
+  if not config_file.exists():
+    reset_config()
+  load_user_defined_config()

{naeural_client-2.2.6.dist-info → naeural_client-2.3.1.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.3
 Name: naeural_client
-Version: 2.2.6
+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/Naeural Edge ProtocolEdgeProtocol/naeural_client
-Project-URL: Bug Tracker, https://github.com/Naeural Edge ProtocolEdgeProtocol/naeural_client/issues
-Author-email: Stefan Saraev <saraevstefan@gmail.com>, Andrei Ionut Damian <andrei.damian@me.com>, Cristan Bleotiu <cristibleotiu@gmail.com>
+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>
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
@@ -16,6 +16,7 @@ Requires-Dist: pika
 Requires-Dist: pyaml
 Requires-Dist: pyopenssl>=23.0.0
 Requires-Dist: python-dateutil
+Requires-Dist: web3
 Description-Content-Type: text/markdown
 
 # naeural_client SDK

{naeural_client-2.2.6.dist-info → naeural_client-2.3.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
 naeural_client/__init__.py,sha256=UKEDGS0wFYyxwmhEAKJGecO2vYbIfRYUP4SQgnK10IE,578
-naeural_client/_ver.py,sha256=lZiu4kJosgmfFcg5Zp1ACcy6GyugTYJj01wjM9GVt7s,330
-naeural_client/base_decentra_object.py,sha256=qDBpitcyhr1eEXPD8cGFtcNPNf71fqNRsmOEcCpx4sM,4180
+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
 naeural_client/base/distributed_custom_code_presets.py,sha256=cvz5R88P6Z5V61Ce1vHVVh8bOkgXd6gve_vdESDNAsg,2544
-naeural_client/base/generic_session.py,sha256=QbaRWvC5XeWSdYWYg7kZXSYX4jUHH7aVcDcFLRQ9I5o,75834
+naeural_client/base/generic_session.py,sha256=I1M2dxFMWe6FVxOs_n54DjYpWDIRGn9UJOqWo0YdBjA,77367
 naeural_client/base/instance.py,sha256=kcZJmjLBtx8Bjj_ysIOx1JmLA-qSpG7E28j5rq6IYus,20444
 naeural_client/base/pipeline.py,sha256=KwcPWD2XMvHotWFMpcnIycFhqiNnZuyUTUWiLU0PM5Y,57519
 naeural_client/base/plugin_template.py,sha256=qGaXByd_JZFpjvH9GXNbT7KaitRxIJB6-1IhbKrZjq4,138123
@@ -13,11 +13,15 @@ naeural_client/base/transaction.py,sha256=bfs6td5M0fINgPQNxhrl_AUjb1YiilLDQ-Cd_o
 naeural_client/base/payload/__init__.py,sha256=y8fBI8tG2ObNfaXFWjyWZXwu878FRYj_I8GIbHT4GKE,29
 naeural_client/base/payload/payload.py,sha256=v50D7mBBD2WwWzvpbRGMSr-X6vv5ie21IY1aDxTqe1c,2275
 naeural_client/bc/__init__.py,sha256=FQj23D1PrY06NUOARiKQi4cdj0-VxnoYgYDEht8lpr8,158
-naeural_client/bc/base.py,sha256=nAFL4z9kyFcmrilHWCia69xMWi65VzjoQ_mo-yCQhGA,28331
+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=8JQ4AIDz0AZAhm3xOFRrYW-k1WGRIchn4O1WO_qRntQ,10370
+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=eKzO8hu_436e3svGPNSpn6q4EiEcaTIKPhgn5QOJJVw,1426
+naeural_client/cli/cli_commands.py,sha256=NluWqnsyuabu0EKNM6MDUBtnfloH7oqCOrkfJs8Ajjk,353
+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
@@ -52,8 +56,8 @@ 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=tTxzCKOhcqGOtckHK8lQ1nUTNeaBNkeh0_SmDyzX6_Y,65146
-naeural_client/logging/small_logger.py,sha256=6wljiHP1moCkgohRnr2EX095eM2RtdJ5B3cytbO_Ow4,2887
+naeural_client/logging/base_logger.py,sha256=IEhDnR6vn_nMBE4OwzUHO_71wuvAtCXjHHx4yeRxm6s,65880
+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
 naeural_client/logging/logger_mixins/computer_vision_mixin.py,sha256=TrtG7ayM2ab-4jjIkIWAQaFi9cVfiINAWrJCt8mCCFI,13213
@@ -74,8 +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=0IngDOJjtopdi06VdtKPRv6qCBOTEt_Ww4l4MIBKhZw,3624
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
-naeural_client-2.2.6.dist-info/METADATA,sha256=W-910TVqH3CTfTisr-54C-CgiLW6-xhhUvULCi4BYbU,14457
-naeural_client-2.2.6.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-naeural_client-2.2.6.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.2.6.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,,

naeural_client-2.3.1.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+nepctl = naeural_client.cli.cli:main