naeural-client 2.6.41__py3-none-any.whl → 2.7.1__py3-none-any.whl

naeural_client/_ver.py

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

naeural_client/base/generic_session.py

@@ -1191,7 +1191,7 @@ class GenericSession(BaseDecentrAIObject):
     
     def __load_user_config(self, dotenv_path):
       # if the ~/.naeural/config file exists, load the credentials from there else try to load them from .env
-      if not load_user_defined_config():        
+      if not load_user_defined_config(verbose=not self.log.silent):        
         # 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

naeural_client/bc/base.py

@@ -20,8 +20,8 @@ from ..utils.config import get_user_folder
 
 from ..const.base import (
   BCctbase, BCct, 
-  DAUTH_SUBKEY, DAUTH_URL, DAUTH_ENV_KEY,
-  DAUTH_NONCE, DAUTH_VARS, dAuth,
+  DAUTH_SUBKEY, DAUTH_ENV_KEY,
+  DAUTH_NONCE, dAuth,
 )
 
     
@@ -1409,7 +1409,7 @@ class BaseBlockEngine:
 
   
   @staticmethod
-  def web3_is_node_licensed(address : str, network='mainnet') -> bool:
+  def web3_is_node_licensed(address : str, network=None) -> bool:
     """
     Check if the address is allowed to send commands to the node
 
@@ -1418,6 +1418,9 @@ class BaseBlockEngine:
     address : str
       the address to check.
     """
+    if network is None:
+      network = os.environ.get(dAuth.DAUTH_NET_ENV_KEY, dAuth.DAUTH_SDK_NET_DEFAULT)
+
     assert network.lower() in ['mainnet', 'testnet'], f"Invalid network {network}"
     
     assert BaseBlockEngine.is_valid_eth_address(address), "Invalid Ethereum address"
@@ -1439,14 +1442,14 @@ class BaseBlockEngine:
     return result
 
 
-  def web3_get_oracles(self, network='mainnet') -> list:
+  def web3_get_oracles(self, network=None) -> list:
     """
     Get the list of oracles from the contract
 
     Parameters
     ----------
     network : str, optional
-      the network to use. The default is 'mainnet'.
+      the network to use. The default is None.
 
     Returns
     -------
@@ -1454,6 +1457,9 @@ class BaseBlockEngine:
       the list of oracles addresses.
 
     """
+    if network is None:
+      network = os.environ.get(dAuth.DAUTH_NET_ENV_KEY, dAuth.DAUTH_SDK_NET_DEFAULT)
+
     assert network.lower() in ['mainnet', 'testnet'], f"Invalid network {network}"
     
     if network.lower() == 'mainnet':
@@ -1482,7 +1488,8 @@ class BaseBlockEngine:
     dauth_endp=None, 
     add_env=True, 
     debug=False, 
-    max_tries=5, 
+    max_tries=5,
+    network=None,
     **kwargs
   ):
     from naeural_client._ver import __VER__ as sdk_version
@@ -1503,14 +1510,20 @@ class BaseBlockEngine:
     url = dauth_endp
     dct_response = {}
     
+    if network is None:
+      network = os.environ.get(dAuth.DAUTH_NET_ENV_KEY, dAuth.DAUTH_SDK_NET_DEFAULT)
+    
     if not isinstance(url, str) or len(url) < MIN_LEN:
-      if isinstance(DAUTH_URL, str) and len(DAUTH_URL) > 0:
-        url = DAUTH_URL
-
       if DAUTH_ENV_KEY in os.environ:
         in_env = True
         url = os.environ[DAUTH_ENV_KEY]
-    
+      else:
+        if network == 'mainnet':
+          url = dAuth.DAUTH_MAINNET_URL
+        else:
+          url = dAuth.DAUTH_TESTNET_URL
+      #endif not in env
+      
     if isinstance(url, str) and len(url) > 0:
       if dauth_endp is None:
         if in_env:

naeural_client/cli/cli_commands.py

@@ -3,8 +3,9 @@ from naeural_client.cli.nodes import (
   restart_node, shutdown_node,
 )
 from naeural_client.cli.oracles import get_availability
-from naeural_client.utils.config import show_config, reset_config, show_address
-
+from naeural_client.utils.config import (
+  show_config, reset_config, show_address, get_set_network
+)
 
 # Define the available commands
 CLI_COMMANDS = {
@@ -55,7 +56,15 @@ CLI_COMMANDS = {
         "addr": {
             "func": show_address, # DONE
             "description": "Show the current client address",
-        }
+        },
+        
+        "network": {
+            "func": get_set_network, # DONE
+            "description": "Get/Set network",
+            "params": {
+              "--new": "The network to set either 'mainnet' or 'testnet'",
+            }
+        },
     },
     "restart": {
         "func": restart_node, # TODO

naeural_client/cli/nodes.py

@@ -1,6 +1,7 @@
+import os
 from time import time
 from naeural_client.utils.config import log_with_color
-from naeural_client.const import SESSION_CT, COMMANDS
+from naeural_client.const import SESSION_CT, COMMANDS, BASE_CT
 
 
 def _get_netstats(
@@ -62,10 +63,11 @@ def get_nodes(args):
     df = df[[c for c in df.columns if c not in FILTERED]]
 
   prefix = "Online n" if (args.online or args.peered) else "N"
+  network = os.environ.get(BASE_CT.dAuth.DAUTH_NET_ENV_KEY, BASE_CT.dAuth.DAUTH_SDK_NET_DEFAULT)
   if supervisor == "ERROR":
     log_with_color(f"No supervisors or no comms available in {elapsed:.1f}s. Please check your settings.", color='r')
   else:
-    log_with_color(f"{prefix}odes reported by <{supervisor}> '{super_alias}' in {elapsed:.1f}s ({nr_supers} supervisors seen):", color='b')
+    log_with_color(f"<{network}> {prefix}odes reported by <{supervisor}> '{super_alias}' in {elapsed:.1f}s ({nr_supers} supervisors seen):", color='b')
     log_with_color(f"{df}")    
   return
   

naeural_client/const/base.py

@@ -10,7 +10,8 @@ class BCctbase:
   ETH_SENDER= 'EE_ETH_SENDER'
 
 
-DAUTH_URL = 'https://dauth.ratio1.ai/get_auth_data'
+DAUTH_TESTNET_URL = 'https://dauth-test.ratio1.ai/get_auth_data'
+DAUTH_MAINNET_URL = 'https://dauth-main.ratio1.ai/get_auth_data'
 DAUTH_SUBKEY = 'auth'
 DAUTH_ENV_KEY = 'EE_DAUTH_URL'
 DAUTH_NONCE = 'nonce'
@@ -53,8 +54,11 @@ _DAUTH_ABI_GET_SIGNERS = [{
 
 
 class dAuth:
-  DAUTH_TESTNET_ND_ADDR = '0x9aB4e425c7dFFC7Aa1A7a262727b0b663e047571'
-  DAUTH_MAINNET_ND_ADDR = ''
+  DAUTH_TESTNET_ND_ADDR = '0xE20198EE2B76eED916A568a47cdea9681f7c79BF'
+  DAUTH_MAINNET_ND_ADDR = '0xE20198EE2B76eED916A568a47cdea9681f7c79BF'
+  
+  DAUTH_NET_ENV_KEY = 'EE_EVM_NET'
+  DAUTH_SDK_NET_DEFAULT = 'testnet'
   
   DAUTH_MAINNET_RPC = 'https://base-mainnet.public.blastapi.io'
   DAUTH_TESTNET_RPC = 'https://base-sepolia.public.blastapi.io'
@@ -75,7 +79,8 @@ class dAuth:
   
   DAUTH_WHITELIST = 'whitelist'
   
-  DAUTH_URL = DAUTH_URL
+  DAUTH_TESTNET_URL = DAUTH_TESTNET_URL
+  DAUTH_MAINNET_URL = DAUTH_MAINNET_URL
   DAUTH_SUBKEY = DAUTH_SUBKEY
   DAUTH_NONCE = DAUTH_NONCE
   DAUTH_VARS = DAUTH_VARS

naeural_client/utils/config.py

@@ -2,7 +2,7 @@ import os
 from pathlib import Path
 import shutil
 
-from naeural_client.const.base import BCct
+from naeural_client.const.base import BCct, dAuth
 from naeural_client._ver import __VER__ as version
 
 
@@ -11,15 +11,11 @@ SDK_HOME = ".naeural"
 LOCAL_PEM_PATH = "./_local_cache/_data/" + BCct.DEFAULT_PEM_FILE
 
 ENV_TEMPLATE = """
+# Configuration file for the Ratio1 SDK
 
-EE_MQTT_HOST=r9092118.ala.eu-central-1.emqxsl.com
-EE_MQTT_PORT=8883
-EE_MQTT_USER=
-EE_MQTT=
+EE_EVM_NET=testnet
+EE_TARGET_NODE=
 
-EE_SECURED=true
-
-TARGET_NODE=
 """
 
 def seconds_to_short_format(seconds):
@@ -93,6 +89,33 @@ def get_user_config_file():
   """
   return get_user_folder() / CONFIG_FILE
 
+
+def get_network():
+  return os.environ.get(dAuth.DAUTH_NET_ENV_KEY, dAuth.DAUTH_SDK_NET_DEFAULT)
+
+def get_set_network(args):
+  net = args.new
+  env_network = get_network()
+  if net is None:
+    log_with_color(f"Current network: {env_network}", color='b')
+  else:
+    config_file = get_user_config_file()
+    # open config_file and update EE_EVM_NET
+    with config_file.open("r") as file:
+      lines = file.readlines()
+    with config_file.open("w") as file:
+      found = False
+      for line in lines:
+        if line.startswith("EE_EVM_NET"):
+          line = f"EE_EVM_NET={net}\n"
+          found = True
+        file.write(line)
+      if not found:
+        file.write(f"EE_EVM_NET={net}\n")
+    log_with_color(f"Network set to {net}", color='b')
+  return
+  
+
 def reset_config(*larg, keep_existing=False, **kwargs):
   """
   Resets the configuration by creating a ~/.naeural folder and populating
@@ -164,8 +187,9 @@ def show_version():
   
   user_folder = get_user_folder()  
 
-  log_with_color(f"NEP SDK folder: {user_folder}", color='b')
-  log_with_color(f"NEP SDK version: {version}", color='b')
+  log_with_color(f"Ratio1 selected network: {get_network()}", color='b')
+  log_with_color(f"SDK folder: {user_folder}", color='b')
+  log_with_color(f"SDK version: {version}", color='b')
   log_with_color(f"SDK Client address: {sess.get_client_address()}", color='b')
   return
   
@@ -181,6 +205,10 @@ def show_config(args):
       log_with_color(f"Current configuration ({config_file}):\n{file.read()}", color='d')
   else:
     log_with_color(f"No configuration found at {config_file}. Please run `reset_config` first.", color="r")
+  log_with_color("Current environment variables:", color='b')
+  for k in os.environ:
+    if k.startswith("EE_"):
+      log_with_color(f"{k}={os.environ[k]}", color='b')
   return
     
 
@@ -190,7 +218,7 @@ def load_user_defined_config(verbose=False):
   """
   config_file = get_user_config_file()
   result = False
-
+  loaded_keys = []
   if config_file.exists():
     with config_file.open("r") as file:
       for line in file:
@@ -202,8 +230,9 @@ def load_user_defined_config(verbose=False):
           if value != "":
             result = True
           os.environ[key.strip()] = value
+          loaded_keys.append(key.strip())
     if verbose:
-      log_with_color(f"Configuration from {config_file} has been loaded into the environment.", color='b')
+      log_with_color(f"{config_file} loaded into the env: {loaded_keys}", color='b')
   else:
     if verbose:
       log_with_color(f"No configuration file found at {config_file}. Please run `reset_config` first.", color="r")

{naeural_client-2.6.41.dist-info → naeural_client-2.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naeural_client
-Version: 2.6.41
+Version: 2.7.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.6.41.dist-info → naeural_client-2.7.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=jRx8rmVlh1pdQJHh66Tj_JEqEPJMYnWRsbTGdwt9cEA,331
+naeural_client/_ver.py,sha256=9vyNSWt4S6kU_mE1kzVtnvSPeM4KKDk55WEx5yLCQ-c,330
 naeural_client/base_decentra_object.py,sha256=C4iwZTkhKNBS4VHlJs5DfElRYLo4Q9l1V1DNVSk1fyQ,4412
 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=zSm9tw3WxdkvMiD5YXR7_B86E6vt2F4FCajKEah3JMc,105845
+naeural_client/base/generic_session.py,sha256=3Z7BGi1g5zIXDAUk-PCKsXVhQKaJldL9id2SDedbSIU,105872
 naeural_client/base/instance.py,sha256=kcZJmjLBtx8Bjj_ysIOx1JmLA-qSpG7E28j5rq6IYus,20444
 naeural_client/base/pipeline.py,sha256=EvESG5UH5GwyAZbJWJk1irTzGYBuOUjl-8KjkCdgLVI,58574
 naeural_client/base/plugin_template.py,sha256=7YAFaND2iXoZLgtunjYkFf_TBGieFr3VdNLO3vCqzmM,138795
@@ -14,15 +14,15 @@ naeural_client/base/webapp_pipeline.py,sha256=ZNGqZ36DY076XVDfGu2Q61kCt3kxIJ4Mi4
 naeural_client/base/payload/__init__.py,sha256=y8fBI8tG2ObNfaXFWjyWZXwu878FRYj_I8GIbHT4GKE,29
 naeural_client/base/payload/payload.py,sha256=x-au7l67Z_vfn_4R2C_pjZCaFuUVXHngJiGOfIAYVdE,2690
 naeural_client/bc/__init__.py,sha256=FQj23D1PrY06NUOARiKQi4cdj0-VxnoYgYDEht8lpr8,158
-naeural_client/bc/base.py,sha256=rrzhpcymcQBaxfo-fLgG8a5DqkdN_W75Ud9naEHvzy0,44759
+naeural_client/bc/base.py,sha256=wfNdwr-dWPftRkq0YdaBZ1xhzdhnz220bpFqqH8iVQM,45152
 naeural_client/bc/chain.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 naeural_client/bc/ec.py,sha256=-HPfKpYAqy_eZpiJf3gWR2L4ZDDP7fZY2uwdNYYmS80,23868
 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=EC7-ehOMQJ_Dq7R9TTrajpvQWwdalAOgb1JAeBGHF50,3830
-naeural_client/cli/cli_commands.py,sha256=Gfims_TqaBi2QWM-6yxd_B_CETF8mmt7oEDPTg59lcI,2821
-naeural_client/cli/nodes.py,sha256=QXSniYy3Phr6buoVV-HUDRYuF5YQDUgf6nT6EzDyMJw,4909
+naeural_client/cli/cli_commands.py,sha256=Ztm1qXUN58OZb-CO6TzWlwCgZyzCxK5C1s49lz6fNmQ,3088
+naeural_client/cli/nodes.py,sha256=A-MqGjI_ufZ7SnlVyMOzlqWQASRvKvF6cz9AGxlbYx4,5037
 naeural_client/cli/oracles.py,sha256=Y_PzHshfSERS_Utjjtw5d_BsQRdGr6P4L6uW8yTdA0M,4809
 naeural_client/code_cheker/__init__.py,sha256=pwkdeZGVL16ZA4Qf2mRahEhoOvKhL7FyuQbMFLr1E5M,33
 naeural_client/code_cheker/base.py,sha256=lT5DRIFO5rqzsMNCmdMRfkAeevmezozehyfgmhnKpuI,19074
@@ -33,7 +33,7 @@ naeural_client/comm/mqtt_wrapper.py,sha256=Ig3bFZkCbWd4y_Whn2PPa91Z3aLgNbNPau6Tn
 naeural_client/const/README.md,sha256=6OHesr-f5NBuuJGryEoi_TCu2XdlhfQYlDKx_IJoXeg,177
 naeural_client/const/__init__.py,sha256=MM6Zib6i7M2qWcMkLtLx14zqU-lE-u2uPHjNvbh2jAM,478
 naeural_client/const/apps.py,sha256=ePBiJXLuPfFOKuw-LJrT9OWbaodU7QApfDurIPNDoB4,655
-naeural_client/const/base.py,sha256=4VNZdm3Bzigure1SqkZ94buEdwVnQhb5cI3KBYlJgFs,6260
+naeural_client/const/base.py,sha256=g3II1Ys-1sjr1OG-sDJyRCV3F48VnxKQc7zTBPn-7FE,6510
 naeural_client/const/comms.py,sha256=La6JXWHexH8CfcBCKyT4fCIoeaoZlcm7KtZ57ab4ZgU,2201
 naeural_client/const/environment.py,sha256=iytmTDgbOjvORPwHQmc0K0r-xJx7dnnzNnqAJJiFCDA,870
 naeural_client/const/formatter.py,sha256=AW3bWlqf39uaqV4BBUuW95qKYfF2OkkU4f9hy3kSVhM,200
@@ -80,11 +80,11 @@ 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=Ub5sw3NG6wskAF5C4s0WU0rzXHVLy70ZTRU0W8HUGTM,6403
+naeural_client/utils/config.py,sha256=GzduH5_ZFN39RBdpICDKhx2ZqXen5fF-JJ0RoEcF2wQ,7401
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
 naeural_client/utils/oracle_sync/oracle_tester.py,sha256=GmZwu2JM9_UB2K-4rKB3o0RgWLqM-7Im6HwBnQLXmHI,25312
-naeural_client-2.6.41.dist-info/METADATA,sha256=rGgli3LSZXZyouXMJAQajOd_TIRRNC8-I3Z9bVB-EA0,12354
-naeural_client-2.6.41.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-2.6.41.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
-naeural_client-2.6.41.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.6.41.dist-info/RECORD,,
+naeural_client-2.7.1.dist-info/METADATA,sha256=ZiN9iutGlO_Sf-k5xFy1TCT-86FkMo-M8yBwrbedAyY,12353
+naeural_client-2.7.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-2.7.1.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
+naeural_client-2.7.1.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.7.1.dist-info/RECORD,,