fastapi 0.158.0__tar.gz → 0.158.1__tar.gz

{fastapi-0.158.0 → fastapi-0.158.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi
-Version: 0.158.0
+Version: 0.158.1
 Summary: FastAPI framework, high performance, easy to learn, fast to code, ready for production
 Author-Email: Sebastián Ramírez <tiangolo@gmail.com>
 License-Expression: MIT

{fastapi-0.158.0 → fastapi-0.158.1}/fastapi/__init__.py

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

{fastapi-0.158.0 → fastapi-0.158.1}/fastapi/dependencies/utils.py

@@ -1366,12 +1366,18 @@ def _get_body_field(
     else:
         BodyFieldInfo = params.Body
 
+    if BodyFieldInfo is not params.File:
         body_param_media_types = [
             f.field_info.media_type
             for f in body_params
-            if isinstance(f.field_info, params.Body)
+            if isinstance(f.field_info, BodyFieldInfo)
         ]
-        if len(set(body_param_media_types)) == 1:
+        if (
+            BodyFieldInfo is params.Form
+            and "multipart/form-data" in body_param_media_types
+        ):
+            BodyFieldInfo_kwargs["media_type"] = "multipart/form-data"
+        elif len(set(body_param_media_types)) == 1:
             BodyFieldInfo_kwargs["media_type"] = body_param_media_types[0]
     final_field = create_model_field(
         name="body",

{fastapi-0.158.0 → fastapi-0.158.1}/pyproject.toml

@@ -53,7 +53,7 @@ dependencies = [
     "annotated-doc>=0.0.2",
     "opentelemetry-api>=1.44.0",
 ]
-version = "0.158.0"
+version = "0.158.1"
 
 [project.urls]
 Homepage = "https://github.com/fastapi/fastapi"

{fastapi-0.158.0 → fastapi-0.158.1}/tests/test_request_body_parameters_media_type.py

@@ -1,4 +1,7 @@
-from fastapi import Body, FastAPI
+from typing import Annotated
+
+import pytest
+from fastapi import Body, Depends, FastAPI, File, Form
 from fastapi.testclient import TestClient
 from inline_snapshot import snapshot
 from pydantic import BaseModel
@@ -35,6 +38,137 @@ async def create_shop(
 client = TestClient(app)
 
 
+@pytest.mark.parametrize(
+    "first_media_type, second_media_type, expected_media_type",
+    [
+        (
+            "application/x-www-form-urlencoded",
+            "application/x-www-form-urlencoded",
+            "application/x-www-form-urlencoded",
+        ),
+        (
+            "multipart/form-data",
+            "application/x-www-form-urlencoded",
+            "multipart/form-data",
+        ),
+        (
+            "application/x-www-form-urlencoded",
+            "multipart/form-data",
+            "multipart/form-data",
+        ),
+        ("multipart/form-data", "multipart/form-data", "multipart/form-data"),
+        (
+            "application/x-www-form-urlencoded; charset=utf-8",
+            "application/x-www-form-urlencoded; charset=utf-8",
+            "application/x-www-form-urlencoded; charset=utf-8",
+        ),
+        (
+            "application/x-www-form-urlencoded; charset=utf-8",
+            "application/x-www-form-urlencoded",
+            "application/x-www-form-urlencoded",
+        ),
+    ],
+)
+def test_form_parameter_media_types(
+    first_media_type, second_media_type, expected_media_type
+):
+    app = FastAPI()
+
+    @app.post("/")
+    def submit(
+        name: Annotated[str, Form(media_type=first_media_type)],
+        token: Annotated[str, Form(media_type=second_media_type)],
+    ):
+        return {"name": name, "token": token}
+
+    client = TestClient(app)
+    if expected_media_type == "multipart/form-data":
+        response = client.post(
+            "/", files={"name": (None, "Rick"), "token": (None, "secret")}
+        )
+    else:
+        response = client.post(
+            "/",
+            content="name=Rick&token=secret",
+            headers={"content-type": expected_media_type},
+        )
+    assert response.status_code == 200, response.text
+    assert response.json() == {"name": "Rick", "token": "secret"}
+    content = app.openapi()["paths"]["/"]["post"]["requestBody"]["content"]
+    assert list(content) == [expected_media_type]
+
+
+@pytest.mark.parametrize("in_dependency", [False, True])
+def test_form_model_media_type(in_dependency):
+    app = FastAPI()
+
+    class Profile(BaseModel):
+        name: str
+
+    class Preferences(BaseModel):
+        limit: int
+
+    def preferences_dependency(
+        preferences: Annotated[Preferences, Form(media_type="multipart/form-data")],
+    ):
+        return preferences
+
+    marker = (
+        Depends(preferences_dependency)
+        if in_dependency
+        else Form(media_type="multipart/form-data")
+    )
+
+    @app.post("/")
+    def submit(
+        profile: Annotated[Profile, Form()],
+        preferences: Annotated[Preferences, marker],
+        token: Annotated[str, Form()],
+    ):
+        return {"profile": profile, "preferences": preferences, "token": token}
+
+    response = TestClient(app).post(
+        "/",
+        files={"name": (None, "Rick"), "limit": (None, "2"), "token": (None, "secret")},
+    )
+    assert response.status_code == 200, response.text
+    assert response.json() == {
+        "profile": {"name": "Rick"},
+        "preferences": {"limit": 2},
+        "token": "secret",
+    }
+    schema = app.openapi()
+    content = schema["paths"]["/"]["post"]["requestBody"]["content"]
+    assert list(content) == ["multipart/form-data"]
+    ref = content["multipart/form-data"]["schema"]["$ref"].rsplit("/", 1)[-1]
+    assert set(schema["components"]["schemas"][ref]["properties"]) == {
+        "name",
+        "limit",
+        "token",
+    }
+
+
+def test_file_media_type_takes_precedence_over_form_media_type():
+    app = FastAPI()
+
+    @app.post("/")
+    def submit(
+        name: Annotated[
+            str, Form(media_type="application/x-www-form-urlencoded; charset=utf-8")
+        ],
+        attachment: Annotated[bytes, File()],
+    ):
+        return {"name": name, "attachment": attachment}
+
+    response = TestClient(app).post(
+        "/", data={"name": "Rick"}, files={"attachment": ("hello.txt", b"hello")}
+    )
+    assert response.status_code == 200, response.text
+    assert response.json() == {"name": "Rick", "attachment": "hello"}
+    content = app.openapi()["paths"]["/"]["post"]["requestBody"]["content"]
+    assert list(content) == ["multipart/form-data"]
+
+
 def test_openapi_schema():
     response = client.get("/openapi.json")
     assert response.status_code == 200, response.text