holado 0.2.3__py3-none-any.whl → 0.2.5__py3-none-any.whl

holado_logging/common/logging/log_config.py

@@ -1,128 +1,153 @@
-
-#################################################
-# HolAdo (Holistic Automation do)
-#
-# (C) Copyright 2021-2025 by Eric Klumpp
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-# The Software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the Software.
-#################################################
-
-import logging
-
-
-# logger = logging.getLogger(__name__)
-
-
-class LogConfig(object):
-    TLogger = None
-    TManager = None
-    default_level = logging.INFO
-    
-    @classmethod
-    def configure(cls, initialize_logging=True, log_level=None):
-        # HolAdo needs at least to add logging level TRACE and PRINT
-        cls.add_logging_level_trace()
-        cls.add_logging_level_print()
-        
-        if log_level:
-            if isinstance(log_level, str):
-                cls.default_level = logging._nameToLevel[log_level]
-            else:
-                cls.default_level = log_level
-        
-        if initialize_logging:
-            from holado_logging.common.logging.holado_logger import HALogger
-            
-            HALogger.default_message_size_limit = 10000
-            cls.TLogger = HALogger
-            cls.TManager = logging.Manager
-            
-            # Configure logging
-            cls.configure_logging()
-    
-    @classmethod
-    def configure_logging(cls):
-        #TODO EKL: make loggers configuration optional
-        # Configure loggers
-        from holado_logging.common.logging.holado_logger import TestRootLogger
-        logging.root = TestRootLogger(cls.default_level)
-        logging.Logger.root = logging.root
-        logging.Logger.manager = cls.TManager(cls.TLogger.root)
-        
-        logging.setLoggerClass(cls.TLogger)
-        
-    
-    @classmethod
-    def add_logging_level_print(cls):
-        if not cls.has_logging_level("PRINT"):
-            cls.add_logging_level("PRINT", 45, None)
-    
-    @classmethod
-    def add_logging_level_trace(cls):
-        if not cls.has_logging_level("TRACE"):
-            cls.add_logging_level("TRACE", 5, None)
-        
-    
-    @classmethod
-    def has_logging_level(cls, levelName):
-        return hasattr(logging, levelName)
-    
-    @classmethod
-    def add_logging_level(cls, levelName, levelNum, methodName=None):
-        """
-        This method was implemented and shared by the author of library haggis (https://haggis.readthedocs.io).
-        
-        Comprehensively adds a new logging level to the `logging` module and the
-        currently configured logging class.
-    
-        `levelName` becomes an attribute of the `logging` module with the value
-        `levelNum`. `methodName` becomes a convenience method for both `logging`
-        itself and the class returned by `logging.getLoggerClass()` (usually just
-        `logging.Logger`). If `methodName` is not specified, `levelName.lower()` is
-        used.
-    
-        To avoid accidental clobberings of existing attributes, this method will
-        raise an `AttributeError` if the level name is already an attribute of the
-        `logging` module or if the method name is already present 
-    
-        Example
-        -------
-        >>> addLoggingLevel('TRACE', logging.DEBUG - 5)
-        >>> logging.getLogger(__name__).setLevel("TRACE")
-        >>> logging.getLogger(__name__).trace('that worked')
-        >>> logging.trace('so did this')
-        >>> logging.TRACE
-        5
-    
-        """
-        if not methodName:
-            methodName = levelName.lower()
-    
-        if hasattr(logging, levelName):
-            raise AttributeError('{} already defined in logging module'.format(levelName))
-        if hasattr(logging, methodName):
-            raise AttributeError('{} already defined in logging module'.format(methodName))
-        if hasattr(logging.getLoggerClass(), methodName):
-            raise AttributeError('{} already defined in logger class'.format(methodName))
-    
-        # This method was inspired by the answers to Stack Overflow post
-        # http://stackoverflow.com/q/2183233/2988730, especially
-        # http://stackoverflow.com/a/13638084/2988730
-        def logForLevel(self, message, *args, **kwargs):
-            if self.isEnabledFor(levelNum):
-                self._log(levelNum, message, args, **kwargs)
-        def logToRoot(message, *args, **kwargs):
-            logging.log(levelNum, message, *args, **kwargs)
-    
-        logging.addLevelName(levelNum, levelName)
-        setattr(logging, levelName, levelNum)
-        setattr(logging.getLoggerClass(), methodName, logForLevel)
-        setattr(logging, methodName, logToRoot)
-    
-    
-    
+
+#################################################
+# HolAdo (Holistic Automation do)
+#
+# (C) Copyright 2021-2025 by Eric Klumpp
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+# The Software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the Software.
+#################################################
+
+import logging
+
+
+# logger = logging.getLogger(__name__)
+
+
+class LogConfig(object):
+    TLogger = None
+    TManager = None
+    config_file_path = None
+    default_level = logging.INFO
+    log_on_console=False
+    log_in_file=True
+    __is_configured = False
+    
+    @classmethod
+    def configure(cls, use_holado_logger=True, config_file_path=None, log_level=None, log_on_console=False, log_in_file=True):
+        if cls.__is_configured:
+            logging.warning(f"Logging was already configured, it is not possible to configure it twice. This new configuration is skipped.")
+            return
+        
+        # HolAdo needs at least to add logging level TRACE and PRINT
+        cls.add_logging_level_trace()
+        cls.add_logging_level_print()
+        
+        cls.config_file_path = config_file_path
+        if config_file_path:
+            import configparser
+            config = configparser.ConfigParser()
+            config.read(config_file_path)
+            log_level = config.get("holado", "level")
+            log_on_console = config.get("holado", "log_on_console")
+            log_in_file = config.get("holado", "log_in_file")
+        
+        if log_level:
+            if isinstance(log_level, str):
+                log_level = logging._nameToLevel[log_level]
+            cls.default_level = log_level
+        if log_on_console:
+            if isinstance(log_on_console, str):
+                log_on_console = True if log_on_console == "True" else False
+            cls.log_on_console = log_on_console
+        if log_in_file:
+            if isinstance(log_in_file, str):
+                log_in_file = True if log_in_file == "True" else False
+            cls.log_in_file = log_in_file
+        
+        if use_holado_logger:
+            cls.__set_holado_loggers()
+        
+        cls.__is_configured = True
+    
+    @classmethod
+    def __set_holado_loggers(cls):
+        from holado_logging.common.logging.holado_logger import HALogger
+        
+        # Configure loggers to use
+        HALogger.default_message_size_limit = 10000
+        cls.TLogger = HALogger
+        cls.TManager = logging.Manager
+        
+        # Set loggers in logging
+        from holado_logging.common.logging.holado_logger import HARootLogger
+        logging.root = HARootLogger(cls.default_level)
+        logging.Logger.root = logging.root
+        logging.Logger.manager = cls.TManager(cls.TLogger.root)
+        
+        logging.setLoggerClass(cls.TLogger)
+        
+    
+    @classmethod
+    def add_logging_level_print(cls):
+        if not cls.has_logging_level("PRINT"):
+            cls.add_logging_level("PRINT", 45, None)
+    
+    @classmethod
+    def add_logging_level_trace(cls):
+        if not cls.has_logging_level("TRACE"):
+            cls.add_logging_level("TRACE", 5, None)
+        
+    
+    @classmethod
+    def has_logging_level(cls, levelName):
+        return hasattr(logging, levelName)
+    
+    @classmethod
+    def add_logging_level(cls, levelName, levelNum, methodName=None):
+        """
+        This method was implemented and shared by the author of library haggis (https://haggis.readthedocs.io).
+        
+        Comprehensively adds a new logging level to the `logging` module and the
+        currently configured logging class.
+    
+        `levelName` becomes an attribute of the `logging` module with the value
+        `levelNum`. `methodName` becomes a convenience method for both `logging`
+        itself and the class returned by `logging.getLoggerClass()` (usually just
+        `logging.Logger`). If `methodName` is not specified, `levelName.lower()` is
+        used.
+    
+        To avoid accidental clobberings of existing attributes, this method will
+        raise an `AttributeError` if the level name is already an attribute of the
+        `logging` module or if the method name is already present 
+    
+        Example
+        -------
+        >>> addLoggingLevel('TRACE', logging.DEBUG - 5)
+        >>> logging.getLogger(__name__).setLevel("TRACE")
+        >>> logging.getLogger(__name__).trace('that worked')
+        >>> logging.trace('so did this')
+        >>> logging.TRACE
+        5
+    
+        """
+        if not methodName:
+            methodName = levelName.lower()
+    
+        if hasattr(logging, levelName):
+            raise AttributeError('{} already defined in logging module'.format(levelName))
+        if hasattr(logging, methodName):
+            raise AttributeError('{} already defined in logging module'.format(methodName))
+        if hasattr(logging.getLoggerClass(), methodName):
+            raise AttributeError('{} already defined in logger class'.format(methodName))
+    
+        # This method was inspired by the answers to Stack Overflow post
+        # http://stackoverflow.com/q/2183233/2988730, especially
+        # http://stackoverflow.com/a/13638084/2988730
+        def logForLevel(self, message, *args, **kwargs):
+            if self.isEnabledFor(levelNum):
+                self._log(levelNum, message, args, **kwargs)
+        def logToRoot(message, *args, **kwargs):
+            logging.log(levelNum, message, *args, **kwargs)
+    
+        logging.addLevelName(levelNum, levelName)
+        setattr(logging, levelName, levelNum)
+        setattr(logging.getLoggerClass(), methodName, logForLevel)
+        setattr(logging, methodName, logToRoot)
+    
+    
+    
     

holado_logging/common/logging/log_manager.py

@@ -63,28 +63,28 @@ class LogManager(object):
                 self.format = '%(asctime)s | %(process)-5d-%(thread)-5d | %(levelname)5s | %(module)35s | %(message)s'
                 self.style = '%'
         
-    def initialize(self, log_on_console=True):
+    def configure(self):
+        self.__config_file_path = LogConfig.config_file_path
+        
+        if self.__config_file_path:
+            config = configparser.ConfigParser()
+            config.read(self.__config_file_path)
+            
+            if config.has_section("loggers_levels"):
+                self.__loggers_levels = config.items(section="loggers_levels")
+    
+    def initialize(self):
         """
         Initialize log manager.
         If log_on_console is True, logs are published on console until a new configuration by calling method set_config
         """
-        if log_on_console:
+        handlers = []
+        if LogConfig.log_on_console:
             self.on_console = True
             self.__console_handler = self.__new_console_handler()
-            logging.basicConfig(format=self.format, style=self.style, level=LogConfig.default_level, handlers=[self.__console_handler])
-        else:
-            logging.basicConfig(format=self.format, style=self.style, level=LogConfig.default_level, handlers=[])
-        
-    def set_config_file_path(self, file_path, update_default_level=True):
-        self.__config_file_path = file_path
+            handlers.append(self.__console_handler)
         
-        config = configparser.ConfigParser()
-        config.read(self.__config_file_path)
-        if update_default_level:
-            LogConfig.default_level = config.get("logger_root", "level")
-        
-        if config.has_section("loggers_levels"):
-            self.__loggers_levels = config.items(section="loggers_levels")
+        logging.basicConfig(format=self.format, style=self.style, level=LogConfig.default_level, handlers=handlers)
     
     def has_log_file(self, file_name):
         with self.__files_lock:
@@ -154,8 +154,7 @@ class LogManager(object):
         # Update log destination to files
         with self.__files_lock:
             # Remove old log files
-            # if self.__root_file_name:
-            #     self.remove_root_file_handler(do_reset=True)
+            # Note: root file is not removed if it is configured
             for file_name in list(self.__file_handlers.keys()):
                 if file_name not in self.__file_names:
                     self.remove_file_handler(file_name, do_remove_log_file=False)
@@ -166,7 +165,6 @@ class LogManager(object):
             for file_name in self.__file_names:
                 if file_name not in list(self.__file_handlers.keys()):
                     self.add_file_handler(file_name)
-                
         
         # level
         if logger_.getEffectiveLevel() != LogConfig.default_level:
@@ -176,7 +174,10 @@ class LogManager(object):
         for name, level in self.__loggers_levels:
             if not name.startswith("#"):
                 logging.getLogger(name).setLevel(level)
-                
+        
+        # WARNING: For local debug only
+        # logging.getLogger("holado_logging.common.logging.log_manager").setLevel(logging.DEBUG)
+        
     def set_level(self, log_level, do_set_config=True):
         from holado_core.common.exceptions.technical_exception import TechnicalException
         

holado_multitask/multitasking/multitask_manager.py

@@ -187,7 +187,7 @@ class MultitaskManager(object):
     
     def prepare_thread(self, name, update_parent=True):
         """
-        Create a process context and return a unique name based to given name
+        Create a thread context and return a unique name based to given name
         """
         with self.__thread_lock:
             res = name

holado_multitask/multithreading/thread.py

@@ -21,6 +21,7 @@ from holado_python.standard_library.typing import Typing
 from holado.common.handlers.undefined import undefined_argument, default_context
 from holado_core.common.exceptions.technical_exception import TimeoutTechnicalException
 from holado_core.common.exceptions.functional_exception import FunctionalException
+from holado_python.common.tools.datetime import DateTime, FORMAT_DATETIME_ISO
 
 logger = logging.getLogger(__name__)
 
@@ -35,7 +36,8 @@ class Thread(threading.Thread):
             default_wait_timeout = Config.timeout_seconds * 1000
             
         self.__name = name
-        self.__unique_name = SessionContext.instance().multitask_manager.prepare_thread(name)
+        # Note: if SessionContext doesn't have an instance (like during session context reset), use name+now as unique name
+        self.__unique_name = SessionContext.instance().multitask_manager.prepare_thread(name) if SessionContext.has_instance() else f"{name}_{DateTime.datetime_2_str(DateTime.now(), FORMAT_DATETIME_ISO)}"
         self.__default_wait_timeout = default_wait_timeout
         self.__delay_before_run_sec = delay_before_run_sec
 
@@ -48,7 +50,8 @@ class Thread(threading.Thread):
         self._is_idle.set()
         
         # Register thread
-        if register_thread:
+        # Note: Do not register thread if session context doesn't have an instance (like during session context reset)
+        if register_thread and SessionContext.has_instance():
             # Registered name has to be unique
             SessionContext.instance().threads_manager.register_thread(self.__unique_name, self, scope=register_scope)
         
@@ -74,13 +77,14 @@ class Thread(threading.Thread):
         
     def _set_ident(self):
         super()._set_ident()
-        if not MultitaskManager.has_thread_native_id():
+        if not MultitaskManager.has_thread_native_id() and SessionContext.has_instance():
             SessionContext.instance().multitask_manager.set_thread_uid(self.__unique_name, MultitaskManager.get_thread_uid(thread=self))
         
     if MultitaskManager.has_thread_native_id():
         def _set_native_id(self):
             super()._set_native_id()
-            SessionContext.instance().multitask_manager.set_thread_uid(self.__unique_name, MultitaskManager.get_thread_uid(thread=self))
+            if SessionContext.has_instance():
+                SessionContext.instance().multitask_manager.set_thread_uid(self.__unique_name, MultitaskManager.get_thread_uid(thread=self))
         
     def join(self, timeout=undefined_argument, raise_if_still_alive=True):
         """

holado_protobuf/__init__.py

@@ -19,7 +19,6 @@ def dependencies():
 
 def register():
     from holado.common.context.session_context import SessionContext
-    from holado_protobuf.ipc.protobuf.types.google.protobuf import Timestamp
     from holado_python.common.tools.comparators.datetime_comparator import DatetimeComparator
     from holado_python.common.tools.datetime import DateTime
     
@@ -51,6 +50,7 @@ def register():
         
         # Register datetime conversion
         
+        from holado_protobuf.ipc.protobuf.types.google.protobuf import Timestamp
         DatetimeComparator.register_resource_for_type_in_class('protobuf.Timestamp', None, 
                                                                lambda o: isinstance(o, Timestamp.protobuf_class()), 
                                                                lambda o: DateTime.seconds_nanos_to_datetime(o.seconds, o.nanos),