naeural-client 2.7.0__tar.gz → 2.7.1__tar.gz

{naeural_client-2.7.0 → naeural_client-2.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naeural_client
-Version: 2.7.0
+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.7.0 → naeural_client-2.7.1}/naeural_client/_ver.py

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

{naeural_client-2.7.0 → naeural_client-2.7.1}/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-2.7.0 → naeural_client-2.7.1}/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,
 )
 
     
@@ -1488,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
@@ -1509,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-2.7.0 → naeural_client-2.7.1}/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-2.7.0 → naeural_client-2.7.1}/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-2.7.0 → naeural_client-2.7.1}/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'
@@ -54,7 +55,7 @@ _DAUTH_ABI_GET_SIGNERS = [{
 
 class dAuth:
   DAUTH_TESTNET_ND_ADDR = '0xE20198EE2B76eED916A568a47cdea9681f7c79BF'
-  DAUTH_MAINNET_ND_ADDR = ''
+  DAUTH_MAINNET_ND_ADDR = '0xE20198EE2B76eED916A568a47cdea9681f7c79BF'
   
   DAUTH_NET_ENV_KEY = 'EE_EVM_NET'
   DAUTH_SDK_NET_DEFAULT = 'testnet'
@@ -78,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-2.7.0 → naeural_client-2.7.1}/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
 
 
@@ -14,7 +14,7 @@ ENV_TEMPLATE = """
 # Configuration file for the Ratio1 SDK
 
 EE_EVM_NET=testnet
-TARGET_NODE=
+EE_TARGET_NODE=
 
 """
 
@@ -89,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
@@ -160,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
   
@@ -177,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
     
 
@@ -186,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:
@@ -198,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.7.0 → naeural_client-2.7.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "naeural_client"
-version = "2.7.0"
+version = "2.7.1"
 authors = [
   { name="Andrei Ionut Damian", email="andrei.damian@me.com" },
   { name="Cristan Bleotiu", email="cristibleotiu@gmail.com" },

{naeural_client-2.7.0 → naeural_client-2.7.1}/xperimental/_checks/auth_check.py

@@ -8,7 +8,10 @@ from naeural_client.bc import DefaultBlockEngine
 
 
 if __name__ == '__main__' :
-  l = Logger("ENC", base_folder=".", app_folder="_local_cache")
+  l = Logger(
+    "ENC", base_folder=".", app_folder="_local_cache",
+    # silent=True,
+  )
   eng1 = DefaultBlockEngine(
     log=l, name="default", 
     config={
@@ -25,12 +28,20 @@ if __name__ == '__main__' :
   
   to_use = eng2
   
-  for _ in range(4):
+  for _ in range(3):
     d = to_use.dauth_autocomplete(
       add_env=False,
       debug=True,
       max_tries=1,
       sender_alias='test1',
     )
-    
-    l.P(f"Result: {json.dumps(d, indent=2)}", color='b')  
+    # try:
+    #   res = dict(
+    #     name = d['result']['server_alias'],
+    #     wl = d['result']['auth']['whitelist'],
+    #     pwd = d['result']['auth']['EE_MQTT'],
+    #   )
+    #   l.P(f"\n\n{json.dumps(res, indent=2)}", show=True)
+    # except:
+    #   l.P(f"ERROR: {d}", show=True)
+    

naeural_client-2.7.1/xperimental/_checks/session_check.py

@@ -0,0 +1,8 @@
+from naeural_client import Session
+
+
+if __name__ == '__main__':
+  sess = Session(
+    silent=False
+  )
+  print(sess.get_client_address())