naeural-core 7.7.246__py3-none-any.whl → 7.7.248__py3-none-any.whl

naeural_core/comm/communication_manager.py

@@ -84,7 +84,12 @@ class CommunicationManager(Manager, _ConfigHandlerMixin):
   def has_failed_comms(self):
     comm = self._has_failed_comms()
     if comm is not None:
-      self.P("Detected total communication failure on comm {}. This may generate shutdown/restart.".format(comm.__class__.__name__), color='error')
+      retries = comm._nr_conn_retry_iters
+      self.P("Detected {} comm failures on comm {}. This may generate shutdown/restart.".format(
+          retries, comm.__class__.__name__
+        ), 
+        color='error'
+      )
       return True
     return False  
 

naeural_core/comm/default/mqtt.py

@@ -13,7 +13,8 @@ from naeural_core.comm.base import BaseCommThread
 _CONFIG = {
   **BaseCommThread.CONFIG,
 
-  "CONNECTION_FAIL_SLEEP_TIME": 10,
+  "CONNECTION_FAIL_SLEEP_TIME": 50,
+  "BURST_RECONNECTS" : 2,
 
   'VALIDATION_RULES': {
     **BaseCommThread.CONFIG['VALIDATION_RULES'],
@@ -83,7 +84,9 @@ class MQTTCommThread(BaseCommThread):
     if self.connection is None or not self.has_server_conn:
       self.has_send_conn = False
       self.has_recv_conn = False
-      dct_ret = self._controller.server_connect()
+      dct_ret = self._controller.server_connect(
+        max_retries=self.cfg_burst_reconnects
+      )
       self.has_server_conn = dct_ret['has_connection']
       msg = dct_ret['msg']
       msg_type = dct_ret['msg_type']

naeural_core/local_libraries/config_handler_mixin.py

@@ -208,8 +208,58 @@ class _ConfigHandlerMixin(object):
 
   
   def create_config_handlers(self, verbose=0):    
-    if hasattr(self, 'config_data') and isinstance(self.config_data, dict) and len(self.config_data) > 0:
-      res = []
+    if not (hasattr(self, 'config_data') and isinstance(self.config_data, dict) and len(self.config_data) > 0):
+      return
+
+    cache_enabled = False
+    if hasattr(self, 'log') and hasattr(self.log, 'config_data'):
+      cache_enabled = self.log.config_data.get('BM_CACHE_CONFIG_HANDLERS', False)
+
+    res = []
+    cls = type(self)
+
+    if cache_enabled:
+      # 1) Ensure BasePluginExecutor base keys are created once (no import)
+      base_cls = next((c for c in cls.mro() if c.__name__ == "BasePluginExecutor"), None)
+      if base_cls is not None:
+        base_created = getattr(base_cls, '_cfg_keys_created', None)
+        if base_created is None:
+          base_created = set()
+          setattr(base_cls, '_cfg_keys_created', base_created)
+
+        base_cfg = getattr(base_cls, 'CONFIG', {}) or {}
+        base_keys = set(base_cfg.keys())
+        missing_base = base_keys - base_created
+
+        for k in missing_base:
+          func_name = self._get_prop(k)
+          if not hasattr(base_cls, func_name):
+            fnc = partial(getter, key=k) # create the func
+            fnc_prop = property(fget=fnc, doc="Get '{}' from config_data".format(k)) # create prop from func 
+            setattr(base_cls, func_name, fnc_prop) # set the prop of the class
+          base_created.add(k)
+
+      # 2) Per-subclass cache for extra keys
+      created_keys = getattr(cls, '_cfg_keys_created', None)
+      if created_keys is None:
+        created_keys = set()
+        setattr(cls, '_cfg_keys_created', created_keys)
+
+      current_keys = set(self.config_data.keys())
+      missing_keys = current_keys - created_keys
+
+      for k in missing_keys:
+        func_name = self._get_prop(k)
+        if not hasattr(cls, func_name):
+          # below is a bit tricky: using a lambda generates a non-deterministic abnormal behavior
+          # the ideea is to create a global func instance that wil be then loaded on the class (not instance)
+          # as a descriptor object - ie a `property`. "many Bothans died to bring the plans of the Death Star..."
+          fnc = partial(getter, key=k) # create the func
+          fnc_prop = property(fget=fnc, doc="Get '{}' from config_data".format(k)) # create prop from func 
+          setattr(cls, func_name, fnc_prop) # set the prop of the class
+          res.append(func_name)
+        created_keys.add(k)
+    else:
       for k in self.config_data:
         func_name = self._get_prop(k)
         if not hasattr(self, func_name):
@@ -217,13 +267,13 @@ class _ConfigHandlerMixin(object):
           # the ideea is to create a global func instance that wil be then loaded on the class (not instance)
           # as a descriptor object - ie a `property`. "many Bothans died to bring the plans of the Death Star..."
           fnc = partial(getter, key=k) # create the func
-          cls = type(self) # get the class
           fnc_prop = property(fget=fnc, doc="Get '{}' from config_data".format(k)) # create prop from func 
           setattr(cls, func_name, fnc_prop) # set the prop of the class
           res.append(func_name)
-      if len(res) > 0 and verbose > 1:
-        self.P("Created '{}' config_data handlers: {}".format(self.__class__.__name__, res), color='b')
-      self.__cfg_ready = True
+
+    if len(res) > 0 and verbose > 1:
+      self.P("Created '{}' config_data handlers: {}".format(self.__class__.__name__, res), color='b')
+    self.__cfg_ready = True
     return
   
   
@@ -480,12 +530,34 @@ class _ConfigHandlerMixin(object):
     for msg in fail_msgs:
       self.add_error(msg)
 
-    for method_name, func in self.log.get_class_methods(self.__class__, include_parent=True):
-      if method_name.startswith('validate_'):
+    cache_enabled = False
+    if hasattr(self, 'log') and hasattr(self.log, 'config_data'):
+      cache_enabled = self.log.config_data.get('BM_CACHE_VALIDATORS', False)
+
+    if cache_enabled:
+      cls = self.__class__
+      validators = getattr(cls, "_cfg_validators", None)
+      if validators is None:
+        validators = []
+        for method_name, func in self.log.get_class_methods(cls, include_parent=True):
+          if method_name.startswith('validate_'):
+            validators.append(func)
+        setattr(cls, "_cfg_validators", validators)
+
+      for func in validators:
         try:
           func(self)
         except:
-          self.add_error("Programming error in validation method '{}'.\n{}".format(method_name, traceback.format_exc()))
+          self.add_error("Programming error in validation method '{}'.\n{}".format(
+            func.__name__, traceback.format_exc()))
+    else:
+      for method_name, func in self.log.get_class_methods(self.__class__, include_parent=True):
+        if method_name.startswith('validate_'):
+          try:
+            func(self)
+          except:
+            self.add_error("Programming error in validation method '{}'.\n{}".format(
+              method_name, traceback.format_exc()))
 
     lst_errors = self.get_errors()
     lst_warnings = self.get_warnings()

naeural_core/main/orchestrator.py

@@ -432,8 +432,9 @@ class Orchestrator(DecentrAIObject,
   
   
   def _maybe_save_local_info(self):
-    if (time() - self.__last_local_info_save) >= 2:
+    if (time() - self.__last_local_info_save) >= 10: # save local info every 10 seconds
       self.save_local_address()
+      self.__last_local_info_save = time()      
     return
 
 
@@ -481,7 +482,6 @@ class Orchestrator(DecentrAIObject,
         self.P(f"Failed to get local info: {exc}", color='r')
       with open(addr_file, 'w') as f:
         f.write(json.dumps(data, indent=2))
-      self.__last_local_info_save = time()
     except Exception as e:
       if not self.__save_local_address_error_logged:
         self.P(f"Error saving local info: {e}\n{traceback.format_exc()}", color='r')
@@ -1809,7 +1809,9 @@ class Orchestrator(DecentrAIObject,
         
         self.__loop_stage = "0"
         self.log.start_timer(self._main_loop_timer_name)
+        self.__loop_stage = "0.maybe_delay"
         self._maybe_delay_main_loop()
+        self.__loop_stage = "0.save_info"
         self._maybe_save_local_info()
         self._main_loop_counts['ITER'] += 1
         

naeural_core/main/ver.py

@@ -1,4 +1,4 @@
-__VER__ = '7.7.246'
+__VER__ = '7.7.248'
 
 
 

{naeural_core-7.7.246.dist-info → naeural_core-7.7.248.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naeural_core
-Version: 7.7.246
+Version: 7.7.248
 Summary: Ratio1 Core is the backbone of the Ratio1 Edge Protocol.
 Project-URL: Homepage, https://github.com/Ratio1/naeural_core
 Project-URL: Bug Tracker, https://github.com/Ratio1/naeural_core/issues

{naeural_core-7.7.246.dist-info → naeural_core-7.7.248.dist-info}/RECORD

@@ -102,11 +102,11 @@ naeural_core/business/training/minio_download_dataset.py,sha256=7uoo5CFLynWbLkBh
 naeural_core/business/training/minio_upload_dataset.py,sha256=5stm_E_L3SLwcjd2znUVMIC2PWO07f6QfBdcrKRiHCo,2162
 naeural_core/business/training/second_stage_training_process.py,sha256=z8LG9xx2G6s5AqeSD-t5rBegIctkFMEf4ZqEJVXZcz0,3152
 naeural_core/comm/__init__.py,sha256=SpAWJIyYdOouZSImzVrEF_M4-nrCrY9p3cVYwvmbt20,105
-naeural_core/comm/communication_manager.py,sha256=swMxO3DPTnT0SeSsv6PWz0gP0WsWOzA_BlYawoWHSB4,30471
+naeural_core/comm/communication_manager.py,sha256=dj6bkuD6RywGLuG6CAFy1uB4OLkuIQE_gi0bHHlrjoQ,30547
 naeural_core/comm/base/__init__.py,sha256=rDzAtPwcMOsW3aCp0t07GpJz5qweLiJgafTngHwEMOo,44
 naeural_core/comm/base/base_comm_thread.py,sha256=DVPzLN9UfKxjiVf0FtjOr5001-YzkjPMmC4RJFhoGG0,27034
 naeural_core/comm/default/amqp.py,sha256=-6_qGlOIjOUz42nkwnfMQZEVfdeUKGTNgjcTuo49v4E,4145
-naeural_core/comm/default/mqtt.py,sha256=F2VOOmjXkz7diFC-PVdxZgBI7O9aCwul5KfA6r4Yitc,4709
+naeural_core/comm/default/mqtt.py,sha256=I0cAqSvETKhzszMctryt7vJ_3onOFAojWJvnsXk9_Aw,4788
 naeural_core/comm/default/readme.md,sha256=hNY9V5HU8yW0JjyseiPWMkV8l7YU0ZEBw_iq_lpW-Uk,162
 naeural_core/comm/mixins/__init__.py,sha256=d8o2tKAkQ-P9voRB6REnEmObVyi4AiQgNVZuAKKObKo,290
 naeural_core/comm/mixins/commandcontrol_comm_mixin.py,sha256=VhAGzR23-x8INn8VGBd7z2YUtT4GIkeTNwNK0CmAjio,4781
@@ -207,7 +207,7 @@ naeural_core/local_libraries/__init__.py,sha256=j1oqXOivpe5pu-yUfJdNuuSbTv-jw2uk
 naeural_core/local_libraries/azure_logger.py,sha256=VC-8UnleVzG5NHcAw7fvM1XmYwUv4-x5SlfD_Xrx-cg,2910
 naeural_core/local_libraries/clustering.py,sha256=J0GNywMNrQcYVI4Ty0aaS86cR-ztXygZTp2N9j-T4Hk,3051
 naeural_core/local_libraries/config.txt,sha256=sOe3IGuBPCNZOMm4cxf5D7ukDYLV5qsM-q0acGqPJCA,70
-naeural_core/local_libraries/config_handler_mixin.py,sha256=0EKX-NOXQ_JZriKJOWWdXNHGxwGGQqXz8OCf8CM00DA,19022
+naeural_core/local_libraries/config_handler_mixin.py,sha256=8O2s19XUxLy3AeH7RyZ3OYfGELkIaTzrgbE1r9zNcAc,22015
 naeural_core/local_libraries/custom_layers.py,sha256=5ajYAPCjmwpHNwwf9KjZwXkMM_D-nDoebFB_4DpPuQQ,1297
 naeural_core/local_libraries/decorators.py,sha256=dSGH3TZAMizEuemc2I_tRUETFnCaFv57Vp94GuzsKGA,224
 naeural_core/local_libraries/model_helper.inf,sha256=Xws-UlelG5wEltHfcH7CzZBCrjjL_4aJdxl34MltZW0,22
@@ -344,8 +344,8 @@ naeural_core/main/epochs_manager.py,sha256=lH01Pv9E_uz5fdvh_W2dZ29hZLM0CL2NZfuYJ
 naeural_core/main/geoloc.py,sha256=TEqyuNzpVqZSBCo0OOrpHYncIsHSClvRt28hgvxJ35o,24909
 naeural_core/main/main_loop_data_handler.py,sha256=hABB65OUBhtur3rd2mYsEhdAc54jVILzybrvxml5h0s,13815
 naeural_core/main/net_mon.py,sha256=qlyo1fqTeQy_M9VfJOxon_PBbQat0QO9Zbu_93FMbLc,88144
-naeural_core/main/orchestrator.py,sha256=EodPSzrJd-Yg_RnBIA6-aIsMBa94I5uV1ATZUR5j3Kg,70750
-naeural_core/main/ver.py,sha256=Fip6sWAtYku7LUkSjMOXpG8On1M6iP6Ca2XL401fIp4,335
+naeural_core/main/orchestrator.py,sha256=PzKsv3M-knOmfum41MEN3tRmMjbRcTLn0aj3NVK35MM,70878
+naeural_core/main/ver.py,sha256=Ulb7BDcSagoVACfyK_sEKr0DiMGB9RS_q3e-Qcqka8E,335
 naeural_core/main/orchestrator_mixins/__init__.py,sha256=MNleg48vdlqsyAR8Vamjl4ahG2jwCH5kLbQN5CfU57E,149
 naeural_core/main/orchestrator_mixins/managers_init.py,sha256=sQVqpr99a5WP9HCloYCyaWDW5J3IypEImlf703bqTF4,6692
 naeural_core/main/orchestrator_mixins/utils.py,sha256=jMa0uStVNLQmp0VhNMRvfBDjo387ORLlUVLthRNBKqc,1866
@@ -555,7 +555,7 @@ naeural_core/utils/tracing/onnx/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 naeural_core/utils/tracing/onnx/base_trt_scripter.py,sha256=1FelEBo7JGsc8hbJ3sevzxnM-J61nvBHz6L1VLpZrVc,2043
 naeural_core/utils/tracing/onnx/utils.py,sha256=IKmqUWakrMWn34uJvbRjNLacdszD8jkkQBFPUhgJtOQ,5618
 naeural_core/utils/web_app/favicon.ico,sha256=zU6-Jxx4ol1A9FJvcQELYV9DiqwqyvjPS89xQybZE74,15406
-naeural_core-7.7.246.dist-info/METADATA,sha256=7TJG8ZVWo-2u1HbLnvfKFEERby9Q_fB2EsoZIDTOfIY,6522
-naeural_core-7.7.246.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-naeural_core-7.7.246.dist-info/licenses/LICENSE,sha256=SPHPWjOdAUUUUI020nI5VNCtFjmTOlJpi1cZxyB3gKo,11339
-naeural_core-7.7.246.dist-info/RECORD,,
+naeural_core-7.7.248.dist-info/METADATA,sha256=gSIrss11lt0A52kui8DuqG2By9gqFfJGOf-MBkDnrhA,6522
+naeural_core-7.7.248.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+naeural_core-7.7.248.dist-info/licenses/LICENSE,sha256=SPHPWjOdAUUUUI020nI5VNCtFjmTOlJpi1cZxyB3gKo,11339
+naeural_core-7.7.248.dist-info/RECORD,,