naeural-client 2.6.32__py3-none-any.whl → 2.6.33__py3-none-any.whl

naeural_client/_ver.py

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

naeural_client/base/generic_session.py

@@ -571,6 +571,11 @@ class GenericSession(BaseDecentrAIObject):
       """
       node_whitelist = dict_msg.get(PAYLOAD_DATA.NETMON_WHITELIST, [])
       node_secured = dict_msg.get(PAYLOAD_DATA.NETMON_NODE_SECURED, False)
+      node_online = dict_msg.get(PAYLOAD_DATA.NETMON_STATUS_KEY) == PAYLOAD_DATA.NETMON_STATUS_ONLINE
+      node_alias = dict_msg.get(PAYLOAD_DATA.NETMON_EEID, None)
+      
+      if node_online:
+        self.__track_online_node(node_addr, node_alias)
       
       client_is_allowed = self.bc_engine.contains_current_address(node_whitelist)
       can_send = not node_secured or client_is_allowed or self.bc_engine.address == node_addr
@@ -758,7 +763,10 @@ class GenericSession(BaseDecentrAIObject):
               nr_peers = sum([v for k, v in self._dct_can_send_to_node.items()])
               if nr_peers > 0 and not self.__at_least_one_node_peered:                
                 self.__at_least_one_node_peered = True
-                self.P(f"Received {PLUGIN_SIGNATURES.NET_MON_01} from {sender_addr}, so far {nr_peers} peers that allow me: {json.dumps(self._dct_can_send_to_node, indent=2)}", color='g')
+                self.P(
+                  f"Received {PLUGIN_SIGNATURES.NET_MON_01} from {sender_addr}, so far {nr_peers} peers that allow me: {json.dumps(self._dct_can_send_to_node, indent=2)}", 
+                  color='g'
+                )
           # end for each node in network map
         # end if current_network is valid
       # end if NET_MON_01
@@ -912,7 +920,15 @@ class GenericSession(BaseDecentrAIObject):
       self.__running_main_loop_thread = True
       self._main_loop_thread.start()
       
-      # we could wait here for `self.__at_least_one_node_peered` but is not a good idea
+      start_wait = tm()
+      while not self.__at_least_a_netmon_received:
+        if (tm() - start_wait) > self.START_TIMEOUT:
+          msg = "Timeout waiting for NET_MON_01 message. No connections. Exiting..."
+          self.P(msg, color='r', show=True)
+          break
+        sleep(0.1)
+      if self.__at_least_a_netmon_received:
+        self.P("Received at least one NET_MON_01 message. Resuming the main thread...", color='g')
       return
 
     def __handle_open_transactions(self):
@@ -1061,11 +1077,6 @@ class GenericSession(BaseDecentrAIObject):
         self.__maybe_reconnect()
         self.__handle_open_transactions()
         sleep(0.1)
-        if not self.__at_least_a_netmon_received:
-          if (tm() - self.__start_main_loop_time) > self.START_TIMEOUT:
-            msg = "Timeout waiting for NET_MON_01 message. Exiting..."
-            self.P(msg, color='r', show=True)
-            break        
       # end while self.running
 
       self.P("Main loop thread exiting...", verbosity=2)
@@ -1107,6 +1118,7 @@ class GenericSession(BaseDecentrAIObject):
           bool_loop_condition = isinstance(wait, bool) and wait
           number_loop_condition = isinstance(wait, (int, float)) and (wait == 0 or (tm() - _start_timer) < wait)
           callable_loop_condition = callable(wait) and wait()
+        self.P("Exiting loop...", verbosity=2)
       except KeyboardInterrupt:
         self.P("CTRL+C detected. Stopping loop.", color='r', verbosity=1)
 
@@ -1139,6 +1151,7 @@ class GenericSession(BaseDecentrAIObject):
           bool_loop_condition = isinstance(wait, bool) and wait
           number_loop_condition = isinstance(wait, (int, float)) and (wait == 0 or (tm() - _start_timer) < wait)
           callable_loop_condition = callable(wait) and wait()
+        self.P("Exiting loop...", verbosity=2)
       except KeyboardInterrupt:
         self.P("CTRL+C detected. Stopping loop.", color='r', verbosity=1)
         
@@ -1762,7 +1775,7 @@ class GenericSession(BaseDecentrAIObject):
           List of addresses of all the Naeural Edge Protocol edge nodes that are considered online
 
       """
-      return [k for k, v in self._dct_node_last_seen_time.items() if tm() - v < self.online_timeout]
+      return [k for k, v in self._dct_node_last_seen_time.items() if (tm() - v) < self.online_timeout]
 
     def get_allowed_nodes(self):
       """
@@ -2171,7 +2184,7 @@ class GenericSession(BaseDecentrAIObject):
       *,
       node,
       name,
-      signature,
+      signature=PLUGIN_SIGNATURES.CUSTOM_WEBAPI_01,
       ngrok_edge_label=None,
       endpoints=None,
       use_ngrok=True,

naeural_client/base/pipeline.py

@@ -870,8 +870,11 @@ class Pipeline(BaseCodeChecker):
       Exception
           Plugin instance already exists. 
       """
+      from naeural_client.default.instance import REVERSE_MAP
+      
       if isinstance(signature, str):
         str_signature = signature.upper()
+        signature = REVERSE_MAP.get(str_signature, str_signature)
       else:
         plugin_template = signature
         str_signature = plugin_template.signature.upper()
@@ -1079,7 +1082,8 @@ class Pipeline(BaseCodeChecker):
         self.__apply_staged_config(verbose=verbose)
         self.__apply_staged_instances_config(verbose=verbose)
 
-      self.P("Pipeline <{}> deployed".format(self.name), color="g")
+      # TODO: must add "deployed" message to proper location
+      self.P("Pipeline <{}> deploy initiated...".format(self.name))
 
       if with_confirmation and not wait_confirmation:
         return transactions
@@ -1222,11 +1226,12 @@ class Pipeline(BaseCodeChecker):
       Exception
           The pipeline does not contain the desired instance.
       """
-
+      from naeural_client.default.instance import REVERSE_MAP
       # search for the instance in the list
       plugin_template = None
       if isinstance(signature, str):
         str_signature = signature.upper()
+        signature = REVERSE_MAP.get(str_signature, str_signature)
       else:
         plugin_template = signature
         str_signature = plugin_template.signature.upper()

naeural_client/base/webapp_pipeline.py

@@ -109,6 +109,8 @@ class WebappPipeline(Pipeline):
     while self.ngrok_url is None:
       elapsed = time.time() - start
       if elapsed > timeout:
-        raise Exception("Timeout waiting for ngrok url")
+        msg = "Timeout waiting for ngrok url"
+        self.P(msg, color="red")
+        raise Exception(msg)
     # return the ngrok url
     return self.ngrok_url

naeural_client/bc/base.py

@@ -573,8 +573,9 @@ class BaseBlockEngine:
         #endif
       #endfor
       if len(lst_addresses) > 0:
-        existing_addrs, existing_names = self._load_and_maybe_create_allowed(return_names=True)
-        existing_addrs = [self.maybe_add_prefix(x) for x in existing_addrs]
+        existing_addrs, existing_names = self._load_and_maybe_create_allowed(
+          return_names=True, return_prefix=True
+        )
         for addr, name in zip(lst_addresses, lst_names):
           if addr not in existing_addrs:
             changed = True
@@ -629,7 +630,9 @@ class BaseBlockEngine:
             )
             errors = True
           else:
-            lst_final.append(self.maybe_add_prefix(allowed))
+            if return_prefix:
+              allowed = self.maybe_add_prefix(allowed)
+            lst_final.append(allowed)
             lst_lines.append(allowed_tuple)
             lst_names.append(name)
         if errors:
@@ -944,7 +947,7 @@ class BaseBlockEngine:
       True if the current address is in the list.
 
     """
-    lst = [self._remove_prefix(x) for x in lst_addresses]
+    lst = [self._remove_prefix(x) for x in lst_addresses if x is not None]
     return self.address_no_prefix in lst
   
   @property
@@ -960,8 +963,8 @@ class BaseBlockEngine:
   
   @property
   def allowed_list(self):
-    """Returns the allowed command senders for the current node"""
-    return self._load_and_maybe_create_allowed()
+    """Returns the allowed command senders (non-prefixed) for the current node"""
+    return self._load_and_maybe_create_allowed(return_names=False, return_prefix=False)
   
   @property
   def whitelist(self):

naeural_client/default/instance/__init__.py

@@ -14,3 +14,8 @@ class PLUGIN_TYPES:
   CUSTOM_WEBAPI_01 = CustomWebapi01
   CHAIN_DIST_CUSTOM_JOB_01 = ChainDistCustomJob01
   TELEGRAM_BASIC_BOT_01 = BasicTelegramBot01
+  
+  
+REVERSE_MAP = {
+  x.signature: x for x in PLUGIN_TYPES.__dict__.values() if hasattr(x, "signature")
+}

naeural_client/utils/config.py

@@ -139,6 +139,10 @@ def reset_config(*larg, keep_existing=False, **kwargs):
       if not keep_existing:
         target_pem.unlink()        
         log_with_color(f"Deleted {target_pem}. A default key will be generated.", color='b')
+      #end if
+    #endif pem exists
+  #end if local pem exists
+  show_version()
   return
 
 def show_address(args):

{naeural_client-2.6.32.dist-info → naeural_client-2.6.33.dist-info}/METADATA

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

@@ -1,20 +1,20 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=lJOZ0HCGsKGDzT1uT-izNuro_E4D0bjxQ5ymKSXoG18,331
+naeural_client/_ver.py,sha256=LmPOqbSjTBCD9bB2yLsx239p0IDIXEobXCX_8g6ND3c,331
 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=joF01ZoIt6QCSg7hDkg5M8ZCmKubpbQVh-plqi6GA9E,105079
+naeural_client/base/generic_session.py,sha256=ACDABiJR0mY4U4wQdGj82IrnxBwC_8RUDSr6HeSMOlw,105598
 naeural_client/base/instance.py,sha256=kcZJmjLBtx8Bjj_ysIOx1JmLA-qSpG7E28j5rq6IYus,20444
-naeural_client/base/pipeline.py,sha256=b4uNHrEIOlAtw4PGUx20dxwBhDck5__SrVXaHcSi8ZA,58251
+naeural_client/base/pipeline.py,sha256=EvESG5UH5GwyAZbJWJk1irTzGYBuOUjl-8KjkCdgLVI,58574
 naeural_client/base/plugin_template.py,sha256=qGaXByd_JZFpjvH9GXNbT7KaitRxIJB6-1IhbKrZjq4,138123
 naeural_client/base/responses.py,sha256=ZKBZmRhYDv8M8mQ5C_ahGsQvtWH4b9ImRcuerQdZmNw,6937
 naeural_client/base/transaction.py,sha256=bfs6td5M0fINgPQNxhrl_AUjb1YiilLDQ-Cd_o3OR_E,5146
-naeural_client/base/webapp_pipeline.py,sha256=QmPLVmhP0CPdi0YuvbZEH4APYz2Amtw3gyOu4bVodYA,2740
+naeural_client/base/webapp_pipeline.py,sha256=ZNGqZ36DY076XVDfGu2Q61kCt3kxIJ4Mi4QbPZuDVn0,2791
 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=c7zYNJb9aaGYgRoVkCHOLjrZjp7aCACyCIyIP69Obuc,42177
+naeural_client/bc/base.py,sha256=kvPRvjKyFjjwa3GZF6BYbcITwoAfjtc0k0DP0FXpfgw,42274
 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
@@ -41,7 +41,7 @@ naeural_client/const/heartbeat.py,sha256=xHZBX_NzHTklwA2_AEKR0SGdlbavMT4nirqjQg8
 naeural_client/const/misc.py,sha256=VDCwwpf5bl9ltx9rzT2WPVP8B3mZFRufU1tSS5MO240,413
 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/__init__.py,sha256=_cr6a9gProAZKL9_uz855q2pWt2jHwqE16ed8sm6V8I,653
 naeural_client/default/instance/chain_dist_custom_job_01_plugin.py,sha256=QtHi3uXKsVs9eyMgbnvBVbMylErhV1Du4X2-7zDL7Y0,1915
 naeural_client/default/instance/custom_webapi_01_plugin.py,sha256=EEjW9c2EQatMktOjO5picyDYDSrppc6_TmMNI8lgFeA,4784
 naeural_client/default/instance/net_mon_01_plugin.py,sha256=u85i2AiYHkLJnam0wOx-m71hlp0EYyNtk3JwbkOrvHg,1208
@@ -80,11 +80,11 @@ naeural_client/logging/tzlocal/win32.py,sha256=zBoj0vFVrGhnCm_f7xmYzGym4-fV-4Ij2
 naeural_client/logging/tzlocal/windows_tz.py,sha256=Sv9okktjZJfRGGUOOppsvQuX_eXyXUxkSKCAFmWT9Hw,34203
 naeural_client/utils/__init__.py,sha256=mAnke3-MeRzz3nhQvhuHqLnpaaCSmDxicd7Ck9uwpmI,77
 naeural_client/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_LtMyCY,1072
-naeural_client/utils/config.py,sha256=v7xHikr6Z5Sbvf3opYeMhYzGWD2pe0HlRwa-aGJzUh8,6323
+naeural_client/utils/config.py,sha256=Ub5sw3NG6wskAF5C4s0WU0rzXHVLy70ZTRU0W8HUGTM,6403
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
 naeural_client/utils/oracle_sync/multiple_requests.py,sha256=GLzROGZ0gI4d1PVWgW_JBUYZjEL4LqZvHvwelxDiPW4,20892
-naeural_client-2.6.32.dist-info/METADATA,sha256=EVBTuCxaqYaN2J1KKk3LK8Bioiyglhitn0_lOz0w6DI,12354
-naeural_client-2.6.32.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-2.6.32.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
-naeural_client-2.6.32.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.6.32.dist-info/RECORD,,
+naeural_client-2.6.33.dist-info/METADATA,sha256=32uUFJQMGhRnZMLgonWIN6o02gT-mG968NNaVwcIni4,12354
+naeural_client-2.6.33.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-2.6.33.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
+naeural_client-2.6.33.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.6.33.dist-info/RECORD,,