Merge branch 'litestar-org:main' into sse_timeout_events

Author: RenameMe1

litestar/dto/base_dto.py

@@ -15,6 +15,7 @@
 from litestar.dto.types import RenameStrategy
 from litestar.enums import RequestEncodingType
 from litestar.exceptions.dto_exceptions import InvalidAnnotationException
+from litestar.response.base import Response
 from litestar.types.builtin_types import NoneType
 from litestar.types.composite_types import TypeEncodersMap
 from litestar.typing import FieldDefinition
@@ -229,7 +230,7 @@ def create_openapi_schema(
         key = "data_backend" if field_definition.name == "data" else "return_backend"
         backend = cls._dto_backends[handler_id][key]  # type: ignore[literal-required]
 
-        if backend.wrapper_attribute_name:
+        if backend.wrapper_attribute_name and not field_definition.is_subclass_of(Response):
             # The DTO has been built for a handler that has a DTO supported type wrapped in a generic type.
             #
             # The backend doesn't receive the full annotation, only the type of the attribute on the outer type that
@@ -238,7 +239,7 @@ def create_openapi_schema(
             # This special casing rebuilds the outer generic type annotation with the original model replaced by the DTO
             # generated transfer model type in the type arguments.
             transfer_model = backend.transfer_model_type
-            generic_args = tuple(transfer_model if a is cls.model_type else a for a in field_definition.args)
+            generic_args = tuple(transfer_model if arg is cls.model_type else arg for arg in field_definition.args)
             annotation = field_definition.safe_generic_origin[generic_args]
         else:
             annotation = backend.annotation

tests/unit/test_dto/test_factory/test_integration.py

@@ -697,6 +697,11 @@ def handler() -> Response[PaginatedUser]:
         response = client.get("/")
         assert response.json() == {"name": "John"}
 
+        schema_response = client.get("/schema/openapi.json")
+        schemas = list(schema_response.json()["components"]["schemas"].values())
+        assert len(schemas) == 1
+        assert schemas[0]["title"] == "HandlerPaginatedUserResponseBody"
+
 
 def test_dto_response_wrapped_collection_return_type(use_experimental_dto_backend: bool) -> None:
     @get(
@@ -713,6 +718,11 @@ def handler() -> Response[List[PaginatedUser]]:
         response = client.get("/")
         assert response.json() == [{"name": "John"}, {"name": "Jane"}]
 
+        schema_response = client.get("/schema/openapi.json")
+        schemas = list(schema_response.json()["components"]["schemas"].values())
+        assert len(schemas) == 1
+        assert schemas[0]["title"] == "HandlerPaginatedUserResponseBody"
+
 
 def test_schema_required_fields_with_msgspec_dto(use_experimental_dto_backend: bool) -> None:
     class MsgspecUser(Struct):
@@ -1009,6 +1019,46 @@ def get_users() -> WithCount[User]:
     assert not_none(model_schema.properties).keys() == {"id", "name"}
 
 
+def test_openapi_schema_for_type_with_litestar_response_generic_type(
+    create_module: Callable[[str], ModuleType], use_experimental_dto_backend: bool
+) -> None:
+    module = create_module("""
+from dataclasses import dataclass
+from typing import List
+
+from litestar import Litestar, Response, get
+from litestar.dto import DataclassDTO, DTOConfig
+
+
+@dataclass
+class Item:
+    id: int
+    name: str
+    secret: str
+
+
+class ItemReadDTO(DataclassDTO[Item]):
+    config = DTOConfig(exclude=["secret"])
+
+
+@get("/get_items", return_dto=ItemReadDTO)
+async def get_items() -> Response[List[Item]]:
+    return Response(
+        headers={"X-SomeParam": "SomeValue"},
+        content=[
+            Item(id=1, name="Item 1", secret="123"),
+            Item(id=2, name="Item 2", secret="456"),
+        ],
+    )
+
+app = Litestar(route_handlers=[get_items])
+""")
+
+    openapi = cast("Litestar", module.app).openapi_schema
+    schema = openapi.components.schemas["GetItemsItemResponseBody"]
+    assert not_none(schema.properties).keys() == {"id", "name"}
+
+
 def test_openapi_schema_for_dto_includes_body_examples(create_module: Callable[[str], ModuleType]) -> None:
     module = create_module(
         """