Merge branch 'develop' into flash

litestar/_openapi/datastructures.py

@@ -150,7 +150,8 @@ def generate_components_schemas(self) -> dict[str, Schema]:
                 self.set_reference_paths(name_, registered_schema)
                 components_schemas[name_] = registered_schema.schema
 
-        return components_schemas
+        # Sort them by name to ensure they're always generated in the same order.
+        return {name: components_schemas[name] for name in sorted(components_schemas.keys())}
 
 
 class OpenAPIContext:

tests/unit/test_openapi/test_integration.py

@@ -9,7 +9,7 @@
 import yaml
 from typing_extensions import Annotated
 
-from litestar import Controller, Litestar, get, post
+from litestar import Controller, Litestar, delete, get, patch, post
 from litestar._openapi.plugin import OpenAPIPlugin
 from litestar.app import DEFAULT_OPENAPI_CONFIG
 from litestar.enums import MediaType, OpenAPIMediaType, ParamType
@@ -399,3 +399,47 @@ def get_handler(q: str) -> None:
         assert openapi_one == openapi_two
     else:
         assert openapi_one != openapi_two
+
+
+def test_components_schemas_in_alphabetical_order() -> None:
+    # https://github.com/litestar-org/litestar/issues/3059
+
+    @dataclass
+    class A:
+        ...
+
+    @dataclass
+    class B:
+        ...
+
+    @dataclass
+    class C:
+        ...
+
+    class TestController(Controller):
+        @post("/", sync_to_thread=False)
+        def post_handler(self, data: B) -> None:
+            ...
+
+        @get("/", sync_to_thread=False)
+        def get_handler(self) -> A:  # type: ignore[empty-body]
+            ...
+
+        @patch("/", sync_to_thread=False)
+        def patch_handler(self, data: C) -> A:  # type: ignore[empty-body]
+            ...
+
+        @delete("/", sync_to_thread=False)
+        def delete_handler(self, data: B) -> None:
+            ...
+
+    app = Litestar([TestController], signature_types=[A, B, C])
+    openapi_plugin = app.plugins.get(OpenAPIPlugin)
+    openapi = openapi_plugin.provide_openapi()
+
+    expected_keys = [
+        "test_components_schemas_in_alphabetical_order.A",
+        "test_components_schemas_in_alphabetical_order.B",
+        "test_components_schemas_in_alphabetical_order.C",
+    ]
+    assert list(openapi.components.schemas.keys()) == expected_keys