naeural-client 2.5.30__tar.gz → 2.6.0__tar.gz

{naeural_client-2.5.30 → naeural_client-2.6.0}/PKG-INFO

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

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

{naeural_client-2.5.30 → naeural_client-2.6.0}/naeural_client/base/generic_session.py

@@ -1,3 +1,12 @@
+"""
+
+TODO: 
+  - config precedence when starting a session - env vs manually provided data
+  - add support for remaining commands from EE
+
+
+"""
+
 import json
 import os
 import traceback
@@ -30,7 +39,7 @@ from ..utils.config import (
 
 # from ..default.instance import PLUGIN_TYPES # circular import
 
-# TODO: add support for remaining commands from EE
+
 
 DEBUG_MQTT_SERVER = "r9092118.ala.eu-central-1.emqxsl.com"
 
@@ -87,6 +96,7 @@ class GenericSession(BaseDecentrAIObject):
               local_cache_app_folder='_local_cache',
               use_home_folder=False,
               eth_enabled=True,
+              auto_configuration=True,
               **kwargs
             ) -> None:
     """
@@ -166,6 +176,8 @@ class GenericSession(BaseDecentrAIObject):
             nr_empty = self._config[key]["TOPIC"].count("{}")
             self._config[key]["TOPIC"] = self._config[key]["TOPIC"].format(root_topic, *(["{}"] * (nr_empty - 1)))
     # end if root_topic
+    
+    self.__auto_configuration = auto_configuration
 
     self.log = log
     self.name = name
@@ -188,13 +200,12 @@ class GenericSession(BaseDecentrAIObject):
     # this is used to store data received from net-mon instances
     self.__current_network_statuses = {} 
 
-    pwd = pwd or kwargs.get('password', kwargs.get('pass', None))
-    user = user or kwargs.get('username', None)
-    host = host or kwargs.get('hostname', None)
+    self.__pwd = pwd or kwargs.get('password', kwargs.get('pass', None))
+    self.__user = user or kwargs.get('username', None)
+    self.__host = host or kwargs.get('hostname', None)
+    self.__port = port
+    self.__secured = secured
     
-    ## 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
@@ -206,15 +217,15 @@ class GenericSession(BaseDecentrAIObject):
     self.__running_main_loop_thread = False
     self.__closed_everything = False
 
-    self.sdk_main_loop_thread = Thread(target=self.__main_loop, daemon=True)
     self.__formatter_plugins_locations = formatter_plugins_locations
 
     self.__blockchain_config = blockchain_config
-
-    # TODO: needs refactoring - suboptimal design
+    
+    self.__dotenv_path = dotenv_path
+    
     self.__bc_engine : DefaultBlockEngine = bc_engine
     self.bc_engine : DefaultBlockEngine = None 
-    # END TODO
+    
     
 
     self.__open_transactions: list[Transaction] = []
@@ -246,13 +257,37 @@ class GenericSession(BaseDecentrAIObject):
     )
     return
 
-  def startup(self):
+  def startup(self):    
+    ## 1st config step - we prepare config via ~/.naeural/config or .env
+    self.__load_user_config(dotenv_path=self.__dotenv_path)
+
+    # TODO: needs refactoring - suboptimal design
     # start the blockchain engine assuming config is already set
+    
     self.__start_blockchain(
       self.__bc_engine, self.__blockchain_config, 
       user_config=self.__user_config_loaded,
     )
+    
+    # this next call will attempt to complete the dauth process
+    dct_env = self.bc_engine.dauth_autocomplete(
+      dauth_endp=None, # get from consts or env
+      add_env=self.__auto_configuration,
+      debug=False,
+    )
     # end bc_engine
+    # END TODO
+    
+    ## last config step
+    self.__fill_config(
+      host=self.__host, 
+      port=self.__port, 
+      user=self.__port, 
+      pwd=self.__pwd, 
+      secured=self.__secured,
+    )
+    ## end config
+        
     self.formatter_wrapper = IOFormatterWrapper(self.log, plugin_search_locations=self.__formatter_plugins_locations)
 
     msg = f"Connection to {self._config[comm_ct.USER]}:*****@{self._config[comm_ct.HOST]}:{self._config[comm_ct.PORT]} {'<secured>' if self._config[comm_ct.SECURED] else '<UNSECURED>'}"
@@ -895,9 +930,29 @@ class GenericSession(BaseDecentrAIObject):
 
   # Utils
   if True:
-    def __fill_config(self, host, port, user, pwd, secured, dotenv_path):
+    
+    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():        
+        # 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:
+          keys = [k for k in os.environ if k.startswith("EE_")]
+          print("Loaded credentials from environment variables: {keys}", flush=True)
+        self.__user_config_loaded = False
+      else:
+        if not self.silent:
+          keys = [k for k in os.environ if k.startswith("EE_")]
+          print(f"Loaded credentials from `{get_user_config_file()}`: {keys}.", flush=True)
+        self.__user_config_loaded = True
+      # endif config loading from ~ or ./.env      
+    
+    def __fill_config(self, host, port, user, pwd, secured):
       """
-      Fill the configuration dictionary with the credentials provided when creating this instance.
+      Fill the configuration dictionary with the ceredentials provided when creating this instance.
 
 
       Parameters
@@ -925,23 +980,8 @@ class GenericSession(BaseDecentrAIObject):
       ------
       ValueError
           Missing credentials
-      """
+      """      
 
-      # 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,

{naeural_client-2.5.30 → naeural_client-2.6.0}/naeural_client/bc/base.py

@@ -4,6 +4,8 @@ import json
 import binascii
 import numpy as np
 import datetime
+import uuid
+import requests
 
 from hashlib import sha256, md5
 from threading import Lock
@@ -14,7 +16,7 @@ from cryptography.hazmat.primitives import serialization
 
 from ..utils.config import get_user_folder
 
-from ..const.base import BCctbase, BCct
+from ..const.base import BCctbase, BCct, DAUTH_SUBKEY, DAUTH_URL
     
   
   
@@ -1212,3 +1214,56 @@ class BaseBlockEngine:
     return self.__eth_account
   
   ### end Ethereum
+
+
+  def dauth_autocomplete(self, dauth_endp=None, add_env=True, debug=False, max_tries=5):
+    dct_env = {}
+    done = False
+    tries = 0
+    in_env = False
+    url = dauth_endp
+    
+    if url is None:
+      if isinstance(DAUTH_URL, str) and len(DAUTH_URL) > 0:
+        url = DAUTH_URL
+      else:
+        url = os.environ.get('DAUTH_URL')
+        in_env = True
+    
+    if isinstance(url, str) and len(url) > 0:
+      if dauth_endp is None:
+        self.P("Found dAuth URL in environment: '{}'".format(url), color='g')
+      
+      while not done:
+        self.P(f"Trying dAuth `{url}` information... (try {tries})")
+        try:
+          nonce_data = {
+            'nonce' : str(uuid.uuid4())[:8]
+          }
+          self.sign(nonce_data)
+          response = requests.post(url, json={'body' : nonce_data})
+          dct_response = response.json()
+          if debug:
+            self.P(f"Response:\n {json.dumps(dct_response, indent=2)}")
+          dct_result = dct_response.get('result', {}).get(DAUTH_SUBKEY, {})
+          error = dct_response.get('error', None)
+          if error is not None:
+            self.P(f"Error in dAuth response: {dct_response}", color='r')
+          dct_env = {k : v for k,v in dct_result.items() if k.startswith('EE_')}
+          self.P("Found {} keys in dAuth response.".format(len(dct_env)), color='g')
+          for k, v in dct_env.items():
+            if k not in os.environ:
+              self.P(f"  Adding key `{k}{'=' + str(v) if debug else ''}` to env.", color='y')
+            else:
+              self.P(f"  Overwrite  `{k}{'=' + str(v) if debug else ''}` in env.", color='y')
+            if add_env:
+              os.environ[k] = v
+          done = True
+        except Exception as exc:
+          self.P(f"Error in dAuth URL request: {exc}", color='r')          
+        #end try
+        tries += 1
+        if tries >= max_tries:
+          done = True    
+      #end while
+    return dct_env

{naeural_client-2.5.30 → naeural_client-2.6.0}/naeural_client/const/base.py

@@ -3,6 +3,7 @@ SB_ID = 'SB_ID'  # change to SB_ID = EE_ID post mod from sb to ee
 
 
 DAUTH_URL = 'https://dauth.ratio1.ai/get_auth_data'
+DAUTH_SUBKEY = 'auth'
 
 class LocalInfo:
   LOCAL_INFO_FILE = 'local_info.json'

{naeural_client-2.5.30 → naeural_client-2.6.0}/pyproject.toml

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

naeural_client-2.6.0/xperimental/auth/t1.py

@@ -0,0 +1,27 @@
+
+import json
+
+
+from naeural_client import Logger, const
+from naeural_client.bc import DefaultBlockEngine
+
+
+
+if __name__ == '__main__' :
+  l = Logger("ENC", base_folder=".", app_folder="_local_cache")
+  eng1 = DefaultBlockEngine(
+    log=l, name="test1", 
+    config={
+        "PEM_FILE"     : "test1.pem",
+        "PASSWORD"     : None,      
+        "PEM_LOCATION" : "data"
+      }
+  )
+  
+  d = eng1.dauth_autocomplete(
+    add_env=False,
+    debug=True,
+    max_tries=1,
+  )
+  
+  l.P(f"Result: {d}", color='b')