naeural-client 2.6.6__tar.gz → 2.6.7__tar.gz

{naeural_client-2.6.6 → naeural_client-2.6.7}/PKG-INFO

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

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

{naeural_client-2.6.6 → naeural_client-2.6.7}/naeural_client/base/generic_session.py

@@ -168,6 +168,10 @@ class GenericSession(BaseDecentrAIObject):
     root_topic : str, optional
         This is the root of the topics used by the SDK. It is used to create the topics for the communication channels.
         Defaults to "naeural"
+        
+    auto_configuration : bool, optional
+        If True, the SDK will attempt to complete the dauth process automatically.
+        Defaults to True.
     """
     
     self.__at_least_one_node_peered = False
@@ -281,6 +285,7 @@ class GenericSession(BaseDecentrAIObject):
       dauth_endp=None, # get from consts or env
       add_env=self.__auto_configuration,
       debug=False,
+      sender_alias='ratio1-SDK'
     )
     # end bc_engine
     # END TODO
@@ -2523,10 +2528,11 @@ class GenericSession(BaseDecentrAIObject):
         'Address': PAYLOAD_DATA.NETMON_ADDRESS,
         'Alias'  : PAYLOAD_DATA.NETMON_EEID,
         'Seen ago' : PAYLOAD_DATA.NETMON_LAST_SEEN,
-        'Last state': PAYLOAD_DATA.NETMON_STATUS_KEY,
+        'Version' : PAYLOAD_DATA.NETMON_NODE_VERSION,
+        'State': PAYLOAD_DATA.NETMON_STATUS_KEY,
         'Last probe' : PAYLOAD_DATA.NETMON_LAST_REMOTE_TIME,
         'Zone' : PAYLOAD_DATA.NETMON_NODE_UTC,
-        'Supervisor' : PAYLOAD_DATA.NETMON_IS_SUPERVISOR,
+        'Oracle' : PAYLOAD_DATA.NETMON_IS_SUPERVISOR,
         'Peered' : PAYLOAD_DATA.NETMON_WHITELIST,
       })
       reverse_mapping = {v: k for k, v in mapping.items()}
@@ -2564,6 +2570,7 @@ class GenericSession(BaseDecentrAIObject):
           # the following will get the whitelist for the current inspected  node
           # without calling self.get_allowed_nodes but instead using the netmon data
           whitelist = node_info.get(PAYLOAD_DATA.NETMON_WHITELIST, [])
+          version = node_info.get(PAYLOAD_DATA.NETMON_NODE_VERSION, '0.0.0')
           client_is_allowed = self.bc_engine.contains_current_address(whitelist)          
           if allowed_only and not client_is_allowed:
             continue
@@ -2587,6 +2594,8 @@ class GenericSession(BaseDecentrAIObject):
               val = self.bc_engine._add_prefix(val)
             elif key == PAYLOAD_DATA.NETMON_WHITELIST:
               val = client_is_allowed
+            elif key in [PAYLOAD_DATA.NETMON_STATUS_KEY, PAYLOAD_DATA.NETMON_NODE_VERSION]:
+              val = val.split(' ')[0]
             res[column].append(val)          
         # end for
       # end if

{naeural_client-2.6.6 → naeural_client-2.6.7}/naeural_client/bc/base.py

@@ -16,7 +16,11 @@ from cryptography.hazmat.primitives import serialization
 
 from ..utils.config import get_user_folder
 
-from ..const.base import BCctbase, BCct, DAUTH_SUBKEY, DAUTH_URL, DAUTH_ENV_KEY
+from ..const.base import (
+  BCctbase, BCct, 
+  DAUTH_SUBKEY, DAUTH_URL, DAUTH_ENV_KEY,
+  DAUTH_NONCE, DAUTH_VARS,
+)
     
   
   
@@ -1216,7 +1220,7 @@ class BaseBlockEngine:
   ### end Ethereum
 
 
-  def dauth_autocomplete(self, dauth_endp=None, add_env=True, debug=False, max_tries=5):
+  def dauth_autocomplete(self, dauth_endp=None, add_env=True, debug=False, max_tries=5, **kwargs):
     MIN_LEN = 10
     dct_env = {}
     dct_result = {}
@@ -1243,11 +1247,16 @@ class BaseBlockEngine:
       while not done:
         self.P(f"Trying dAuth `{url}` information... (try {tries})")
         try:
-          nonce_data = {
-            'nonce' : str(uuid.uuid4())[:8]
+          to_send = {
+            **kwargs,
+            DAUTH_NONCE : str(uuid.uuid4())[:8],
           }
-          self.sign(nonce_data)
-          response = requests.post(url, json={'body' : nonce_data})
+          ######
+          if len(kwargs) == 0:
+            to_send['sender_alias'] = 'direct-call'
+          ######
+          self.sign(to_send)          
+          response = requests.post(url, json={'body' : to_send})
           if response.status_code == 200:
             dct_response = response.json()
             if debug:

{naeural_client-2.6.6 → naeural_client-2.6.7}/naeural_client/cli/nodes.py

@@ -49,6 +49,9 @@ def get_nodes(args):
     supervisor=supervisor_addr,
   )
   df, supervisor, super_alias, nr_supers, elapsed = res
+  if args.online:
+    FILTERED = ['State']
+    df = df[[c for c in df.columns if c not in FILTERED]]
 
   prefix = "Online n" if (args.online or args.peered) else "N"
   if supervisor == "ERROR":
@@ -72,6 +75,8 @@ def get_supervisors(args):
     supervisors_only=True,
   )
   df, supervisor, super_alias, nr_supers, elapsed = res
+  FILTERED = ['Oracle', 'State']
+  df = df[[c for c in df.columns if c not in FILTERED]]
   
   if supervisor == "ERROR":
     log_with_color(f"No supervisors or no comms available in {elapsed:.1f}s. Please check your settings.", color='r')

{naeural_client-2.6.6 → naeural_client-2.6.7}/naeural_client/const/base.py

@@ -1,25 +1,27 @@
 EE_ID = 'EE_ID'
 SB_ID = 'SB_ID'  # change to SB_ID = EE_ID post mod from sb to ee
 
+class BCctbase: 
+  SIGN      = 'EE_SIGN'
+  SENDER    = 'EE_SENDER'
+  HASH      = 'EE_HASH'
+  
+  ETH_SIGN  = 'EE_ETH_SIGN'
+  ETH_SENDER= 'EE_ETH_SENDER'
+
 
 DAUTH_URL = 'https://dauth.ratio1.ai/get_auth_data'
 DAUTH_SUBKEY = 'auth'
 DAUTH_ENV_KEY = 'DAUTH_URL'
+DAUTH_NONCE = 'nonce'
+DAUTH_VARS = [DAUTH_NONCE, BCctbase.SIGN, BCctbase.SENDER, BCctbase.HASH]
+
 
 class LocalInfo:
   LOCAL_INFO_FILE = 'local_info.json'
   K_ADDRESS = 'address'
   K_ALIAS = 'alias'
   K_ETH_ADDRESS = 'eth_address'
-
-
-class BCctbase: 
-  SIGN      = 'EE_SIGN'
-  SENDER    = 'EE_SENDER'
-  HASH      = 'EE_HASH'
-  
-  ETH_SIGN  = 'EE_ETH_SIGN'
-  ETH_SENDER= 'EE_ETH_SENDER'
     
 
 class BCct:

{naeural_client-2.6.6 → naeural_client-2.6.7}/naeural_client/const/payload.py

@@ -206,6 +206,7 @@ class PAYLOAD_DATA:
   NETMON_IS_SUPERVISOR = 'is_supervisor'
   NETMON_WHITELIST = 'whitelist'
   NETMON_NODE_SECURED = 'secured'
+  NETMON_NODE_VERSION = 'version'
   
   
 class NET_CONFIG:

{naeural_client-2.6.6 → naeural_client-2.6.7}/pyproject.toml

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