naeural-client 2.7.20__tar.gz → 2.7.23__tar.gz

{naeural_client-2.7.20 → naeural_client-2.7.23}/PKG-INFO

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

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

{naeural_client-2.7.20 → naeural_client-2.7.23}/naeural_client/bc/base.py

@@ -1602,9 +1602,6 @@ class BaseBlockEngine:
               self.P(f"Response received from {server_alias} <{server_addr}>:\n {json.dumps(dct_response, indent=2)}")
             else:
               self.P(f"Response received from {server_alias} <{server_addr}>,")
-            error = dct_response.get('error', None)
-            if error is not None:
-              self.P(f"Error in dAuth response: {dct_response}", color='r')
             ver_result = self.verify(dct_result)
             if ver_result.valid:
               self.P(f"Signature from {server_alias} <{server_addr}> is valid.", color='g')
@@ -1624,22 +1621,29 @@ class BaseBlockEngine:
               self.P(f"No whitelist addresses found in dAuth response.", color='d')
             # end whitelist
 
+            error = dct_dauth.get('error', None)
+
             dct_env = {k : v for k,v in dct_dauth.items() if k.startswith(dAuth.DAUTH_ENV_KEYS_PREFIX)}
-            self.P("Found {} keys in dAuth response.".format(len(dct_env)), color='g')
-            for k, v in dct_env.items():
-              try:
-                if not isinstance(v, str):
-                  v = json.dumps(v)
-              except:
-                v = str(v)
-              if k not in os.environ:
-                self.P(f"  Adding key `{k}{'=' + str(v) + ' ({})'.format(type(v).__name__) if debug else ''}` to env.", color='y')
-              else:
-                self.P(f"  Overwrite  `{k}{'=' + str(v) + ' ({})'.format(type(v).__name__) if debug else ''}` in env.", color='y')
-              if add_env:
-                os.environ[k] = v
-              #endif add to env
-            #endfor each key in dAuth response
+            if len(dct_env) > 0:
+              self.P("Found {} keys in dAuth response.".format(len(dct_env)), color='g')
+              for k, v in dct_env.items():
+                try:
+                  if not isinstance(v, str):
+                    v = json.dumps(v)
+                except:
+                  v = str(v)
+                if k not in os.environ:
+                  self.P(f"  Adding key `{k}{'=' + str(v) + ' ({})'.format(type(v).__name__) if debug else ''}` to env.", color='y')
+                else:
+                  self.P(f"  Overwrite  `{k}{'=' + str(v) + ' ({})'.format(type(v).__name__) if debug else ''}` in env.", color='y')
+                if add_env:
+                  os.environ[k] = v
+                #endif add to env
+              #endfor each key in dAuth response
+              if error is not None:
+                self.P(f"Server message: {error}", color='y')
+            else:
+              self.P(f"dAuth reject response. Your node is not licensed. Error: {error}", color='r')
             done = True
           else:
             self.P(f"Error in dAuth response: {response.status_code} - {response.text}", color='r')

{naeural_client-2.7.20 → naeural_client-2.7.23}/naeural_client/cli/cli_commands.py

@@ -5,7 +5,7 @@ from naeural_client.cli.nodes import (
 from naeural_client.cli.oracles import get_availability
 from naeural_client.utils.config import (
   show_config, reset_config, show_address, get_set_network,
-  get_apps
+  get_apps, get_networks
 )
 
 # Define the available commands
@@ -47,7 +47,11 @@ CLI_COMMANDS = {
                 "--full": "Include admin apps (flag)",
                 "--json": "Output the entire JSON config of applications (flag)",
             }
-        }
+        },
+        "networks": {
+            "func": get_networks, # DONE
+            "description": "Show the network configuration",
+        },
     },
     "config": {
         "show": {

{naeural_client-2.7.20 → naeural_client-2.7.23}/naeural_client/utils/config.py

@@ -93,14 +93,26 @@ 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_networks(args):
+  """
+  Shows the network configuration.
+  """
+  log_with_color(f"Client v{version} on network: {get_network()}", color='b')
+  from naeural_client.const.evm_net import EVM_NET_DATA
+  log_with_color(f"Available networks:\n{json.dumps(EVM_NET_DATA, indent=2)}", color='w')  
+  return
+
+
 def get_set_network(args):
   net = args.new or args.set
   env_network = get_network()
   if net is None:
-    log_with_color(f"Current network: {env_network}", color='b')
+    log_with_color(f"Client v{version} on network: {env_network}", color='b')
   else:
     config_file = get_user_config_file()
     # open config_file and update EE_EVM_NET
@@ -124,7 +136,7 @@ def reset_config(*larg, keep_existing=False, **kwargs):
   Resets the configuration by creating a ~/.naeural folder and populating
   ~/.naeural/config with values from a local .env file, if it exists.
   """
-  log_with_color("Resetting the configuration...", color='y')
+  log_with_color(f"Client v{version} resetting the configuration...", color='y')
   # Define the target config folder and file
   config_dir = get_user_folder()
   config_file = get_user_config_file()

{naeural_client-2.7.20 → naeural_client-2.7.23}/pyproject.toml

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

naeural_client-2.7.20/xperimental/_checks/auth_check.py → naeural_client-2.7.23/xperimental/_checks/dauth_check.py

@@ -31,7 +31,7 @@ if __name__ == '__main__' :
   to_use = eng1
   responders = {}
   
-  for _ in range(20):
+  for _ in range(5):
     d = to_use.dauth_autocomplete(
       # dauth_endp='N/Adhstrgredshtfnfnhgm',
       add_env=False,