refactor(logging): improve logging setup and formatting consistency

- Refactored logging setup calls across multiple files to enhance readability by standardizing the formatting of parameters.
- Cleaned up whitespace and improved indentation in logging-related code to maintain consistency and clarity.
- Ensured that logging configuration updates are handled uniformly, contributing to better maintainability of the logging system.

Author: martin-papy

packages/qdrant-loader-core/src/qdrant_loader_core/logging.py

@@ -193,14 +193,17 @@ class LoggingConfig:
     _initialized = False
     _installed_handlers: list[logging.Handler] = []
     _file_handler: logging.FileHandler | None = None
-    _current_config: tuple[
-        str,  # level
-        str,  # format
-        str | None,  # file
-        bool,  # clean_output
-        bool,  # suppress_qdrant_warnings
-        bool,  # disable_console
-    ] | None = None
+    _current_config: (
+        tuple[
+            str,  # level
+            str,  # format
+            str | None,  # file
+            bool,  # clean_output
+            bool,  # suppress_qdrant_warnings
+            bool,  # disable_console
+        ]
+        | None
+    ) = None
 
     @classmethod
     def setup(
@@ -389,5 +392,14 @@ def reconfigure(cls, *, file: str | None = None) -> None:
 
         # Update current config tuple if available
         if cls._current_config is not None:
-            level, fmt, _, clean_output, suppress_qdrant_warnings, disable_console = cls._current_config
-            cls._current_config = (level, fmt, file, clean_output, suppress_qdrant_warnings, disable_console)
+            level, fmt, _, clean_output, suppress_qdrant_warnings, disable_console = (
+                cls._current_config
+            )
+            cls._current_config = (
+                level,
+                fmt,
+                file,
+                clean_output,
+                suppress_qdrant_warnings,
+                disable_console,
+            )

packages/qdrant-loader-core/tests/test_logging_core.py

@@ -6,27 +6,26 @@ def test_redaction_filter_masks_and_marks(caplog):
     caplog.set_level(logging.INFO)
 
     logging_mod = import_module("qdrant_loader_core.logging")
-    LoggingConfig = logging_mod.LoggingConfig
     RedactionFilter = logging_mod.RedactionFilter
 
     # Keep root handlers to restore after test to avoid side-effects
     root = logging.getLogger()
     prev_handlers = list(root.handlers)
-    
+
     # Create a custom handler that captures messages after redaction
     captured_messages = []
-    
+
     class TestHandler(logging.Handler):
         def emit(self, record):
             # Format the record to get the final message
             msg = self.format(record)
             captured_messages.append(msg)
-    
+
     try:
         # Clear existing handlers and add our test handler with redaction filter
         for h in list(root.handlers):
             root.removeHandler(h)
-        
+
         test_handler = TestHandler()
         test_handler.setLevel(logging.INFO)
         test_handler.addFilter(RedactionFilter())
@@ -41,13 +40,18 @@ def emit(self, record):
         logger.info("arg test %s", "sk-ABCDEFGH")
 
         # Redaction marker should appear at least once
-        assert any("***REDACTED***" in m for m in captured_messages), f"Messages: {captured_messages}"
+        assert any(
+            "***REDACTED***" in m for m in captured_messages
+        ), f"Messages: {captured_messages}"
         # Original secrets should not appear
-        assert all("sk-ABCDEFGHIJKLMN" not in m for m in captured_messages), f"Messages: {captured_messages}"
+        assert all(
+            "sk-ABCDEFGHIJKLMN" not in m for m in captured_messages
+        ), f"Messages: {captured_messages}"
         # Mask should keep first/last 2 chars for long secrets.
         # Depending on exact pattern matched, the visible context may be key or value.
         assert any(
-            ("sk***REDACTED***MN" in m) or ("ap***REDACTED***MN" in m) for m in captured_messages
+            ("sk***REDACTED***MN" in m) or ("ap***REDACTED***MN" in m)
+            for m in captured_messages
         ), f"Messages: {captured_messages}"
     finally:
         # Restore handlers

packages/qdrant-loader-mcp-server/src/qdrant_loader_mcp_server/cli.py

@@ -55,11 +55,16 @@ def _setup_logging(log_level: str, transport: str | None = None) -> None:
                 # Only switch file target (none in stdio; may be env provided)
                 LoggingConfig.reconfigure(file=os.getenv("MCP_LOG_FILE"))  # type: ignore[attr-defined]
             else:
-                LoggingConfig.setup(level=level, format=("json" if disable_console_logging else "console"))
+                LoggingConfig.setup(
+                    level=level,
+                    format=("json" if disable_console_logging else "console"),
+                )
         else:
             # Force replace handlers on older versions
             logging.getLogger().handlers = []
-            LoggingConfig.setup(level=level, format=("json" if disable_console_logging else "console"))
+            LoggingConfig.setup(
+                level=level, format=("json" if disable_console_logging else "console")
+            )
     except Exception as e:
         print(f"Failed to setup logging: {e}", file=sys.stderr)
 

packages/qdrant-loader-mcp-server/tests/unit/test_cli.py

@@ -107,7 +107,7 @@ def test_setup_logging_console_enabled(self, mock_logging_config):
         # Mock that LoggingConfig is not initialized and has no reconfigure method
         mock_logging_config._initialized = False
         mock_logging_config.reconfigure = None
-        
+
         _setup_logging("DEBUG")
 
         mock_logging_config.setup.assert_called_once_with(
@@ -121,7 +121,7 @@ def test_setup_logging_console_disabled(self, mock_logging_config):
         # Mock that LoggingConfig is not initialized and has no reconfigure method
         mock_logging_config._initialized = False
         mock_logging_config.reconfigure = None
-        
+
         _setup_logging("INFO")
 
         mock_logging_config.setup.assert_called_once_with(level="INFO", format="json")
@@ -133,7 +133,7 @@ def test_setup_logging_console_disabled_case_insensitive(self, mock_logging_conf
         # Mock that LoggingConfig is not initialized and has no reconfigure method
         mock_logging_config._initialized = False
         mock_logging_config.reconfigure = None
-        
+
         _setup_logging("WARNING")
 
         mock_logging_config.setup.assert_called_once_with(

packages/qdrant-loader-mcp-server/tests/unit/test_logging.py

@@ -200,8 +200,10 @@ def test_logging_config_suppress_qdrant_warnings():
 
         # Check if qdrant_client logger was accessed (either directly or via core)
         # The implementation may delegate to core logging which handles this
-        logger_calls = [call[0][0] for call in mock_get_logger.call_args_list if call[0]]
-        
+        logger_calls = [
+            call[0][0] for call in mock_get_logger.call_args_list if call[0]
+        ]
+
         # If core logging is available, it handles qdrant suppression internally
         # If not, the fallback should add the filter
         if "qdrant_client" in logger_calls:

packages/qdrant-loader/src/qdrant_loader/cli/commands/init_cmd.py

@@ -44,12 +44,16 @@ async def run_init_command(
                 if getattr(LoggingConfig, "_initialized", False):  # type: ignore[attr-defined]
                     LoggingConfig.reconfigure(file="qdrant-loader.log")  # type: ignore[attr-defined]
                 else:
-                    LoggingConfig.setup(level=log_level, format="console", file="qdrant-loader.log")
+                    LoggingConfig.setup(
+                        level=log_level, format="console", file="qdrant-loader.log"
+                    )
             else:
                 import logging as _py_logging
 
                 _py_logging.getLogger().handlers = []
-                LoggingConfig.setup(level=log_level, format="console", file="qdrant-loader.log")
+                LoggingConfig.setup(
+                    level=log_level, format="console", file="qdrant-loader.log"
+                )
             logger = LoggingConfig.get_logger(__name__)
 
             # Check for updates (non-blocking semantics preserved by immediate return)

packages/qdrant-loader/src/qdrant_loader/config/__init__.py

@@ -39,6 +39,7 @@
 # Load environment variables from .env file
 load_dotenv(override=False)
 
+
 def _get_logger():
     return LoggingConfig.get_logger(__name__)
 
@@ -379,7 +380,9 @@ def from_yaml(
             # Step 1: Load environment variables first
             if env_path is not None:
                 # Custom env file specified - load only this file
-                _get_logger().debug("Loading custom environment file", path=str(env_path))
+                _get_logger().debug(
+                    "Loading custom environment file", path=str(env_path)
+                )
                 if not env_path.exists():
                     raise FileNotFoundError(f"Environment file not found: {env_path}")
                 load_dotenv(env_path, override=True)

packages/qdrant-loader/src/qdrant_loader/config/workspace.py

@@ -154,7 +154,9 @@ def get_workspace_env_override(workspace_config: WorkspaceConfig) -> dict[str, s
         "STATE_DB_PATH": str(workspace_config.database_path),
     }
 
-    _get_logger().debug("Generated workspace environment overrides", overrides=overrides)
+    _get_logger().debug(
+        "Generated workspace environment overrides", overrides=overrides
+    )
     return overrides
 
 

packages/qdrant-loader/tests/unit/config/test_workspace.py

@@ -268,8 +268,8 @@ def test_create_workspace_structure_new_directory(self):
             workspace_path = Path(temp_dir) / "new_workspace"
 
             with patch("qdrant_loader.config.workspace._get_logger") as mock_get_logger:
-            mock_logger = Mock()
-            mock_get_logger.return_value = mock_logger
+                mock_logger = Mock()
+                mock_get_logger.return_value = mock_logger
                 create_workspace_structure(workspace_path)
 
                 # Verify directories were created

packages/qdrant-loader/tests/unit/utils/test_logging_redaction.py

@@ -10,19 +10,19 @@ def test_logging_redacts_sensitive_fields(caplog):
 
     # Create a custom handler to capture redacted messages
     captured_messages = []
-    
+
     class TestHandler(logging.Handler):
         def emit(self, record):
             # Format the record to get the final message after redaction
             msg = self.format(record)
             captured_messages.append(msg)
-    
+
     # Add our test handler to the root logger
     root_logger = logging.getLogger()
     test_handler = TestHandler()
     test_handler.setLevel(logging.DEBUG)
     root_logger.addHandler(test_handler)
-    
+
     try:
         logger.info(
             "config_dump",
@@ -53,19 +53,19 @@ def test_stdlib_logs_are_redacted(caplog):
 
     # Create a custom handler to capture redacted messages
     captured_messages = []
-    
+
     class TestHandler(logging.Handler):
         def emit(self, record):
             # Format the record to get the final message after redaction
             msg = self.format(record)
             captured_messages.append(msg)
-    
+
     # Add our test handler to the root logger
     root_logger = logging.getLogger()
     test_handler = TestHandler()
     test_handler.setLevel(logging.DEBUG)
     root_logger.addHandler(test_handler)
-    
+
     try:
         logger.info(
             "Sending token=%s and api_key=%s",