Merge branch 'main' into docs/split-responses-section

Author: Aabid Mohamed

.github/workflows/ci.yml

@@ -43,7 +43,7 @@ jobs:
           python-version: "3.11"
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v8.3.0
+        uses: astral-sh/setup-uv@v8.3.1
         with:
           enable-cache: true
 
@@ -60,7 +60,7 @@ jobs:
           python-version: "3.11"
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v8.3.0
+        uses: astral-sh/setup-uv@v8.3.1
         with:
           enable-cache: true
 
@@ -77,7 +77,7 @@ jobs:
           python-version: "3.11"
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v8.3.0
+        uses: astral-sh/setup-uv@v8.3.1
         with:
           enable-cache: true
 
@@ -125,7 +125,7 @@ jobs:
           python-version: 3.14
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v8.3.0
+        uses: astral-sh/setup-uv@v8.3.1
         with:
           version: "0.6.12"
           enable-cache: true
@@ -161,7 +161,7 @@ jobs:
           python-version: 3.11
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v8.3.0
+        uses: astral-sh/setup-uv@v8.3.1
         with:
           enable-cache: true
 
@@ -210,7 +210,7 @@ jobs:
           allow-prereleases: true
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v8.3.0
+        uses: astral-sh/setup-uv@v8.3.1
         with:
           enable-cache: true
 
@@ -250,7 +250,7 @@ jobs:
           python-version: "3.12"
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v8.3.0
+        uses: astral-sh/setup-uv@v8.3.1
         with:
           enable-cache: true
 

.github/workflows/docs.yml

@@ -36,7 +36,7 @@ jobs:
           python-version: "3.12"
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v8.3.0
+        uses: astral-sh/setup-uv@v8.3.1
         with:
           version: "0.5.4"
           enable-cache: true

.github/workflows/publish.yml

@@ -22,7 +22,7 @@ jobs:
           python-version: "3.12"
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v8.3.0
+        uses: astral-sh/setup-uv@v8.3.1
         with:
           version: "0.5.4"
           enable-cache: true

.github/workflows/test.yml

@@ -54,7 +54,7 @@ jobs:
         if: startsWith(inputs.os, 'windows')
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v8.3.0
+        uses: astral-sh/setup-uv@v8.3.1
         with:
           version: "0.8.8"
           enable-cache: true

litestar/_openapi/responses.py

@@ -42,12 +42,19 @@
 
 __all__ = ("create_responses_for_handler",)
 
-CAPITAL_LETTERS_PATTERN = re.compile(r"(?=[A-Z])")
+WORD_BOUNDARY_PATTERN = re.compile(
+    r"""
+    (?<=[a-z0-9])(?=[A-Z])      # a lowercase letter or digit, followed by an uppercase letter
+    |
+    (?<=[A-Z])(?=[A-Z][a-z])    # an uppercase run, followed by a new capitalized word
+    """,
+    re.VERBOSE,
+)
 
 
 def pascal_case_to_text(string: str) -> str:
     """Given a 'PascalCased' string, return its split form- 'Pascal Cased'."""
-    return " ".join(re.split(CAPITAL_LETTERS_PATTERN, string)).strip()
+    return " ".join(re.split(WORD_BOUNDARY_PATTERN, string)).strip()
 
 
 def create_cookie_schema(cookie: Cookie) -> Schema:

tests/unit/test_openapi/test_responses.py

@@ -15,6 +15,7 @@
 from litestar._openapi.responses import (
     ResponseFactory,
     create_error_responses,
+    pascal_case_to_text,
 )
 from litestar._openapi.schema_generation.plugins import openapi_schema_plugins
 from litestar.datastructures import Cookie, ResponseHeader
@@ -151,6 +152,37 @@ class AlternativePetException(HTTPException):
         assert schema.type
 
 
+@pytest.mark.parametrize(
+    ("string", "expected"),
+    [
+        ("PetException", "Pet Exception"),
+        ("InvalidAPIKeyError", "Invalid API Key Error"),
+        ("HTTPException", "HTTP Exception"),
+        ("ValidationException", "Validation Exception"),
+        ("API", "API"),
+        ("Error", "Error"),
+        ("error", "error"),
+        ("HTTP404Error", "HTTP404 Error"),
+        ("Base64Decoder", "Base64 Decoder"),
+        ("", ""),
+    ],
+)
+def test_pascal_case_to_text(string: str, expected: str) -> None:
+    assert pascal_case_to_text(string) == expected
+
+
+def test_create_error_responses_preserves_acronyms_in_description() -> None:
+    class InvalidAPIKeyError(HTTPException):
+        status_code = 401
+
+    _, response = next(create_error_responses(exceptions=[InvalidAPIKeyError]))
+
+    assert response.content
+    schema = response.content[MediaType.JSON].schema
+    assert isinstance(schema, Schema)
+    assert schema.description == "Invalid API Key Error"
+
+
 def test_create_error_responses_with_non_http_status_code() -> None:
     class HouseNotFoundError(HTTPException):
         status_code: int = 420