remove cyclic

Author: sanderegg

packages/service-library/src/servicelib/logging_base.py

@@ -0,0 +1,22 @@
+from typing import NotRequired, TypedDict
+
+
+class LogExtra(TypedDict):
+    log_uid: NotRequired[str]
+    log_oec: NotRequired[str]
+
+
+def get_log_record_extra(
+    *,
+    user_id: int | str | None = None,
+    error_code: str | None = None,
+) -> LogExtra | None:
+    extra: LogExtra = {}
+
+    if user_id:
+        assert int(user_id) > 0  # nosec
+        extra["log_uid"] = f"{user_id}"
+    if error_code:
+        extra["log_oec"] = error_code
+
+    return extra or None

packages/service-library/src/servicelib/logging_errors.py

@@ -5,7 +5,7 @@
 from common_library.errors_classes import OsparcErrorMixin
 from common_library.json_serialization import json_dumps, representation_encoder
 
-from .logging_utils import LogExtra, get_log_record_extra
+from .logging_base import LogExtra, get_log_record_extra
 
 _logger = logging.getLogger(__name__)
 

packages/service-library/src/servicelib/logging_utils.py

@@ -17,11 +17,12 @@
 from datetime import datetime
 from inspect import getframeinfo, stack
 from pathlib import Path
-from typing import Any, Final, NotRequired, TypeAlias, TypedDict, TypeVar
+from typing import Any, Final, TypeAlias, TypedDict, TypeVar
 
 from common_library.json_serialization import json_dumps
 from settings_library.tracing import TracingSettings
 
+from .logging_base import LogExtra
 from .logging_errors import create_troubleshootting_log_kwargs
 from .logging_utils_filtering import GeneralLogFilter, LoggerName, MessageSubstring
 from .tracing import setup_log_tracing
@@ -61,27 +62,6 @@
 }
 
 
-class LogExtra(TypedDict):
-    log_uid: NotRequired[str]
-    log_oec: NotRequired[str]
-
-
-def get_log_record_extra(
-    *,
-    user_id: int | str | None = None,
-    error_code: str | None = None,
-) -> LogExtra | None:
-    extra: LogExtra = {}
-
-    if user_id:
-        assert int(user_id) > 0  # nosec
-        extra["log_uid"] = f"{user_id}"
-    if error_code:
-        extra["log_oec"] = error_code
-
-    return extra or None
-
-
 class CustomFormatter(logging.Formatter):
     """Custom Formatter does these 2 things:
     1. Overrides 'funcName' with the value of 'func_name_override', if it exists.