fastapi 0.118.0__tar.gz → 0.118.2__tar.gz

{fastapi-0.118.0 → fastapi-0.118.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastapi
-Version: 0.118.0
+Version: 0.118.2
 Summary: FastAPI framework, high performance, easy to learn, fast to code, ready for production
 Author-Email: =?utf-8?q?Sebasti=C3=A1n_Ram=C3=ADrez?= <tiangolo@gmail.com>
 Classifier: Intended Audience :: Information Technology

{fastapi-0.118.0 → fastapi-0.118.2}/fastapi/__init__.py

@@ -1,6 +1,6 @@
 """FastAPI framework, high performance, easy to learn, fast to code, ready for production"""
 
-__version__ = "0.118.0"
+__version__ = "0.118.2"
 
 from starlette import status as status
 

{fastapi-0.118.0 → fastapi-0.118.2}/fastapi/_compat.py

@@ -1,3 +1,4 @@
+import warnings
 from collections import deque
 from copy import copy
 from dataclasses import dataclass, is_dataclass
@@ -109,9 +110,20 @@ if PYDANTIC_V2:
             return self.field_info.annotation
 
         def __post_init__(self) -> None:
-            self._type_adapter: TypeAdapter[Any] = TypeAdapter(
-                Annotated[self.field_info.annotation, self.field_info]
-            )
+            with warnings.catch_warnings():
+                # Pydantic >= 2.12.0 warns about field specific metadata that is unused
+                # (e.g. `TypeAdapter(Annotated[int, Field(alias='b')])`). In some cases, we
+                # end up building the type adapter from a model field annotation so we
+                # need to ignore the warning:
+                if PYDANTIC_VERSION_MINOR_TUPLE >= (2, 12):
+                    from pydantic.warnings import UnsupportedFieldAttributeWarning
+
+                    warnings.simplefilter(
+                        "ignore", category=UnsupportedFieldAttributeWarning
+                    )
+                self._type_adapter: TypeAdapter[Any] = TypeAdapter(
+                    Annotated[self.field_info.annotation, self.field_info]
+                )
 
         def get_default(self) -> Any:
             if self.field_info.is_required():
@@ -578,6 +590,9 @@ def field_annotation_is_complex(annotation: Union[Type[Any], None]) -> bool:
     if origin is Union or origin is UnionType:
         return any(field_annotation_is_complex(arg) for arg in get_args(annotation))
 
+    if origin is Annotated:
+        return field_annotation_is_complex(get_args(annotation)[0])
+
     return (
         _annotation_is_complex(annotation)
         or _annotation_is_complex(origin)

{fastapi-0.118.0 → fastapi-0.118.2}/fastapi/params.py

@@ -22,7 +22,7 @@ class ParamTypes(Enum):
     cookie = "cookie"
 
 
-class Param(FieldInfo):
+class Param(FieldInfo):  # type: ignore[misc]
     in_: ParamTypes
 
     def __init__(
@@ -136,7 +136,7 @@ class Param(FieldInfo):
         return f"{self.__class__.__name__}({self.default})"
 
 
-class Path(Param):
+class Path(Param):  # type: ignore[misc]
     in_ = ParamTypes.path
 
     def __init__(
@@ -222,7 +222,7 @@ class Path(Param):
         )
 
 
-class Query(Param):
+class Query(Param):  # type: ignore[misc]
     in_ = ParamTypes.query
 
     def __init__(
@@ -306,7 +306,7 @@ class Query(Param):
         )
 
 
-class Header(Param):
+class Header(Param):  # type: ignore[misc]
     in_ = ParamTypes.header
 
     def __init__(
@@ -392,7 +392,7 @@ class Header(Param):
         )
 
 
-class Cookie(Param):
+class Cookie(Param):  # type: ignore[misc]
     in_ = ParamTypes.cookie
 
     def __init__(
@@ -476,7 +476,7 @@ class Cookie(Param):
         )
 
 
-class Body(FieldInfo):
+class Body(FieldInfo):  # type: ignore[misc]
     def __init__(
         self,
         default: Any = Undefined,
@@ -593,7 +593,7 @@ class Body(FieldInfo):
         return f"{self.__class__.__name__}({self.default})"
 
 
-class Form(Body):
+class Form(Body):  # type: ignore[misc]
     def __init__(
         self,
         default: Any = Undefined,
@@ -677,7 +677,7 @@ class Form(Body):
         )
 
 
-class File(Form):
+class File(Form):  # type: ignore[misc]
     def __init__(
         self,
         default: Any = Undefined,

{fastapi-0.118.0 → fastapi-0.118.2}/pyproject.toml

@@ -49,7 +49,7 @@ dependencies = [
     "pydantic>=1.7.4,!=1.8,!=1.8.1,!=2.0.0,!=2.0.1,!=2.1.0,<3.0.0",
     "typing-extensions>=4.8.0",
 ]
-version = "0.118.0"
+version = "0.118.2"
 
 [project.urls]
 Homepage = "https://github.com/fastapi/fastapi"

{fastapi-0.118.0 → fastapi-0.118.2}/requirements-docs-tests.txt

@@ -1,4 +1,4 @@
 # For mkdocstrings and tests
 httpx >=0.23.0,<1.0.0
 # For linting and generating docs versions
-ruff ==0.12.7
+ruff ==0.13.2

{fastapi-0.118.0 → fastapi-0.118.2}/requirements-docs.txt

@@ -12,8 +12,8 @@ pillow==11.3.0
 # For image processing by Material for MkDocs
 cairosvg==2.8.2
 mkdocstrings[python]==0.26.1
-griffe-typingdoc==0.2.8
+griffe-typingdoc==0.2.9
 # For griffe, it formats with black
 black==25.1.0
-mkdocs-macros-plugin==1.3.9
-markdown-include-variants==0.0.4
+mkdocs-macros-plugin==1.4.0
+markdown-include-variants==0.0.5

{fastapi-0.118.0 → fastapi-0.118.2}/requirements-tests.txt

@@ -4,7 +4,7 @@ pytest >=7.1.3,<9.0.0
 coverage[toml] >= 6.5.0,< 8.0
 mypy ==1.14.1
 dirty-equals ==0.9.0
-sqlmodel==0.0.24
+sqlmodel==0.0.25
 flask >=1.1.2,<4.0.0
 anyio[trio] >=3.2.1,<5.0.0
 PyJWT==2.9.0

fastapi-0.118.0/scripts/test-cov-html.sh → fastapi-0.118.2/scripts/coverage.sh

@@ -3,7 +3,6 @@
 set -e
 set -x
 
-bash scripts/test.sh ${@}
 coverage combine
 coverage report
 coverage html

{fastapi-0.118.0 → fastapi-0.118.2}/scripts/deploy_docs_status.py

@@ -1,7 +1,8 @@
 import logging
 import re
+from typing import Literal
 
-from github import Github
+from github import Auth, Github
 from pydantic import BaseModel, SecretStr
 from pydantic_settings import BaseSettings
 
@@ -12,7 +13,7 @@ class Settings(BaseSettings):
     deploy_url: str | None = None
     commit_sha: str
     run_id: int
-    is_done: bool = False
+    state: Literal["pending", "success", "error"] = "pending"
 
 
 class LinkData(BaseModel):
@@ -26,7 +27,7 @@ def main() -> None:
     settings = Settings()
 
     logging.info(f"Using config: {settings.model_dump_json()}")
-    g = Github(settings.github_token.get_secret_value())
+    g = Github(auth=Auth.Token(settings.github_token.get_secret_value()))
     repo = g.get_repo(settings.github_repository)
     use_pr = next(
         (pr for pr in repo.get_pulls() if pr.head.sha == settings.commit_sha), None
@@ -37,24 +38,35 @@ def main() -> None:
     commits = list(use_pr.get_commits())
     current_commit = [c for c in commits if c.sha == settings.commit_sha][0]
     run_url = f"https://github.com/{settings.github_repository}/actions/runs/{settings.run_id}"
-    if settings.is_done and not settings.deploy_url:
+    if settings.state == "pending":
         current_commit.create_status(
-            state="success",
-            description="No Docs Changes",
+            state="pending",
+            description="Deploying Docs",
             context="deploy-docs",
             target_url=run_url,
         )
-        logging.info("No docs changes found")
+        logging.info("No deploy URL available yet")
         return
+    if settings.state == "error":
+        current_commit.create_status(
+            state="error",
+            description="Error Deploying Docs",
+            context="deploy-docs",
+            target_url=run_url,
+        )
+        logging.info("Error deploying docs")
+        return
+    assert settings.state == "success"
     if not settings.deploy_url:
         current_commit.create_status(
-            state="pending",
-            description="Deploying Docs",
+            state="success",
+            description="No Docs Changes",
             context="deploy-docs",
             target_url=run_url,
         )
-        logging.info("No deploy URL available yet")
+        logging.info("No docs changes found")
         return
+    assert settings.deploy_url
     current_commit.create_status(
         state="success",
         description="Docs Deployed",
@@ -104,7 +116,9 @@ def main() -> None:
         current_lang_links.sort(key=lambda x: x.preview_link)
         links.extend(current_lang_links)
 
-    message = f"📝 Docs preview for commit {settings.commit_sha} at: {deploy_url}"
+    header = "## 📝 Docs preview"
+    message = header
+    message += f"\n\nLast commit {settings.commit_sha} at: {deploy_url}"
 
     if links:
         message += "\n\n### Modified Pages\n\n"
@@ -116,7 +130,17 @@ def main() -> None:
             message += "\n"
 
     print(message)
-    use_pr.as_issue().create_comment(message)
+    issue = use_pr.as_issue()
+    comments = list(issue.get_comments())
+    for comment in comments:
+        if (
+            comment.body.startswith(header)
+            and comment.user.login == "github-actions[bot]"
+        ):
+            comment.edit(message)
+            break
+    else:
+        issue.create_comment(message)
 
     logging.info("Finished")
 

{fastapi-0.118.0 → fastapi-0.118.2}/scripts/mkdocs_hooks.py

@@ -132,6 +132,15 @@ def on_pre_page(page: Page, *, config: MkDocsConfig, files: Files) -> Page:
 def on_page_markdown(
     markdown: str, *, page: Page, config: MkDocsConfig, files: Files
 ) -> str:
+    # Set matadata["social"]["cards_layout_options"]["title"] to clean title (without
+    # permalink)
+    title = page.title
+    clean_title = title.split("{ #")[0]
+    if clean_title:
+        page.meta.setdefault("social", {})
+        page.meta["social"].setdefault("cards_layout_options", {})
+        page.meta["social"]["cards_layout_options"]["title"] = clean_title
+
     if isinstance(page.file, EnFile):
         for excluded_section in non_translated_sections:
             if page.file.src_path.startswith(excluded_section):

fastapi-0.118.2/scripts/test-cov-html.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -e
+set -x
+
+bash scripts/test.sh ${@}
+bash scripts/coverage.sh

{fastapi-0.118.0 → fastapi-0.118.2}/tests/test_multi_body_errors.py

@@ -185,7 +185,15 @@ def test_openapi_schema():
                                 "title": "Age",
                                 "anyOf": [
                                     {"exclusiveMinimum": 0.0, "type": "number"},
-                                    {"type": "string"},
+                                    IsOneOf(
+                                        # pydantic < 2.12.0
+                                        {"type": "string"},
+                                        # pydantic >= 2.12.0
+                                        {
+                                            "type": "string",
+                                            "pattern": r"^(?!^[-+.]*$)[+-]?0*\d*\.?\d*$",
+                                        },
+                                    ),
                                 ],
                             }
                         )

fastapi-0.118.2/tests/test_union_body_discriminator.py

@@ -0,0 +1,188 @@
+from typing import Any, Dict, Union
+
+from dirty_equals import IsDict
+from fastapi import FastAPI
+from fastapi.testclient import TestClient
+from inline_snapshot import snapshot
+from pydantic import BaseModel, Field
+from typing_extensions import Annotated, Literal
+
+from .utils import needs_pydanticv2
+
+
+@needs_pydanticv2
+def test_discriminator_pydantic_v2() -> None:
+    from pydantic import Tag
+
+    app = FastAPI()
+
+    class FirstItem(BaseModel):
+        value: Literal["first"]
+        price: int
+
+    class OtherItem(BaseModel):
+        value: Literal["other"]
+        price: float
+
+    Item = Annotated[
+        Union[Annotated[FirstItem, Tag("first")], Annotated[OtherItem, Tag("other")]],
+        Field(discriminator="value"),
+    ]
+
+    @app.post("/items/")
+    def save_union_body_discriminator(
+        item: Item, q: Annotated[str, Field(description="Query string")]
+    ) -> Dict[str, Any]:
+        return {"item": item}
+
+    client = TestClient(app)
+    response = client.post("/items/?q=first", json={"value": "first", "price": 100})
+    assert response.status_code == 200, response.text
+    assert response.json() == {"item": {"value": "first", "price": 100}}
+
+    response = client.post("/items/?q=other", json={"value": "other", "price": 100.5})
+    assert response.status_code == 200, response.text
+    assert response.json() == {"item": {"value": "other", "price": 100.5}}
+
+    response = client.get("/openapi.json")
+    assert response.status_code == 200, response.text
+    assert response.json() == snapshot(
+        {
+            "openapi": "3.1.0",
+            "info": {"title": "FastAPI", "version": "0.1.0"},
+            "paths": {
+                "/items/": {
+                    "post": {
+                        "summary": "Save Union Body Discriminator",
+                        "operationId": "save_union_body_discriminator_items__post",
+                        "parameters": [
+                            {
+                                "name": "q",
+                                "in": "query",
+                                "required": True,
+                                "schema": {
+                                    "type": "string",
+                                    "description": "Query string",
+                                    "title": "Q",
+                                },
+                            }
+                        ],
+                        "requestBody": {
+                            "required": True,
+                            "content": {
+                                "application/json": {
+                                    "schema": {
+                                        "oneOf": [
+                                            {"$ref": "#/components/schemas/FirstItem"},
+                                            {"$ref": "#/components/schemas/OtherItem"},
+                                        ],
+                                        "discriminator": {
+                                            "propertyName": "value",
+                                            "mapping": {
+                                                "first": "#/components/schemas/FirstItem",
+                                                "other": "#/components/schemas/OtherItem",
+                                            },
+                                        },
+                                        "title": "Item",
+                                    }
+                                }
+                            },
+                        },
+                        "responses": {
+                            "200": {
+                                "description": "Successful Response",
+                                "content": {
+                                    "application/json": {
+                                        "schema": IsDict(
+                                            {
+                                                # Pydantic 2.10, in Python 3.8
+                                                # TODO: remove when dropping support for Python 3.8
+                                                "type": "object",
+                                                "title": "Response Save Union Body Discriminator Items  Post",
+                                            }
+                                        )
+                                        | IsDict(
+                                            {
+                                                "type": "object",
+                                                "additionalProperties": True,
+                                                "title": "Response Save Union Body Discriminator Items  Post",
+                                            }
+                                        )
+                                    }
+                                },
+                            },
+                            "422": {
+                                "description": "Validation Error",
+                                "content": {
+                                    "application/json": {
+                                        "schema": {
+                                            "$ref": "#/components/schemas/HTTPValidationError"
+                                        }
+                                    }
+                                },
+                            },
+                        },
+                    }
+                }
+            },
+            "components": {
+                "schemas": {
+                    "FirstItem": {
+                        "properties": {
+                            "value": {
+                                "type": "string",
+                                "const": "first",
+                                "title": "Value",
+                            },
+                            "price": {"type": "integer", "title": "Price"},
+                        },
+                        "type": "object",
+                        "required": ["value", "price"],
+                        "title": "FirstItem",
+                    },
+                    "HTTPValidationError": {
+                        "properties": {
+                            "detail": {
+                                "items": {
+                                    "$ref": "#/components/schemas/ValidationError"
+                                },
+                                "type": "array",
+                                "title": "Detail",
+                            }
+                        },
+                        "type": "object",
+                        "title": "HTTPValidationError",
+                    },
+                    "OtherItem": {
+                        "properties": {
+                            "value": {
+                                "type": "string",
+                                "const": "other",
+                                "title": "Value",
+                            },
+                            "price": {"type": "number", "title": "Price"},
+                        },
+                        "type": "object",
+                        "required": ["value", "price"],
+                        "title": "OtherItem",
+                    },
+                    "ValidationError": {
+                        "properties": {
+                            "loc": {
+                                "items": {
+                                    "anyOf": [{"type": "string"}, {"type": "integer"}]
+                                },
+                                "type": "array",
+                                "title": "Location",
+                            },
+                            "msg": {"type": "string", "title": "Message"},
+                            "type": {"type": "string", "title": "Error Type"},
+                        },
+                        "type": "object",
+                        "required": ["loc", "msg", "type"],
+                        "title": "ValidationError",
+                    },
+                }
+            },
+        }
+    )