naeural-client 2.6.6__py3-none-any.whl → 2.6.8__py3-none-any.whl

naeural_client/_ver.py

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

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='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/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/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/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/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.dist-info → naeural_client-2.6.8.dist-info}/METADATA

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

@@ -1,10 +1,10 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=UMYFIwE4ZXTXGAjXHvaICoKOZ23qedlElzJItHT6NXw,330
+naeural_client/_ver.py,sha256=yJtX4SNbT4YjEO5phTqEoYSmgPOrRB8oka3J72U8Mww,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=Qkc7XTRcrlKT6vd4N28jGobnQuCSZ33phu16VPC5rg8,97074
+naeural_client/base/generic_session.py,sha256=p7NZoMZJEW-2Zb0CrJyXIgtlpqZcRW9If6p3R_EfzzE,97509
 naeural_client/base/instance.py,sha256=kcZJmjLBtx8Bjj_ysIOx1JmLA-qSpG7E28j5rq6IYus,20444
 naeural_client/base/pipeline.py,sha256=b4uNHrEIOlAtw4PGUx20dxwBhDck5__SrVXaHcSi8ZA,58251
 naeural_client/base/plugin_template.py,sha256=qGaXByd_JZFpjvH9GXNbT7KaitRxIJB6-1IhbKrZjq4,138123
@@ -14,7 +14,7 @@ naeural_client/base/webapp_pipeline.py,sha256=QmPLVmhP0CPdi0YuvbZEH4APYz2Amtw3gy
 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=kkRGYkAJ6ZCEUSKyUNpj8NW2kvhAtiuNNKe3ci3Py1s,35028
+naeural_client/bc/base.py,sha256=gp0ckE-D_9fIvfFj53ULZiIOz9-yhSuOD8F9bKDrrVM,35220
 naeural_client/bc/chain.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 naeural_client/bc/ec.py,sha256=qI8l7YqiS4MNftlx-tF7IZUswrSeQc7KMn5OZ0fEaJs,23370
 naeural_client/certs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -22,7 +22,7 @@ naeural_client/certs/r9092118.ala.eu-central-1.emqxsl.com.crt,sha256=y-6io0tseyx
 naeural_client/cli/README.md,sha256=WPdI_EjzAbUW1aPyj1sSR8rLydcJKZtoiaEtklQrjHo,74
 naeural_client/cli/cli.py,sha256=c0ZavVwArQEGv8tueTnz3aGKTuUe6Sqmm5oTUFUVIUE,3816
 naeural_client/cli/cli_commands.py,sha256=VffU1tpG1CGae6z4GtcAdktAlEAfIiXq9n2oHAx1kAI,1944
-naeural_client/cli/nodes.py,sha256=Oq7bh7kkU79doBLEa8ANU6OiWv83mJvyjFyZqwpKx1s,4595
+naeural_client/cli/nodes.py,sha256=9KA-O6C6fwNEx2Cu9rPBXC_ijU4J6ucZcnPw7ubc7bc,4785
 naeural_client/code_cheker/__init__.py,sha256=pwkdeZGVL16ZA4Qf2mRahEhoOvKhL7FyuQbMFLr1E5M,33
 naeural_client/code_cheker/base.py,sha256=lT5DRIFO5rqzsMNCmdMRfkAeevmezozehyfgmhnKpuI,19074
 naeural_client/code_cheker/checker.py,sha256=QWupeM7ToancVIq1tRUxRNUrI8B5l5eoY0kDU4-O5aE,7365
@@ -32,13 +32,13 @@ 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=gIONTZUkqPveu3DwelyJWpbFMeIR9l6DlaNg-xEfK1A,611
-naeural_client/const/base.py,sha256=rlma-zwAXLtdLmHAHYuntxEgJyaJt_6N_Y5XjL-R7Gg,4248
+naeural_client/const/base.py,sha256=8e3qrYFpVGl7swMGQm9Yjj_40ghpvLHYsbeTQNWD_w8,4344
 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
 naeural_client/const/heartbeat.py,sha256=xHZBX_NzHTklwA2_AEKR0SGdlbavMT4nirqjQg8WlTU,2550
 naeural_client/const/misc.py,sha256=VDCwwpf5bl9ltx9rzT2WPVP8B3mZFRufU1tSS5MO240,413
-naeural_client/const/payload.py,sha256=40d5yKtiS_WnpWFXCFtEfOQ4ET6tCUVuwzXrghN23eI,6529
+naeural_client/const/payload.py,sha256=cKfl2RO1VowrLM0KlYoZQIcwFs_mOCC9xzEZtj0pS9E,6563
 naeural_client/default/__init__.py,sha256=ozU6CMMuWl0LhG8Ae3LrZ65a6tLrptfscVYGf83zjxM,46
 naeural_client/default/instance/__init__.py,sha256=w1de6OMj9a5GPGF-Wl1b_I_YAy9fWBEss2QnyPPyaB0,546
 naeural_client/default/instance/chain_dist_custom_job_01_plugin.py,sha256=QtHi3uXKsVs9eyMgbnvBVbMylErhV1Du4X2-7zDL7Y0,1915
@@ -81,8 +81,8 @@ naeural_client/utils/__init__.py,sha256=mAnke3-MeRzz3nhQvhuHqLnpaaCSmDxicd7Ck9uw
 naeural_client/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_LtMyCY,1072
 naeural_client/utils/config.py,sha256=v7xHikr6Z5Sbvf3opYeMhYzGWD2pe0HlRwa-aGJzUh8,6323
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
-naeural_client-2.6.6.dist-info/METADATA,sha256=SYrLhTGgqPaIAtgwU_GypoGDSo08qew0oOeokjbV4IY,14618
-naeural_client-2.6.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-2.6.6.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
-naeural_client-2.6.6.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.6.6.dist-info/RECORD,,
+naeural_client-2.6.8.dist-info/METADATA,sha256=SsJSf4SEE0mF_RWFXrx91L_jDa4Dz0o9X8g64-xVbB4,14618
+naeural_client-2.6.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-2.6.8.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
+naeural_client-2.6.8.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.6.8.dist-info/RECORD,,