typing fixes

Author: provinzkraut

litestar/logging/structlog.py

@@ -108,7 +108,8 @@ def should_log_as_json(self) -> bool:
         return True
 
     def _get_structlog_config(self) -> dict[str, None]:
-        if self._structlog_config is None:
+        config = self._structlog_config
+        if config is None:
             if (
                 self.bypass_processors_under_capture_logs
                 and (config_processors := structlog.get_config()["processors"])
@@ -142,7 +143,7 @@ def _get_structlog_config(self) -> dict[str, None]:
             # get around frozen dataclasses
             object.__setattr__(self, "_structlog_config", config)
 
-        return self._structlog_config
+        return config
 
     def get_litestar_logger(self, name: str | None = None) -> Logger:
         logger = structlog.wrap_logger(

litestar/middleware/logging.py

@@ -23,7 +23,7 @@
 
 
 if TYPE_CHECKING:
-    from collections.abc import Collection, Iterable
+    from collections.abc import Iterable, Sequence
 
     from litestar.connection import Request
     from litestar.logging import LoggingConfig
@@ -59,14 +59,14 @@ def __init__(
         response_headers_to_obfuscate: Iterable[str] = ("Authorization", "X-API-KEY"),
         request_log_message: str = "HTTP Request",
         response_log_message: str = "HTTP Response",
-        request_log_fields: Collection[RequestExtractorField] = (
+        request_log_fields: Sequence[RequestExtractorField] = (
             "path",
             "method",
             "content_type",
             "query",
             "path_params",
         ),
-        response_log_fields: Collection[ResponseExtractorField] = ("status_code",),  # type: ignore[assignment] # Literal is not correctly infered here
+        response_log_fields: Sequence[ResponseExtractorField] = ("status_code",),
         parse_body: bool = False,
         parse_query: bool = True,
     ) -> None:

tests/unit/test_middleware/test_logging_middleware.py

@@ -60,7 +60,7 @@ def test_logging_middleware_regular_logger(caplog: "LogCaptureFixture", handler:
     assert len(caplog.messages) == 2
 
     assert caplog.messages[0] == "HTTP Request"
-    assert caplog.records[0].litestar == {
+    assert caplog.records[0].litestar == { # type: ignore[attr-defined]
         "path": "/",
         "method": "GET",
         "content_type": '["",{}]',
@@ -179,7 +179,7 @@ def test_logging_middleware_compressed_response_body(
         create_test_client(
             route_handlers=[handler],
             compression_config=CompressionConfig(backend="gzip", minimum_size=1),
-            middleware=[LoggingMiddleware(include_compressed_body=include, response_log_fields=("body",))],
+            middleware=[LoggingMiddleware(include_compressed_body=include, response_log_fields=["body",])],
         ) as client,
     ):
         # Set cookies on the client to avoid warnings about per-request cookies.
@@ -188,9 +188,9 @@ def test_logging_middleware_compressed_response_body(
     assert response.status_code == HTTP_200_OK
     assert len(caplog.messages) == 2
     if include:
-        assert "body" in caplog.records[1].litestar
+        assert "body" in caplog.records[1].litestar # type: ignore[attr-defined]
     else:
-        assert "body" not in caplog.records[1].litestar
+        assert "body" not in caplog.records[1].litestar # type: ignore[attr-defined]
 
 
 def test_logging_middleware_post_body() -> None:
@@ -260,9 +260,9 @@ def test_logging_middleware_log_fields(caplog: "LogCaptureFixture", handler: HTT
         assert len(caplog.messages) == 2
 
     assert caplog.messages[0] == "HTTP Request"
-    assert caplog.records[0].litestar == {"path": "/"}
+    assert caplog.records[0].litestar == {"path": "/"} # type: ignore[attr-defined]
     assert caplog.messages[1] == "HTTP Response"
-    assert caplog.records[1].litestar == {"status_code": 200}
+    assert caplog.records[1].litestar == {"status_code": 200} # type: ignore[attr-defined]
 
 
 def test_logging_middleware_with_session_middleware(session_backend_config_memory: "ServerSideSessionConfig") -> None: