v0.45.1: Fix Log with log console format set to None

Also add prefix "[SettingsLoader] " to print statements in SettingsLoader if we do not write to log

pyproject.toml

@@ -1,7 +1,7 @@
 # MARK: Project info
 [project]
 name = "corelibs"
-version = "0.44.0"
+version = "0.45.1"
 description = "Collection of utils for Python scripts"
 readme = "README.md"
 requires-python = ">=3.13"

src/corelibs/check_handling/regex_constants_compiled.py

@@ -0,0 +1,23 @@
+"""
+List of regex compiled strings that can be used
+"""
+
+from corelibs.check_handling.regex_constants import (
+    compile_re,
+    EMAIL_BASIC_REGEX,
+    NAME_EMAIL_SIMPLE_REGEX,
+    NAME_EMAIL_BASIC_REGEX,
+    DOMAIN_WITH_LOCALHOST_REGEX,
+    DOMAIN_WITH_LOCALHOST_PORT_REGEX,
+    DOMAIN_REGEX
+)
+
+# all above in compiled form
+COMPILED_EMAIL_BASIC_REGEX = compile_re(EMAIL_BASIC_REGEX)
+COMPILED_NAME_EMAIL_SIMPLE_REGEX = compile_re(NAME_EMAIL_SIMPLE_REGEX)
+COMPILED_NAME_EMAIL_BASIC_REGEX = compile_re(NAME_EMAIL_BASIC_REGEX)
+COMPILED_DOMAIN_WITH_LOCALHOST_REGEX = compile_re(DOMAIN_WITH_LOCALHOST_REGEX)
+COMPILED_DOMAIN_WITH_LOCALHOST_PORT_REGEX = compile_re(DOMAIN_WITH_LOCALHOST_PORT_REGEX)
+COMPILED_DOMAIN_REGEX = compile_re(DOMAIN_REGEX)
+
+# __END__

src/corelibs/config_handling/settings_loader.py

@@ -577,7 +577,7 @@ class SettingsLoader:
             self.log.logger.log(Log.get_log_level_int(level), msg, stacklevel=2)
         if self.log is None or self.always_print:
             if print_error:
-                print(msg)
+                print(f"[SettingsLoader] {msg}")
         if level == 'ERROR':
             # remove any prefix [!] for error message list
             self.__error_msg.append(msg.replace('[!] ', '').strip())

src/corelibs/logging_handling/log.py

@@ -602,9 +602,9 @@ class Log(LogParent):
                 __setting = self.DEFAULT_LOG_SETTINGS.get(__log_entry, True)
             default_log_settings[__log_entry] = __setting
         # check console log type
-        default_log_settings['console_format_type'] = cast('ConsoleFormat', log_settings.get(
-            'console_format_type', self.DEFAULT_LOG_SETTINGS['console_format_type']
-        ))
+        if (console_format_type := log_settings.get('console_format_type')) is None:
+            console_format_type = self.DEFAULT_LOG_SETTINGS['console_format_type']
+        default_log_settings['console_format_type'] = cast('ConsoleFormat', console_format_type)
         # check log queue
         __setting = log_settings.get('log_queue', self.DEFAULT_LOG_SETTINGS['log_queue'])
         if __setting is not None:
@@ -774,6 +774,16 @@ class Log(LogParent):
             self.__set_console_formatter(console_format_type)
         )
 
+    def get_console_formatter(self) -> ConsoleFormat:
+        """
+        Get the current console formatter, this the settings type
+        Note that if eg "ALL" is set it will return the combined information but not the ALL flag name itself
+
+        Returns:
+            ConsoleFormat -- _description_
+        """
+        return self.log_settings['console_format_type']
+
     # MARK: console handler
     def __create_console_handler(
         self, handler_name: str,

test-run/check_handling/regex_checks.py

@@ -6,6 +6,10 @@ from corelibs_text_colors.text_colors import Colors
 from corelibs.check_handling.regex_constants import (
     compile_re, DOMAIN_WITH_LOCALHOST_REGEX, EMAIL_BASIC_REGEX, NAME_EMAIL_BASIC_REGEX, SUB_EMAIL_BASIC_REGEX
 )
+from corelibs.check_handling.regex_constants_compiled import (
+    COMPILED_DOMAIN_WITH_LOCALHOST_REGEX, COMPILED_EMAIL_BASIC_REGEX,
+    COMPILED_NAME_EMAIL_SIMPLE_REGEX, COMPILED_NAME_EMAIL_BASIC_REGEX
+)
 
 NAME_EMAIL_SIMPLE_REGEX = r"""
 ^\s*(?:"(?P<name1>[^"]+)"\s*<(?P<email1>[^>]+)>|
@@ -28,7 +32,7 @@ def domain_test():
         "some-domain.org"
     ]
 
-    regex_domain_check = compile_re(DOMAIN_WITH_LOCALHOST_REGEX)
+    regex_domain_check = COMPILED_DOMAIN_WITH_LOCALHOST_REGEX
     print(f"REGEX: {DOMAIN_WITH_LOCALHOST_REGEX}")
     print(f"Check regex: {regex_domain_check.search('localhost')}")
 
@@ -59,10 +63,15 @@ def email_test():
     test open <open@open.com>
     """
 
-    basic_email = compile_re(EMAIL_BASIC_REGEX)
+    print(f"REGEX: SUB_EMAIL_BASIC_REGEX: {SUB_EMAIL_BASIC_REGEX}")
+    print(f"REGEX: EMAIL_BASIC_REGEX: {EMAIL_BASIC_REGEX}")
+    print(f"REGEX: COMPILED_NAME_EMAIL_SIMPLE_REGEX: {COMPILED_NAME_EMAIL_SIMPLE_REGEX}")
+    print(f"REGEX: NAME_EMAIL_BASIC_REGEX: {NAME_EMAIL_BASIC_REGEX}")
+
+    basic_email = COMPILED_EMAIL_BASIC_REGEX
     sub_basic_email = compile_re(SUB_EMAIL_BASIC_REGEX)
-    simple_name_email_regex = compile_re(NAME_EMAIL_SIMPLE_REGEX)
-    full_name_email_regex = compile_re(NAME_EMAIL_BASIC_REGEX)
+    simple_name_email_regex = COMPILED_NAME_EMAIL_SIMPLE_REGEX
+    full_name_email_regex = COMPILED_NAME_EMAIL_BASIC_REGEX
     for email in email_list.splitlines():
         email = email.strip()
         if not email:

test-run/logging_handling/log.py

@@ -27,7 +27,8 @@ def main():
             "per_run_log": True,
             # "console_format_type": ConsoleFormatSettings.NONE,
             # "console_format_type": ConsoleFormatSettings.MINIMAL,
-            "console_format_type": ConsoleFormat.TIME_MICROSECONDS | ConsoleFormat.NAME | ConsoleFormat.LEVEL,
+            # "console_format_type": ConsoleFormat.TIME_MICROSECONDS | ConsoleFormat.NAME | ConsoleFormat.LEVEL,
+            "console_format_type": None,
             # "console_format_type": ConsoleFormat.NAME,
             # "console_format_type": (
             #     ConsoleFormat.TIME | ConsoleFormat.TIMEZONE | ConsoleFormat.LINENO | ConsoleFormat.LEVEL
@@ -121,10 +122,16 @@ def main():
 
     log.set_log_level(Log.CONSOLE_HANDLER, LoggingLevel.DEBUG)
     log.debug('Current logging format: %s', log.log_settings['console_format_type'])
+    log.debug('Current console formatter: %s', log.get_console_formatter())
     log.update_console_formatter(ConsoleFormat.TIME | ConsoleFormat.LINENO)
-    log.info('Does hit show less')
+    log.info('Does hit show less A')
+    log.debug('Current console formatter after A: %s', log.get_console_formatter())
     log.update_console_formatter(ConsoleFormat.TIME | ConsoleFormat.LINENO)
     log.info('Does hit show less B')
+    log.debug('Current console formatter after B: %s', log.get_console_formatter())
+    log.update_console_formatter(ConsoleFormatSettings.ALL)
+    log.info('Does hit show less C')
+    log.debug('Current console formatter after C: %s', log.get_console_formatter())
     print(f"*** Any handler is minimum level ERROR: {log.any_handler_is_minimum_level(LoggingLevel.ERROR)}")
     print(f"*** Any handler is minimum level DEBUG: {log.any_handler_is_minimum_level(LoggingLevel.DEBUG)}")
 

tests/unit/check_handling/test_regex_constants.py

@@ -14,7 +14,15 @@ from corelibs.check_handling.regex_constants import (
     NAME_EMAIL_BASIC_REGEX,
     DOMAIN_WITH_LOCALHOST_REGEX,
     DOMAIN_WITH_LOCALHOST_PORT_REGEX,
-    DOMAIN_REGEX,
+    DOMAIN_REGEX
+)
+from corelibs.check_handling.regex_constants_compiled import (
+    COMPILED_EMAIL_BASIC_REGEX,
+    COMPILED_NAME_EMAIL_SIMPLE_REGEX,
+    COMPILED_NAME_EMAIL_BASIC_REGEX,
+    COMPILED_DOMAIN_WITH_LOCALHOST_REGEX,
+    COMPILED_DOMAIN_WITH_LOCALHOST_PORT_REGEX,
+    COMPILED_DOMAIN_REGEX,
 )
 
 
@@ -51,7 +59,7 @@ class TestEmailBasicRegex:
     @pytest.fixture
     def email_pattern(self) -> re.Pattern[str]:
         """Fixture that returns compiled email regex pattern."""
-        return compile_re(EMAIL_BASIC_REGEX)
+        return COMPILED_EMAIL_BASIC_REGEX
 
     @pytest.mark.parametrize("valid_email", [
         "user@example.com",
@@ -192,7 +200,7 @@ class TestNameEmailSimpleRegex:
     @pytest.fixture
     def name_email_simple_pattern(self) -> re.Pattern[str]:
         """Fixture that returns compiled name+email simple regex pattern."""
-        return compile_re(NAME_EMAIL_SIMPLE_REGEX)
+        return COMPILED_NAME_EMAIL_SIMPLE_REGEX
 
     @pytest.mark.parametrize("test_input,expected_groups", [
         ('"John Doe" <john@example.com>', {'name1': 'John Doe', 'email1': 'john@example.com'}),
@@ -284,7 +292,7 @@ class TestNameEmailBasicRegex:
     @pytest.fixture
     def name_email_basic_pattern(self) -> re.Pattern[str]:
         """Fixture that returns compiled name+email basic regex pattern."""
-        return compile_re(NAME_EMAIL_BASIC_REGEX)
+        return COMPILED_NAME_EMAIL_BASIC_REGEX
 
     @pytest.mark.parametrize("test_input,expected_name,expected_email", [
         ('"John Doe" <john@example.com>', 'John Doe', 'john@example.com'),
@@ -391,7 +399,7 @@ class TestDomainWithLocalhostRegex:
     @pytest.fixture
     def domain_localhost_pattern(self) -> re.Pattern[str]:
         """Fixture that returns compiled domain with localhost regex pattern."""
-        return compile_re(DOMAIN_WITH_LOCALHOST_REGEX)
+        return COMPILED_DOMAIN_WITH_LOCALHOST_REGEX
 
     @pytest.mark.parametrize("valid_domain", [
         "localhost",
@@ -443,7 +451,7 @@ class TestDomainWithLocalhostPortRegex:
     @pytest.fixture
     def domain_localhost_port_pattern(self) -> re.Pattern[str]:
         """Fixture that returns compiled domain and localhost with port pattern."""
-        return compile_re(DOMAIN_WITH_LOCALHOST_PORT_REGEX)
+        return COMPILED_DOMAIN_WITH_LOCALHOST_PORT_REGEX
 
     @pytest.mark.parametrize("valid_domain", [
         "localhost",
@@ -509,7 +517,7 @@ class TestDomainRegex:
     @pytest.fixture
     def domain_pattern(self) -> re.Pattern[str]:
         """Fixture that returns compiled domain regex pattern."""
-        return compile_re(DOMAIN_REGEX)
+        return COMPILED_DOMAIN_REGEX
 
     @pytest.mark.parametrize("valid_domain", [
         "example.com",
@@ -568,6 +576,8 @@ class TestRegexPatternConsistency:
         """Test that all regex patterns can be compiled without errors."""
         patterns = [
             EMAIL_BASIC_REGEX,
+            NAME_EMAIL_SIMPLE_REGEX,
+            NAME_EMAIL_BASIC_REGEX,
             DOMAIN_WITH_LOCALHOST_REGEX,
             DOMAIN_WITH_LOCALHOST_PORT_REGEX,
             DOMAIN_REGEX,
@@ -576,9 +586,24 @@ class TestRegexPatternConsistency:
             compiled = compile_re(pattern)
             assert isinstance(compiled, re.Pattern)
 
+    def test_compiled_patterns_are_patterns(self) -> None:
+        """Test that all COMPILED_ constants are Pattern objects."""
+        compiled_patterns = [
+            COMPILED_EMAIL_BASIC_REGEX,
+            COMPILED_NAME_EMAIL_SIMPLE_REGEX,
+            COMPILED_NAME_EMAIL_BASIC_REGEX,
+            COMPILED_DOMAIN_WITH_LOCALHOST_REGEX,
+            COMPILED_DOMAIN_WITH_LOCALHOST_PORT_REGEX,
+            COMPILED_DOMAIN_REGEX,
+        ]
+        for pattern in compiled_patterns:
+            assert isinstance(pattern, re.Pattern)
+
     def test_domain_patterns_are_strings(self) -> None:
         """Test that all regex constants are strings."""
         assert isinstance(EMAIL_BASIC_REGEX, str)
+        assert isinstance(NAME_EMAIL_SIMPLE_REGEX, str)
+        assert isinstance(NAME_EMAIL_BASIC_REGEX, str)
         assert isinstance(DOMAIN_WITH_LOCALHOST_REGEX, str)
         assert isinstance(DOMAIN_WITH_LOCALHOST_PORT_REGEX, str)
         assert isinstance(DOMAIN_REGEX, str)
@@ -587,8 +612,8 @@ class TestRegexPatternConsistency:
         """Test that domain patterns follow expected hierarchy."""
         # DOMAIN_WITH_LOCALHOST_PORT_REGEX should accept everything
         # DOMAIN_WITH_LOCALHOST_REGEX accepts
-        domain_localhost = compile_re(DOMAIN_WITH_LOCALHOST_REGEX)
-        domain_localhost_port = compile_re(DOMAIN_WITH_LOCALHOST_PORT_REGEX)
+        domain_localhost = COMPILED_DOMAIN_WITH_LOCALHOST_REGEX
+        domain_localhost_port = COMPILED_DOMAIN_WITH_LOCALHOST_PORT_REGEX
 
         test_cases = ["example.com", "subdomain.example.com", "localhost"]
         for test_case in test_cases:

tests/unit/logging_handling/log_testing/test_log_3_custom_console_formatter.py

@@ -28,6 +28,7 @@ def tmp_log_path(tmp_path: Path) -> Path:
 @pytest.fixture
 def basic_log_settings() -> LogSettings:
     """Basic log settings for testing"""
+    # Return a new dict each time to avoid state pollution
     return {
         "log_level_console": LoggingLevel.WARNING,
         "log_level_file": LoggingLevel.DEBUG,
@@ -308,4 +309,54 @@ class TestUpdateConsoleFormatter:
         # Verify message was logged
         assert "Test warning message" in caplog.text
 
+    def test_log_console_format_option_set_to_none(
+        self, tmp_log_path: Path
+    ):
+        """Test that when log_console_format option is set to None, it uses ConsoleFormatSettings.ALL"""
+        # Save the original DEFAULT_LOG_SETTINGS to restore it after test
+        original_default = Log.DEFAULT_LOG_SETTINGS.copy()
+
+        try:
+            # Reset DEFAULT_LOG_SETTINGS to ensure clean state
+            Log.DEFAULT_LOG_SETTINGS = {
+                "log_level_console": Log.DEFAULT_LOG_LEVEL_CONSOLE,
+                "log_level_file": Log.DEFAULT_LOG_LEVEL_FILE,
+                "per_run_log": False,
+                "console_enabled": True,
+                "console_color_output_enabled": True,
+                "console_format_type": ConsoleFormatSettings.ALL,
+                "add_start_info": True,
+                "add_end_info": False,
+                "log_queue": None,
+            }
+
+            # Create a fresh settings dict with console_format_type explicitly set to None
+            settings: LogSettings = {
+                "log_level_console": LoggingLevel.WARNING,
+                "log_level_file": LoggingLevel.DEBUG,
+                "per_run_log": False,
+                "console_enabled": True,
+                "console_color_output_enabled": False,
+                "console_format_type": None,  # type: ignore
+                "add_start_info": False,
+                "add_end_info": False,
+                "log_queue": None,
+            }
+
+            # Verify that None is explicitly set in the input
+            assert settings['console_format_type'] is None
+
+            log = Log(
+                log_path=tmp_log_path,
+                log_name="test_log",
+                log_settings=settings
+            )
+
+            # Verify that None was replaced with ConsoleFormatSettings.ALL
+            # The Log class should replace None with the default value (ALL)
+            assert log.log_settings['console_format_type'] == ConsoleFormatSettings.ALL
+        finally:
+            # Restore original DEFAULT_LOG_SETTINGS
+            Log.DEFAULT_LOG_SETTINGS = original_default
+
 # __END__