Console & file logging format msg seperate & removed timestamp from console & minor fixes to di

src/cpl-core/cpl/core/log/logger.py

@@ -93,14 +93,13 @@ class Logger(LoggerABC):
     def _log(self, level: LogLevel, *messages: Messages):
         try:
             timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S.%f")
-            formatted_message = self._format_message(level.value, timestamp, *messages)
 
-            self._write_log_to_file(level, formatted_message)
-            self._write_to_console(level, formatted_message)
+            self._write_log_to_file(level, self._file_format_message(level.value, timestamp, *messages))
+            self._write_to_console(level, self._console_format_message(level.value, timestamp, *messages))
         except Exception as e:
             print(f"Error while logging: {e} -> {traceback.format_exc()}")
 
-    def _format_message(self, level: str, timestamp, *messages: Messages) -> str:
+    def _file_format_message(self, level: str, timestamp, *messages: Messages) -> str:
         if isinstance(messages, tuple):
             messages = list(messages)
 
@@ -119,6 +118,24 @@ class Logger(LoggerABC):
 
         return message
 
+    def _console_format_message(self, level: str, timestamp, *messages: Messages) -> str:
+        if isinstance(messages, tuple):
+            messages = list(messages)
+
+        if not isinstance(messages, list):
+            messages = [messages]
+
+        messages = [str(message) for message in messages if message is not None]
+
+        message = f"[{level.upper():^3}]"
+        message += f" [{self._file_prefix}]"
+        if self._source is not None:
+            message += f" - [{self._source}]"
+
+        message += f": {' '.join(messages)}"
+
+        return message
+
     def header(self, string: str):
         self._log(LogLevel.info, string)
 

src/cpl-core/cpl/core/log/logger_abc.py

@@ -11,7 +11,10 @@ class LoggerABC(ABC):
     def set_level(self, level: LogLevel): ...
 
     @abstractmethod
-    def _format_message(self, level: str, timestamp, *messages: Messages) -> str: ...
+    def _file_format_message(self, level: str, timestamp, *messages: Messages) -> str: ...
+
+    @abstractmethod
+    def _console_format_message(self, level: str, timestamp, *messages: Messages) -> str: ...
 
     @abstractmethod
     def header(self, string: str):

src/cpl-core/cpl/core/log/structured_logger.py

@@ -1,15 +1,13 @@
 import asyncio
 import importlib.util
 import json
-import traceback
 from datetime import datetime
 
 from starlette.requests import Request
 
-from cpl.core.log.log_level import LogLevel
 from cpl.core.log.logger import Logger
 from cpl.core.typing import Source, Messages
-from cpl.dependency import get_provider
+from cpl.dependency.context import get_provider
 
 
 class StructuredLogger(Logger):
@@ -21,18 +19,7 @@ class StructuredLogger(Logger):
     def log_file(self):
         return f"logs/{self._file_prefix}_{datetime.now().strftime('%Y-%m-%d')}.jsonl"
 
-    def _log(self, level: LogLevel, *messages: Messages):
-        try:
-            timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S.%f")
-            formatted_message = self._format_message(level.value, timestamp, *messages)
-            structured_message = self._get_structured_message(level.value, timestamp, formatted_message)
-
-            self._write_log_to_file(level, structured_message)
-            self._write_to_console(level, formatted_message)
-        except Exception as e:
-            print(f"Error while logging: {e} -> {traceback.format_exc()}")
-
-    def _get_structured_message(self, level: str, timestamp: str, messages: str) -> str:
+    def _file_format_message(self, level: str, timestamp: str, *messages: Messages) -> str:
         structured_message = {
             "timestamp": timestamp,
             "level": level.upper(),

src/cpl-core/cpl/core/log/wrapped_logger.py

@@ -1,7 +1,7 @@
 import inspect
 from typing import Type
 
-from cpl.core.log import LoggerABC, LogLevel
+from cpl.core.log import LoggerABC, LogLevel, StructuredLogger
 from cpl.core.typing import Messages
 from cpl.dependency.inject import inject
 from cpl.dependency.service_provider import ServiceProvider
@@ -31,8 +31,11 @@ class WrappedLogger(LoggerABC):
     def set_level(self, level: LogLevel):
         self._logger.set_level(level)
 
-    def _format_message(self, level: str, timestamp, *messages: Messages) -> str:
-        return self._logger._format_message(level, timestamp, *messages)
+    def _file_format_message(self, level: str, timestamp, *messages: Messages) -> str:
+        return self._logger._file_format_message(level, timestamp, *messages)
+
+    def _console_format_message(self, level: str, timestamp, *messages: Messages) -> str:
+        return self._logger._console_format_message(level, timestamp, *messages)
 
     @staticmethod
     def _get_source() -> str | None:
@@ -48,6 +51,7 @@ class WrappedLogger(LoggerABC):
             ServiceCollection,
             WrappedLogger,
             WrappedLogger.__subclasses__(),
+            StructuredLogger,
         ]
 
         ignore_modules = [x.__module__ for x in ignore_classes if isinstance(x, type)]