Browse Source

Drop support for Pydantic v1, keeping short temporary support for Pydantic v2's `pydantic.v1` (#14575)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
pull/14577/head
Sebastián Ramírez 6 months ago
committed by GitHub
parent
commit
e2cd8a4201
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 21
      .github/workflows/test.yml
  2. 32
      docs/en/docs/advanced/path-operation-advanced-configuration.md
  3. 44
      docs/en/docs/advanced/settings.md
  4. 14
      docs/en/docs/how-to/migrate-from-pydantic-v1-to-pydantic-v2.md
  5. 4
      docs/en/docs/how-to/separate-openapi-schemas.md
  6. 16
      docs/en/docs/tutorial/body-updates.md
  7. 8
      docs/en/docs/tutorial/body.md
  8. 30
      docs/en/docs/tutorial/extra-models.md
  9. 14
      docs/en/docs/tutorial/query-params-str-validations.md
  10. 14
      docs/en/docs/tutorial/response-model.md
  11. 24
      docs/en/docs/tutorial/schema-extra-example.md
  12. 2
      docs_src/body/tutorial002_py310.py
  13. 2
      docs_src/body/tutorial002_py39.py
  14. 2
      docs_src/body/tutorial003_py310.py
  15. 2
      docs_src/body/tutorial003_py39.py
  16. 2
      docs_src/body/tutorial004_py310.py
  17. 2
      docs_src/body/tutorial004_py39.py
  18. 4
      docs_src/body_updates/tutorial002_py310.py
  19. 4
      docs_src/body_updates/tutorial002_py39.py
  20. 20
      docs_src/cookie_param_models/tutorial002_pv1_an_py310.py
  21. 20
      docs_src/cookie_param_models/tutorial002_pv1_an_py39.py
  22. 18
      docs_src/cookie_param_models/tutorial002_pv1_py310.py
  23. 20
      docs_src/cookie_param_models/tutorial002_pv1_py39.py
  24. 2
      docs_src/extra_models/tutorial001_py310.py
  25. 2
      docs_src/extra_models/tutorial001_py39.py
  26. 2
      docs_src/extra_models/tutorial002_py310.py
  27. 2
      docs_src/extra_models/tutorial002_py39.py
  28. 22
      docs_src/header_param_models/tutorial002_pv1_an_py310.py
  29. 22
      docs_src/header_param_models/tutorial002_pv1_an_py39.py
  30. 20
      docs_src/header_param_models/tutorial002_pv1_py310.py
  31. 22
      docs_src/header_param_models/tutorial002_pv1_py39.py
  32. 2
      docs_src/path_operation_advanced_configuration/tutorial007_pv1_py39.py
  33. 21
      docs_src/query_param_models/tutorial002_pv1_an_py310.py
  34. 21
      docs_src/query_param_models/tutorial002_pv1_an_py39.py
  35. 21
      docs_src/query_param_models/tutorial002_pv1_py310.py
  36. 21
      docs_src/query_param_models/tutorial002_pv1_py39.py
  37. 5
      docs_src/request_form_models/tutorial002_pv1_an_py39.py
  38. 5
      docs_src/request_form_models/tutorial002_pv1_py39.py
  39. 2
      docs_src/schema_extra_example/tutorial001_pv1_py310.py
  40. 2
      docs_src/schema_extra_example/tutorial001_pv1_py39.py
  41. 2
      docs_src/settings/app03_an_py39/config_pv1.py
  42. 2
      docs_src/settings/app03_py39/config_pv1.py
  43. 2
      docs_src/settings/tutorial001_pv1_py39.py
  44. 1
      fastapi/_compat/__init__.py
  45. 206
      fastapi/_compat/main.py
  46. 2
      fastapi/_compat/may_v1.py
  47. 179
      fastapi/_compat/v1.py
  48. 4
      fastapi/_compat/v2.py
  49. 16
      fastapi/datastructures.py
  50. 13
      fastapi/dependencies/utils.py
  51. 4
      fastapi/encoders.py
  52. 24
      fastapi/openapi/models.py
  53. 82
      fastapi/params.py
  54. 12
      fastapi/routing.py
  55. 27
      fastapi/temp_pydantic_v1_params.py
  56. 21
      fastapi/utils.py
  57. 15
      pyproject.toml
  58. 8
      tests/test_additional_properties_bool.py
  59. 6
      tests/test_ambiguous_params.py
  60. 5
      tests/test_arbitrary_types.py
  61. 8
      tests/test_compat.py
  62. 133
      tests/test_compat_params_v1.py
  63. 4
      tests/test_computed_fields.py
  64. 30
      tests/test_custom_schema_fields.py
  65. 6
      tests/test_datastructures.py
  66. 7
      tests/test_datetime_custom_encoder.py
  67. 10
      tests/test_filter_pydantic_sub_model/app_pv1.py
  68. 170
      tests/test_filter_pydantic_sub_model/test_filter_pydantic_sub_model_pv1.py
  69. 207
      tests/test_filter_pydantic_sub_model_pv2.py
  70. 8
      tests/test_forms_single_model.py
  71. 312
      tests/test_get_model_definitions_formfeed_escape.py
  72. 7
      tests/test_inherited_custom_class.py
  73. 68
      tests/test_jsonable_encoder.py
  74. 46
      tests/test_no_schema_split.py
  75. 40
      tests/test_openapi_separate_input_output_schemas.py
  76. 78
      tests/test_pydantic_v1_v2_01.py
  77. 40
      tests/test_pydantic_v1_v2_list.py
  78. 226
      tests/test_pydantic_v1_v2_mixed.py
  79. 769
      tests/test_pydantic_v1_v2_multifile/test_multifile.py
  80. 193
      tests/test_pydantic_v1_v2_noneable.py
  81. 8
      tests/test_query_cookie_header_model_extra_params.py
  82. 7
      tests/test_read_with_orm_mode.py
  83. 10
      tests/test_request_param_model_by_alias.py
  84. 11
      tests/test_request_params/test_body/test_list.py
  85. 9
      tests/test_request_params/test_body/test_optional_list.py
  86. 15
      tests/test_request_params/test_body/test_optional_str.py
  87. 11
      tests/test_request_params/test_body/test_required_str.py
  88. 11
      tests/test_request_params/test_cookie/test_optional_str.py
  89. 11
      tests/test_request_params/test_cookie/test_required_str.py
  90. 11
      tests/test_request_params/test_file/test_list.py
  91. 11
      tests/test_request_params/test_file/test_optional.py
  92. 11
      tests/test_request_params/test_file/test_optional_list.py
  93. 11
      tests/test_request_params/test_file/test_required.py
  94. 11
      tests/test_request_params/test_form/test_list.py
  95. 11
      tests/test_request_params/test_form/test_optional_list.py
  96. 11
      tests/test_request_params/test_form/test_optional_str.py
  97. 11
      tests/test_request_params/test_form/test_required_str.py
  98. 11
      tests/test_request_params/test_header/test_list.py
  99. 11
      tests/test_request_params/test_header/test_optional_list.py
  100. 11
      tests/test_request_params/test_header/test_optional_str.py

21
.github/workflows/test.yml

@ -44,35 +44,22 @@ jobs:
matrix: matrix:
os: [ windows-latest, macos-latest ] os: [ windows-latest, macos-latest ]
python-version: [ "3.14" ] python-version: [ "3.14" ]
pydantic-version: [ "pydantic>=2.0.2,<3.0.0" ]
include: include:
- os: ubuntu-latest - os: ubuntu-latest
python-version: "3.9" python-version: "3.9"
pydantic-version: "pydantic>=1.10.0,<2.0.0"
coverage: coverage coverage: coverage
- os: macos-latest - os: macos-latest
python-version: "3.10" python-version: "3.10"
pydantic-version: "pydantic>=2.0.2,<3.0.0" coverage: coverage
- os: windows-latest - os: windows-latest
python-version: "3.11"
pydantic-version: "pydantic>=1.10.0,<2.0.0"
- os: ubuntu-latest
python-version: "3.12" python-version: "3.12"
pydantic-version: "pydantic>=2.0.2,<3.0.0"
- os: macos-latest
python-version: "3.13"
pydantic-version: "pydantic>=1.10.0,<2.0.0"
- os: windows-latest
python-version: "3.13"
pydantic-version: "pydantic>=2.0.2,<3.0.0"
coverage: coverage coverage: coverage
# Ubuntu with 3.13 needs coverage for CodSpeed benchmarks
- os: ubuntu-latest - os: ubuntu-latest
python-version: "3.13" python-version: "3.13"
pydantic-version: "pydantic>=2.0.2,<3.0.0"
coverage: coverage coverage: coverage
- os: ubuntu-latest - os: ubuntu-latest
python-version: "3.14" python-version: "3.14"
pydantic-version: "pydantic>=2.0.2,<3.0.0"
coverage: coverage coverage: coverage
fail-fast: false fail-fast: false
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
@ -96,8 +83,6 @@ jobs:
pyproject.toml pyproject.toml
- name: Install Dependencies - name: Install Dependencies
run: uv pip install -r requirements-tests.txt run: uv pip install -r requirements-tests.txt
- name: Install Pydantic
run: uv pip install "${{ matrix.pydantic-version }}"
- run: mkdir coverage - run: mkdir coverage
- name: Test - name: Test
run: bash scripts/test.sh run: bash scripts/test.sh
@ -105,7 +90,7 @@ jobs:
COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }} COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}
CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }} CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }}
- name: CodSpeed benchmarks - name: CodSpeed benchmarks
if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.13' && matrix.pydantic-version == 'pydantic>=2.0.2,<3.0.0' if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.13'
uses: CodSpeedHQ/action@v4 uses: CodSpeedHQ/action@v4
env: env:
COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }} COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}

32
docs/en/docs/advanced/path-operation-advanced-configuration.md

@ -153,48 +153,16 @@ And you could do this even if the data type in the request is not JSON.
For example, in this application we don't use FastAPI's integrated functionality to extract the JSON Schema from Pydantic models nor the automatic validation for JSON. In fact, we are declaring the request content type as YAML, not JSON: For example, in this application we don't use FastAPI's integrated functionality to extract the JSON Schema from Pydantic models nor the automatic validation for JSON. In fact, we are declaring the request content type as YAML, not JSON:
//// tab | Pydantic v2
{* ../../docs_src/path_operation_advanced_configuration/tutorial007_py39.py hl[15:20, 22] *} {* ../../docs_src/path_operation_advanced_configuration/tutorial007_py39.py hl[15:20, 22] *}
////
//// tab | Pydantic v1
{* ../../docs_src/path_operation_advanced_configuration/tutorial007_pv1_py39.py hl[15:20, 22] *}
////
/// info
In Pydantic version 1 the method to get the JSON Schema for a model was called `Item.schema()`, in Pydantic version 2, the method is called `Item.model_json_schema()`.
///
Nevertheless, although we are not using the default integrated functionality, we are still using a Pydantic model to manually generate the JSON Schema for the data that we want to receive in YAML. Nevertheless, although we are not using the default integrated functionality, we are still using a Pydantic model to manually generate the JSON Schema for the data that we want to receive in YAML.
Then we use the request directly, and extract the body as `bytes`. This means that FastAPI won't even try to parse the request payload as JSON. Then we use the request directly, and extract the body as `bytes`. This means that FastAPI won't even try to parse the request payload as JSON.
And then in our code, we parse that YAML content directly, and then we are again using the same Pydantic model to validate the YAML content: And then in our code, we parse that YAML content directly, and then we are again using the same Pydantic model to validate the YAML content:
//// tab | Pydantic v2
{* ../../docs_src/path_operation_advanced_configuration/tutorial007_py39.py hl[24:31] *} {* ../../docs_src/path_operation_advanced_configuration/tutorial007_py39.py hl[24:31] *}
////
//// tab | Pydantic v1
{* ../../docs_src/path_operation_advanced_configuration/tutorial007_pv1_py39.py hl[24:31] *}
////
/// info
In Pydantic version 1 the method to parse and validate an object was `Item.parse_obj()`, in Pydantic version 2, the method is called `Item.model_validate()`.
///
/// tip /// tip
Here we reuse the same Pydantic model. Here we reuse the same Pydantic model.

44
docs/en/docs/advanced/settings.md

@ -46,12 +46,6 @@ $ pip install "fastapi[all]"
</div> </div>
/// info
In Pydantic v1 it came included with the main package. Now it is distributed as this independent package so that you can choose to install it or not if you don't need that functionality.
///
### Create the `Settings` object { #create-the-settings-object } ### Create the `Settings` object { #create-the-settings-object }
Import `BaseSettings` from Pydantic and create a sub-class, very much like with a Pydantic model. Import `BaseSettings` from Pydantic and create a sub-class, very much like with a Pydantic model.
@ -60,24 +54,8 @@ The same way as with Pydantic models, you declare class attributes with type ann
You can use all the same validation features and tools you use for Pydantic models, like different data types and additional validations with `Field()`. You can use all the same validation features and tools you use for Pydantic models, like different data types and additional validations with `Field()`.
//// tab | Pydantic v2
{* ../../docs_src/settings/tutorial001_py39.py hl[2,5:8,11] *} {* ../../docs_src/settings/tutorial001_py39.py hl[2,5:8,11] *}
////
//// tab | Pydantic v1
/// info
In Pydantic v1 you would import `BaseSettings` directly from `pydantic` instead of from `pydantic_settings`.
///
{* ../../docs_src/settings/tutorial001_pv1_py39.py hl[2,5:8,11] *}
////
/// tip /// tip
If you want something quick to copy and paste, don't use this example, use the last one below. If you want something quick to copy and paste, don't use this example, use the last one below.
@ -215,8 +193,6 @@ APP_NAME="ChimichangApp"
And then update your `config.py` with: And then update your `config.py` with:
//// tab | Pydantic v2
{* ../../docs_src/settings/app03_an_py39/config.py hl[9] *} {* ../../docs_src/settings/app03_an_py39/config.py hl[9] *}
/// tip /// tip
@ -225,26 +201,6 @@ The `model_config` attribute is used just for Pydantic configuration. You can re
/// ///
////
//// tab | Pydantic v1
{* ../../docs_src/settings/app03_an_py39/config_pv1.py hl[9:10] *}
/// tip
The `Config` class is used just for Pydantic configuration. You can read more at <a href="https://docs.pydantic.dev/1.10/usage/model_config/" class="external-link" target="_blank">Pydantic Model Config</a>.
///
////
/// info
In Pydantic version 1 the configuration was done in an internal class `Config`, in Pydantic version 2 it's done in an attribute `model_config`. This attribute takes a `dict`, and to get autocompletion and inline errors you can import and use `SettingsConfigDict` to define that `dict`.
///
Here we define the config `env_file` inside of your Pydantic `Settings` class, and set the value to the filename with the dotenv file we want to use. Here we define the config `env_file` inside of your Pydantic `Settings` class, and set the value to the filename with the dotenv file we want to use.
### Creating the `Settings` only once with `lru_cache` { #creating-the-settings-only-once-with-lru-cache } ### Creating the `Settings` only once with `lru_cache` { #creating-the-settings-only-once-with-lru-cache }

14
docs/en/docs/how-to/migrate-from-pydantic-v1-to-pydantic-v2.md

@ -2,21 +2,23 @@
If you have an old FastAPI app, you might be using Pydantic version 1. If you have an old FastAPI app, you might be using Pydantic version 1.
FastAPI has had support for either Pydantic v1 or v2 since version 0.100.0. FastAPI version 0.100.0 had support for either Pydantic v1 or v2. It would use whichever you had installed.
If you had installed Pydantic v2, it would use it. If instead you had Pydantic v1, it would use that. FastAPI version 0.119.0 introduced partial support for Pydantic v1 from inside of Pydantic v2 (as `pydantic.v1`), to facilitate the migration to v2.
Pydantic v1 is now deprecated and support for it will be removed in the next versions of FastAPI, you should **migrate to Pydantic v2**. This way you will get the latest features, improvements, and fixes. FastAPI 0.126.0 dropped support for Pydantic v1, while still supporting `pydantic.v1` for a little while.
/// warning /// warning
Also, the Pydantic team stopped support for Pydantic v1 for the latest versions of Python, starting with **Python 3.14**. The Pydantic team stopped support for Pydantic v1 for the latest versions of Python, starting with **Python 3.14**.
This includes `pydantic.v1`, which is no longer supported in Python 3.14 and above.
If you want to use the latest features of Python, you will need to make sure you use Pydantic v2. If you want to use the latest features of Python, you will need to make sure you use Pydantic v2.
/// ///
If you have an old FastAPI app with Pydantic v1, here I'll show you how to migrate it to Pydantic v2, and the **new features in FastAPI 0.119.0** to help you with a gradual migration. If you have an old FastAPI app with Pydantic v1, here I'll show you how to migrate it to Pydantic v2, and the **features in FastAPI 0.119.0** to help you with a gradual migration.
## Official Guide { #official-guide } ## Official Guide { #official-guide }
@ -44,7 +46,7 @@ After this, you can run the tests and check if everything works. If it does, you
## Pydantic v1 in v2 { #pydantic-v1-in-v2 } ## Pydantic v1 in v2 { #pydantic-v1-in-v2 }
Pydantic v2 includes everything from Pydantic v1 as a submodule `pydantic.v1`. Pydantic v2 includes everything from Pydantic v1 as a submodule `pydantic.v1`. But this is no longer supported in versions above Python 3.13.
This means that you can install the latest version of Pydantic v2 and import and use the old Pydantic v1 components from this submodule, as if you had the old Pydantic v1 installed. This means that you can install the latest version of Pydantic v2 and import and use the old Pydantic v1 components from this submodule, as if you had the old Pydantic v1 installed.

4
docs/en/docs/how-to/separate-openapi-schemas.md

@ -1,6 +1,6 @@
# Separate OpenAPI Schemas for Input and Output or Not { #separate-openapi-schemas-for-input-and-output-or-not } # Separate OpenAPI Schemas for Input and Output or Not { #separate-openapi-schemas-for-input-and-output-or-not }
When using **Pydantic v2**, the generated OpenAPI is a bit more exact and **correct** than before. 😎 Since **Pydantic v2** was released, the generated OpenAPI is a bit more exact and **correct** than before. 😎
In fact, in some cases, it will even have **two JSON Schemas** in OpenAPI for the same Pydantic model, for input and output, depending on if they have **default values**. In fact, in some cases, it will even have **two JSON Schemas** in OpenAPI for the same Pydantic model, for input and output, depending on if they have **default values**.
@ -100,5 +100,3 @@ And now there will be one single schema for input and output for the model, only
<div class="screenshot"> <div class="screenshot">
<img src="/img/tutorial/separate-openapi-schemas/image05.png"> <img src="/img/tutorial/separate-openapi-schemas/image05.png">
</div> </div>
This is the same behavior as in Pydantic v1. 🤓

16
docs/en/docs/tutorial/body-updates.md

@ -50,14 +50,6 @@ If you want to receive partial updates, it's very useful to use the parameter `e
Like `item.model_dump(exclude_unset=True)`. Like `item.model_dump(exclude_unset=True)`.
/// info
In Pydantic v1 the method was called `.dict()`, it was deprecated (but still supported) in Pydantic v2, and renamed to `.model_dump()`.
The examples here use `.dict()` for compatibility with Pydantic v1, but you should use `.model_dump()` instead if you can use Pydantic v2.
///
That would generate a `dict` with only the data that was set when creating the `item` model, excluding default values. That would generate a `dict` with only the data that was set when creating the `item` model, excluding default values.
Then you can use this to generate a `dict` with only the data that was set (sent in the request), omitting default values: Then you can use this to generate a `dict` with only the data that was set (sent in the request), omitting default values:
@ -68,14 +60,6 @@ Then you can use this to generate a `dict` with only the data that was set (sent
Now, you can create a copy of the existing model using `.model_copy()`, and pass the `update` parameter with a `dict` containing the data to update. Now, you can create a copy of the existing model using `.model_copy()`, and pass the `update` parameter with a `dict` containing the data to update.
/// info
In Pydantic v1 the method was called `.copy()`, it was deprecated (but still supported) in Pydantic v2, and renamed to `.model_copy()`.
The examples here use `.copy()` for compatibility with Pydantic v1, but you should use `.model_copy()` instead if you can use Pydantic v2.
///
Like `stored_item_model.model_copy(update=update_data)`: Like `stored_item_model.model_copy(update=update_data)`:
{* ../../docs_src/body_updates/tutorial002_py310.py hl[33] *} {* ../../docs_src/body_updates/tutorial002_py310.py hl[33] *}

8
docs/en/docs/tutorial/body.md

@ -128,14 +128,6 @@ Inside of the function, you can access all the attributes of the model object di
{* ../../docs_src/body/tutorial002_py310.py *} {* ../../docs_src/body/tutorial002_py310.py *}
/// info
In Pydantic v1 the method was called `.dict()`, it was deprecated (but still supported) in Pydantic v2, and renamed to `.model_dump()`.
The examples here use `.dict()` for compatibility with Pydantic v1, but you should use `.model_dump()` instead if you can use Pydantic v2.
///
## Request body + path parameters { #request-body-path-parameters } ## Request body + path parameters { #request-body-path-parameters }
You can declare path parameters and request body at the same time. You can declare path parameters and request body at the same time.

30
docs/en/docs/tutorial/extra-models.md

@ -22,22 +22,13 @@ Here's a general idea of how the models could look like with their password fiel
{* ../../docs_src/extra_models/tutorial001_py310.py hl[7,9,14,20,22,27:28,31:33,38:39] *} {* ../../docs_src/extra_models/tutorial001_py310.py hl[7,9,14,20,22,27:28,31:33,38:39] *}
### About `**user_in.model_dump()` { #about-user-in-model-dump }
/// info #### Pydantic's `.model_dump()` { #pydantics-model-dump }
In Pydantic v1 the method was called `.dict()`, it was deprecated (but still supported) in Pydantic v2, and renamed to `.model_dump()`.
The examples here use `.dict()` for compatibility with Pydantic v1, but you should use `.model_dump()` instead if you can use Pydantic v2.
///
### About `**user_in.dict()` { #about-user-in-dict }
#### Pydantic's `.dict()` { #pydantics-dict }
`user_in` is a Pydantic model of class `UserIn`. `user_in` is a Pydantic model of class `UserIn`.
Pydantic models have a `.dict()` method that returns a `dict` with the model's data. Pydantic models have a `.model_dump()` method that returns a `dict` with the model's data.
So, if we create a Pydantic object `user_in` like: So, if we create a Pydantic object `user_in` like:
@ -48,7 +39,7 @@ user_in = UserIn(username="john", password="secret", email="[email protected]
and then we call: and then we call:
```Python ```Python
user_dict = user_in.dict() user_dict = user_in.model_dump()
``` ```
we now have a `dict` with the data in the variable `user_dict` (it's a `dict` instead of a Pydantic model object). we now have a `dict` with the data in the variable `user_dict` (it's a `dict` instead of a Pydantic model object).
@ -104,20 +95,20 @@ UserInDB(
#### A Pydantic model from the contents of another { #a-pydantic-model-from-the-contents-of-another } #### A Pydantic model from the contents of another { #a-pydantic-model-from-the-contents-of-another }
As in the example above we got `user_dict` from `user_in.dict()`, this code: As in the example above we got `user_dict` from `user_in.model_dump()`, this code:
```Python ```Python
user_dict = user_in.dict() user_dict = user_in.model_dump()
UserInDB(**user_dict) UserInDB(**user_dict)
``` ```
would be equivalent to: would be equivalent to:
```Python ```Python
UserInDB(**user_in.dict()) UserInDB(**user_in.model_dump())
``` ```
...because `user_in.dict()` is a `dict`, and then we make Python "unpack" it by passing it to `UserInDB` prefixed with `**`. ...because `user_in.model_dump()` is a `dict`, and then we make Python "unpack" it by passing it to `UserInDB` prefixed with `**`.
So, we get a Pydantic model from the data in another Pydantic model. So, we get a Pydantic model from the data in another Pydantic model.
@ -126,7 +117,7 @@ So, we get a Pydantic model from the data in another Pydantic model.
And then adding the extra keyword argument `hashed_password=hashed_password`, like in: And then adding the extra keyword argument `hashed_password=hashed_password`, like in:
```Python ```Python
UserInDB(**user_in.dict(), hashed_password=hashed_password) UserInDB(**user_in.model_dump(), hashed_password=hashed_password)
``` ```
...ends up being like: ...ends up being like:
@ -181,7 +172,6 @@ When defining a <a href="https://docs.pydantic.dev/latest/concepts/types/#unions
{* ../../docs_src/extra_models/tutorial003_py310.py hl[1,14:15,18:20,33] *} {* ../../docs_src/extra_models/tutorial003_py310.py hl[1,14:15,18:20,33] *}
### `Union` in Python 3.10 { #union-in-python-3-10 } ### `Union` in Python 3.10 { #union-in-python-3-10 }
In this example we pass `Union[PlaneItem, CarItem]` as the value of the argument `response_model`. In this example we pass `Union[PlaneItem, CarItem]` as the value of the argument `response_model`.
@ -204,7 +194,6 @@ For that, use the standard Python `typing.List` (or just `list` in Python 3.9 an
{* ../../docs_src/extra_models/tutorial004_py39.py hl[18] *} {* ../../docs_src/extra_models/tutorial004_py39.py hl[18] *}
## Response with arbitrary `dict` { #response-with-arbitrary-dict } ## Response with arbitrary `dict` { #response-with-arbitrary-dict }
You can also declare a response using a plain arbitrary `dict`, declaring just the type of the keys and values, without using a Pydantic model. You can also declare a response using a plain arbitrary `dict`, declaring just the type of the keys and values, without using a Pydantic model.
@ -215,7 +204,6 @@ In this case, you can use `typing.Dict` (or just `dict` in Python 3.9 and above)
{* ../../docs_src/extra_models/tutorial005_py39.py hl[6] *} {* ../../docs_src/extra_models/tutorial005_py39.py hl[6] *}
## Recap { #recap } ## Recap { #recap }
Use multiple Pydantic models and inherit freely for each case. Use multiple Pydantic models and inherit freely for each case.

14
docs/en/docs/tutorial/query-params-str-validations.md

@ -206,20 +206,6 @@ If you feel lost with all these **"regular expression"** ideas, don't worry. The
Now you know that whenever you need them you can use them in **FastAPI**. Now you know that whenever you need them you can use them in **FastAPI**.
### Pydantic v1 `regex` instead of `pattern` { #pydantic-v1-regex-instead-of-pattern }
Before Pydantic version 2 and before FastAPI 0.100.0, the parameter was called `regex` instead of `pattern`, but it's now deprecated.
You could still see some code using it:
//// tab | Pydantic v1
{* ../../docs_src/query_params_str_validations/tutorial004_regex_an_py310.py hl[11] *}
////
But know that this is deprecated and it should be updated to use the new parameter `pattern`. 🤓
## Default values { #default-values } ## Default values { #default-values }
You can, of course, use default values other than `None`. You can, of course, use default values other than `None`.

14
docs/en/docs/tutorial/response-model.md

@ -252,20 +252,6 @@ So, if you send a request to that *path operation* for the item with ID `foo`, t
/// info /// info
In Pydantic v1 the method was called `.dict()`, it was deprecated (but still supported) in Pydantic v2, and renamed to `.model_dump()`.
The examples here use `.dict()` for compatibility with Pydantic v1, but you should use `.model_dump()` instead if you can use Pydantic v2.
///
/// info
FastAPI uses Pydantic model's `.dict()` with <a href="https://docs.pydantic.dev/1.10/usage/exporting_models/#modeldict" class="external-link" target="_blank">its `exclude_unset` parameter</a> to achieve this.
///
/// info
You can also use: You can also use:
* `response_model_exclude_defaults=True` * `response_model_exclude_defaults=True`

24
docs/en/docs/tutorial/schema-extra-example.md

@ -8,36 +8,14 @@ Here are several ways to do it.
You can declare `examples` for a Pydantic model that will be added to the generated JSON Schema. You can declare `examples` for a Pydantic model that will be added to the generated JSON Schema.
//// tab | Pydantic v2
{* ../../docs_src/schema_extra_example/tutorial001_py310.py hl[13:24] *} {* ../../docs_src/schema_extra_example/tutorial001_py310.py hl[13:24] *}
////
//// tab | Pydantic v1
{* ../../docs_src/schema_extra_example/tutorial001_pv1_py310.py hl[13:23] *}
////
That extra info will be added as-is to the output **JSON Schema** for that model, and it will be used in the API docs. That extra info will be added as-is to the output **JSON Schema** for that model, and it will be used in the API docs.
//// tab | Pydantic v2 You can use the attribute `model_config` that takes a `dict` as described in <a href="https://docs.pydantic.dev/latest/api/config/" class="external-link" target="_blank">Pydantic's docs: Configuration</a>.
In Pydantic version 2, you would use the attribute `model_config`, that takes a `dict` as described in <a href="https://docs.pydantic.dev/latest/api/config/" class="external-link" target="_blank">Pydantic's docs: Configuration</a>.
You can set `"json_schema_extra"` with a `dict` containing any additional data you would like to show up in the generated JSON Schema, including `examples`. You can set `"json_schema_extra"` with a `dict` containing any additional data you would like to show up in the generated JSON Schema, including `examples`.
////
//// tab | Pydantic v1
In Pydantic version 1, you would use an internal class `Config` and `schema_extra`, as described in <a href="https://docs.pydantic.dev/1.10/usage/schema/#schema-customization" class="external-link" target="_blank">Pydantic's docs: Schema customization</a>.
You can set `schema_extra` with a `dict` containing any additional data you would like to show up in the generated JSON Schema, including `examples`.
////
/// tip /// tip
You could use the same technique to extend the JSON Schema and add your own custom extra info. You could use the same technique to extend the JSON Schema and add your own custom extra info.

2
docs_src/body/tutorial002_py310.py

@ -14,7 +14,7 @@ app = FastAPI()
@app.post("/items/") @app.post("/items/")
async def create_item(item: Item): async def create_item(item: Item):
item_dict = item.dict() item_dict = item.model_dump()
if item.tax is not None: if item.tax is not None:
price_with_tax = item.price + item.tax price_with_tax = item.price + item.tax
item_dict.update({"price_with_tax": price_with_tax}) item_dict.update({"price_with_tax": price_with_tax})

2
docs_src/body/tutorial002_py39.py

@ -16,7 +16,7 @@ app = FastAPI()
@app.post("/items/") @app.post("/items/")
async def create_item(item: Item): async def create_item(item: Item):
item_dict = item.dict() item_dict = item.model_dump()
if item.tax is not None: if item.tax is not None:
price_with_tax = item.price + item.tax price_with_tax = item.price + item.tax
item_dict.update({"price_with_tax": price_with_tax}) item_dict.update({"price_with_tax": price_with_tax})

2
docs_src/body/tutorial003_py310.py

@ -14,4 +14,4 @@ app = FastAPI()
@app.put("/items/{item_id}") @app.put("/items/{item_id}")
async def update_item(item_id: int, item: Item): async def update_item(item_id: int, item: Item):
return {"item_id": item_id, **item.dict()} return {"item_id": item_id, **item.model_dump()}

2
docs_src/body/tutorial003_py39.py

@ -16,4 +16,4 @@ app = FastAPI()
@app.put("/items/{item_id}") @app.put("/items/{item_id}")
async def update_item(item_id: int, item: Item): async def update_item(item_id: int, item: Item):
return {"item_id": item_id, **item.dict()} return {"item_id": item_id, **item.model_dump()}

2
docs_src/body/tutorial004_py310.py

@ -14,7 +14,7 @@ app = FastAPI()
@app.put("/items/{item_id}") @app.put("/items/{item_id}")
async def update_item(item_id: int, item: Item, q: str | None = None): async def update_item(item_id: int, item: Item, q: str | None = None):
result = {"item_id": item_id, **item.dict()} result = {"item_id": item_id, **item.model_dump()}
if q: if q:
result.update({"q": q}) result.update({"q": q})
return result return result

2
docs_src/body/tutorial004_py39.py

@ -16,7 +16,7 @@ app = FastAPI()
@app.put("/items/{item_id}") @app.put("/items/{item_id}")
async def update_item(item_id: int, item: Item, q: Union[str, None] = None): async def update_item(item_id: int, item: Item, q: Union[str, None] = None):
result = {"item_id": item_id, **item.dict()} result = {"item_id": item_id, **item.model_dump()}
if q: if q:
result.update({"q": q}) result.update({"q": q})
return result return result

4
docs_src/body_updates/tutorial002_py310.py

@ -29,7 +29,7 @@ async def read_item(item_id: str):
async def update_item(item_id: str, item: Item): async def update_item(item_id: str, item: Item):
stored_item_data = items[item_id] stored_item_data = items[item_id]
stored_item_model = Item(**stored_item_data) stored_item_model = Item(**stored_item_data)
update_data = item.dict(exclude_unset=True) update_data = item.model_dump(exclude_unset=True)
updated_item = stored_item_model.copy(update=update_data) updated_item = stored_item_model.model_copy(update=update_data)
items[item_id] = jsonable_encoder(updated_item) items[item_id] = jsonable_encoder(updated_item)
return updated_item return updated_item

4
docs_src/body_updates/tutorial002_py39.py

@ -31,7 +31,7 @@ async def read_item(item_id: str):
async def update_item(item_id: str, item: Item): async def update_item(item_id: str, item: Item):
stored_item_data = items[item_id] stored_item_data = items[item_id]
stored_item_model = Item(**stored_item_data) stored_item_model = Item(**stored_item_data)
update_data = item.dict(exclude_unset=True) update_data = item.model_dump(exclude_unset=True)
updated_item = stored_item_model.copy(update=update_data) updated_item = stored_item_model.model_copy(update=update_data)
items[item_id] = jsonable_encoder(updated_item) items[item_id] = jsonable_encoder(updated_item)
return updated_item return updated_item

20
docs_src/cookie_param_models/tutorial002_pv1_an_py310.py

@ -1,20 +0,0 @@
from typing import Annotated
from fastapi import Cookie, FastAPI
from pydantic import BaseModel
app = FastAPI()
class Cookies(BaseModel):
class Config:
extra = "forbid"
session_id: str
fatebook_tracker: str | None = None
googall_tracker: str | None = None
@app.get("/items/")
async def read_items(cookies: Annotated[Cookies, Cookie()]):
return cookies

20
docs_src/cookie_param_models/tutorial002_pv1_an_py39.py

@ -1,20 +0,0 @@
from typing import Annotated, Union
from fastapi import Cookie, FastAPI
from pydantic import BaseModel
app = FastAPI()
class Cookies(BaseModel):
class Config:
extra = "forbid"
session_id: str
fatebook_tracker: Union[str, None] = None
googall_tracker: Union[str, None] = None
@app.get("/items/")
async def read_items(cookies: Annotated[Cookies, Cookie()]):
return cookies

18
docs_src/cookie_param_models/tutorial002_pv1_py310.py

@ -1,18 +0,0 @@
from fastapi import Cookie, FastAPI
from pydantic import BaseModel
app = FastAPI()
class Cookies(BaseModel):
class Config:
extra = "forbid"
session_id: str
fatebook_tracker: str | None = None
googall_tracker: str | None = None
@app.get("/items/")
async def read_items(cookies: Cookies = Cookie()):
return cookies

20
docs_src/cookie_param_models/tutorial002_pv1_py39.py

@ -1,20 +0,0 @@
from typing import Union
from fastapi import Cookie, FastAPI
from pydantic import BaseModel
app = FastAPI()
class Cookies(BaseModel):
class Config:
extra = "forbid"
session_id: str
fatebook_tracker: Union[str, None] = None
googall_tracker: Union[str, None] = None
@app.get("/items/")
async def read_items(cookies: Cookies = Cookie()):
return cookies

2
docs_src/extra_models/tutorial001_py310.py

@ -30,7 +30,7 @@ def fake_password_hasher(raw_password: str):
def fake_save_user(user_in: UserIn): def fake_save_user(user_in: UserIn):
hashed_password = fake_password_hasher(user_in.password) hashed_password = fake_password_hasher(user_in.password)
user_in_db = UserInDB(**user_in.dict(), hashed_password=hashed_password) user_in_db = UserInDB(**user_in.model_dump(), hashed_password=hashed_password)
print("User saved! ..not really") print("User saved! ..not really")
return user_in_db return user_in_db

2
docs_src/extra_models/tutorial001_py39.py

@ -32,7 +32,7 @@ def fake_password_hasher(raw_password: str):
def fake_save_user(user_in: UserIn): def fake_save_user(user_in: UserIn):
hashed_password = fake_password_hasher(user_in.password) hashed_password = fake_password_hasher(user_in.password)
user_in_db = UserInDB(**user_in.dict(), hashed_password=hashed_password) user_in_db = UserInDB(**user_in.model_dump(), hashed_password=hashed_password)
print("User saved! ..not really") print("User saved! ..not really")
return user_in_db return user_in_db

2
docs_src/extra_models/tutorial002_py310.py

@ -28,7 +28,7 @@ def fake_password_hasher(raw_password: str):
def fake_save_user(user_in: UserIn): def fake_save_user(user_in: UserIn):
hashed_password = fake_password_hasher(user_in.password) hashed_password = fake_password_hasher(user_in.password)
user_in_db = UserInDB(**user_in.dict(), hashed_password=hashed_password) user_in_db = UserInDB(**user_in.model_dump(), hashed_password=hashed_password)
print("User saved! ..not really") print("User saved! ..not really")
return user_in_db return user_in_db

2
docs_src/extra_models/tutorial002_py39.py

@ -30,7 +30,7 @@ def fake_password_hasher(raw_password: str):
def fake_save_user(user_in: UserIn): def fake_save_user(user_in: UserIn):
hashed_password = fake_password_hasher(user_in.password) hashed_password = fake_password_hasher(user_in.password)
user_in_db = UserInDB(**user_in.dict(), hashed_password=hashed_password) user_in_db = UserInDB(**user_in.model_dump(), hashed_password=hashed_password)
print("User saved! ..not really") print("User saved! ..not really")
return user_in_db return user_in_db

22
docs_src/header_param_models/tutorial002_pv1_an_py310.py

@ -1,22 +0,0 @@
from typing import Annotated
from fastapi import FastAPI, Header
from pydantic import BaseModel
app = FastAPI()
class CommonHeaders(BaseModel):
class Config:
extra = "forbid"
host: str
save_data: bool
if_modified_since: str | None = None
traceparent: str | None = None
x_tag: list[str] = []
@app.get("/items/")
async def read_items(headers: Annotated[CommonHeaders, Header()]):
return headers

22
docs_src/header_param_models/tutorial002_pv1_an_py39.py

@ -1,22 +0,0 @@
from typing import Annotated, Union
from fastapi import FastAPI, Header
from pydantic import BaseModel
app = FastAPI()
class CommonHeaders(BaseModel):
class Config:
extra = "forbid"
host: str
save_data: bool
if_modified_since: Union[str, None] = None
traceparent: Union[str, None] = None
x_tag: list[str] = []
@app.get("/items/")
async def read_items(headers: Annotated[CommonHeaders, Header()]):
return headers

20
docs_src/header_param_models/tutorial002_pv1_py310.py

@ -1,20 +0,0 @@
from fastapi import FastAPI, Header
from pydantic import BaseModel
app = FastAPI()
class CommonHeaders(BaseModel):
class Config:
extra = "forbid"
host: str
save_data: bool
if_modified_since: str | None = None
traceparent: str | None = None
x_tag: list[str] = []
@app.get("/items/")
async def read_items(headers: CommonHeaders = Header()):
return headers

22
docs_src/header_param_models/tutorial002_pv1_py39.py

@ -1,22 +0,0 @@
from typing import Union
from fastapi import FastAPI, Header
from pydantic import BaseModel
app = FastAPI()
class CommonHeaders(BaseModel):
class Config:
extra = "forbid"
host: str
save_data: bool
if_modified_since: Union[str, None] = None
traceparent: Union[str, None] = None
x_tag: list[str] = []
@app.get("/items/")
async def read_items(headers: CommonHeaders = Header()):
return headers

2
docs_src/path_operation_advanced_configuration/tutorial007_pv1_py39.py

@ -1,6 +1,6 @@
import yaml import yaml
from fastapi import FastAPI, HTTPException, Request from fastapi import FastAPI, HTTPException, Request
from pydantic import BaseModel, ValidationError from pydantic.v1 import BaseModel, ValidationError
app = FastAPI() app = FastAPI()

21
docs_src/query_param_models/tutorial002_pv1_an_py310.py

@ -1,21 +0,0 @@
from typing import Annotated, Literal
from fastapi import FastAPI, Query
from pydantic import BaseModel, Field
app = FastAPI()
class FilterParams(BaseModel):
class Config:
extra = "forbid"
limit: int = Field(100, gt=0, le=100)
offset: int = Field(0, ge=0)
order_by: Literal["created_at", "updated_at"] = "created_at"
tags: list[str] = []
@app.get("/items/")
async def read_items(filter_query: Annotated[FilterParams, Query()]):
return filter_query

21
docs_src/query_param_models/tutorial002_pv1_an_py39.py

@ -1,21 +0,0 @@
from typing import Annotated, Literal
from fastapi import FastAPI, Query
from pydantic import BaseModel, Field
app = FastAPI()
class FilterParams(BaseModel):
class Config:
extra = "forbid"
limit: int = Field(100, gt=0, le=100)
offset: int = Field(0, ge=0)
order_by: Literal["created_at", "updated_at"] = "created_at"
tags: list[str] = []
@app.get("/items/")
async def read_items(filter_query: Annotated[FilterParams, Query()]):
return filter_query

21
docs_src/query_param_models/tutorial002_pv1_py310.py

@ -1,21 +0,0 @@
from typing import Literal
from fastapi import FastAPI, Query
from pydantic import BaseModel, Field
app = FastAPI()
class FilterParams(BaseModel):
class Config:
extra = "forbid"
limit: int = Field(100, gt=0, le=100)
offset: int = Field(0, ge=0)
order_by: Literal["created_at", "updated_at"] = "created_at"
tags: list[str] = []
@app.get("/items/")
async def read_items(filter_query: FilterParams = Query()):
return filter_query

21
docs_src/query_param_models/tutorial002_pv1_py39.py

@ -1,21 +0,0 @@
from typing import Literal
from fastapi import FastAPI, Query
from pydantic import BaseModel, Field
app = FastAPI()
class FilterParams(BaseModel):
class Config:
extra = "forbid"
limit: int = Field(100, gt=0, le=100)
offset: int = Field(0, ge=0)
order_by: Literal["created_at", "updated_at"] = "created_at"
tags: list[str] = []
@app.get("/items/")
async def read_items(filter_query: FilterParams = Query()):
return filter_query

5
docs_src/request_form_models/tutorial002_pv1_an_py39.py

@ -1,7 +1,8 @@
from typing import Annotated from typing import Annotated
from fastapi import FastAPI, Form from fastapi import FastAPI
from pydantic import BaseModel from fastapi.temp_pydantic_v1_params import Form
from pydantic.v1 import BaseModel
app = FastAPI() app = FastAPI()

5
docs_src/request_form_models/tutorial002_pv1_py39.py

@ -1,5 +1,6 @@
from fastapi import FastAPI, Form from fastapi import FastAPI
from pydantic import BaseModel from fastapi.temp_pydantic_v1_params import Form
from pydantic.v1 import BaseModel
app = FastAPI() app = FastAPI()

2
docs_src/schema_extra_example/tutorial001_pv1_py310.py

@ -1,5 +1,5 @@
from fastapi import FastAPI from fastapi import FastAPI
from pydantic import BaseModel from pydantic.v1 import BaseModel
app = FastAPI() app = FastAPI()

2
docs_src/schema_extra_example/tutorial001_pv1_py39.py

@ -1,7 +1,7 @@
from typing import Union from typing import Union
from fastapi import FastAPI from fastapi import FastAPI
from pydantic import BaseModel from pydantic.v1 import BaseModel
app = FastAPI() app = FastAPI()

2
docs_src/settings/app03_an_py39/config_pv1.py

@ -1,4 +1,4 @@
from pydantic import BaseSettings from pydantic.v1 import BaseSettings
class Settings(BaseSettings): class Settings(BaseSettings):

2
docs_src/settings/app03_py39/config_pv1.py

@ -1,4 +1,4 @@
from pydantic import BaseSettings from pydantic.v1 import BaseSettings
class Settings(BaseSettings): class Settings(BaseSettings):

2
docs_src/settings/tutorial001_pv1_py39.py

@ -1,5 +1,5 @@
from fastapi import FastAPI from fastapi import FastAPI
from pydantic import BaseSettings from pydantic.v1 import BaseSettings
class Settings(BaseSettings): class Settings(BaseSettings):

1
fastapi/_compat/__init__.py

@ -11,7 +11,6 @@ from .main import _is_model_class as _is_model_class
from .main import _is_model_field as _is_model_field from .main import _is_model_field as _is_model_field
from .main import _is_undefined as _is_undefined from .main import _is_undefined as _is_undefined
from .main import _model_dump as _model_dump from .main import _model_dump as _model_dump
from .main import _model_rebuild as _model_rebuild
from .main import copy_field_info as copy_field_info from .main import copy_field_info as copy_field_info
from .main import create_body_model as create_body_model from .main import create_body_model as create_body_model
from .main import evaluate_forwardref as evaluate_forwardref from .main import evaluate_forwardref as evaluate_forwardref

206
fastapi/_compat/main.py

@ -6,43 +6,26 @@ from typing import (
) )
from fastapi._compat import may_v1 from fastapi._compat import may_v1
from fastapi._compat.shared import PYDANTIC_V2, lenient_issubclass from fastapi._compat.shared import lenient_issubclass
from fastapi.types import ModelNameMap from fastapi.types import ModelNameMap
from pydantic import BaseModel from pydantic import BaseModel
from typing_extensions import Literal from typing_extensions import Literal
from . import v2
from .model_field import ModelField from .model_field import ModelField
from .v2 import BaseConfig as BaseConfig
if PYDANTIC_V2: from .v2 import FieldInfo as FieldInfo
from .v2 import BaseConfig as BaseConfig from .v2 import PydanticSchemaGenerationError as PydanticSchemaGenerationError
from .v2 import FieldInfo as FieldInfo from .v2 import RequiredParam as RequiredParam
from .v2 import PydanticSchemaGenerationError as PydanticSchemaGenerationError from .v2 import Undefined as Undefined
from .v2 import RequiredParam as RequiredParam from .v2 import UndefinedType as UndefinedType
from .v2 import Undefined as Undefined from .v2 import Url as Url
from .v2 import UndefinedType as UndefinedType from .v2 import Validator as Validator
from .v2 import Url as Url from .v2 import evaluate_forwardref as evaluate_forwardref
from .v2 import Validator as Validator from .v2 import get_missing_field_error as get_missing_field_error
from .v2 import evaluate_forwardref as evaluate_forwardref from .v2 import (
from .v2 import get_missing_field_error as get_missing_field_error with_info_plain_validator_function as with_info_plain_validator_function,
from .v2 import ( )
with_info_plain_validator_function as with_info_plain_validator_function,
)
else:
from .v1 import BaseConfig as BaseConfig # type: ignore[assignment]
from .v1 import FieldInfo as FieldInfo
from .v1 import ( # type: ignore[assignment]
PydanticSchemaGenerationError as PydanticSchemaGenerationError,
)
from .v1 import RequiredParam as RequiredParam
from .v1 import Undefined as Undefined
from .v1 import UndefinedType as UndefinedType
from .v1 import Url as Url # type: ignore[assignment]
from .v1 import Validator as Validator
from .v1 import evaluate_forwardref as evaluate_forwardref
from .v1 import get_missing_field_error as get_missing_field_error
from .v1 import ( # type: ignore[assignment]
with_info_plain_validator_function as with_info_plain_validator_function,
)
@lru_cache @lru_cache
@ -50,7 +33,7 @@ def get_cached_model_fields(model: type[BaseModel]) -> list[ModelField]:
if lenient_issubclass(model, may_v1.BaseModel): if lenient_issubclass(model, may_v1.BaseModel):
from fastapi._compat import v1 from fastapi._compat import v1
return v1.get_model_fields(model) return v1.get_model_fields(model) # type: ignore[arg-type,return-value]
else: else:
from . import v2 from . import v2
@ -60,11 +43,8 @@ def get_cached_model_fields(model: type[BaseModel]) -> list[ModelField]:
def _is_undefined(value: object) -> bool: def _is_undefined(value: object) -> bool:
if isinstance(value, may_v1.UndefinedType): if isinstance(value, may_v1.UndefinedType):
return True return True
elif PYDANTIC_V2:
from . import v2
return isinstance(value, v2.UndefinedType) return isinstance(value, v2.UndefinedType)
return False
def _get_model_config(model: BaseModel) -> Any: def _get_model_config(model: BaseModel) -> Any:
@ -72,10 +52,8 @@ def _get_model_config(model: BaseModel) -> Any:
from fastapi._compat import v1 from fastapi._compat import v1
return v1._get_model_config(model) return v1._get_model_config(model)
elif PYDANTIC_V2:
from . import v2
return v2._get_model_config(model) return v2._get_model_config(model)
def _model_dump( def _model_dump(
@ -85,20 +63,15 @@ def _model_dump(
from fastapi._compat import v1 from fastapi._compat import v1
return v1._model_dump(model, mode=mode, **kwargs) return v1._model_dump(model, mode=mode, **kwargs)
elif PYDANTIC_V2:
from . import v2
return v2._model_dump(model, mode=mode, **kwargs) return v2._model_dump(model, mode=mode, **kwargs)
def _is_error_wrapper(exc: Exception) -> bool: def _is_error_wrapper(exc: Exception) -> bool:
if isinstance(exc, may_v1.ErrorWrapper): if isinstance(exc, may_v1.ErrorWrapper):
return True return True
elif PYDANTIC_V2:
from . import v2
return isinstance(exc, v2.ErrorWrapper) return isinstance(exc, v2.ErrorWrapper)
return False
def copy_field_info(*, field_info: FieldInfo, annotation: Any) -> FieldInfo: def copy_field_info(*, field_info: FieldInfo, annotation: Any) -> FieldInfo:
@ -106,11 +79,8 @@ def copy_field_info(*, field_info: FieldInfo, annotation: Any) -> FieldInfo:
from fastapi._compat import v1 from fastapi._compat import v1
return v1.copy_field_info(field_info=field_info, annotation=annotation) return v1.copy_field_info(field_info=field_info, annotation=annotation)
else:
assert PYDANTIC_V2
from . import v2
return v2.copy_field_info(field_info=field_info, annotation=annotation) return v2.copy_field_info(field_info=field_info, annotation=annotation)
def create_body_model( def create_body_model(
@ -120,11 +90,8 @@ def create_body_model(
from fastapi._compat import v1 from fastapi._compat import v1
return v1.create_body_model(fields=fields, model_name=model_name) return v1.create_body_model(fields=fields, model_name=model_name)
else:
assert PYDANTIC_V2
from . import v2
return v2.create_body_model(fields=fields, model_name=model_name) # type: ignore[arg-type] return v2.create_body_model(fields=fields, model_name=model_name) # type: ignore[arg-type]
def get_annotation_from_field_info( def get_annotation_from_field_info(
@ -136,13 +103,10 @@ def get_annotation_from_field_info(
return v1.get_annotation_from_field_info( return v1.get_annotation_from_field_info(
annotation=annotation, field_info=field_info, field_name=field_name annotation=annotation, field_info=field_info, field_name=field_name
) )
else:
assert PYDANTIC_V2
from . import v2
return v2.get_annotation_from_field_info( return v2.get_annotation_from_field_info(
annotation=annotation, field_info=field_info, field_name=field_name annotation=annotation, field_info=field_info, field_name=field_name
) )
def is_bytes_field(field: ModelField) -> bool: def is_bytes_field(field: ModelField) -> bool:
@ -150,11 +114,8 @@ def is_bytes_field(field: ModelField) -> bool:
from fastapi._compat import v1 from fastapi._compat import v1
return v1.is_bytes_field(field) return v1.is_bytes_field(field)
else:
assert PYDANTIC_V2
from . import v2
return v2.is_bytes_field(field) # type: ignore[arg-type] return v2.is_bytes_field(field) # type: ignore[arg-type]
def is_bytes_sequence_field(field: ModelField) -> bool: def is_bytes_sequence_field(field: ModelField) -> bool:
@ -162,11 +123,8 @@ def is_bytes_sequence_field(field: ModelField) -> bool:
from fastapi._compat import v1 from fastapi._compat import v1
return v1.is_bytes_sequence_field(field) return v1.is_bytes_sequence_field(field)
else:
assert PYDANTIC_V2
from . import v2
return v2.is_bytes_sequence_field(field) # type: ignore[arg-type] return v2.is_bytes_sequence_field(field) # type: ignore[arg-type]
def is_scalar_field(field: ModelField) -> bool: def is_scalar_field(field: ModelField) -> bool:
@ -174,23 +132,12 @@ def is_scalar_field(field: ModelField) -> bool:
from fastapi._compat import v1 from fastapi._compat import v1
return v1.is_scalar_field(field) return v1.is_scalar_field(field)
else:
assert PYDANTIC_V2
from . import v2
return v2.is_scalar_field(field) # type: ignore[arg-type] return v2.is_scalar_field(field) # type: ignore[arg-type]
def is_scalar_sequence_field(field: ModelField) -> bool: def is_scalar_sequence_field(field: ModelField) -> bool:
if isinstance(field, may_v1.ModelField): return v2.is_scalar_sequence_field(field) # type: ignore[arg-type]
from fastapi._compat import v1
return v1.is_scalar_sequence_field(field)
else:
assert PYDANTIC_V2
from . import v2
return v2.is_scalar_sequence_field(field) # type: ignore[arg-type]
def is_sequence_field(field: ModelField) -> bool: def is_sequence_field(field: ModelField) -> bool:
@ -198,11 +145,8 @@ def is_sequence_field(field: ModelField) -> bool:
from fastapi._compat import v1 from fastapi._compat import v1
return v1.is_sequence_field(field) return v1.is_sequence_field(field)
else:
assert PYDANTIC_V2
from . import v2
return v2.is_sequence_field(field) # type: ignore[arg-type] return v2.is_sequence_field(field) # type: ignore[arg-type]
def serialize_sequence_value(*, field: ModelField, value: Any) -> Sequence[Any]: def serialize_sequence_value(*, field: ModelField, value: Any) -> Sequence[Any]:
@ -210,22 +154,8 @@ def serialize_sequence_value(*, field: ModelField, value: Any) -> Sequence[Any]:
from fastapi._compat import v1 from fastapi._compat import v1
return v1.serialize_sequence_value(field=field, value=value) return v1.serialize_sequence_value(field=field, value=value)
else:
assert PYDANTIC_V2
from . import v2
return v2.serialize_sequence_value(field=field, value=value) # type: ignore[arg-type]
return v2.serialize_sequence_value(field=field, value=value) # type: ignore[arg-type]
def _model_rebuild(model: type[BaseModel]) -> None:
if lenient_issubclass(model, may_v1.BaseModel):
from fastapi._compat import v1
v1._model_rebuild(model)
elif PYDANTIC_V2:
from . import v2
v2._model_rebuild(model)
def get_compat_model_name_map(fields: list[ModelField]) -> ModelNameMap: def get_compat_model_name_map(fields: list[ModelField]) -> ModelNameMap:
@ -236,27 +166,18 @@ def get_compat_model_name_map(fields: list[ModelField]) -> ModelNameMap:
from fastapi._compat import v1 from fastapi._compat import v1
v1_flat_models = v1.get_flat_models_from_fields( v1_flat_models = v1.get_flat_models_from_fields(
v1_model_fields, known_models=set() v1_model_fields, # type: ignore[arg-type]
known_models=set(),
) )
all_flat_models = v1_flat_models all_flat_models = v1_flat_models
else: else:
all_flat_models = set() all_flat_models = set()
if PYDANTIC_V2:
from . import v2
v2_model_fields = [ v2_model_fields = [field for field in fields if isinstance(field, v2.ModelField)]
field for field in fields if isinstance(field, v2.ModelField) v2_flat_models = v2.get_flat_models_from_fields(v2_model_fields, known_models=set())
] all_flat_models = all_flat_models.union(v2_flat_models) # type: ignore[arg-type]
v2_flat_models = v2.get_flat_models_from_fields(
v2_model_fields, known_models=set()
)
all_flat_models = all_flat_models.union(v2_flat_models)
model_name_map = v2.get_model_name_map(all_flat_models) model_name_map = v2.get_model_name_map(all_flat_models) # type: ignore[arg-type]
return model_name_map
from fastapi._compat import v1
model_name_map = v1.get_model_name_map(all_flat_models)
return model_name_map return model_name_map
@ -275,29 +196,23 @@ def get_definitions(
if sys.version_info < (3, 14): if sys.version_info < (3, 14):
v1_fields = [field for field in fields if isinstance(field, may_v1.ModelField)] v1_fields = [field for field in fields if isinstance(field, may_v1.ModelField)]
v1_field_maps, v1_definitions = may_v1.get_definitions( v1_field_maps, v1_definitions = may_v1.get_definitions(
fields=v1_fields, fields=v1_fields, # type: ignore[arg-type]
model_name_map=model_name_map,
separate_input_output_schemas=separate_input_output_schemas,
)
v2_fields = [field for field in fields if isinstance(field, v2.ModelField)]
v2_field_maps, v2_definitions = v2.get_definitions(
fields=v2_fields,
model_name_map=model_name_map, model_name_map=model_name_map,
separate_input_output_schemas=separate_input_output_schemas, separate_input_output_schemas=separate_input_output_schemas,
) )
if not PYDANTIC_V2: all_definitions = {**v1_definitions, **v2_definitions}
return v1_field_maps, v1_definitions all_field_maps = {**v1_field_maps, **v2_field_maps} # type: ignore[misc]
else: return all_field_maps, all_definitions
from . import v2
v2_fields = [field for field in fields if isinstance(field, v2.ModelField)]
v2_field_maps, v2_definitions = v2.get_definitions(
fields=v2_fields,
model_name_map=model_name_map,
separate_input_output_schemas=separate_input_output_schemas,
)
all_definitions = {**v1_definitions, **v2_definitions}
all_field_maps = {**v1_field_maps, **v2_field_maps}
return all_field_maps, all_definitions
# Pydantic v1 is not supported since Python 3.14 # Pydantic v1 is not supported since Python 3.14
else: else:
from . import v2
v2_fields = [field for field in fields if isinstance(field, v2.ModelField)] v2_fields = [field for field in fields if isinstance(field, v2.ModelField)]
v2_field_maps, v2_definitions = v2.get_definitions( v2_field_maps, v2_definitions = v2.get_definitions(
fields=v2_fields, fields=v2_fields,
@ -326,33 +241,24 @@ def get_schema_from_model_field(
field_mapping=field_mapping, field_mapping=field_mapping,
separate_input_output_schemas=separate_input_output_schemas, separate_input_output_schemas=separate_input_output_schemas,
) )
else:
assert PYDANTIC_V2
from . import v2
return v2.get_schema_from_model_field( return v2.get_schema_from_model_field(
field=field, # type: ignore[arg-type] field=field, # type: ignore[arg-type]
model_name_map=model_name_map, model_name_map=model_name_map,
field_mapping=field_mapping, # type: ignore[arg-type] field_mapping=field_mapping, # type: ignore[arg-type]
separate_input_output_schemas=separate_input_output_schemas, separate_input_output_schemas=separate_input_output_schemas,
) )
def _is_model_field(value: Any) -> bool: def _is_model_field(value: Any) -> bool:
if isinstance(value, may_v1.ModelField): if isinstance(value, may_v1.ModelField):
return True return True
elif PYDANTIC_V2:
from . import v2
return isinstance(value, v2.ModelField) return isinstance(value, v2.ModelField)
return False
def _is_model_class(value: Any) -> bool: def _is_model_class(value: Any) -> bool:
if lenient_issubclass(value, may_v1.BaseModel): if lenient_issubclass(value, may_v1.BaseModel):
return True return True
elif PYDANTIC_V2:
from . import v2
return lenient_issubclass(value, v2.BaseModel) # type: ignore[attr-defined] return lenient_issubclass(value, v2.BaseModel) # type: ignore[attr-defined]
return False

2
fastapi/_compat/may_v1.py

@ -102,7 +102,7 @@ def _normalize_errors(errors: Sequence[Any]) -> list[dict[str, Any]]:
use_errors: list[Any] = [] use_errors: list[Any] = []
for error in errors: for error in errors:
if isinstance(error, ErrorWrapper): if isinstance(error, ErrorWrapper):
new_errors = ValidationError( # type: ignore[call-arg] new_errors = ValidationError(
errors=[error], model=RequestErrorModel errors=[error], model=RequestErrorModel
).errors() ).errors()
use_errors.extend(new_errors) use_errors.extend(new_errors)

179
fastapi/_compat/v1.py

@ -11,6 +11,44 @@ from typing import (
from fastapi._compat import shared from fastapi._compat import shared
from fastapi.openapi.constants import REF_PREFIX as REF_PREFIX from fastapi.openapi.constants import REF_PREFIX as REF_PREFIX
from fastapi.types import ModelNameMap from fastapi.types import ModelNameMap
from pydantic.v1 import BaseConfig as BaseConfig
from pydantic.v1 import BaseModel as BaseModel
from pydantic.v1 import ValidationError as ValidationError
from pydantic.v1 import create_model as create_model
from pydantic.v1.class_validators import Validator as Validator
from pydantic.v1.color import Color as Color
from pydantic.v1.error_wrappers import ErrorWrapper as ErrorWrapper
from pydantic.v1.fields import (
SHAPE_FROZENSET,
SHAPE_LIST,
SHAPE_SEQUENCE,
SHAPE_SET,
SHAPE_SINGLETON,
SHAPE_TUPLE,
SHAPE_TUPLE_ELLIPSIS,
)
from pydantic.v1.fields import FieldInfo as FieldInfo
from pydantic.v1.fields import ModelField as ModelField
from pydantic.v1.fields import Undefined as Undefined
from pydantic.v1.fields import UndefinedType as UndefinedType
from pydantic.v1.networks import AnyUrl as AnyUrl
from pydantic.v1.networks import NameEmail as NameEmail
from pydantic.v1.schema import TypeModelSet as TypeModelSet
from pydantic.v1.schema import field_schema, model_process_schema
from pydantic.v1.schema import (
get_annotation_from_field_info as get_annotation_from_field_info,
)
from pydantic.v1.schema import (
get_flat_models_from_field as get_flat_models_from_field,
)
from pydantic.v1.schema import (
get_flat_models_from_fields as get_flat_models_from_fields,
)
from pydantic.v1.schema import get_model_name_map as get_model_name_map
from pydantic.v1.types import SecretBytes as SecretBytes
from pydantic.v1.types import SecretStr as SecretStr
from pydantic.v1.typing import evaluate_forwardref as evaluate_forwardref
from pydantic.v1.utils import lenient_issubclass as lenient_issubclass
from pydantic.version import VERSION as PYDANTIC_VERSION from pydantic.version import VERSION as PYDANTIC_VERSION
from typing_extensions import Literal from typing_extensions import Literal
@ -20,103 +58,6 @@ PYDANTIC_V2 = PYDANTIC_VERSION_MINOR_TUPLE[0] == 2
# shadowing typing.Required. # shadowing typing.Required.
RequiredParam: Any = Ellipsis RequiredParam: Any = Ellipsis
if not PYDANTIC_V2:
from pydantic import BaseConfig as BaseConfig
from pydantic import BaseModel as BaseModel
from pydantic import ValidationError as ValidationError
from pydantic import create_model as create_model
from pydantic.class_validators import Validator as Validator
from pydantic.color import Color as Color
from pydantic.error_wrappers import ErrorWrapper as ErrorWrapper
from pydantic.errors import MissingError
from pydantic.fields import ( # type: ignore[attr-defined]
SHAPE_FROZENSET,
SHAPE_LIST,
SHAPE_SEQUENCE,
SHAPE_SET,
SHAPE_SINGLETON,
SHAPE_TUPLE,
SHAPE_TUPLE_ELLIPSIS,
)
from pydantic.fields import FieldInfo as FieldInfo
from pydantic.fields import ModelField as ModelField # type: ignore[attr-defined]
from pydantic.fields import Undefined as Undefined # type: ignore[attr-defined]
from pydantic.fields import ( # type: ignore[attr-defined]
UndefinedType as UndefinedType,
)
from pydantic.networks import AnyUrl as AnyUrl
from pydantic.networks import NameEmail as NameEmail
from pydantic.schema import TypeModelSet as TypeModelSet
from pydantic.schema import (
field_schema,
model_process_schema,
)
from pydantic.schema import (
get_annotation_from_field_info as get_annotation_from_field_info,
)
from pydantic.schema import get_flat_models_from_field as get_flat_models_from_field
from pydantic.schema import (
get_flat_models_from_fields as get_flat_models_from_fields,
)
from pydantic.schema import get_model_name_map as get_model_name_map
from pydantic.types import SecretBytes as SecretBytes
from pydantic.types import SecretStr as SecretStr
from pydantic.typing import evaluate_forwardref as evaluate_forwardref
from pydantic.utils import lenient_issubclass as lenient_issubclass
else:
from pydantic.v1 import BaseConfig as BaseConfig # type: ignore[assignment]
from pydantic.v1 import BaseModel as BaseModel # type: ignore[assignment]
from pydantic.v1 import ( # type: ignore[assignment]
ValidationError as ValidationError,
)
from pydantic.v1 import create_model as create_model # type: ignore[no-redef]
from pydantic.v1.class_validators import Validator as Validator
from pydantic.v1.color import Color as Color # type: ignore[assignment]
from pydantic.v1.error_wrappers import ErrorWrapper as ErrorWrapper
from pydantic.v1.errors import MissingError
from pydantic.v1.fields import (
SHAPE_FROZENSET,
SHAPE_LIST,
SHAPE_SEQUENCE,
SHAPE_SET,
SHAPE_SINGLETON,
SHAPE_TUPLE,
SHAPE_TUPLE_ELLIPSIS,
)
from pydantic.v1.fields import FieldInfo as FieldInfo # type: ignore[assignment]
from pydantic.v1.fields import ModelField as ModelField
from pydantic.v1.fields import Undefined as Undefined
from pydantic.v1.fields import UndefinedType as UndefinedType
from pydantic.v1.networks import AnyUrl as AnyUrl
from pydantic.v1.networks import ( # type: ignore[assignment]
NameEmail as NameEmail,
)
from pydantic.v1.schema import TypeModelSet as TypeModelSet
from pydantic.v1.schema import (
field_schema,
model_process_schema,
)
from pydantic.v1.schema import (
get_annotation_from_field_info as get_annotation_from_field_info,
)
from pydantic.v1.schema import (
get_flat_models_from_field as get_flat_models_from_field,
)
from pydantic.v1.schema import (
get_flat_models_from_fields as get_flat_models_from_fields,
)
from pydantic.v1.schema import get_model_name_map as get_model_name_map
from pydantic.v1.types import ( # type: ignore[assignment]
SecretBytes as SecretBytes,
)
from pydantic.v1.types import ( # type: ignore[assignment]
SecretStr as SecretStr,
)
from pydantic.v1.typing import evaluate_forwardref as evaluate_forwardref
from pydantic.v1.utils import lenient_issubclass as lenient_issubclass
GetJsonSchemaHandler = Any GetJsonSchemaHandler = Any
JsonSchemaValue = dict[str, Any] JsonSchemaValue = dict[str, Any]
@ -200,24 +141,6 @@ def is_pv1_scalar_field(field: ModelField) -> bool:
return True return True
def is_pv1_scalar_sequence_field(field: ModelField) -> bool:
if (field.shape in sequence_shapes) and not lenient_issubclass(
field.type_, BaseModel
):
if field.sub_fields is not None:
for sub_field in field.sub_fields:
if not is_pv1_scalar_field(sub_field):
return False
return True
if shared._annotation_is_sequence(field.type_):
return True
return False
def _model_rebuild(model: type[BaseModel]) -> None:
model.update_forward_refs()
def _model_dump( def _model_dump(
model: BaseModel, mode: Literal["json", "python"] = "json", **kwargs: Any model: BaseModel, mode: Literal["json", "python"] = "json", **kwargs: Any
) -> Any: ) -> Any:
@ -225,7 +148,7 @@ def _model_dump(
def _get_model_config(model: BaseModel) -> Any: def _get_model_config(model: BaseModel) -> Any:
return model.__config__ # type: ignore[attr-defined] return model.__config__
def get_schema_from_model_field( def get_schema_from_model_field(
@ -237,8 +160,10 @@ def get_schema_from_model_field(
], ],
separate_input_output_schemas: bool = True, separate_input_output_schemas: bool = True,
) -> dict[str, Any]: ) -> dict[str, Any]:
return field_schema( # type: ignore[no-any-return] return field_schema(
field, model_name_map=model_name_map, ref_prefix=REF_PREFIX field,
model_name_map=model_name_map, # type: ignore[arg-type]
ref_prefix=REF_PREFIX,
)[0] )[0]
@ -257,7 +182,7 @@ def get_definitions(
dict[str, dict[str, Any]], dict[str, dict[str, Any]],
]: ]:
models = get_flat_models_from_fields(fields, known_models=set()) models = get_flat_models_from_fields(fields, known_models=set())
return {}, get_model_definitions(flat_models=models, model_name_map=model_name_map) return {}, get_model_definitions(flat_models=models, model_name_map=model_name_map) # type: ignore[arg-type]
def is_scalar_field(field: ModelField) -> bool: def is_scalar_field(field: ModelField) -> bool:
@ -268,12 +193,8 @@ def is_sequence_field(field: ModelField) -> bool:
return field.shape in sequence_shapes or shared._annotation_is_sequence(field.type_) return field.shape in sequence_shapes or shared._annotation_is_sequence(field.type_)
def is_scalar_sequence_field(field: ModelField) -> bool:
return is_pv1_scalar_sequence_field(field)
def is_bytes_field(field: ModelField) -> bool: def is_bytes_field(field: ModelField) -> bool:
return lenient_issubclass(field.type_, bytes) # type: ignore[no-any-return] return lenient_issubclass(field.type_, bytes)
def is_bytes_sequence_field(field: ModelField) -> bool: def is_bytes_sequence_field(field: ModelField) -> bool:
@ -288,20 +209,14 @@ def serialize_sequence_value(*, field: ModelField, value: Any) -> Sequence[Any]:
return sequence_shape_to_type[field.shape](value) # type: ignore[no-any-return] return sequence_shape_to_type[field.shape](value) # type: ignore[no-any-return]
def get_missing_field_error(loc: tuple[str, ...]) -> dict[str, Any]:
missing_field_error = ErrorWrapper(MissingError(), loc=loc)
new_error = ValidationError([missing_field_error], RequestErrorModel)
return new_error.errors()[0] # type: ignore[return-value]
def create_body_model( def create_body_model(
*, fields: Sequence[ModelField], model_name: str *, fields: Sequence[ModelField], model_name: str
) -> type[BaseModel]: ) -> type[BaseModel]:
BodyModel = create_model(model_name) BodyModel = create_model(model_name)
for f in fields: for f in fields:
BodyModel.__fields__[f.name] = f # type: ignore[index] BodyModel.__fields__[f.name] = f
return BodyModel return BodyModel
def get_model_fields(model: type[BaseModel]) -> list[ModelField]: def get_model_fields(model: type[BaseModel]) -> list[ModelField]:
return list(model.__fields__.values()) # type: ignore[attr-defined] return list(model.__fields__.values())

4
fastapi/_compat/v2.py

@ -216,10 +216,6 @@ def get_annotation_from_field_info(
return annotation return annotation
def _model_rebuild(model: type[BaseModel]) -> None:
model.model_rebuild()
def _model_dump( def _model_dump(
model: BaseModel, mode: Literal["json", "python"] = "json", **kwargs: Any model: BaseModel, mode: Literal["json", "python"] = "json", **kwargs: Any
) -> Any: ) -> Any:

16
fastapi/datastructures.py

@ -1,4 +1,3 @@
from collections.abc import Iterable
from typing import ( from typing import (
Annotated, Annotated,
Any, Any,
@ -135,27 +134,12 @@ class UploadFile(StarletteUploadFile):
""" """
return await super().close() return await super().close()
@classmethod
def __get_validators__(cls: type["UploadFile"]) -> Iterable[Callable[..., Any]]:
yield cls.validate
@classmethod
def validate(cls: type["UploadFile"], v: Any) -> Any:
if not isinstance(v, StarletteUploadFile):
raise ValueError(f"Expected UploadFile, received: {type(v)}")
return v
@classmethod @classmethod
def _validate(cls, __input_value: Any, _: Any) -> "UploadFile": def _validate(cls, __input_value: Any, _: Any) -> "UploadFile":
if not isinstance(__input_value, StarletteUploadFile): if not isinstance(__input_value, StarletteUploadFile):
raise ValueError(f"Expected UploadFile, received: {type(__input_value)}") raise ValueError(f"Expected UploadFile, received: {type(__input_value)}")
return cast(UploadFile, __input_value) return cast(UploadFile, __input_value)
# TODO: remove when deprecating Pydantic v1
@classmethod
def __modify_schema__(cls, field_schema: dict[str, Any]) -> None:
field_schema.update({"type": "string", "format": "binary"})
@classmethod @classmethod
def __get_pydantic_json_schema__( def __get_pydantic_json_schema__(
cls, core_schema: CoreSchema, handler: GetJsonSchemaHandler cls, core_schema: CoreSchema, handler: GetJsonSchemaHandler

13
fastapi/dependencies/utils.py

@ -18,7 +18,6 @@ from typing import (
import anyio import anyio
from fastapi import params from fastapi import params
from fastapi._compat import ( from fastapi._compat import (
PYDANTIC_V2,
ModelField, ModelField,
RequiredParam, RequiredParam,
Undefined, Undefined,
@ -410,7 +409,8 @@ def analyze_param(
if isinstance(fastapi_annotation, (FieldInfo, may_v1.FieldInfo)): if isinstance(fastapi_annotation, (FieldInfo, may_v1.FieldInfo)):
# Copy `field_info` because we mutate `field_info.default` below. # Copy `field_info` because we mutate `field_info.default` below.
field_info = copy_field_info( field_info = copy_field_info(
field_info=fastapi_annotation, annotation=use_annotation field_info=fastapi_annotation, # type: ignore[arg-type]
annotation=use_annotation,
) )
assert field_info.default in { assert field_info.default in {
Undefined, Undefined,
@ -444,10 +444,9 @@ def analyze_param(
"Cannot specify FastAPI annotations in `Annotated` and default value" "Cannot specify FastAPI annotations in `Annotated` and default value"
f" together for {param_name!r}" f" together for {param_name!r}"
) )
field_info = value field_info = value # type: ignore[assignment]
if PYDANTIC_V2: if isinstance(field_info, FieldInfo):
if isinstance(field_info, FieldInfo): field_info.annotation = type_annotation
field_info.annotation = type_annotation
# Get Depends from type annotation # Get Depends from type annotation
if depends is not None and depends.dependency is None: if depends is not None and depends.dependency is None:
@ -485,7 +484,7 @@ def analyze_param(
field_info = params.File(annotation=use_annotation, default=default_value) field_info = params.File(annotation=use_annotation, default=default_value)
elif not field_annotation_is_scalar(annotation=type_annotation): elif not field_annotation_is_scalar(annotation=type_annotation):
if annotation_is_pydantic_v1(use_annotation): if annotation_is_pydantic_v1(use_annotation):
field_info = temp_pydantic_v1_params.Body( field_info = temp_pydantic_v1_params.Body( # type: ignore[assignment]
annotation=use_annotation, default=default_value annotation=use_annotation, default=default_value
) )
else: else:

4
fastapi/encoders.py

@ -228,11 +228,11 @@ def jsonable_encoder(
# TODO: remove when deprecating Pydantic v1 # TODO: remove when deprecating Pydantic v1
encoders: dict[Any, Any] = {} encoders: dict[Any, Any] = {}
if isinstance(obj, may_v1.BaseModel): if isinstance(obj, may_v1.BaseModel):
encoders = getattr(obj.__config__, "json_encoders", {}) # type: ignore[attr-defined] encoders = getattr(obj.__config__, "json_encoders", {})
if custom_encoder: if custom_encoder:
encoders = {**encoders, **custom_encoder} encoders = {**encoders, **custom_encoder}
obj_dict = _model_dump( obj_dict = _model_dump(
obj, obj, # type: ignore[arg-type]
mode="json", mode="json",
include=include, include=include,
exclude=exclude, exclude=exclude,

24
fastapi/openapi/models.py

@ -3,11 +3,9 @@ from enum import Enum
from typing import Annotated, Any, Callable, Optional, Union from typing import Annotated, Any, Callable, Optional, Union
from fastapi._compat import ( from fastapi._compat import (
PYDANTIC_V2,
CoreSchema, CoreSchema,
GetJsonSchemaHandler, GetJsonSchemaHandler,
JsonSchemaValue, JsonSchemaValue,
_model_rebuild,
with_info_plain_validator_function, with_info_plain_validator_function,
) )
from fastapi.logger import logger from fastapi.logger import logger
@ -57,13 +55,7 @@ except ImportError: # pragma: no cover
class BaseModelWithConfig(BaseModel): class BaseModelWithConfig(BaseModel):
if PYDANTIC_V2: model_config = {"extra": "allow"}
model_config = {"extra": "allow"}
else:
class Config:
extra = "allow"
class Contact(BaseModelWithConfig): class Contact(BaseModelWithConfig):
@ -226,13 +218,7 @@ class Example(TypedDict, total=False):
value: Optional[Any] value: Optional[Any]
externalValue: Optional[AnyUrl] externalValue: Optional[AnyUrl]
if PYDANTIC_V2: # type: ignore [misc] __pydantic_config__ = {"extra": "allow"} # type: ignore[misc]
__pydantic_config__ = {"extra": "allow"}
else:
class Config:
extra = "allow"
class ParameterInType(Enum): class ParameterInType(Enum):
@ -447,6 +433,6 @@ class OpenAPI(BaseModelWithConfig):
externalDocs: Optional[ExternalDocumentation] = None externalDocs: Optional[ExternalDocumentation] = None
_model_rebuild(Schema) Schema.model_rebuild()
_model_rebuild(Operation) Operation.model_rebuild()
_model_rebuild(Encoding) Encoding.model_rebuild()

82
fastapi/params.py

@ -9,8 +9,6 @@ from pydantic.fields import FieldInfo
from typing_extensions import Literal, deprecated from typing_extensions import Literal, deprecated
from ._compat import ( from ._compat import (
PYDANTIC_V2,
PYDANTIC_VERSION_MINOR_TUPLE,
Undefined, Undefined,
) )
@ -111,29 +109,24 @@ class Param(FieldInfo): # type: ignore[misc]
stacklevel=4, stacklevel=4,
) )
current_json_schema_extra = json_schema_extra or extra current_json_schema_extra = json_schema_extra or extra
if PYDANTIC_VERSION_MINOR_TUPLE < (2, 7): kwargs["deprecated"] = deprecated
self.deprecated = deprecated
else: if serialization_alias in (_Unset, None) and isinstance(alias, str):
kwargs["deprecated"] = deprecated serialization_alias = alias
if PYDANTIC_V2: if validation_alias in (_Unset, None):
if serialization_alias in (_Unset, None) and isinstance(alias, str): validation_alias = alias
serialization_alias = alias kwargs.update(
if validation_alias in (_Unset, None): {
validation_alias = alias "annotation": annotation,
kwargs.update( "alias_priority": alias_priority,
{ "validation_alias": validation_alias,
"annotation": annotation, "serialization_alias": serialization_alias,
"alias_priority": alias_priority, "strict": strict,
"validation_alias": validation_alias, "json_schema_extra": current_json_schema_extra,
"serialization_alias": serialization_alias, }
"strict": strict, )
"json_schema_extra": current_json_schema_extra, kwargs["pattern"] = pattern or regex
}
)
kwargs["pattern"] = pattern or regex
else:
kwargs["regex"] = pattern or regex
kwargs.update(**current_json_schema_extra)
use_kwargs = {k: v for k, v in kwargs.items() if v is not _Unset} use_kwargs = {k: v for k, v in kwargs.items() if v is not _Unset}
super().__init__(**use_kwargs) super().__init__(**use_kwargs)
@ -571,29 +564,22 @@ class Body(FieldInfo): # type: ignore[misc]
stacklevel=4, stacklevel=4,
) )
current_json_schema_extra = json_schema_extra or extra current_json_schema_extra = json_schema_extra or extra
if PYDANTIC_VERSION_MINOR_TUPLE < (2, 7): kwargs["deprecated"] = deprecated
self.deprecated = deprecated if serialization_alias in (_Unset, None) and isinstance(alias, str):
else: serialization_alias = alias
kwargs["deprecated"] = deprecated if validation_alias in (_Unset, None):
if PYDANTIC_V2: validation_alias = alias
if serialization_alias in (_Unset, None) and isinstance(alias, str): kwargs.update(
serialization_alias = alias {
if validation_alias in (_Unset, None): "annotation": annotation,
validation_alias = alias "alias_priority": alias_priority,
kwargs.update( "validation_alias": validation_alias,
{ "serialization_alias": serialization_alias,
"annotation": annotation, "strict": strict,
"alias_priority": alias_priority, "json_schema_extra": current_json_schema_extra,
"validation_alias": validation_alias, }
"serialization_alias": serialization_alias, )
"strict": strict, kwargs["pattern"] = pattern or regex
"json_schema_extra": current_json_schema_extra,
}
)
kwargs["pattern"] = pattern or regex
else:
kwargs["regex"] = pattern or regex
kwargs.update(**current_json_schema_extra)
use_kwargs = {k: v for k, v in kwargs.items() if v is not _Unset} use_kwargs = {k: v for k, v in kwargs.items() if v is not _Unset}

12
fastapi/routing.py

@ -1,4 +1,3 @@
import dataclasses
import email.message import email.message
import functools import functools
import inspect import inspect
@ -30,6 +29,7 @@ from fastapi._compat import (
_model_dump, _model_dump,
_normalize_errors, _normalize_errors,
lenient_issubclass, lenient_issubclass,
may_v1,
) )
from fastapi.datastructures import Default, DefaultPlaceholder from fastapi.datastructures import Default, DefaultPlaceholder
from fastapi.dependencies.models import Dependant from fastapi.dependencies.models import Dependant
@ -58,7 +58,6 @@ from fastapi.utils import (
get_value_or_default, get_value_or_default,
is_body_allowed_for_status_code, is_body_allowed_for_status_code,
) )
from pydantic import BaseModel
from starlette import routing from starlette import routing
from starlette._exception_handler import wrap_app_handling_exceptions from starlette._exception_handler import wrap_app_handling_exceptions
from starlette._utils import is_async_callable from starlette._utils import is_async_callable
@ -153,8 +152,8 @@ def _prepare_response_content(
exclude_defaults: bool = False, exclude_defaults: bool = False,
exclude_none: bool = False, exclude_none: bool = False,
) -> Any: ) -> Any:
if isinstance(res, BaseModel): if isinstance(res, may_v1.BaseModel):
read_with_orm_mode = getattr(_get_model_config(res), "read_with_orm_mode", None) read_with_orm_mode = getattr(_get_model_config(res), "read_with_orm_mode", None) # type: ignore[arg-type]
if read_with_orm_mode: if read_with_orm_mode:
# Let from_orm extract the data from this model instead of converting # Let from_orm extract the data from this model instead of converting
# it now to a dict. # it now to a dict.
@ -162,7 +161,7 @@ def _prepare_response_content(
# access instead of dict iteration, e.g. lazy relationships. # access instead of dict iteration, e.g. lazy relationships.
return res return res
return _model_dump( return _model_dump(
res, res, # type: ignore[arg-type]
by_alias=True, by_alias=True,
exclude_unset=exclude_unset, exclude_unset=exclude_unset,
exclude_defaults=exclude_defaults, exclude_defaults=exclude_defaults,
@ -188,9 +187,6 @@ def _prepare_response_content(
) )
for k, v in res.items() for k, v in res.items()
} }
elif dataclasses.is_dataclass(res):
assert not isinstance(res, type)
return dataclasses.asdict(res)
return res return res

27
fastapi/temp_pydantic_v1_params.py

@ -6,12 +6,11 @@ from fastapi.params import ParamTypes
from typing_extensions import deprecated from typing_extensions import deprecated
from ._compat.may_v1 import FieldInfo, Undefined from ._compat.may_v1 import FieldInfo, Undefined
from ._compat.shared import PYDANTIC_VERSION_MINOR_TUPLE
_Unset: Any = Undefined _Unset: Any = Undefined
class Param(FieldInfo): # type: ignore[misc] class Param(FieldInfo):
in_: ParamTypes in_: ParamTypes
def __init__( def __init__(
@ -98,10 +97,7 @@ class Param(FieldInfo): # type: ignore[misc]
stacklevel=4, stacklevel=4,
) )
current_json_schema_extra = json_schema_extra or extra current_json_schema_extra = json_schema_extra or extra
if PYDANTIC_VERSION_MINOR_TUPLE < (2, 7): kwargs["deprecated"] = deprecated
self.deprecated = deprecated
else:
kwargs["deprecated"] = deprecated
kwargs["regex"] = pattern or regex kwargs["regex"] = pattern or regex
kwargs.update(**current_json_schema_extra) kwargs.update(**current_json_schema_extra)
use_kwargs = {k: v for k, v in kwargs.items() if v is not _Unset} use_kwargs = {k: v for k, v in kwargs.items() if v is not _Unset}
@ -112,7 +108,7 @@ class Param(FieldInfo): # type: ignore[misc]
return f"{self.__class__.__name__}({self.default})" return f"{self.__class__.__name__}({self.default})"
class Path(Param): # type: ignore[misc] class Path(Param):
in_ = ParamTypes.path in_ = ParamTypes.path
def __init__( def __init__(
@ -198,7 +194,7 @@ class Path(Param): # type: ignore[misc]
) )
class Query(Param): # type: ignore[misc] class Query(Param):
in_ = ParamTypes.query in_ = ParamTypes.query
def __init__( def __init__(
@ -282,7 +278,7 @@ class Query(Param): # type: ignore[misc]
) )
class Header(Param): # type: ignore[misc] class Header(Param):
in_ = ParamTypes.header in_ = ParamTypes.header
def __init__( def __init__(
@ -368,7 +364,7 @@ class Header(Param): # type: ignore[misc]
) )
class Cookie(Param): # type: ignore[misc] class Cookie(Param):
in_ = ParamTypes.cookie in_ = ParamTypes.cookie
def __init__( def __init__(
@ -452,7 +448,7 @@ class Cookie(Param): # type: ignore[misc]
) )
class Body(FieldInfo): # type: ignore[misc] class Body(FieldInfo):
def __init__( def __init__(
self, self,
default: Any = Undefined, default: Any = Undefined,
@ -541,10 +537,7 @@ class Body(FieldInfo): # type: ignore[misc]
stacklevel=4, stacklevel=4,
) )
current_json_schema_extra = json_schema_extra or extra current_json_schema_extra = json_schema_extra or extra
if PYDANTIC_VERSION_MINOR_TUPLE < (2, 7): kwargs["deprecated"] = deprecated
self.deprecated = deprecated
else:
kwargs["deprecated"] = deprecated
kwargs["regex"] = pattern or regex kwargs["regex"] = pattern or regex
kwargs.update(**current_json_schema_extra) kwargs.update(**current_json_schema_extra)
@ -556,7 +549,7 @@ class Body(FieldInfo): # type: ignore[misc]
return f"{self.__class__.__name__}({self.default})" return f"{self.__class__.__name__}({self.default})"
class Form(Body): # type: ignore[misc] class Form(Body):
def __init__( def __init__(
self, self,
default: Any = Undefined, default: Any = Undefined,
@ -640,7 +633,7 @@ class Form(Body): # type: ignore[misc]
) )
class File(Form): # type: ignore[misc] class File(Form):
def __init__( def __init__(
self, self,
default: Any = Undefined, default: Any = Undefined,

21
fastapi/utils.py

@ -1,7 +1,6 @@
import re import re
import warnings import warnings
from collections.abc import MutableMapping from collections.abc import MutableMapping
from dataclasses import is_dataclass
from typing import ( from typing import (
TYPE_CHECKING, TYPE_CHECKING,
Any, Any,
@ -13,7 +12,6 @@ from weakref import WeakKeyDictionary
import fastapi import fastapi
from fastapi._compat import ( from fastapi._compat import (
PYDANTIC_V2,
BaseConfig, BaseConfig,
ModelField, ModelField,
PydanticSchemaGenerationError, PydanticSchemaGenerationError,
@ -29,6 +27,8 @@ from pydantic import BaseModel
from pydantic.fields import FieldInfo from pydantic.fields import FieldInfo
from typing_extensions import Literal from typing_extensions import Literal
from ._compat import v2
if TYPE_CHECKING: # pragma: nocover if TYPE_CHECKING: # pragma: nocover
from .routing import APIRoute from .routing import APIRoute
@ -105,14 +105,12 @@ def create_model_field(
from fastapi._compat import v1 from fastapi._compat import v1
try: try:
return v1.ModelField(**v1_kwargs) # type: ignore[no-any-return] return v1.ModelField(**v1_kwargs) # type: ignore[return-value]
except RuntimeError: except RuntimeError:
raise fastapi.exceptions.FastAPIError( raise fastapi.exceptions.FastAPIError(
_invalid_args_message.format(type_=type_) _invalid_args_message.format(type_=type_)
) from None ) from None
elif PYDANTIC_V2: else:
from ._compat import v2
field_info = field_info or FieldInfo( field_info = field_info or FieldInfo(
annotation=type_, default=default, alias=alias annotation=type_, default=default, alias=alias
) )
@ -128,7 +126,7 @@ def create_model_field(
from fastapi._compat import v1 from fastapi._compat import v1
try: try:
return v1.ModelField(**v1_kwargs) # type: ignore[no-any-return] return v1.ModelField(**v1_kwargs)
except RuntimeError: except RuntimeError:
raise fastapi.exceptions.FastAPIError( raise fastapi.exceptions.FastAPIError(
_invalid_args_message.format(type_=type_) _invalid_args_message.format(type_=type_)
@ -140,11 +138,8 @@ def create_cloned_field(
*, *,
cloned_types: Optional[MutableMapping[type[BaseModel], type[BaseModel]]] = None, cloned_types: Optional[MutableMapping[type[BaseModel], type[BaseModel]]] = None,
) -> ModelField: ) -> ModelField:
if PYDANTIC_V2: if isinstance(field, v2.ModelField):
from ._compat import v2 return field
if isinstance(field, v2.ModelField):
return field
from fastapi._compat import v1 from fastapi._compat import v1
@ -154,8 +149,6 @@ def create_cloned_field(
cloned_types = _CLONED_TYPES_CACHE cloned_types = _CLONED_TYPES_CACHE
original_type = field.type_ original_type = field.type_
if is_dataclass(original_type) and hasattr(original_type, "__pydantic_model__"):
original_type = original_type.__pydantic_model__
use_type = original_type use_type = original_type
if lenient_issubclass(original_type, v1.BaseModel): if lenient_issubclass(original_type, v1.BaseModel):
original_type = cast(type[v1.BaseModel], original_type) original_type = cast(type[v1.BaseModel], original_type)

15
pyproject.toml

@ -30,7 +30,6 @@ classifiers = [
"Framework :: AsyncIO", "Framework :: AsyncIO",
"Framework :: FastAPI", "Framework :: FastAPI",
"Framework :: Pydantic", "Framework :: Pydantic",
"Framework :: Pydantic :: 1",
"Framework :: Pydantic :: 2", "Framework :: Pydantic :: 2",
"Intended Audience :: Developers", "Intended Audience :: Developers",
"Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3 :: Only",
@ -45,7 +44,7 @@ classifiers = [
] ]
dependencies = [ dependencies = [
"starlette>=0.40.0,<0.51.0", "starlette>=0.40.0,<0.51.0",
"pydantic>=1.7.4,!=1.8,!=1.8.1,!=2.0.0,!=2.0.1,!=2.1.0,<3.0.0", "pydantic>=2.7.0",
"typing-extensions>=4.8.0", "typing-extensions>=4.8.0",
"annotated-doc>=0.0.2", "annotated-doc>=0.0.2",
] ]
@ -71,11 +70,10 @@ standard = [
"email-validator >=2.0.0", "email-validator >=2.0.0",
# Uvicorn with uvloop # Uvicorn with uvloop
"uvicorn[standard] >=0.12.0", "uvicorn[standard] >=0.12.0",
# TODO: this should be part of some pydantic optional extra dependencies
# # Settings management # # Settings management
# "pydantic-settings >=2.0.0", "pydantic-settings >=2.0.0",
# # Extra Pydantic data types # # Extra Pydantic data types
# "pydantic-extra-types >=2.0.0", "pydantic-extra-types >=2.0.0",
] ]
standard-no-fastapi-cloud-cli = [ standard-no-fastapi-cloud-cli = [
@ -90,11 +88,10 @@ standard-no-fastapi-cloud-cli = [
"email-validator >=2.0.0", "email-validator >=2.0.0",
# Uvicorn with uvloop # Uvicorn with uvloop
"uvicorn[standard] >=0.12.0", "uvicorn[standard] >=0.12.0",
# TODO: this should be part of some pydantic optional extra dependencies
# # Settings management # # Settings management
# "pydantic-settings >=2.0.0", "pydantic-settings >=2.0.0",
# # Extra Pydantic data types # # Extra Pydantic data types
# "pydantic-extra-types >=2.0.0", "pydantic-extra-types >=2.0.0",
] ]
all = [ all = [
@ -183,8 +180,6 @@ filterwarnings = [
# Ref: https://github.com/python-trio/trio/pull/3054 # Ref: https://github.com/python-trio/trio/pull/3054
# Remove once there's a new version of Trio # Remove once there's a new version of Trio
'ignore:The `hash` argument is deprecated*:DeprecationWarning:trio', 'ignore:The `hash` argument is deprecated*:DeprecationWarning:trio',
# Ignore flaky coverage / pytest warning about SQLite connection, only applies to Python 3.13 and Pydantic v1
'ignore:Exception ignored in. <sqlite3\.Connection object.*:pytest.PytestUnraisableExceptionWarning',
] ]
[tool.coverage.run] [tool.coverage.run]

8
tests/test_additional_properties_bool.py

@ -2,18 +2,12 @@ from typing import Union
from dirty_equals import IsDict from dirty_equals import IsDict
from fastapi import FastAPI from fastapi import FastAPI
from fastapi._compat import PYDANTIC_V2
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from pydantic import BaseModel, ConfigDict from pydantic import BaseModel, ConfigDict
class FooBaseModel(BaseModel): class FooBaseModel(BaseModel):
if PYDANTIC_V2: model_config = ConfigDict(extra="forbid")
model_config = ConfigDict(extra="forbid")
else:
class Config:
extra = "forbid"
class Foo(FooBaseModel): class Foo(FooBaseModel):

6
tests/test_ambiguous_params.py

@ -4,7 +4,6 @@ import pytest
from fastapi import Depends, FastAPI, Path from fastapi import Depends, FastAPI, Path
from fastapi.param_functions import Query from fastapi.param_functions import Query
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from fastapi.utils import PYDANTIC_V2
app = FastAPI() app = FastAPI()
@ -71,6 +70,5 @@ def test_multiple_annotations():
response = client.get("/multi-query", params={"foo": "123"}) response = client.get("/multi-query", params={"foo": "123"})
assert response.status_code == 422 assert response.status_code == 422
if PYDANTIC_V2: response = client.get("/multi-query", params={"foo": "1"})
response = client.get("/multi-query", params={"foo": "1"}) assert response.status_code == 422
assert response.status_code == 422

5
tests/test_arbitrary_types.py

@ -5,8 +5,6 @@ from fastapi import FastAPI
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from inline_snapshot import snapshot from inline_snapshot import snapshot
from .utils import needs_pydanticv2
@pytest.fixture(name="client") @pytest.fixture(name="client")
def get_client(): def get_client():
@ -42,13 +40,11 @@ def get_client():
return client return client
@needs_pydanticv2
def test_get(client: TestClient): def test_get(client: TestClient):
response = client.get("/") response = client.get("/")
assert response.json() == {"custom_field": [1.0, 2.0, 3.0]} assert response.json() == {"custom_field": [1.0, 2.0, 3.0]}
@needs_pydanticv2
def test_typeadapter(): def test_typeadapter():
# This test is only to confirm that Pydantic alone is working as expected # This test is only to confirm that Pydantic alone is working as expected
from pydantic import ( from pydantic import (
@ -93,7 +89,6 @@ def test_typeadapter():
) )
@needs_pydanticv2
def test_openapi_schema(client: TestClient): def test_openapi_schema(client: TestClient):
response = client.get("openapi.json") response = client.get("openapi.json")
assert response.json() == snapshot( assert response.json() == snapshot(

8
tests/test_compat.py

@ -14,10 +14,9 @@ from fastapi.testclient import TestClient
from pydantic import BaseModel, ConfigDict from pydantic import BaseModel, ConfigDict
from pydantic.fields import FieldInfo from pydantic.fields import FieldInfo
from .utils import needs_py310, needs_py_lt_314, needs_pydanticv2 from .utils import needs_py310, needs_py_lt_314
@needs_pydanticv2
def test_model_field_default_required(): def test_model_field_default_required():
from fastapi._compat import v2 from fastapi._compat import v2
@ -46,7 +45,6 @@ def test_is_model_field():
assert not _is_model_field(str) assert not _is_model_field(str)
@needs_pydanticv2
def test_get_model_config(): def test_get_model_config():
# For coverage in Pydantic v2 # For coverage in Pydantic v2
class Foo(BaseModel): class Foo(BaseModel):
@ -75,7 +73,6 @@ def test_complex():
assert response2.json() == [1, 2] assert response2.json() == [1, 2]
@needs_pydanticv2
def test_propagates_pydantic2_model_config(): def test_propagates_pydantic2_model_config():
app = FastAPI() app = FastAPI()
@ -136,7 +133,6 @@ def test_is_uploadfile_sequence_annotation():
assert is_uploadfile_sequence_annotation(Union[list[str], list[UploadFile]]) assert is_uploadfile_sequence_annotation(Union[list[str], list[UploadFile]])
@needs_pydanticv2
def test_serialize_sequence_value_with_optional_list(): def test_serialize_sequence_value_with_optional_list():
"""Test that serialize_sequence_value handles optional lists correctly.""" """Test that serialize_sequence_value handles optional lists correctly."""
from fastapi._compat import v2 from fastapi._compat import v2
@ -148,7 +144,6 @@ def test_serialize_sequence_value_with_optional_list():
assert isinstance(result, list) assert isinstance(result, list)
@needs_pydanticv2
@needs_py310 @needs_py310
def test_serialize_sequence_value_with_optional_list_pipe_union(): def test_serialize_sequence_value_with_optional_list_pipe_union():
"""Test that serialize_sequence_value handles optional lists correctly (with new syntax).""" """Test that serialize_sequence_value handles optional lists correctly (with new syntax)."""
@ -161,7 +156,6 @@ def test_serialize_sequence_value_with_optional_list_pipe_union():
assert isinstance(result, list) assert isinstance(result, list)
@needs_pydanticv2
def test_serialize_sequence_value_with_none_first_in_union(): def test_serialize_sequence_value_with_none_first_in_union():
"""Test that serialize_sequence_value handles Union[None, List[...]] correctly.""" """Test that serialize_sequence_value handles Union[None, List[...]] correctly."""
from fastapi._compat import v2 from fastapi._compat import v2

133
tests/test_compat_params_v1.py

@ -3,7 +3,7 @@ from typing import Optional
import pytest import pytest
from tests.utils import pydantic_snapshot, skip_module_if_py_gte_314 from tests.utils import skip_module_if_py_gte_314
if sys.version_info >= (3, 14): if sys.version_info >= (3, 14):
skip_module_if_py_gte_314() skip_module_if_py_gte_314()
@ -588,23 +588,14 @@ def test_openapi_schema():
"required": True, "required": True,
"content": { "content": {
"application/json": { "application/json": {
"schema": pydantic_snapshot( "schema": {
v1=snapshot( "title": "Body",
"allOf": [
{ {
"$ref": "#/components/schemas/Body_update_item_items__item_id__put" "$ref": "#/components/schemas/Body_update_item_items__item_id__put"
} }
), ],
v2=snapshot( }
{
"title": "Body",
"allOf": [
{
"$ref": "#/components/schemas/Body_update_item_items__item_id__put"
}
],
}
),
),
} }
}, },
}, },
@ -809,23 +800,14 @@ def test_openapi_schema():
"requestBody": { "requestBody": {
"content": { "content": {
"application/json": { "application/json": {
"schema": pydantic_snapshot( "schema": {
v1=snapshot( "allOf": [
{ {
"$ref": "#/components/schemas/Body_create_item_embed_items_embed__post" "$ref": "#/components/schemas/Body_create_item_embed_items_embed__post"
} }
), ],
v2=snapshot( "title": "Body",
{ }
"allOf": [
{
"$ref": "#/components/schemas/Body_create_item_embed_items_embed__post"
}
],
"title": "Body",
}
),
),
} }
}, },
"required": True, "required": True,
@ -855,23 +837,14 @@ def test_openapi_schema():
"requestBody": { "requestBody": {
"content": { "content": {
"application/x-www-form-urlencoded": { "application/x-www-form-urlencoded": {
"schema": pydantic_snapshot( "schema": {
v1=snapshot( "allOf": [
{ {
"$ref": "#/components/schemas/Body_submit_form_form_data__post" "$ref": "#/components/schemas/Body_submit_form_form_data__post"
} }
), ],
v2=snapshot( "title": "Body",
{ }
"allOf": [
{
"$ref": "#/components/schemas/Body_submit_form_form_data__post"
}
],
"title": "Body",
}
),
),
} }
}, },
"required": True, "required": True,
@ -901,23 +874,14 @@ def test_openapi_schema():
"requestBody": { "requestBody": {
"content": { "content": {
"multipart/form-data": { "multipart/form-data": {
"schema": pydantic_snapshot( "schema": {
v1=snapshot( "allOf": [
{ {
"$ref": "#/components/schemas/Body_upload_file_upload__post" "$ref": "#/components/schemas/Body_upload_file_upload__post"
} }
), ],
v2=snapshot( "title": "Body",
{ },
"allOf": [
{
"$ref": "#/components/schemas/Body_upload_file_upload__post"
}
],
"title": "Body",
}
),
),
} }
}, },
"required": True, "required": True,
@ -947,23 +911,14 @@ def test_openapi_schema():
"requestBody": { "requestBody": {
"content": { "content": {
"multipart/form-data": { "multipart/form-data": {
"schema": pydantic_snapshot( "schema": {
v1=snapshot( "allOf": [
{ {
"$ref": "#/components/schemas/Body_upload_multiple_files_upload_multiple__post" "$ref": "#/components/schemas/Body_upload_multiple_files_upload_multiple__post"
} }
), ],
v2=snapshot( "title": "Body",
{ }
"allOf": [
{
"$ref": "#/components/schemas/Body_upload_multiple_files_upload_multiple__post"
}
],
"title": "Body",
}
),
),
} }
}, },
"required": True, "required": True,
@ -990,21 +945,12 @@ def test_openapi_schema():
"components": { "components": {
"schemas": { "schemas": {
"Body_create_item_embed_items_embed__post": { "Body_create_item_embed_items_embed__post": {
"properties": pydantic_snapshot( "properties": {
v1=snapshot( "item": {
{"item": {"$ref": "#/components/schemas/Item"}} "allOf": [{"$ref": "#/components/schemas/Item"}],
), "title": "Item",
v2=snapshot( }
{ },
"item": {
"allOf": [
{"$ref": "#/components/schemas/Item"}
],
"title": "Item",
}
}
),
),
"type": "object", "type": "object",
"required": ["item"], "required": ["item"],
"title": "Body_create_item_embed_items_embed__post", "title": "Body_create_item_embed_items_embed__post",
@ -1030,17 +976,10 @@ def test_openapi_schema():
}, },
"Body_update_item_items__item_id__put": { "Body_update_item_items__item_id__put": {
"properties": { "properties": {
"item": pydantic_snapshot( "item": {
v1=snapshot({"$ref": "#/components/schemas/Item"}), "allOf": [{"$ref": "#/components/schemas/Item"}],
v2=snapshot( "title": "Item",
{ },
"allOf": [
{"$ref": "#/components/schemas/Item"}
],
"title": "Item",
}
),
),
"importance": { "importance": {
"type": "integer", "type": "integer",
"maximum": 10.0, "maximum": 10.0,

4
tests/test_computed_fields.py

@ -2,8 +2,6 @@ import pytest
from fastapi import FastAPI from fastapi import FastAPI
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from .utils import needs_pydanticv2
@pytest.fixture(name="client") @pytest.fixture(name="client")
def get_client(request): def get_client(request):
@ -35,7 +33,6 @@ def get_client(request):
@pytest.mark.parametrize("client", [True, False], indirect=True) @pytest.mark.parametrize("client", [True, False], indirect=True)
@pytest.mark.parametrize("path", ["/", "/responses"]) @pytest.mark.parametrize("path", ["/", "/responses"])
@needs_pydanticv2
def test_get(client: TestClient, path: str): def test_get(client: TestClient, path: str):
response = client.get(path) response = client.get(path)
assert response.status_code == 200, response.text assert response.status_code == 200, response.text
@ -43,7 +40,6 @@ def test_get(client: TestClient, path: str):
@pytest.mark.parametrize("client", [True, False], indirect=True) @pytest.mark.parametrize("client", [True, False], indirect=True)
@needs_pydanticv2
def test_openapi_schema(client: TestClient): def test_openapi_schema(client: TestClient):
response = client.get("/openapi.json") response = client.get("/openapi.json")
assert response.status_code == 200, response.text assert response.status_code == 200, response.text

30
tests/test_custom_schema_fields.py

@ -1,12 +1,8 @@
from typing import Annotated, Optional from typing import Annotated, Optional
from fastapi import FastAPI from fastapi import FastAPI
from fastapi._compat import PYDANTIC_V2
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from pydantic import BaseModel from pydantic import BaseModel, WithJsonSchema
if PYDANTIC_V2:
from pydantic import WithJsonSchema
app = FastAPI() app = FastAPI()
@ -14,23 +10,15 @@ app = FastAPI()
class Item(BaseModel): class Item(BaseModel):
name: str name: str
if PYDANTIC_V2: description: Annotated[
description: Annotated[ Optional[str], WithJsonSchema({"type": ["string", "null"]})
Optional[str], WithJsonSchema({"type": ["string", "null"]}) ] = None
] = None
model_config = { model_config = {
"json_schema_extra": { "json_schema_extra": {
"x-something-internal": {"level": 4}, "x-something-internal": {"level": 4},
}
} }
else: }
description: Optional[str] = None # type: ignore[no-redef]
class Config:
schema_extra = {
"x-something-internal": {"level": 4},
}
@app.get("/foo", response_model=Item) @app.get("/foo", response_model=Item)
@ -55,7 +43,7 @@ item_schema = {
}, },
"description": { "description": {
"title": "Description", "title": "Description",
"type": ["string", "null"] if PYDANTIC_V2 else "string", "type": ["string", "null"],
}, },
}, },
} }

6
tests/test_datastructures.py

@ -7,12 +7,6 @@ from fastapi.datastructures import Default
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
# TODO: remove when deprecating Pydantic v1
def test_upload_file_invalid():
with pytest.raises(ValueError):
UploadFile.validate("not a Starlette UploadFile")
def test_upload_file_invalid_pydantic_v2(): def test_upload_file_invalid_pydantic_v2():
with pytest.raises(ValueError): with pytest.raises(ValueError):
UploadFile._validate("not a Starlette UploadFile", {}) UploadFile._validate("not a Starlette UploadFile", {})

7
tests/test_datetime_custom_encoder.py

@ -4,10 +4,9 @@ from fastapi import FastAPI
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from pydantic import BaseModel from pydantic import BaseModel
from .utils import needs_pydanticv1, needs_pydanticv2 from .utils import needs_pydanticv1
@needs_pydanticv2
def test_pydanticv2(): def test_pydanticv2():
from pydantic import field_serializer from pydantic import field_serializer
@ -34,7 +33,9 @@ def test_pydanticv2():
# TODO: remove when deprecating Pydantic v1 # TODO: remove when deprecating Pydantic v1
@needs_pydanticv1 @needs_pydanticv1
def test_pydanticv1(): def test_pydanticv1():
class ModelWithDatetimeField(BaseModel): from pydantic import v1
class ModelWithDatetimeField(v1.BaseModel):
dt_field: datetime dt_field: datetime
class Config: class Config:

10
tests/test_filter_pydantic_sub_model/app_pv1.py

@ -1,7 +1,7 @@
from typing import Optional from typing import Optional
from fastapi import Depends, FastAPI from fastapi import Depends, FastAPI
from pydantic import BaseModel, validator from pydantic.v1 import BaseModel, validator
app = FastAPI() app = FastAPI()
@ -18,6 +18,7 @@ class ModelA(BaseModel):
name: str name: str
description: Optional[str] = None description: Optional[str] = None
model_b: ModelB model_b: ModelB
tags: dict[str, str] = {}
@validator("name") @validator("name")
def lower_username(cls, name: str, values): def lower_username(cls, name: str, values):
@ -32,4 +33,9 @@ async def get_model_c() -> ModelC:
@app.get("/model/{name}", response_model=ModelA) @app.get("/model/{name}", response_model=ModelA)
async def get_model_a(name: str, model_c=Depends(get_model_c)): async def get_model_a(name: str, model_c=Depends(get_model_c)):
return {"name": name, "description": "model-a-desc", "model_b": model_c} return {
"name": name,
"description": "model-a-desc",
"model_b": model_c,
"tags": {"key1": "value1", "key2": "value2"},
}

170
tests/test_filter_pydantic_sub_model/test_filter_pydantic_sub_model_pv1.py

@ -1,6 +1,7 @@
import pytest import pytest
from fastapi.exceptions import ResponseValidationError from fastapi.exceptions import ResponseValidationError
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from inline_snapshot import snapshot
from ..utils import needs_pydanticv1 from ..utils import needs_pydanticv1
@ -21,6 +22,7 @@ def test_filter_sub_model(client: TestClient):
"name": "modelA", "name": "modelA",
"description": "model-a-desc", "description": "model-a-desc",
"model_b": {"username": "test-user"}, "model_b": {"username": "test-user"},
"tags": {"key1": "value1", "key2": "value2"},
} }
@ -41,90 +43,104 @@ def test_validator_is_cloned(client: TestClient):
def test_openapi_schema(client: TestClient): def test_openapi_schema(client: TestClient):
response = client.get("/openapi.json") response = client.get("/openapi.json")
assert response.status_code == 200, response.text assert response.status_code == 200, response.text
assert response.json() == { assert response.json() == snapshot(
"openapi": "3.1.0", {
"info": {"title": "FastAPI", "version": "0.1.0"}, "openapi": "3.1.0",
"paths": { "info": {"title": "FastAPI", "version": "0.1.0"},
"/model/{name}": { "paths": {
"get": { "/model/{name}": {
"summary": "Get Model A", "get": {
"operationId": "get_model_a_model__name__get", "summary": "Get Model A",
"parameters": [ "operationId": "get_model_a_model__name__get",
{ "parameters": [
"required": True, {
"schema": {"title": "Name", "type": "string"}, "required": True,
"name": "name", "schema": {"title": "Name", "type": "string"},
"in": "path", "name": "name",
} "in": "path",
], }
"responses": { ],
"200": { "responses": {
"description": "Successful Response", "200": {
"content": { "description": "Successful Response",
"application/json": { "content": {
"schema": {"$ref": "#/components/schemas/ModelA"} "application/json": {
} "schema": {
"$ref": "#/components/schemas/ModelA"
}
}
},
}, },
}, "422": {
"422": { "description": "Validation Error",
"description": "Validation Error", "content": {
"content": { "application/json": {
"application/json": { "schema": {
"schema": { "$ref": "#/components/schemas/HTTPValidationError"
"$ref": "#/components/schemas/HTTPValidationError" }
} }
} },
}, },
}, },
}, }
} }
} },
}, "components": {
"components": { "schemas": {
"schemas": { "HTTPValidationError": {
"HTTPValidationError": { "title": "HTTPValidationError",
"title": "HTTPValidationError", "type": "object",
"type": "object", "properties": {
"properties": { "detail": {
"detail": { "title": "Detail",
"title": "Detail", "type": "array",
"type": "array", "items": {
"items": {"$ref": "#/components/schemas/ValidationError"}, "$ref": "#/components/schemas/ValidationError"
} },
}
},
}, },
}, "ModelA": {
"ModelA": { "title": "ModelA",
"title": "ModelA", "required": ["name", "model_b"],
"required": ["name", "model_b"], "type": "object",
"type": "object", "properties": {
"properties": { "name": {"title": "Name", "type": "string"},
"name": {"title": "Name", "type": "string"}, "description": {"title": "Description", "type": "string"},
"description": {"title": "Description", "type": "string"}, "model_b": {"$ref": "#/components/schemas/ModelB"},
"model_b": {"$ref": "#/components/schemas/ModelB"}, "tags": {
"additionalProperties": {"type": "string"},
"type": "object",
"title": "Tags",
"default": {},
},
},
},
"ModelB": {
"title": "ModelB",
"required": ["username"],
"type": "object",
"properties": {
"username": {"title": "Username", "type": "string"}
},
}, },
}, "ValidationError": {
"ModelB": { "title": "ValidationError",
"title": "ModelB", "required": ["loc", "msg", "type"],
"required": ["username"], "type": "object",
"type": "object", "properties": {
"properties": {"username": {"title": "Username", "type": "string"}}, "loc": {
}, "title": "Location",
"ValidationError": { "type": "array",
"title": "ValidationError", "items": {
"required": ["loc", "msg", "type"], "anyOf": [{"type": "string"}, {"type": "integer"}]
"type": "object", },
"properties": {
"loc": {
"title": "Location",
"type": "array",
"items": {
"anyOf": [{"type": "string"}, {"type": "integer"}]
}, },
"msg": {"title": "Message", "type": "string"},
"type": {"title": "Error Type", "type": "string"},
}, },
"msg": {"title": "Message", "type": "string"},
"type": {"title": "Error Type", "type": "string"},
}, },
}, }
} },
}, }
} )

207
tests/test_filter_pydantic_sub_model_pv2.py

@ -5,8 +5,7 @@ from dirty_equals import HasRepr, IsDict, IsOneOf
from fastapi import Depends, FastAPI from fastapi import Depends, FastAPI
from fastapi.exceptions import ResponseValidationError from fastapi.exceptions import ResponseValidationError
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from inline_snapshot import snapshot
from .utils import needs_pydanticv2
@pytest.fixture(name="client") @pytest.fixture(name="client")
@ -25,6 +24,7 @@ def get_client():
name: str name: str
description: Optional[str] = None description: Optional[str] = None
foo: ModelB foo: ModelB
tags: dict[str, str] = {}
@field_validator("name") @field_validator("name")
def lower_username(cls, name: str, info: ValidationInfo): def lower_username(cls, name: str, info: ValidationInfo):
@ -37,13 +37,17 @@ def get_client():
@app.get("/model/{name}", response_model=ModelA) @app.get("/model/{name}", response_model=ModelA)
async def get_model_a(name: str, model_c=Depends(get_model_c)): async def get_model_a(name: str, model_c=Depends(get_model_c)):
return {"name": name, "description": "model-a-desc", "foo": model_c} return {
"name": name,
"description": "model-a-desc",
"foo": model_c,
"tags": {"key1": "value1", "key2": "value2"},
}
client = TestClient(app) client = TestClient(app)
return client return client
@needs_pydanticv2
def test_filter_sub_model(client: TestClient): def test_filter_sub_model(client: TestClient):
response = client.get("/model/modelA") response = client.get("/model/modelA")
assert response.status_code == 200, response.text assert response.status_code == 200, response.text
@ -51,10 +55,10 @@ def test_filter_sub_model(client: TestClient):
"name": "modelA", "name": "modelA",
"description": "model-a-desc", "description": "model-a-desc",
"foo": {"username": "test-user"}, "foo": {"username": "test-user"},
"tags": {"key1": "value1", "key2": "value2"},
} }
@needs_pydanticv2
def test_validator_is_cloned(client: TestClient): def test_validator_is_cloned(client: TestClient):
with pytest.raises(ResponseValidationError) as err: with pytest.raises(ResponseValidationError) as err:
client.get("/model/modelX") client.get("/model/modelX")
@ -79,106 +83,119 @@ def test_validator_is_cloned(client: TestClient):
] ]
@needs_pydanticv2
def test_openapi_schema(client: TestClient): def test_openapi_schema(client: TestClient):
response = client.get("/openapi.json") response = client.get("/openapi.json")
assert response.status_code == 200, response.text assert response.status_code == 200, response.text
assert response.json() == { assert response.json() == snapshot(
"openapi": "3.1.0", {
"info": {"title": "FastAPI", "version": "0.1.0"}, "openapi": "3.1.0",
"paths": { "info": {"title": "FastAPI", "version": "0.1.0"},
"/model/{name}": { "paths": {
"get": { "/model/{name}": {
"summary": "Get Model A", "get": {
"operationId": "get_model_a_model__name__get", "summary": "Get Model A",
"parameters": [ "operationId": "get_model_a_model__name__get",
{ "parameters": [
"required": True, {
"schema": {"title": "Name", "type": "string"}, "required": True,
"name": "name", "schema": {"title": "Name", "type": "string"},
"in": "path", "name": "name",
} "in": "path",
], }
"responses": { ],
"200": { "responses": {
"description": "Successful Response", "200": {
"content": { "description": "Successful Response",
"application/json": { "content": {
"schema": {"$ref": "#/components/schemas/ModelA"} "application/json": {
} "schema": {
"$ref": "#/components/schemas/ModelA"
}
}
},
}, },
}, "422": {
"422": { "description": "Validation Error",
"description": "Validation Error", "content": {
"content": { "application/json": {
"application/json": { "schema": {
"schema": { "$ref": "#/components/schemas/HTTPValidationError"
"$ref": "#/components/schemas/HTTPValidationError" }
} }
} },
}, },
}, },
}, }
} }
} },
}, "components": {
"components": { "schemas": {
"schemas": { "HTTPValidationError": {
"HTTPValidationError": { "title": "HTTPValidationError",
"title": "HTTPValidationError", "type": "object",
"type": "object", "properties": {
"properties": { "detail": {
"detail": { "title": "Detail",
"title": "Detail", "type": "array",
"type": "array", "items": {
"items": {"$ref": "#/components/schemas/ValidationError"}, "$ref": "#/components/schemas/ValidationError"
} },
},
},
"ModelA": {
"title": "ModelA",
"required": IsOneOf(
["name", "description", "foo"],
# TODO remove when deprecating Pydantic v1
["name", "foo"],
),
"type": "object",
"properties": {
"name": {"title": "Name", "type": "string"},
"description": IsDict(
{
"title": "Description",
"anyOf": [{"type": "string"}, {"type": "null"}],
} }
) },
|
# TODO remove when deprecating Pydantic v1
IsDict({"title": "Description", "type": "string"}),
"foo": {"$ref": "#/components/schemas/ModelB"},
}, },
}, "ModelA": {
"ModelB": { "title": "ModelA",
"title": "ModelB", "required": IsOneOf(
"required": ["username"], ["name", "description", "foo"],
"type": "object", # TODO remove when deprecating Pydantic v1
"properties": {"username": {"title": "Username", "type": "string"}}, ["name", "foo"],
}, ),
"ValidationError": { "type": "object",
"title": "ValidationError", "properties": {
"required": ["loc", "msg", "type"], "name": {"title": "Name", "type": "string"},
"type": "object", "description": IsDict(
"properties": { {
"loc": { "title": "Description",
"title": "Location", "anyOf": [{"type": "string"}, {"type": "null"}],
"type": "array", }
"items": { )
"anyOf": [{"type": "string"}, {"type": "integer"}] |
# TODO remove when deprecating Pydantic v1
IsDict({"title": "Description", "type": "string"}),
"foo": {"$ref": "#/components/schemas/ModelB"},
"tags": {
"additionalProperties": {"type": "string"},
"type": "object",
"title": "Tags",
"default": {},
}, },
}, },
"msg": {"title": "Message", "type": "string"},
"type": {"title": "Error Type", "type": "string"},
}, },
}, "ModelB": {
} "title": "ModelB",
}, "required": ["username"],
} "type": "object",
"properties": {
"username": {"title": "Username", "type": "string"}
},
},
"ValidationError": {
"title": "ValidationError",
"required": ["loc", "msg", "type"],
"type": "object",
"properties": {
"loc": {
"title": "Location",
"type": "array",
"items": {
"anyOf": [{"type": "string"}, {"type": "integer"}]
},
},
"msg": {"title": "Message", "type": "string"},
"type": {"title": "Error Type", "type": "string"},
},
},
}
},
}
)

8
tests/test_forms_single_model.py

@ -2,7 +2,6 @@ from typing import Annotated, Optional
from dirty_equals import IsDict from dirty_equals import IsDict
from fastapi import FastAPI, Form from fastapi import FastAPI, Form
from fastapi._compat import PYDANTIC_V2
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
@ -20,12 +19,7 @@ class FormModel(BaseModel):
class FormModelExtraAllow(BaseModel): class FormModelExtraAllow(BaseModel):
param: str param: str
if PYDANTIC_V2: model_config = {"extra": "allow"}
model_config = {"extra": "allow"}
else:
class Config:
extra = "allow"
@app.post("/form/") @app.post("/form/")

312
tests/test_get_model_definitions_formfeed_escape.py

@ -1,181 +1,169 @@
from collections.abc import Iterator
from typing import Any
import fastapi._compat
import fastapi.openapi.utils
import pydantic.schema
import pytest import pytest
from fastapi import FastAPI from fastapi import FastAPI
from pydantic import BaseModel from fastapi.testclient import TestClient
from starlette.testclient import TestClient from inline_snapshot import snapshot
from .utils import needs_pydanticv1 from .utils import needs_pydanticv1
class Address(BaseModel): @pytest.fixture(
""" name="client",
This is a public description of an Address params=[
\f pytest.param("pydantic-v1", marks=needs_pydanticv1),
You can't see this part of the docstring, it's private! "pydantic-v2",
""" ],
)
line_1: str def client_fixture(request: pytest.FixtureRequest) -> TestClient:
city: str if request.param == "pydantic-v1":
state_province: str from pydantic.v1 import BaseModel
else:
from pydantic import BaseModel
class Facility(BaseModel):
id: str class Address(BaseModel):
address: Address """
This is a public description of an Address
\f
app = FastAPI() You can't see this part of the docstring, it's private!
"""
line_1: str
city: str
state_province: str
class Facility(BaseModel):
id: str
address: Address
app = FastAPI()
@app.get("/facilities/{facility_id}")
def get_facility(facility_id: str) -> Facility:
return Facility(
id=facility_id,
address=Address(line_1="123 Main St", city="Anytown", state_province="CA"),
)
client = TestClient(app) client = TestClient(app)
return client
@app.get("/facilities/{facility_id}") def test_get(client: TestClient):
def get_facility(facility_id: str) -> Facility: ... response = client.get("/facilities/42")
assert response.status_code == 200, response.text
assert response.json() == {
"id": "42",
"address": {
"line_1": "123 Main St",
"city": "Anytown",
"state_province": "CA",
},
}
openapi_schema = { def test_openapi_schema(client: TestClient):
"components": { """
"schemas": { Sanity check to ensure our app's openapi schema renders as we expect
"Address": { """
# NOTE: the description of this model shows only the public-facing text, before the `\f` in docstring response = client.get("/openapi.json")
"description": "This is a public description of an Address\n", assert response.status_code == 200, response.text
"properties": { assert response.json() == snapshot(
"city": {"title": "City", "type": "string"}, {
"line_1": {"title": "Line 1", "type": "string"}, "components": {
"state_province": {"title": "State Province", "type": "string"}, "schemas": {
}, "Address": {
"required": ["line_1", "city", "state_province"], # NOTE: the description of this model shows only the public-facing text, before the `\f` in docstring
"title": "Address", "description": "This is a public description of an Address\n",
"type": "object", "properties": {
}, "city": {"title": "City", "type": "string"},
"Facility": { "line_1": {"title": "Line 1", "type": "string"},
"properties": { "state_province": {
"address": {"$ref": "#/components/schemas/Address"}, "title": "State Province",
"id": {"title": "Id", "type": "string"}, "type": "string",
}, },
"required": ["id", "address"], },
"title": "Facility", "required": ["line_1", "city", "state_province"],
"type": "object", "title": "Address",
}, "type": "object",
"HTTPValidationError": {
"properties": {
"detail": {
"items": {"$ref": "#/components/schemas/ValidationError"},
"title": "Detail",
"type": "array",
}
},
"title": "HTTPValidationError",
"type": "object",
},
"ValidationError": {
"properties": {
"loc": {
"items": {"anyOf": [{"type": "string"}, {"type": "integer"}]},
"title": "Location",
"type": "array",
}, },
"msg": {"title": "Message", "type": "string"}, "Facility": {
"type": {"title": "Error Type", "type": "string"}, "properties": {
}, "address": {"$ref": "#/components/schemas/Address"},
"required": ["loc", "msg", "type"], "id": {"title": "Id", "type": "string"},
"title": "ValidationError",
"type": "object",
},
}
},
"info": {"title": "FastAPI", "version": "0.1.0"},
"openapi": "3.1.0",
"paths": {
"/facilities/{facility_id}": {
"get": {
"operationId": "get_facility_facilities__facility_id__get",
"parameters": [
{
"in": "path",
"name": "facility_id",
"required": True,
"schema": {"title": "Facility Id", "type": "string"},
}
],
"responses": {
"200": {
"content": {
"application/json": {
"schema": {"$ref": "#/components/schemas/Facility"}
}
}, },
"description": "Successful Response", "required": ["id", "address"],
"title": "Facility",
"type": "object",
}, },
"422": { "HTTPValidationError": {
"content": { "properties": {
"application/json": { "detail": {
"schema": { "items": {
"$ref": "#/components/schemas/HTTPValidationError" "$ref": "#/components/schemas/ValidationError"
} },
"title": "Detail",
"type": "array",
} }
}, },
"description": "Validation Error", "title": "HTTPValidationError",
"type": "object",
}, },
}, "ValidationError": {
"summary": "Get Facility", "properties": {
} "loc": {
"items": {
"anyOf": [{"type": "string"}, {"type": "integer"}]
},
"title": "Location",
"type": "array",
},
"msg": {"title": "Message", "type": "string"},
"type": {"title": "Error Type", "type": "string"},
},
"required": ["loc", "msg", "type"],
"title": "ValidationError",
"type": "object",
},
}
},
"info": {"title": "FastAPI", "version": "0.1.0"},
"openapi": "3.1.0",
"paths": {
"/facilities/{facility_id}": {
"get": {
"operationId": "get_facility_facilities__facility_id__get",
"parameters": [
{
"in": "path",
"name": "facility_id",
"required": True,
"schema": {"title": "Facility Id", "type": "string"},
}
],
"responses": {
"200": {
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/Facility"
}
}
},
"description": "Successful Response",
},
"422": {
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/HTTPValidationError"
}
}
},
"description": "Validation Error",
},
},
"summary": "Get Facility",
}
}
},
} }
},
}
def test_openapi_schema():
"""
Sanity check to ensure our app's openapi schema renders as we expect
"""
response = client.get("/openapi.json")
assert response.status_code == 200, response.text
assert response.json() == openapi_schema
class SortedTypeSet(set):
"""
Set of Types whose `__iter__()` method yields results sorted by the type names
"""
def __init__(self, seq: set[type[Any]], *, sort_reversed: bool):
super().__init__(seq)
self.sort_reversed = sort_reversed
def __iter__(self) -> Iterator[type[Any]]:
members_sorted = sorted(
super().__iter__(),
key=lambda type_: type_.__name__,
reverse=self.sort_reversed,
)
yield from members_sorted
@needs_pydanticv1
@pytest.mark.parametrize("sort_reversed", [True, False])
def test_model_description_escaped_with_formfeed(sort_reversed: bool):
"""
Regression test for bug fixed by https://github.com/fastapi/fastapi/pull/6039.
Test `get_model_definitions` with models passed in different order.
"""
from fastapi._compat import v1
all_fields = fastapi.openapi.utils.get_fields_from_routes(app.routes)
flat_models = v1.get_flat_models_from_fields(all_fields, known_models=set())
model_name_map = pydantic.schema.get_model_name_map(flat_models)
expected_address_description = "This is a public description of an Address\n"
models = v1.get_model_definitions(
flat_models=SortedTypeSet(flat_models, sort_reversed=sort_reversed),
model_name_map=model_name_map,
) )
assert models["Address"]["description"] == expected_address_description

7
tests/test_inherited_custom_class.py

@ -5,7 +5,7 @@ from fastapi import FastAPI
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from pydantic import BaseModel from pydantic import BaseModel
from .utils import needs_pydanticv1, needs_pydanticv2 from .utils import needs_pydanticv1
class MyUuid: class MyUuid:
@ -26,7 +26,6 @@ class MyUuid:
raise TypeError("vars() argument must have __dict__ attribute") raise TypeError("vars() argument must have __dict__ attribute")
@needs_pydanticv2
def test_pydanticv2(): def test_pydanticv2():
from pydantic import field_serializer from pydantic import field_serializer
@ -73,6 +72,8 @@ def test_pydanticv2():
# TODO: remove when deprecating Pydantic v1 # TODO: remove when deprecating Pydantic v1
@needs_pydanticv1 @needs_pydanticv1
def test_pydanticv1(): def test_pydanticv1():
from pydantic import v1
app = FastAPI() app = FastAPI()
@app.get("/fast_uuid") @app.get("/fast_uuid")
@ -84,7 +85,7 @@ def test_pydanticv1():
vars(asyncpg_uuid) vars(asyncpg_uuid)
return {"fast_uuid": asyncpg_uuid} return {"fast_uuid": asyncpg_uuid}
class SomeCustomClass(BaseModel): class SomeCustomClass(v1.BaseModel):
class Config: class Config:
arbitrary_types_allowed = True arbitrary_types_allowed = True
json_encoders = {uuid.UUID: str} json_encoders = {uuid.UUID: str}

68
tests/test_jsonable_encoder.py

@ -8,11 +8,11 @@ from pathlib import PurePath, PurePosixPath, PureWindowsPath
from typing import Optional from typing import Optional
import pytest import pytest
from fastapi._compat import PYDANTIC_V2, Undefined from fastapi._compat import Undefined
from fastapi.encoders import jsonable_encoder from fastapi.encoders import jsonable_encoder
from pydantic import BaseModel, Field, ValidationError from pydantic import BaseModel, Field, ValidationError
from .utils import needs_pydanticv1, needs_pydanticv2 from .utils import needs_pydanticv1
class Person: class Person:
@ -59,12 +59,7 @@ class RoleEnum(Enum):
class ModelWithConfig(BaseModel): class ModelWithConfig(BaseModel):
role: Optional[RoleEnum] = None role: Optional[RoleEnum] = None
if PYDANTIC_V2: model_config = {"use_enum_values": True}
model_config = {"use_enum_values": True}
else:
class Config:
use_enum_values = True
class ModelWithAlias(BaseModel): class ModelWithAlias(BaseModel):
@ -89,6 +84,18 @@ def test_encode_dict():
} }
def test_encode_dict_include_exclude_list():
pet = {"name": "Firulais", "owner": {"name": "Foo"}}
assert jsonable_encoder(pet) == {"name": "Firulais", "owner": {"name": "Foo"}}
assert jsonable_encoder(pet, include=["name"]) == {"name": "Firulais"}
assert jsonable_encoder(pet, exclude=["owner"]) == {"name": "Firulais"}
assert jsonable_encoder(pet, include=[]) == {}
assert jsonable_encoder(pet, exclude=[]) == {
"name": "Firulais",
"owner": {"name": "Foo"},
}
def test_encode_class(): def test_encode_class():
person = Person(name="Foo") person = Person(name="Foo")
pet = Pet(owner=person, name="Firulais") pet = Pet(owner=person, name="Firulais")
@ -130,7 +137,6 @@ def test_encode_unsupported():
jsonable_encoder(unserializable) jsonable_encoder(unserializable)
@needs_pydanticv2
def test_encode_custom_json_encoders_model_pydanticv2(): def test_encode_custom_json_encoders_model_pydanticv2():
from pydantic import field_serializer from pydantic import field_serializer
@ -153,7 +159,9 @@ def test_encode_custom_json_encoders_model_pydanticv2():
# TODO: remove when deprecating Pydantic v1 # TODO: remove when deprecating Pydantic v1
@needs_pydanticv1 @needs_pydanticv1
def test_encode_custom_json_encoders_model_pydanticv1(): def test_encode_custom_json_encoders_model_pydanticv1():
class ModelWithCustomEncoder(BaseModel): from pydantic import v1
class ModelWithCustomEncoder(v1.BaseModel):
dt_field: datetime dt_field: datetime
class Config: class Config:
@ -208,10 +216,12 @@ def test_encode_model_with_default():
@needs_pydanticv1 @needs_pydanticv1
def test_custom_encoders(): def test_custom_encoders():
from pydantic import v1
class safe_datetime(datetime): class safe_datetime(datetime):
pass pass
class MyModel(BaseModel): class MyModel(v1.BaseModel):
dt_field: safe_datetime dt_field: safe_datetime
instance = MyModel(dt_field=safe_datetime.now()) instance = MyModel(dt_field=safe_datetime.now())
@ -244,12 +254,7 @@ def test_encode_model_with_pure_path():
class ModelWithPath(BaseModel): class ModelWithPath(BaseModel):
path: PurePath path: PurePath
if PYDANTIC_V2: model_config = {"arbitrary_types_allowed": True}
model_config = {"arbitrary_types_allowed": True}
else:
class Config:
arbitrary_types_allowed = True
test_path = PurePath("/foo", "bar") test_path = PurePath("/foo", "bar")
obj = ModelWithPath(path=test_path) obj = ModelWithPath(path=test_path)
@ -260,12 +265,7 @@ def test_encode_model_with_pure_posix_path():
class ModelWithPath(BaseModel): class ModelWithPath(BaseModel):
path: PurePosixPath path: PurePosixPath
if PYDANTIC_V2: model_config = {"arbitrary_types_allowed": True}
model_config = {"arbitrary_types_allowed": True}
else:
class Config:
arbitrary_types_allowed = True
obj = ModelWithPath(path=PurePosixPath("/foo", "bar")) obj = ModelWithPath(path=PurePosixPath("/foo", "bar"))
assert jsonable_encoder(obj) == {"path": "/foo/bar"} assert jsonable_encoder(obj) == {"path": "/foo/bar"}
@ -275,45 +275,44 @@ def test_encode_model_with_pure_windows_path():
class ModelWithPath(BaseModel): class ModelWithPath(BaseModel):
path: PureWindowsPath path: PureWindowsPath
if PYDANTIC_V2: model_config = {"arbitrary_types_allowed": True}
model_config = {"arbitrary_types_allowed": True}
else:
class Config:
arbitrary_types_allowed = True
obj = ModelWithPath(path=PureWindowsPath("/foo", "bar")) obj = ModelWithPath(path=PureWindowsPath("/foo", "bar"))
assert jsonable_encoder(obj) == {"path": "\\foo\\bar"} assert jsonable_encoder(obj) == {"path": "\\foo\\bar"}
def test_encode_pure_path():
test_path = PurePath("/foo", "bar")
assert jsonable_encoder({"path": test_path}) == {"path": str(test_path)}
@needs_pydanticv1 @needs_pydanticv1
def test_encode_root(): def test_encode_root():
class ModelWithRoot(BaseModel): from pydantic import v1
class ModelWithRoot(v1.BaseModel):
__root__: str __root__: str
model = ModelWithRoot(__root__="Foo") model = ModelWithRoot(__root__="Foo")
assert jsonable_encoder(model) == "Foo" assert jsonable_encoder(model) == "Foo"
@needs_pydanticv2
def test_decimal_encoder_float(): def test_decimal_encoder_float():
data = {"value": Decimal(1.23)} data = {"value": Decimal(1.23)}
assert jsonable_encoder(data) == {"value": 1.23} assert jsonable_encoder(data) == {"value": 1.23}
@needs_pydanticv2
def test_decimal_encoder_int(): def test_decimal_encoder_int():
data = {"value": Decimal(2)} data = {"value": Decimal(2)}
assert jsonable_encoder(data) == {"value": 2} assert jsonable_encoder(data) == {"value": 2}
@needs_pydanticv2
def test_decimal_encoder_nan(): def test_decimal_encoder_nan():
data = {"value": Decimal("NaN")} data = {"value": Decimal("NaN")}
assert isnan(jsonable_encoder(data)["value"]) assert isnan(jsonable_encoder(data)["value"])
@needs_pydanticv2
def test_decimal_encoder_infinity(): def test_decimal_encoder_infinity():
data = {"value": Decimal("Infinity")} data = {"value": Decimal("Infinity")}
assert isinf(jsonable_encoder(data)["value"]) assert isinf(jsonable_encoder(data)["value"])
@ -330,7 +329,6 @@ def test_encode_deque_encodes_child_models():
assert jsonable_encoder(dq)[0]["test"] == "test" assert jsonable_encoder(dq)[0]["test"] == "test"
@needs_pydanticv2
def test_encode_pydantic_undefined(): def test_encode_pydantic_undefined():
data = {"value": Undefined} data = {"value": Undefined}
assert jsonable_encoder(data) == {"value": None} assert jsonable_encoder(data) == {"value": None}

46
tests/test_no_schema_split.py

@ -9,8 +9,6 @@ from fastapi.testclient import TestClient
from inline_snapshot import snapshot from inline_snapshot import snapshot
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from tests.utils import pydantic_snapshot
class MessageEventType(str, Enum): class MessageEventType(str, Enum):
alpha = "alpha" alpha = "alpha"
@ -126,47 +124,21 @@ def test_openapi_schema():
}, },
"MessageEvent": { "MessageEvent": {
"properties": { "properties": {
"event_type": pydantic_snapshot( "event_type": {
v2=snapshot( "$ref": "#/components/schemas/MessageEventType",
{ "default": "alpha",
"$ref": "#/components/schemas/MessageEventType", },
"default": "alpha",
}
),
v1=snapshot(
{
"allOf": [
{
"$ref": "#/components/schemas/MessageEventType"
}
],
"default": "alpha",
}
),
),
"output": {"type": "string", "title": "Output"}, "output": {"type": "string", "title": "Output"},
}, },
"type": "object", "type": "object",
"required": ["output"], "required": ["output"],
"title": "MessageEvent", "title": "MessageEvent",
}, },
"MessageEventType": pydantic_snapshot( "MessageEventType": {
v2=snapshot( "type": "string",
{ "enum": ["alpha", "beta"],
"type": "string", "title": "MessageEventType",
"enum": ["alpha", "beta"], },
"title": "MessageEventType",
}
),
v1=snapshot(
{
"type": "string",
"enum": ["alpha", "beta"],
"title": "MessageEventType",
"description": "An enumeration.",
}
),
),
"MessageOutput": { "MessageOutput": {
"properties": { "properties": {
"body": {"type": "string", "title": "Body", "default": ""}, "body": {"type": "string", "title": "Body", "default": ""},

40
tests/test_openapi_separate_input_output_schemas.py

@ -3,37 +3,30 @@ from typing import Optional
from fastapi import FastAPI from fastapi import FastAPI
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from inline_snapshot import snapshot from inline_snapshot import snapshot
from pydantic import BaseModel from pydantic import BaseModel, computed_field
from .utils import PYDANTIC_V2, needs_pydanticv2
class SubItem(BaseModel): class SubItem(BaseModel):
subname: str subname: str
sub_description: Optional[str] = None sub_description: Optional[str] = None
tags: list[str] = [] tags: list[str] = []
if PYDANTIC_V2: model_config = {"json_schema_serialization_defaults_required": True}
model_config = {"json_schema_serialization_defaults_required": True}
class Item(BaseModel): class Item(BaseModel):
name: str name: str
description: Optional[str] = None description: Optional[str] = None
sub: Optional[SubItem] = None sub: Optional[SubItem] = None
if PYDANTIC_V2: model_config = {"json_schema_serialization_defaults_required": True}
model_config = {"json_schema_serialization_defaults_required": True}
if PYDANTIC_V2:
from pydantic import computed_field
class WithComputedField(BaseModel): class WithComputedField(BaseModel):
name: str name: str
@computed_field @computed_field
@property @property
def computed_field(self) -> str: def computed_field(self) -> str:
return f"computed {self.name}" return f"computed {self.name}"
def get_app_client(separate_input_output_schemas: bool = True) -> TestClient: def get_app_client(separate_input_output_schemas: bool = True) -> TestClient:
@ -58,13 +51,11 @@ def get_app_client(separate_input_output_schemas: bool = True) -> TestClient:
Item(name="Plumbus"), Item(name="Plumbus"),
] ]
if PYDANTIC_V2: @app.post("/with-computed-field/")
def create_with_computed_field(
@app.post("/with-computed-field/") with_computed_field: WithComputedField,
def create_with_computed_field( ) -> WithComputedField:
with_computed_field: WithComputedField, return with_computed_field
) -> WithComputedField:
return with_computed_field
client = TestClient(app) client = TestClient(app)
return client return client
@ -151,7 +142,6 @@ def test_read_items():
) )
@needs_pydanticv2
def test_with_computed_field(): def test_with_computed_field():
client = get_app_client() client = get_app_client()
client_no = get_app_client(separate_input_output_schemas=False) client_no = get_app_client(separate_input_output_schemas=False)
@ -168,7 +158,6 @@ def test_with_computed_field():
) )
@needs_pydanticv2
def test_openapi_schema(): def test_openapi_schema():
client = get_app_client() client = get_app_client()
response = client.get("/openapi.json") response = client.get("/openapi.json")
@ -449,7 +438,6 @@ def test_openapi_schema():
) )
@needs_pydanticv2
def test_openapi_schema_no_separate(): def test_openapi_schema_no_separate():
client = get_app_client(separate_input_output_schemas=False) client = get_app_client(separate_input_output_schemas=False)
response = client.get("/openapi.json") response = client.get("/openapi.json")

78
tests/test_pydantic_v1_v2_01.py

@ -1,7 +1,7 @@
import sys import sys
from typing import Any, Union from typing import Any, Union
from tests.utils import pydantic_snapshot, skip_module_if_py_gte_314 from tests.utils import skip_module_if_py_gte_314
if sys.version_info >= (3, 14): if sys.version_info >= (3, 14):
skip_module_if_py_gte_314() skip_module_if_py_gte_314()
@ -225,21 +225,12 @@ def test_openapi_schema():
"requestBody": { "requestBody": {
"content": { "content": {
"application/json": { "application/json": {
"schema": pydantic_snapshot( "schema": {
v2=snapshot( "allOf": [
{
"allOf": [
{
"$ref": "#/components/schemas/SubItem"
}
],
"title": "Data",
}
),
v1=snapshot(
{"$ref": "#/components/schemas/SubItem"} {"$ref": "#/components/schemas/SubItem"}
), ],
) "title": "Data",
}
} }
}, },
"required": True, "required": True,
@ -275,21 +266,12 @@ def test_openapi_schema():
"requestBody": { "requestBody": {
"content": { "content": {
"application/json": { "application/json": {
"schema": pydantic_snapshot( "schema": {
v2=snapshot( "allOf": [
{
"allOf": [
{
"$ref": "#/components/schemas/SubItem"
}
],
"title": "Data",
}
),
v1=snapshot(
{"$ref": "#/components/schemas/SubItem"} {"$ref": "#/components/schemas/SubItem"}
), ],
) "title": "Data",
}
} }
}, },
"required": True, "required": True,
@ -325,21 +307,12 @@ def test_openapi_schema():
"requestBody": { "requestBody": {
"content": { "content": {
"application/json": { "application/json": {
"schema": pydantic_snapshot( "schema": {
v2=snapshot( "allOf": [
{
"allOf": [
{
"$ref": "#/components/schemas/Item"
}
],
"title": "Data",
}
),
v1=snapshot(
{"$ref": "#/components/schemas/Item"} {"$ref": "#/components/schemas/Item"}
), ],
) "title": "Data",
}
} }
}, },
"required": True, "required": True,
@ -373,21 +346,12 @@ def test_openapi_schema():
"requestBody": { "requestBody": {
"content": { "content": {
"application/json": { "application/json": {
"schema": pydantic_snapshot( "schema": {
v2=snapshot( "allOf": [
{
"allOf": [
{
"$ref": "#/components/schemas/Item"
}
],
"title": "Data",
}
),
v1=snapshot(
{"$ref": "#/components/schemas/Item"} {"$ref": "#/components/schemas/Item"}
), ],
) "title": "Data",
}
} }
}, },
"required": True, "required": True,

40
tests/test_pydantic_v1_v2_list.py

@ -1,7 +1,7 @@
import sys import sys
from typing import Any, Union from typing import Any, Union
from tests.utils import pydantic_snapshot, skip_module_if_py_gte_314 from tests.utils import skip_module_if_py_gte_314
if sys.version_info >= (3, 14): if sys.version_info >= (3, 14):
skip_module_if_py_gte_314() skip_module_if_py_gte_314()
@ -375,21 +375,12 @@ def test_openapi_schema():
"requestBody": { "requestBody": {
"content": { "content": {
"application/json": { "application/json": {
"schema": pydantic_snapshot( "schema": {
v2=snapshot( "allOf": [
{
"allOf": [
{
"$ref": "#/components/schemas/Item"
}
],
"title": "Data",
}
),
v1=snapshot(
{"$ref": "#/components/schemas/Item"} {"$ref": "#/components/schemas/Item"}
), ],
) "title": "Data",
}
} }
}, },
"required": True, "required": True,
@ -429,21 +420,12 @@ def test_openapi_schema():
"requestBody": { "requestBody": {
"content": { "content": {
"application/json": { "application/json": {
"schema": pydantic_snapshot( "schema": {
v2=snapshot( "allOf": [
{
"allOf": [
{
"$ref": "#/components/schemas/Item"
}
],
"title": "Data",
}
),
v1=snapshot(
{"$ref": "#/components/schemas/Item"} {"$ref": "#/components/schemas/Item"}
), ],
) "title": "Data",
}
} }
}, },
"required": True, "required": True,

226
tests/test_pydantic_v1_v2_mixed.py

@ -1,7 +1,7 @@
import sys import sys
from typing import Any, Union from typing import Any, Union
from tests.utils import pydantic_snapshot, skip_module_if_py_gte_314 from tests.utils import skip_module_if_py_gte_314
if sys.version_info >= (3, 14): if sys.version_info >= (3, 14):
skip_module_if_py_gte_314() skip_module_if_py_gte_314()
@ -668,38 +668,20 @@ def test_v2_to_v1_validation_error():
assert response.status_code == 422, response.text assert response.status_code == 422, response.text
assert response.json() == snapshot( assert response.json() == snapshot(
{ {
"detail": pydantic_snapshot( "detail": [
v2=snapshot( {
[ "type": "missing",
{ "loc": ["body", "new_size"],
"type": "missing", "msg": "Field required",
"loc": ["body", "new_size"], "input": {"new_title": "Missing fields"},
"msg": "Field required", },
"input": {"new_title": "Missing fields"}, {
}, "type": "missing",
{ "loc": ["body", "new_sub"],
"type": "missing", "msg": "Field required",
"loc": ["body", "new_sub"], "input": {"new_title": "Missing fields"},
"msg": "Field required", },
"input": {"new_title": "Missing fields"}, ]
},
]
),
v1=snapshot(
[
{
"loc": ["body", "new_size"],
"msg": "field required",
"type": "value_error.missing",
},
{
"loc": ["body", "new_sub"],
"msg": "field required",
"type": "value_error.missing",
},
]
),
)
} }
) )
@ -717,23 +699,12 @@ def test_v2_to_v1_nested_validation_error():
assert response.json() == snapshot( assert response.json() == snapshot(
{ {
"detail": [ "detail": [
pydantic_snapshot( {
v2=snapshot( "type": "missing",
{ "loc": ["body", "new_sub", "new_sub_name"],
"type": "missing", "msg": "Field required",
"loc": ["body", "new_sub", "new_sub_name"], "input": {"wrong_field": "value"},
"msg": "Field required", }
"input": {"wrong_field": "value"},
}
),
v1=snapshot(
{
"loc": ["body", "new_sub", "new_sub_name"],
"msg": "field required",
"type": "value_error.missing",
}
),
)
] ]
} }
) )
@ -777,38 +748,20 @@ def test_v2_list_validation_error():
assert response.status_code == 422, response.text assert response.status_code == 422, response.text
assert response.json() == snapshot( assert response.json() == snapshot(
{ {
"detail": pydantic_snapshot( "detail": [
v2=snapshot( {
[ "type": "missing",
{ "loc": ["body", 1, "new_size"],
"type": "missing", "msg": "Field required",
"loc": ["body", 1, "new_size"], "input": {"new_title": "Invalid"},
"msg": "Field required", },
"input": {"new_title": "Invalid"}, {
}, "type": "missing",
{ "loc": ["body", 1, "new_sub"],
"type": "missing", "msg": "Field required",
"loc": ["body", 1, "new_sub"], "input": {"new_title": "Invalid"},
"msg": "Field required", },
"input": {"new_title": "Invalid"}, ]
},
]
),
v1=snapshot(
[
{
"loc": ["body", 1, "new_size"],
"msg": "field required",
"type": "value_error.missing",
},
{
"loc": ["body", 1, "new_sub"],
"msg": "field required",
"type": "value_error.missing",
},
]
),
)
} }
) )
@ -844,31 +797,18 @@ def test_invalid_list_structure_v2():
assert response.status_code == 422, response.text assert response.status_code == 422, response.text
assert response.json() == snapshot( assert response.json() == snapshot(
{ {
"detail": pydantic_snapshot( "detail": [
v2=snapshot( {
[ "type": "list_type",
{ "loc": ["body"],
"type": "list_type", "msg": "Input should be a valid list",
"loc": ["body"], "input": {
"msg": "Input should be a valid list", "new_title": "Not a list",
"input": { "new_size": 100,
"new_title": "Not a list", "new_sub": {"new_sub_name": "Sub"},
"new_size": 100, },
"new_sub": {"new_sub_name": "Sub"}, }
}, ]
}
]
),
v1=snapshot(
[
{
"loc": ["body"],
"msg": "value is not a valid list",
"type": "type_error.list",
}
]
),
)
} }
) )
@ -888,21 +828,12 @@ def test_openapi_schema():
"requestBody": { "requestBody": {
"content": { "content": {
"application/json": { "application/json": {
"schema": pydantic_snapshot( "schema": {
v2=snapshot( "allOf": [
{
"allOf": [
{
"$ref": "#/components/schemas/Item"
}
],
"title": "Data",
}
),
v1=snapshot(
{"$ref": "#/components/schemas/Item"} {"$ref": "#/components/schemas/Item"}
), ],
) "title": "Data",
}
} }
}, },
"required": True, "required": True,
@ -938,21 +869,12 @@ def test_openapi_schema():
"requestBody": { "requestBody": {
"content": { "content": {
"application/json": { "application/json": {
"schema": pydantic_snapshot( "schema": {
v2=snapshot( "allOf": [
{
"allOf": [
{
"$ref": "#/components/schemas/Item"
}
],
"title": "Data",
}
),
v1=snapshot(
{"$ref": "#/components/schemas/Item"} {"$ref": "#/components/schemas/Item"}
), ],
) "title": "Data",
}
} }
}, },
"required": True, "required": True,
@ -1056,21 +978,12 @@ def test_openapi_schema():
"requestBody": { "requestBody": {
"content": { "content": {
"application/json": { "application/json": {
"schema": pydantic_snapshot( "schema": {
v2=snapshot( "allOf": [
{
"allOf": [
{
"$ref": "#/components/schemas/Item"
}
],
"title": "Data",
}
),
v1=snapshot(
{"$ref": "#/components/schemas/Item"} {"$ref": "#/components/schemas/Item"}
), ],
) "title": "Data",
}
} }
}, },
"required": True, "required": True,
@ -1440,17 +1353,10 @@ def test_openapi_schema():
"properties": { "properties": {
"new_title": {"type": "string", "title": "New Title"}, "new_title": {"type": "string", "title": "New Title"},
"new_size": {"type": "integer", "title": "New Size"}, "new_size": {"type": "integer", "title": "New Size"},
"new_description": pydantic_snapshot( "new_description": {
v2=snapshot( "anyOf": [{"type": "string"}, {"type": "null"}],
{ "title": "New Description",
"anyOf": [{"type": "string"}, {"type": "null"}], },
"title": "New Description",
}
),
v1=snapshot(
{"type": "string", "title": "New Description"}
),
),
"new_sub": {"$ref": "#/components/schemas/NewSubItem"}, "new_sub": {"$ref": "#/components/schemas/NewSubItem"},
"new_multi": { "new_multi": {
"items": {"$ref": "#/components/schemas/NewSubItem"}, "items": {"$ref": "#/components/schemas/NewSubItem"},

769
tests/test_pydantic_v1_v2_multifile/test_multifile.py

@ -1,6 +1,6 @@
import sys import sys
from tests.utils import pydantic_snapshot, skip_module_if_py_gte_314 from tests.utils import skip_module_if_py_gte_314
if sys.version_info >= (3, 14): if sys.version_info >= (3, 14):
skip_module_if_py_gte_314() skip_module_if_py_gte_314()
@ -292,23 +292,14 @@ def test_openapi_schema():
"requestBody": { "requestBody": {
"content": { "content": {
"application/json": { "application/json": {
"schema": pydantic_snapshot( "schema": {
v2=snapshot( "allOf": [
{
"allOf": [
{
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv1__Item"
}
],
"title": "Data",
}
),
v1=snapshot(
{ {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv1__Item" "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv1__Item"
} }
), ],
) "title": "Data",
}
} }
}, },
"required": True, "required": True,
@ -344,18 +335,9 @@ def test_openapi_schema():
"requestBody": { "requestBody": {
"content": { "content": {
"application/json": { "application/json": {
"schema": pydantic_snapshot( "schema": {
v2=snapshot( "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__Item-Input"
{ },
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__Item-Input"
}
),
v1=snapshot(
{
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__Item"
}
),
),
} }
}, },
"required": True, "required": True,
@ -391,23 +373,14 @@ def test_openapi_schema():
"requestBody": { "requestBody": {
"content": { "content": {
"application/json": { "application/json": {
"schema": pydantic_snapshot( "schema": {
v2=snapshot( "allOf": [
{
"allOf": [
{
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv1__Item"
}
],
"title": "Data",
}
),
v1=snapshot(
{ {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv1__Item" "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv1__Item"
} }
), ],
) "title": "Data",
}
} }
}, },
"required": True, "required": True,
@ -535,18 +508,9 @@ def test_openapi_schema():
"requestBody": { "requestBody": {
"content": { "content": {
"application/json": { "application/json": {
"schema": pydantic_snapshot( "schema": {
v2=snapshot( "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__Item-Input"
{ },
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__Item-Input"
}
),
v1=snapshot(
{
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__Item"
}
),
),
} }
}, },
"required": True, "required": True,
@ -587,18 +551,9 @@ def test_openapi_schema():
"content": { "content": {
"application/json": { "application/json": {
"schema": { "schema": {
"items": pydantic_snapshot( "items": {
v2=snapshot( "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__Item-Input"
{ },
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__Item-Input"
}
),
v1=snapshot(
{
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__Item"
}
),
),
"type": "array", "type": "array",
"title": "Data", "title": "Data",
} }
@ -642,18 +597,9 @@ def test_openapi_schema():
"content": { "content": {
"application/json": { "application/json": {
"schema": { "schema": {
"items": pydantic_snapshot( "items": {
v2=snapshot( "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__Item-Input"
{ },
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__Item-Input"
}
),
v1=snapshot(
{
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__Item"
}
),
),
"type": "array", "type": "array",
"title": "Data", "title": "Data",
} }
@ -767,460 +713,239 @@ def test_openapi_schema():
}, },
}, },
"components": { "components": {
"schemas": pydantic_snapshot( "schemas": {
v1=snapshot( "Body_handle_v2_items_in_list_to_v1_item_in_list_v2_to_v1_list_of_items_to_list_of_items_post": {
{ "properties": {
"Body_handle_v2_items_in_list_to_v1_item_in_list_v2_to_v1_list_of_items_to_list_of_items_post": { "data1": {
"properties": { "items": {
"data1": { "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__ItemInList"
"items": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__ItemInList"
},
"type": "array",
"title": "Data1",
},
"data2": {
"items": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2b__ItemInList"
},
"type": "array",
"title": "Data2",
},
},
"type": "object",
"required": ["data1", "data2"],
"title": "Body_handle_v2_items_in_list_to_v1_item_in_list_v2_to_v1_list_of_items_to_list_of_items_post",
},
"Body_handle_v2_same_name_to_v1_v2_to_v1_same_name_post": {
"properties": {
"item1": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__Item"
},
"item2": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2b__Item"
},
},
"type": "object",
"required": ["item1", "item2"],
"title": "Body_handle_v2_same_name_to_v1_v2_to_v1_same_name_post",
},
"HTTPValidationError": {
"properties": {
"detail": {
"items": {
"$ref": "#/components/schemas/ValidationError"
},
"type": "array",
"title": "Detail",
}
},
"type": "object",
"title": "HTTPValidationError",
},
"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",
},
"tests__test_pydantic_v1_v2_multifile__modelsv1__Item": {
"properties": {
"title": {"type": "string", "title": "Title"},
"size": {"type": "integer", "title": "Size"},
"description": {
"type": "string",
"title": "Description",
},
"sub": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv1__SubItem"
},
"multi": {
"items": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv1__SubItem"
},
"type": "array",
"title": "Multi",
"default": [],
},
},
"type": "object",
"required": ["title", "size", "sub"],
"title": "Item",
},
"tests__test_pydantic_v1_v2_multifile__modelsv1__ItemInList": {
"properties": {
"name1": {"type": "string", "title": "Name1"}
},
"type": "object",
"required": ["name1"],
"title": "ItemInList",
},
"tests__test_pydantic_v1_v2_multifile__modelsv1__SubItem": {
"properties": {
"name": {"type": "string", "title": "Name"}
},
"type": "object",
"required": ["name"],
"title": "SubItem",
},
"tests__test_pydantic_v1_v2_multifile__modelsv2__Item": {
"properties": {
"new_title": {
"type": "string",
"title": "New Title",
},
"new_size": {
"type": "integer",
"title": "New Size",
},
"new_description": {
"type": "string",
"title": "New Description",
},
"new_sub": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__SubItem"
},
"new_multi": {
"items": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__SubItem"
},
"type": "array",
"title": "New Multi",
"default": [],
},
},
"type": "object",
"required": ["new_title", "new_size", "new_sub"],
"title": "Item",
},
"tests__test_pydantic_v1_v2_multifile__modelsv2__ItemInList": {
"properties": {
"name2": {"type": "string", "title": "Name2"}
},
"type": "object",
"required": ["name2"],
"title": "ItemInList",
},
"tests__test_pydantic_v1_v2_multifile__modelsv2__SubItem": {
"properties": {
"new_sub_name": {
"type": "string",
"title": "New Sub Name",
}
},
"type": "object",
"required": ["new_sub_name"],
"title": "SubItem",
},
"tests__test_pydantic_v1_v2_multifile__modelsv2b__Item": {
"properties": {
"dup_title": {
"type": "string",
"title": "Dup Title",
},
"dup_size": {
"type": "integer",
"title": "Dup Size",
},
"dup_description": {
"type": "string",
"title": "Dup Description",
},
"dup_sub": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2b__SubItem"
},
"dup_multi": {
"items": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2b__SubItem"
},
"type": "array",
"title": "Dup Multi",
"default": [],
},
}, },
"type": "object", "type": "array",
"required": ["dup_title", "dup_size", "dup_sub"], "title": "Data1",
"title": "Item",
}, },
"tests__test_pydantic_v1_v2_multifile__modelsv2b__ItemInList": { "data2": {
"properties": { "items": {
"dup_name2": { "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2b__ItemInList"
"type": "string",
"title": "Dup Name2",
}
},
"type": "object",
"required": ["dup_name2"],
"title": "ItemInList",
},
"tests__test_pydantic_v1_v2_multifile__modelsv2b__SubItem": {
"properties": {
"dup_sub_name": {
"type": "string",
"title": "Dup Sub Name",
}
},
"type": "object",
"required": ["dup_sub_name"],
"title": "SubItem",
},
}
),
v2=snapshot(
{
"Body_handle_v2_items_in_list_to_v1_item_in_list_v2_to_v1_list_of_items_to_list_of_items_post": {
"properties": {
"data1": {
"items": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__ItemInList"
},
"type": "array",
"title": "Data1",
},
"data2": {
"items": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2b__ItemInList"
},
"type": "array",
"title": "Data2",
},
},
"type": "object",
"required": ["data1", "data2"],
"title": "Body_handle_v2_items_in_list_to_v1_item_in_list_v2_to_v1_list_of_items_to_list_of_items_post",
},
"Body_handle_v2_same_name_to_v1_v2_to_v1_same_name_post": {
"properties": {
"item1": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__Item-Input"
},
"item2": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2b__Item"
},
},
"type": "object",
"required": ["item1", "item2"],
"title": "Body_handle_v2_same_name_to_v1_v2_to_v1_same_name_post",
},
"HTTPValidationError": {
"properties": {
"detail": {
"items": {
"$ref": "#/components/schemas/ValidationError"
},
"type": "array",
"title": "Detail",
}
},
"type": "object",
"title": "HTTPValidationError",
},
"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", "type": "array",
"required": ["loc", "msg", "type"], "title": "Data2",
"title": "ValidationError",
}, },
"tests__test_pydantic_v1_v2_multifile__modelsv1__Item": { },
"properties": { "type": "object",
"title": {"type": "string", "title": "Title"}, "required": ["data1", "data2"],
"size": {"type": "integer", "title": "Size"}, "title": "Body_handle_v2_items_in_list_to_v1_item_in_list_v2_to_v1_list_of_items_to_list_of_items_post",
"description": { },
"type": "string", "Body_handle_v2_same_name_to_v1_v2_to_v1_same_name_post": {
"title": "Description", "properties": {
}, "item1": {
"sub": { "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__Item-Input"
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv1__SubItem" },
}, "item2": {
"multi": { "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2b__Item"
"items": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv1__SubItem"
},
"type": "array",
"title": "Multi",
"default": [],
},
},
"type": "object",
"required": ["title", "size", "sub"],
"title": "Item",
},
"tests__test_pydantic_v1_v2_multifile__modelsv1__ItemInList": {
"properties": {
"name1": {"type": "string", "title": "Name1"}
},
"type": "object",
"required": ["name1"],
"title": "ItemInList",
},
"tests__test_pydantic_v1_v2_multifile__modelsv1__SubItem": {
"properties": {
"name": {"type": "string", "title": "Name"}
},
"type": "object",
"required": ["name"],
"title": "SubItem",
},
"tests__test_pydantic_v1_v2_multifile__modelsv2__Item": {
"properties": {
"new_title": {
"type": "string",
"title": "New Title",
},
"new_size": {
"type": "integer",
"title": "New Size",
},
"new_description": {
"anyOf": [{"type": "string"}, {"type": "null"}],
"title": "New Description",
},
"new_sub": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__SubItem"
},
"new_multi": {
"items": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__SubItem"
},
"type": "array",
"title": "New Multi",
"default": [],
},
},
"type": "object",
"required": ["new_title", "new_size", "new_sub"],
"title": "Item",
},
"tests__test_pydantic_v1_v2_multifile__modelsv2__Item-Input": {
"properties": {
"new_title": {
"type": "string",
"title": "New Title",
},
"new_size": {
"type": "integer",
"title": "New Size",
},
"new_description": {
"anyOf": [{"type": "string"}, {"type": "null"}],
"title": "New Description",
},
"new_sub": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__SubItem"
},
"new_multi": {
"items": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__SubItem"
},
"type": "array",
"title": "New Multi",
"default": [],
},
},
"type": "object",
"required": ["new_title", "new_size", "new_sub"],
"title": "Item",
},
"tests__test_pydantic_v1_v2_multifile__modelsv2__ItemInList": {
"properties": {
"name2": {"type": "string", "title": "Name2"}
},
"type": "object",
"required": ["name2"],
"title": "ItemInList",
}, },
"tests__test_pydantic_v1_v2_multifile__modelsv2__SubItem": { },
"properties": { "type": "object",
"new_sub_name": { "required": ["item1", "item2"],
"type": "string", "title": "Body_handle_v2_same_name_to_v1_v2_to_v1_same_name_post",
"title": "New Sub Name", },
} "HTTPValidationError": {
}, "properties": {
"type": "object", "detail": {
"required": ["new_sub_name"], "items": {
"title": "SubItem", "$ref": "#/components/schemas/ValidationError"
},
"type": "array",
"title": "Detail",
}
},
"type": "object",
"title": "HTTPValidationError",
},
"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",
},
"tests__test_pydantic_v1_v2_multifile__modelsv1__Item": {
"properties": {
"title": {"type": "string", "title": "Title"},
"size": {"type": "integer", "title": "Size"},
"description": {
"type": "string",
"title": "Description",
},
"sub": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv1__SubItem"
},
"multi": {
"items": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv1__SubItem"
},
"type": "array",
"title": "Multi",
"default": [],
}, },
"tests__test_pydantic_v1_v2_multifile__modelsv2b__Item": { },
"properties": { "type": "object",
"dup_title": { "required": ["title", "size", "sub"],
"type": "string", "title": "Item",
"title": "Dup Title", },
}, "tests__test_pydantic_v1_v2_multifile__modelsv1__ItemInList": {
"dup_size": { "properties": {"name1": {"type": "string", "title": "Name1"}},
"type": "integer", "type": "object",
"title": "Dup Size", "required": ["name1"],
}, "title": "ItemInList",
"dup_description": { },
"anyOf": [{"type": "string"}, {"type": "null"}], "tests__test_pydantic_v1_v2_multifile__modelsv1__SubItem": {
"title": "Dup Description", "properties": {"name": {"type": "string", "title": "Name"}},
}, "type": "object",
"dup_sub": { "required": ["name"],
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2b__SubItem" "title": "SubItem",
}, },
"dup_multi": { "tests__test_pydantic_v1_v2_multifile__modelsv2__Item": {
"items": { "properties": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2b__SubItem" "new_title": {
}, "type": "string",
"type": "array", "title": "New Title",
"title": "Dup Multi", },
"default": [], "new_size": {
}, "type": "integer",
}, "title": "New Size",
"type": "object", },
"required": ["dup_title", "dup_size", "dup_sub"], "new_description": {
"title": "Item", "anyOf": [{"type": "string"}, {"type": "null"}],
"title": "New Description",
},
"new_sub": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__SubItem"
},
"new_multi": {
"items": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__SubItem"
},
"type": "array",
"title": "New Multi",
"default": [],
}, },
"tests__test_pydantic_v1_v2_multifile__modelsv2b__ItemInList": { },
"properties": { "type": "object",
"dup_name2": { "required": ["new_title", "new_size", "new_sub"],
"type": "string", "title": "Item",
"title": "Dup Name2", },
} "tests__test_pydantic_v1_v2_multifile__modelsv2__Item-Input": {
}, "properties": {
"type": "object", "new_title": {
"required": ["dup_name2"], "type": "string",
"title": "ItemInList", "title": "New Title",
},
"new_size": {
"type": "integer",
"title": "New Size",
},
"new_description": {
"anyOf": [{"type": "string"}, {"type": "null"}],
"title": "New Description",
},
"new_sub": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__SubItem"
},
"new_multi": {
"items": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__SubItem"
},
"type": "array",
"title": "New Multi",
"default": [],
}, },
"tests__test_pydantic_v1_v2_multifile__modelsv2b__SubItem": { },
"properties": { "type": "object",
"dup_sub_name": { "required": ["new_title", "new_size", "new_sub"],
"type": "string", "title": "Item",
"title": "Dup Sub Name", },
} "tests__test_pydantic_v1_v2_multifile__modelsv2__ItemInList": {
}, "properties": {"name2": {"type": "string", "title": "Name2"}},
"type": "object", "type": "object",
"required": ["dup_sub_name"], "required": ["name2"],
"title": "SubItem", "title": "ItemInList",
},
"tests__test_pydantic_v1_v2_multifile__modelsv2__SubItem": {
"properties": {
"new_sub_name": {
"type": "string",
"title": "New Sub Name",
}
},
"type": "object",
"required": ["new_sub_name"],
"title": "SubItem",
},
"tests__test_pydantic_v1_v2_multifile__modelsv2b__Item": {
"properties": {
"dup_title": {
"type": "string",
"title": "Dup Title",
},
"dup_size": {
"type": "integer",
"title": "Dup Size",
},
"dup_description": {
"anyOf": [{"type": "string"}, {"type": "null"}],
"title": "Dup Description",
},
"dup_sub": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2b__SubItem"
},
"dup_multi": {
"items": {
"$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2b__SubItem"
},
"type": "array",
"title": "Dup Multi",
"default": [],
}, },
} },
), "type": "object",
), "required": ["dup_title", "dup_size", "dup_sub"],
"title": "Item",
},
"tests__test_pydantic_v1_v2_multifile__modelsv2b__ItemInList": {
"properties": {
"dup_name2": {
"type": "string",
"title": "Dup Name2",
}
},
"type": "object",
"required": ["dup_name2"],
"title": "ItemInList",
},
"tests__test_pydantic_v1_v2_multifile__modelsv2b__SubItem": {
"properties": {
"dup_sub_name": {
"type": "string",
"title": "Dup Sub Name",
}
},
"type": "object",
"required": ["dup_sub_name"],
"title": "SubItem",
},
},
}, },
} }
) )

193
tests/test_pydantic_v1_v2_noneable.py

@ -1,7 +1,7 @@
import sys import sys
from typing import Any, Union from typing import Any, Union
from tests.utils import pydantic_snapshot, skip_module_if_py_gte_314 from tests.utils import skip_module_if_py_gte_314
if sys.version_info >= (3, 14): if sys.version_info >= (3, 14):
skip_module_if_py_gte_314() skip_module_if_py_gte_314()
@ -312,38 +312,20 @@ def test_v2_to_v1_validation_error():
assert response.status_code == 422, response.text assert response.status_code == 422, response.text
assert response.json() == snapshot( assert response.json() == snapshot(
{ {
"detail": pydantic_snapshot( "detail": [
v2=snapshot( {
[ "type": "missing",
{ "loc": ["body", "new_size"],
"type": "missing", "msg": "Field required",
"loc": ["body", "new_size"], "input": {"new_title": "Missing fields"},
"msg": "Field required", },
"input": {"new_title": "Missing fields"}, {
}, "type": "missing",
{ "loc": ["body", "new_sub"],
"type": "missing", "msg": "Field required",
"loc": ["body", "new_sub"], "input": {"new_title": "Missing fields"},
"msg": "Field required", },
"input": {"new_title": "Missing fields"}, ]
},
]
),
v1=snapshot(
[
{
"loc": ["body", "new_size"],
"msg": "field required",
"type": "value_error.missing",
},
{
"loc": ["body", "new_sub"],
"msg": "field required",
"type": "value_error.missing",
},
]
),
)
} }
) )
@ -361,23 +343,12 @@ def test_v2_to_v1_nested_validation_error():
assert response.json() == snapshot( assert response.json() == snapshot(
{ {
"detail": [ "detail": [
pydantic_snapshot( {
v2=snapshot( "type": "missing",
{ "loc": ["body", "new_sub", "new_sub_name"],
"type": "missing", "msg": "Field required",
"loc": ["body", "new_sub", "new_sub_name"], "input": {"wrong_field": "value"},
"msg": "Field required", }
"input": {"wrong_field": "value"},
}
),
v1=snapshot(
{
"loc": ["body", "new_sub", "new_sub_name"],
"msg": "field required",
"type": "value_error.missing",
}
),
)
] ]
} }
) )
@ -396,23 +367,12 @@ def test_v2_to_v1_type_validation_error():
assert response.json() == snapshot( assert response.json() == snapshot(
{ {
"detail": [ "detail": [
pydantic_snapshot( {
v2=snapshot( "type": "int_parsing",
{ "loc": ["body", "new_size"],
"type": "int_parsing", "msg": "Input should be a valid integer, unable to parse string as an integer",
"loc": ["body", "new_size"], "input": "not_a_number",
"msg": "Input should be a valid integer, unable to parse string as an integer", }
"input": "not_a_number",
}
),
v1=snapshot(
{
"loc": ["body", "new_size"],
"msg": "value is not a valid integer",
"type": "type_error.integer",
}
),
)
] ]
} }
) )
@ -483,21 +443,12 @@ def test_openapi_schema():
"requestBody": { "requestBody": {
"content": { "content": {
"application/json": { "application/json": {
"schema": pydantic_snapshot( "schema": {
v2=snapshot( "allOf": [
{
"allOf": [
{
"$ref": "#/components/schemas/Item"
}
],
"title": "Data",
}
),
v1=snapshot(
{"$ref": "#/components/schemas/Item"} {"$ref": "#/components/schemas/Item"}
), ],
) "title": "Data",
}
} }
}, },
"required": True, "required": True,
@ -507,22 +458,15 @@ def test_openapi_schema():
"description": "Successful Response", "description": "Successful Response",
"content": { "content": {
"application/json": { "application/json": {
"schema": pydantic_snapshot( "schema": {
v2=snapshot( "anyOf": [
{ {
"anyOf": [ "$ref": "#/components/schemas/NewItem"
{ },
"$ref": "#/components/schemas/NewItem" {"type": "null"},
}, ],
{"type": "null"}, "title": "Response Handle V1 Item To V2 V1 To V2 Post",
], }
"title": "Response Handle V1 Item To V2 V1 To V2 Post",
}
),
v1=snapshot(
{"$ref": "#/components/schemas/NewItem"}
),
)
} }
}, },
}, },
@ -546,21 +490,12 @@ def test_openapi_schema():
"requestBody": { "requestBody": {
"content": { "content": {
"application/json": { "application/json": {
"schema": pydantic_snapshot( "schema": {
v2=snapshot( "allOf": [
{
"allOf": [
{
"$ref": "#/components/schemas/Item"
}
],
"title": "Data",
}
),
v1=snapshot(
{"$ref": "#/components/schemas/Item"} {"$ref": "#/components/schemas/Item"}
), ],
) "title": "Data",
}
} }
}, },
"required": True, "required": True,
@ -570,22 +505,15 @@ def test_openapi_schema():
"description": "Successful Response", "description": "Successful Response",
"content": { "content": {
"application/json": { "application/json": {
"schema": pydantic_snapshot( "schema": {
v2=snapshot( "anyOf": [
{ {
"anyOf": [ "$ref": "#/components/schemas/NewItem"
{ },
"$ref": "#/components/schemas/NewItem" {"type": "null"},
}, ],
{"type": "null"}, "title": "Response Handle V1 Item To V2 Filter V1 To V2 Item Filter Post",
], }
"title": "Response Handle V1 Item To V2 Filter V1 To V2 Item Filter Post",
}
),
v1=snapshot(
{"$ref": "#/components/schemas/NewItem"}
),
)
} }
}, },
}, },
@ -707,17 +635,10 @@ def test_openapi_schema():
"properties": { "properties": {
"new_title": {"type": "string", "title": "New Title"}, "new_title": {"type": "string", "title": "New Title"},
"new_size": {"type": "integer", "title": "New Size"}, "new_size": {"type": "integer", "title": "New Size"},
"new_description": pydantic_snapshot( "new_description": {
v2=snapshot( "anyOf": [{"type": "string"}, {"type": "null"}],
{ "title": "New Description",
"anyOf": [{"type": "string"}, {"type": "null"}], },
"title": "New Description",
}
),
v1=snapshot(
{"type": "string", "title": "New Description"}
),
),
"new_sub": {"$ref": "#/components/schemas/NewSubItem"}, "new_sub": {"$ref": "#/components/schemas/NewSubItem"},
"new_multi": { "new_multi": {
"items": {"$ref": "#/components/schemas/NewSubItem"}, "items": {"$ref": "#/components/schemas/NewSubItem"},

8
tests/test_query_cookie_header_model_extra_params.py

@ -1,5 +1,4 @@
from fastapi import Cookie, FastAPI, Header, Query from fastapi import Cookie, FastAPI, Header, Query
from fastapi._compat import PYDANTIC_V2
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from pydantic import BaseModel from pydantic import BaseModel
@ -9,12 +8,7 @@ app = FastAPI()
class Model(BaseModel): class Model(BaseModel):
param: str param: str
if PYDANTIC_V2: model_config = {"extra": "allow"}
model_config = {"extra": "allow"}
else:
class Config:
extra = "allow"
@app.get("/query") @app.get("/query")

7
tests/test_read_with_orm_mode.py

@ -4,10 +4,9 @@ from fastapi import FastAPI
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from pydantic import BaseModel, ConfigDict from pydantic import BaseModel, ConfigDict
from .utils import needs_pydanticv1, needs_pydanticv2 from .utils import needs_pydanticv1
@needs_pydanticv2
def test_read_with_orm_mode() -> None: def test_read_with_orm_mode() -> None:
class PersonBase(BaseModel): class PersonBase(BaseModel):
name: str name: str
@ -48,7 +47,9 @@ def test_read_with_orm_mode() -> None:
@needs_pydanticv1 @needs_pydanticv1
def test_read_with_orm_mode_pv1() -> None: def test_read_with_orm_mode_pv1() -> None:
class PersonBase(BaseModel): from pydantic import v1
class PersonBase(v1.BaseModel):
name: str name: str
lastname: str lastname: str

10
tests/test_request_param_model_by_alias.py

@ -1,6 +1,5 @@
from dirty_equals import IsPartialDict from dirty_equals import IsPartialDict
from fastapi import Cookie, FastAPI, Header, Query from fastapi import Cookie, FastAPI, Header, Query
from fastapi._compat import PYDANTIC_V2
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
@ -53,8 +52,7 @@ def test_query_model_with_alias_by_name():
response = client.get("/query", params={"param": "value"}) response = client.get("/query", params={"param": "value"})
assert response.status_code == 422, response.text assert response.status_code == 422, response.text
details = response.json() details = response.json()
if PYDANTIC_V2: assert details["detail"][0]["input"] == {"param": "value"}
assert details["detail"][0]["input"] == {"param": "value"}
def test_header_model_with_alias_by_name(): def test_header_model_with_alias_by_name():
@ -62,8 +60,7 @@ def test_header_model_with_alias_by_name():
response = client.get("/header", headers={"param": "value"}) response = client.get("/header", headers={"param": "value"})
assert response.status_code == 422, response.text assert response.status_code == 422, response.text
details = response.json() details = response.json()
if PYDANTIC_V2: assert details["detail"][0]["input"] == IsPartialDict({"param": "value"})
assert details["detail"][0]["input"] == IsPartialDict({"param": "value"})
def test_cookie_model_with_alias_by_name(): def test_cookie_model_with_alias_by_name():
@ -72,5 +69,4 @@ def test_cookie_model_with_alias_by_name():
response = client.get("/cookie") response = client.get("/cookie")
assert response.status_code == 422, response.text assert response.status_code == 422, response.text
details = response.json() details = response.json()
if PYDANTIC_V2: assert details["detail"][0]["input"] == {"param": "value"}
assert details["detail"][0]["input"] == {"param": "value"}

11
tests/test_request_params/test_body/test_list.py

@ -6,8 +6,6 @@ from fastapi import Body, FastAPI
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from tests.utils import needs_pydanticv2
from .utils import get_body_model_name from .utils import get_body_model_name
app = FastAPI() app = FastAPI()
@ -246,7 +244,6 @@ async def read_model_required_list_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
["/required-list-validation-alias", "/model-required-list-validation-alias"], ["/required-list-validation-alias", "/model-required-list-validation-alias"],
@ -269,7 +266,6 @@ def test_required_list_validation_alias_schema(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize("json", [None, {}]) @pytest.mark.parametrize("json", [None, {}])
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
@ -294,7 +290,6 @@ def test_required_list_validation_alias_missing(path: str, json: Union[dict, Non
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -319,7 +314,6 @@ def test_required_list_validation_alias_by_name(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -364,7 +358,6 @@ def read_model_required_list_alias_and_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -390,7 +383,6 @@ def test_required_list_alias_and_validation_alias_schema(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize("json", [None, {}]) @pytest.mark.parametrize("json", [None, {}])
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
@ -415,7 +407,6 @@ def test_required_list_alias_and_validation_alias_missing(path: str, json):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -442,7 +433,6 @@ def test_required_list_alias_and_validation_alias_by_name(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -467,7 +457,6 @@ def test_required_list_alias_and_validation_alias_by_alias(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [

9
tests/test_request_params/test_body/test_optional_list.py

@ -6,8 +6,6 @@ from fastapi import Body, FastAPI
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from tests.utils import needs_pydanticv2
from .utils import get_body_model_name from .utils import get_body_model_name
app = FastAPI() app = FastAPI()
@ -283,7 +281,6 @@ def read_model_optional_list_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
["/optional-list-validation-alias", "/model-optional-list-validation-alias"], ["/optional-list-validation-alias", "/model-optional-list-validation-alias"],
@ -369,7 +366,6 @@ def test_optional_list_validation_alias_missing_empty_dict(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -384,7 +380,6 @@ def test_optional_list_validation_alias_by_name(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -432,7 +427,6 @@ def read_model_optional_list_alias_and_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -524,7 +518,6 @@ def test_optional_list_alias_and_validation_alias_missing_empty_dict(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -539,7 +532,6 @@ def test_optional_list_alias_and_validation_alias_by_name(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -554,7 +546,6 @@ def test_optional_list_alias_and_validation_alias_by_alias(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [

15
tests/test_request_params/test_body/test_optional_str.py

@ -6,8 +6,6 @@ from fastapi import Body, FastAPI
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from tests.utils import needs_pydanticv2
from .utils import get_body_model_name from .utils import get_body_model_name
app = FastAPI() app = FastAPI()
@ -268,7 +266,6 @@ def read_model_optional_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
["/optional-validation-alias", "/model-optional-validation-alias"], ["/optional-validation-alias", "/model-optional-validation-alias"],
@ -300,7 +297,6 @@ def test_optional_validation_alias_schema(path: str):
) )
@needs_pydanticv2
def test_optional_validation_alias_missing(): def test_optional_validation_alias_missing():
client = TestClient(app) client = TestClient(app)
response = client.post("/optional-validation-alias") response = client.post("/optional-validation-alias")
@ -308,7 +304,6 @@ def test_optional_validation_alias_missing():
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
def test_model_optional_validation_alias_missing(): def test_model_optional_validation_alias_missing():
client = TestClient(app) client = TestClient(app)
response = client.post("/model-optional-validation-alias") response = client.post("/model-optional-validation-alias")
@ -338,7 +333,6 @@ def test_model_optional_validation_alias_missing():
) )
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
["/optional-validation-alias", "/model-optional-validation-alias"], ["/optional-validation-alias", "/model-optional-validation-alias"],
@ -350,7 +344,6 @@ def test_model_optional_validation_alias_missing_empty_dict(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -365,7 +358,6 @@ def test_optional_validation_alias_by_name(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -410,7 +402,6 @@ def read_model_optional_alias_and_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -445,7 +436,6 @@ def test_optional_alias_and_validation_alias_schema(path: str):
) )
@needs_pydanticv2
def test_optional_alias_and_validation_alias_missing(): def test_optional_alias_and_validation_alias_missing():
client = TestClient(app) client = TestClient(app)
response = client.post("/optional-alias-and-validation-alias") response = client.post("/optional-alias-and-validation-alias")
@ -453,7 +443,6 @@ def test_optional_alias_and_validation_alias_missing():
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
def test_model_optional_alias_and_validation_alias_missing(): def test_model_optional_alias_and_validation_alias_missing():
client = TestClient(app) client = TestClient(app)
response = client.post("/model-optional-alias-and-validation-alias") response = client.post("/model-optional-alias-and-validation-alias")
@ -483,7 +472,6 @@ def test_model_optional_alias_and_validation_alias_missing():
) )
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -498,7 +486,6 @@ def test_model_optional_alias_and_validation_alias_missing_empty_dict(path: str)
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -513,7 +500,6 @@ def test_optional_alias_and_validation_alias_by_name(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -528,7 +514,6 @@ def test_optional_alias_and_validation_alias_by_alias(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [

11
tests/test_request_params/test_body/test_required_str.py

@ -6,8 +6,6 @@ from fastapi import Body, FastAPI
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from tests.utils import needs_pydanticv2
from .utils import get_body_model_name from .utils import get_body_model_name
app = FastAPI() app = FastAPI()
@ -236,7 +234,6 @@ def read_model_required_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
["/required-validation-alias", "/model-required-validation-alias"], ["/required-validation-alias", "/model-required-validation-alias"],
@ -255,7 +252,6 @@ def test_required_validation_alias_schema(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize("json", [None, {}]) @pytest.mark.parametrize("json", [None, {}])
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
@ -282,7 +278,6 @@ def test_required_validation_alias_missing(
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -307,7 +302,6 @@ def test_required_validation_alias_by_name(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -353,7 +347,6 @@ def read_model_required_alias_and_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -375,7 +368,6 @@ def test_required_alias_and_validation_alias_schema(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize("json", [None, {}]) @pytest.mark.parametrize("json", [None, {}])
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
@ -402,7 +394,6 @@ def test_required_alias_and_validation_alias_missing(
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -430,7 +421,6 @@ def test_required_alias_and_validation_alias_by_name(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -455,7 +445,6 @@ def test_required_alias_and_validation_alias_by_alias(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [

11
tests/test_request_params/test_cookie/test_optional_str.py

@ -6,8 +6,6 @@ from fastapi import Cookie, FastAPI
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from tests.utils import needs_pydanticv2
app = FastAPI() app = FastAPI()
# ===================================================================================== # =====================================================================================
@ -189,7 +187,6 @@ def read_model_optional_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
["/optional-validation-alias", "/model-optional-validation-alias"], ["/optional-validation-alias", "/model-optional-validation-alias"],
@ -208,7 +205,6 @@ def test_optional_validation_alias_schema(path: str):
] ]
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
["/optional-validation-alias", "/model-optional-validation-alias"], ["/optional-validation-alias", "/model-optional-validation-alias"],
@ -220,7 +216,6 @@ def test_optional_validation_alias_missing(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -236,7 +231,6 @@ def test_optional_validation_alias_by_name(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -276,7 +270,6 @@ def read_model_optional_alias_and_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -298,7 +291,6 @@ def test_optional_alias_and_validation_alias_schema(path: str):
] ]
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -313,7 +305,6 @@ def test_optional_alias_and_validation_alias_missing(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -329,7 +320,6 @@ def test_optional_alias_and_validation_alias_by_name(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -345,7 +335,6 @@ def test_optional_alias_and_validation_alias_by_alias(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [

11
tests/test_request_params/test_cookie/test_required_str.py

@ -6,8 +6,6 @@ from fastapi import Cookie, FastAPI
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from tests.utils import needs_pydanticv2
app = FastAPI() app = FastAPI()
# ===================================================================================== # =====================================================================================
@ -231,7 +229,6 @@ def read_model_required_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
["/required-validation-alias", "/model-required-validation-alias"], ["/required-validation-alias", "/model-required-validation-alias"],
@ -247,7 +244,6 @@ def test_required_validation_alias_schema(path: str):
] ]
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -274,7 +270,6 @@ def test_required_validation_alias_missing(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -300,7 +295,6 @@ def test_required_validation_alias_by_name(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -339,7 +333,6 @@ def read_model_required_alias_and_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -358,7 +351,6 @@ def test_required_alias_and_validation_alias_schema(path: str):
] ]
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -385,7 +377,6 @@ def test_required_alias_and_validation_alias_missing(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -417,7 +408,6 @@ def test_required_alias_and_validation_alias_by_name(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -446,7 +436,6 @@ def test_required_alias_and_validation_alias_by_alias(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [

11
tests/test_request_params/test_file/test_list.py

@ -5,8 +5,6 @@ from dirty_equals import IsDict
from fastapi import FastAPI, File, UploadFile from fastapi import FastAPI, File, UploadFile
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from tests.utils import needs_pydanticv2
from .utils import get_body_model_name from .utils import get_body_model_name
app = FastAPI() app = FastAPI()
@ -280,7 +278,6 @@ def read_list_uploadfile_validation_alias(
return {"file_size": [file.size for file in p]} return {"file_size": [file.size for file in p]}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -322,7 +319,6 @@ def test_list_validation_alias_schema(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -349,7 +345,6 @@ def test_list_validation_alias_missing(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -374,7 +369,6 @@ def test_list_validation_alias_by_name(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -417,7 +411,6 @@ def read_list_uploadfile_alias_and_validation_alias(
return {"file_size": [file.size for file in p]} return {"file_size": [file.size for file in p]}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -459,7 +452,6 @@ def test_list_alias_and_validation_alias_schema(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -486,7 +478,6 @@ def test_list_alias_and_validation_alias_missing(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -514,7 +505,6 @@ def test_list_alias_and_validation_alias_by_name(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -539,7 +529,6 @@ def test_list_alias_and_validation_alias_by_alias(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [

11
tests/test_request_params/test_file/test_optional.py

@ -5,8 +5,6 @@ from dirty_equals import IsDict
from fastapi import FastAPI, File, UploadFile from fastapi import FastAPI, File, UploadFile
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from tests.utils import needs_pydanticv2
from .utils import get_body_model_name from .utils import get_body_model_name
app = FastAPI() app = FastAPI()
@ -204,7 +202,6 @@ def read_optional_uploadfile_validation_alias(
return {"file_size": p.size if p else None} return {"file_size": p.size if p else None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -239,7 +236,6 @@ def test_optional_validation_alias_schema(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -254,7 +250,6 @@ def test_optional_validation_alias_missing(path: str):
assert response.json() == {"file_size": None} assert response.json() == {"file_size": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -269,7 +264,6 @@ def test_optional_validation_alias_by_name(path: str):
assert response.json() == {"file_size": None} assert response.json() == {"file_size": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -312,7 +306,6 @@ def read_optional_uploadfile_alias_and_validation_alias(
return {"file_size": p.size if p else None} return {"file_size": p.size if p else None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -347,7 +340,6 @@ def test_optional_alias_and_validation_alias_schema(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -362,7 +354,6 @@ def test_optional_alias_and_validation_alias_missing(path: str):
assert response.json() == {"file_size": None} assert response.json() == {"file_size": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -377,7 +368,6 @@ def test_optional_alias_and_validation_alias_by_name(path: str):
assert response.json() == {"file_size": None} assert response.json() == {"file_size": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -392,7 +382,6 @@ def test_optional_alias_and_validation_alias_by_alias(path: str):
assert response.json() == {"file_size": None} assert response.json() == {"file_size": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [

11
tests/test_request_params/test_file/test_optional_list.py

@ -5,8 +5,6 @@ from dirty_equals import IsDict
from fastapi import FastAPI, File, UploadFile from fastapi import FastAPI, File, UploadFile
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from tests.utils import needs_pydanticv2
from .utils import get_body_model_name from .utils import get_body_model_name
app = FastAPI() app = FastAPI()
@ -217,7 +215,6 @@ def read_optional_list_uploadfile_validation_alias(
return {"file_size": [file.size for file in p] if p else None} return {"file_size": [file.size for file in p] if p else None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -259,7 +256,6 @@ def test_optional_validation_alias_schema(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -274,7 +270,6 @@ def test_optional_validation_alias_missing(path: str):
assert response.json() == {"file_size": None} assert response.json() == {"file_size": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -289,7 +284,6 @@ def test_optional_validation_alias_by_name(path: str):
assert response.json() == {"file_size": None} assert response.json() == {"file_size": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -329,7 +323,6 @@ def read_optional_list_uploadfile_alias_and_validation_alias(
return {"file_size": [file.size for file in p] if p else None} return {"file_size": [file.size for file in p] if p else None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -371,7 +364,6 @@ def test_optional_list_alias_and_validation_alias_schema(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -386,7 +378,6 @@ def test_optional_list_alias_and_validation_alias_missing(path: str):
assert response.json() == {"file_size": None} assert response.json() == {"file_size": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -401,7 +392,6 @@ def test_optional_list_alias_and_validation_alias_by_name(path: str):
assert response.json() == {"file_size": None} assert response.json() == {"file_size": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -416,7 +406,6 @@ def test_optional_list_alias_and_validation_alias_by_alias(path: str):
assert response.json() == {"file_size": None} assert response.json() == {"file_size": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [

11
tests/test_request_params/test_file/test_required.py

@ -5,8 +5,6 @@ from dirty_equals import IsDict
from fastapi import FastAPI, File, UploadFile from fastapi import FastAPI, File, UploadFile
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from tests.utils import needs_pydanticv2
from .utils import get_body_model_name from .utils import get_body_model_name
app = FastAPI() app = FastAPI()
@ -242,7 +240,6 @@ def read_required_uploadfile_validation_alias(
return {"file_size": p.size} return {"file_size": p.size}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -268,7 +265,6 @@ def test_required_validation_alias_schema(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -295,7 +291,6 @@ def test_required_validation_alias_missing(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -320,7 +315,6 @@ def test_required_validation_alias_by_name(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -359,7 +353,6 @@ def read_required_uploadfile_alias_and_validation_alias(
return {"file_size": p.size} return {"file_size": p.size}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -385,7 +378,6 @@ def test_required_alias_and_validation_alias_schema(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -412,7 +404,6 @@ def test_required_alias_and_validation_alias_missing(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -440,7 +431,6 @@ def test_required_alias_and_validation_alias_by_name(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -465,7 +455,6 @@ def test_required_alias_and_validation_alias_by_alias(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [

11
tests/test_request_params/test_form/test_list.py

@ -6,8 +6,6 @@ from fastapi import FastAPI, Form
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from tests.utils import needs_pydanticv2
from .utils import get_body_model_name from .utils import get_body_model_name
app = FastAPI() app = FastAPI()
@ -247,7 +245,6 @@ async def read_model_required_list_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
["/required-list-validation-alias", "/model-required-list-validation-alias"], ["/required-list-validation-alias", "/model-required-list-validation-alias"],
@ -270,7 +267,6 @@ def test_required_list_validation_alias_schema(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -297,7 +293,6 @@ def test_required_list_validation_alias_missing(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -322,7 +317,6 @@ def test_required_list_validation_alias_by_name(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
["/required-list-validation-alias", "/model-required-list-validation-alias"], ["/required-list-validation-alias", "/model-required-list-validation-alias"],
@ -363,7 +357,6 @@ def read_model_required_list_alias_and_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -389,7 +382,6 @@ def test_required_list_alias_and_validation_alias_schema(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -416,7 +408,6 @@ def test_required_list_alias_and_validation_alias_missing(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -446,7 +437,6 @@ def test_required_list_alias_and_validation_alias_by_name(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -470,7 +460,6 @@ def test_required_list_alias_and_validation_alias_by_alias(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [

11
tests/test_request_params/test_form/test_optional_list.py

@ -6,8 +6,6 @@ from fastapi import FastAPI, Form
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from tests.utils import needs_pydanticv2
from .utils import get_body_model_name from .utils import get_body_model_name
app = FastAPI() app = FastAPI()
@ -211,7 +209,6 @@ def read_model_optional_list_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
["/optional-list-validation-alias", "/model-optional-list-validation-alias"], ["/optional-list-validation-alias", "/model-optional-list-validation-alias"],
@ -250,7 +247,6 @@ def test_optional_list_validation_alias_schema(path: str):
) )
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
["/optional-list-validation-alias", "/model-optional-list-validation-alias"], ["/optional-list-validation-alias", "/model-optional-list-validation-alias"],
@ -262,7 +258,6 @@ def test_optional_list_validation_alias_missing(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -277,7 +272,6 @@ def test_optional_list_validation_alias_by_name(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
["/optional-list-validation-alias", "/model-optional-list-validation-alias"], ["/optional-list-validation-alias", "/model-optional-list-validation-alias"],
@ -321,7 +315,6 @@ def read_model_optional_list_alias_and_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -363,7 +356,6 @@ def test_optional_list_alias_and_validation_alias_schema(path: str):
) )
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -378,7 +370,6 @@ def test_optional_list_alias_and_validation_alias_missing(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -393,7 +384,6 @@ def test_optional_list_alias_and_validation_alias_by_name(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -408,7 +398,6 @@ def test_optional_list_alias_and_validation_alias_by_alias(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [

11
tests/test_request_params/test_form/test_optional_str.py

@ -6,8 +6,6 @@ from fastapi import FastAPI, Form
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from tests.utils import needs_pydanticv2
from .utils import get_body_model_name from .utils import get_body_model_name
app = FastAPI() app = FastAPI()
@ -194,7 +192,6 @@ def read_model_optional_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
["/optional-validation-alias", "/model-optional-validation-alias"], ["/optional-validation-alias", "/model-optional-validation-alias"],
@ -226,7 +223,6 @@ def test_optional_validation_alias_schema(path: str):
) )
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
["/optional-validation-alias", "/model-optional-validation-alias"], ["/optional-validation-alias", "/model-optional-validation-alias"],
@ -238,7 +234,6 @@ def test_optional_validation_alias_missing(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -253,7 +248,6 @@ def test_optional_validation_alias_by_name(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -298,7 +292,6 @@ def read_model_optional_alias_and_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -333,7 +326,6 @@ def test_optional_alias_and_validation_alias_schema(path: str):
) )
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -348,7 +340,6 @@ def test_optional_alias_and_validation_alias_missing(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -363,7 +354,6 @@ def test_optional_alias_and_validation_alias_by_name(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -378,7 +368,6 @@ def test_optional_alias_and_validation_alias_by_alias(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [

11
tests/test_request_params/test_form/test_required_str.py

@ -6,8 +6,6 @@ from fastapi import FastAPI, Form
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from tests.utils import needs_pydanticv2
from .utils import get_body_model_name from .utils import get_body_model_name
app = FastAPI() app = FastAPI()
@ -232,7 +230,6 @@ def read_model_required_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
["/required-validation-alias", "/model-required-validation-alias"], ["/required-validation-alias", "/model-required-validation-alias"],
@ -251,7 +248,6 @@ def test_required_validation_alias_schema(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -278,7 +274,6 @@ def test_required_validation_alias_missing(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -303,7 +298,6 @@ def test_required_validation_alias_by_name(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -347,7 +341,6 @@ def read_model_required_alias_and_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -369,7 +362,6 @@ def test_required_alias_and_validation_alias_schema(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -396,7 +388,6 @@ def test_required_alias_and_validation_alias_missing(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -424,7 +415,6 @@ def test_required_alias_and_validation_alias_by_name(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -449,7 +439,6 @@ def test_required_alias_and_validation_alias_by_alias(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [

11
tests/test_request_params/test_header/test_list.py

@ -6,8 +6,6 @@ from fastapi import FastAPI, Header
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from tests.utils import needs_pydanticv2
app = FastAPI() app = FastAPI()
# ===================================================================================== # =====================================================================================
@ -234,7 +232,6 @@ async def read_model_required_list_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
["/required-list-validation-alias", "/model-required-list-validation-alias"], ["/required-list-validation-alias", "/model-required-list-validation-alias"],
@ -254,7 +251,6 @@ def test_required_list_validation_alias_schema(path: str):
] ]
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -281,7 +277,6 @@ def test_required_list_validation_alias_missing(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -306,7 +301,6 @@ def test_required_list_validation_alias_by_name(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
["/required-list-validation-alias", "/model-required-list-validation-alias"], ["/required-list-validation-alias", "/model-required-list-validation-alias"],
@ -343,7 +337,6 @@ def read_model_required_list_alias_and_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -366,7 +359,6 @@ def test_required_list_alias_and_validation_alias_schema(path: str):
] ]
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -393,7 +385,6 @@ def test_required_list_alias_and_validation_alias_missing(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -423,7 +414,6 @@ def test_required_list_alias_and_validation_alias_by_name(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -450,7 +440,6 @@ def test_required_list_alias_and_validation_alias_by_alias(path: str):
} }
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [

11
tests/test_request_params/test_header/test_optional_list.py

@ -6,8 +6,6 @@ from fastapi import FastAPI, Header
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from tests.utils import needs_pydanticv2
app = FastAPI() app = FastAPI()
# ===================================================================================== # =====================================================================================
@ -202,7 +200,6 @@ def read_model_optional_list_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
["/optional-list-validation-alias", "/model-optional-list-validation-alias"], ["/optional-list-validation-alias", "/model-optional-list-validation-alias"],
@ -224,7 +221,6 @@ def test_optional_list_validation_alias_schema(path: str):
] ]
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
["/optional-list-validation-alias", "/model-optional-list-validation-alias"], ["/optional-list-validation-alias", "/model-optional-list-validation-alias"],
@ -236,7 +232,6 @@ def test_optional_list_validation_alias_missing(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -251,7 +246,6 @@ def test_optional_list_validation_alias_by_name(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
["/optional-list-validation-alias", "/model-optional-list-validation-alias"], ["/optional-list-validation-alias", "/model-optional-list-validation-alias"],
@ -291,7 +285,6 @@ def read_model_optional_list_alias_and_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -316,7 +309,6 @@ def test_optional_list_alias_and_validation_alias_schema(path: str):
] ]
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -331,7 +323,6 @@ def test_optional_list_alias_and_validation_alias_missing(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -346,7 +337,6 @@ def test_optional_list_alias_and_validation_alias_by_name(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -361,7 +351,6 @@ def test_optional_list_alias_and_validation_alias_by_alias(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [

11
tests/test_request_params/test_header/test_optional_str.py

@ -6,8 +6,6 @@ from fastapi import FastAPI, Header
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from tests.utils import needs_pydanticv2
app = FastAPI() app = FastAPI()
# ===================================================================================== # =====================================================================================
@ -186,7 +184,6 @@ def read_model_optional_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
["/optional-validation-alias", "/model-optional-validation-alias"], ["/optional-validation-alias", "/model-optional-validation-alias"],
@ -205,7 +202,6 @@ def test_optional_validation_alias_schema(path: str):
] ]
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
["/optional-validation-alias", "/model-optional-validation-alias"], ["/optional-validation-alias", "/model-optional-validation-alias"],
@ -217,7 +213,6 @@ def test_optional_validation_alias_missing(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -232,7 +227,6 @@ def test_optional_validation_alias_by_name(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -271,7 +265,6 @@ def read_model_optional_alias_and_validation_alias(
return {"p": p.p} return {"p": p.p}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -293,7 +286,6 @@ def test_optional_alias_and_validation_alias_schema(path: str):
] ]
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -308,7 +300,6 @@ def test_optional_alias_and_validation_alias_missing(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -323,7 +314,6 @@ def test_optional_alias_and_validation_alias_by_name(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [
@ -338,7 +328,6 @@ def test_optional_alias_and_validation_alias_by_alias(path: str):
assert response.json() == {"p": None} assert response.json() == {"p": None}
@needs_pydanticv2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path", "path",
[ [

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save