⬆ Bump sqlmodel from 0.0.27 to 0.0.31

Bumps [sqlmodel](https://github.com/fastapi/sqlmodel) from 0.0.27 to 0.0.31.
- [Release notes](https://github.com/fastapi/sqlmodel/releases)
- [Changelog](https://github.com/fastapi/sqlmodel/blob/main/docs/release-notes.md)
- [Commits](https://github.com/fastapi/sqlmodel/compare/0.0.27...0.0.31)

---
updated-dependencies:
- dependency-name: sqlmodel
  dependency-version: 0.0.31
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/translate.yml

@@ -1,8 +1,8 @@
 name: Translate
 
 on:
-  schedule:
-    - cron: "0 5 15 * *"  # Run at 05:00 on the 15 of every month
+  # schedule:
+  #   - cron: "0 5 15 * *"  # Run at 05:00 on the 15 of every month
 
   workflow_dispatch:
     inputs:

docs/de/llm-prompt.md

@@ -4,213 +4,197 @@ Translate to German (Deutsch).
 
 Language code: de.
 
-
-### Definitions
-
-"hyphen"
-    The character «-»
-    Unicode U+002D (HYPHEN-MINUS)
-    Alternative names: hyphen, dash, minus sign
-
-"dash"
-    The character «–»
-    Unicode U+2013 (EN DASH)
-    German name: Halbgeviertstrich
-
-
 ### Grammar to use when talking to the reader
 
-Use the formal grammar (use «Sie» instead of «Du»).
-
+Use the formal grammar (use `Sie` instead of `Du`).
 
 ### Quotes
 
-1) Convert neutral double quotes («"») and English double typographic quotes («“» and «”») to German double typographic quotes («„» and «“»). Convert neutral single quotes («'») and English single typographic quotes («‘» and «’») to German single typographic quotes («‚» and «‘»). Do NOT convert «`"» to «„», do NOT convert «"`» to «“».
+1) Convert neutral double quotes (`"`) to German double typographic quotes (`„` and `“`). Convert neutral single quotes (`'`) to German single typographic quotes (`‚` and `‘`).
+
+Do NOT convert quotes in code snippets and code blocks to their German typographic equivalents.
 
 Examples:
 
-    Source (English):
+Source (English):
 
-        «««
-        "Hello world"
-        “Hello Universe”
-        "He said: 'Hello'"
-        “my name is ‘Nils’”
-        `"__main__"`
-        `"items"`
-        »»»
+```
+"Hello world"
+“Hello Universe”
+"He said: 'Hello'"
+“my name is ‘Nils’”
+`"__main__"`
+`"items"`
+```
 
-    Result (German):
-
-        «««
-        „Hallo Welt“
-        „Hallo Universum“
-        „Er sagte: ‚Hallo‘“
-        „Mein Name ist ‚Nils‘“
-        `"__main__"`
-        `"items"`
-        »»»
+Result (German):
 
+```
+„Hallo Welt“
+„Hallo Universum“
+„Er sagte: ‚Hallo‘“
+„Mein Name ist ‚Nils‘“
+`"__main__"`
+`"items"`
+```
 
 ### Ellipsis
 
-1) Make sure there is a space between an ellipsis and a word following or preceding the ellipsis.
+- Make sure there is a space between an ellipsis and a word following or preceding the ellipsis.
 
 Examples:
 
-    Source (English):
+Source (English):
 
-        «««
-        ...as we intended.
-        ...this would work:
-        ...etc.
-        others...
-        More to come...
-        »»»
+```
+...as we intended.
+...this would work:
+...etc.
+others...
+More to come...
+```
 
-    Result (German):
+Result (German):
 
-        «««
-        ... wie wir es beabsichtigt hatten.
-        ... das würde funktionieren:
-        ... usw.
-        Andere ...
-        Später mehr ...
-        »»»
-
-2) This does not apply in URLs, code blocks, and code snippets. Do not remove or add spaces there.
+```
+... wie wir es beabsichtigt hatten.
+... das würde funktionieren:
+... usw.
+Andere ...
+Später mehr ...
+```
 
+- This does not apply in URLs, code blocks, and code snippets. Do not remove or add spaces there.
 
 ### Headings
 
-1) Translate headings using the infinite form.
+- Translate headings using the infinite form.
 
 Examples:
 
-    Source (English):
+Source (English):
 
-        «««
-        ## Create a Project { #create-a-project }
-        »»»
+```
+## Create a Project { #create-a-project }
+```
 
-    Translate with (German):
+Result (German):
 
-        «««
-        ## Ein Projekt erstellen { #create-a-project }
-        »»»
+```
+## Ein Projekt erstellen { #create-a-project }
+```
 
-    Do NOT translate with (German):
+Do NOT translate with (German):
 
-        «««
-        ## Erstellen Sie ein Projekt { #create-a-project }
-        »»»
+```
+## Erstellen Sie ein Projekt { #create-a-project }
+```
 
-    Source (English):
+Source (English):
 
-        «««
-        # Install Packages { #install-packages }
-        »»»
+```
+# Install Packages { #install-packages }
+```
 
-    Translate with (German):
+Translate with (German):
 
-        «««
-        # Pakete installieren { #install-packages }
-        »»»
+```
+# Pakete installieren { #install-packages }
+```
 
-    Do NOT translate with (German):
+Do NOT translate with (German):
 
-        «««
-        # Installieren Sie Pakete { #install-packages }
-        »»»
+```
+# Installieren Sie Pakete { #install-packages }
+```
 
-    Source (English):
+Source (English):
 
-        «««
-        ### Run Your Program { #run-your-program }
-        »»»
+```
+### Run Your Program { #run-your-program }
+```
 
-    Translate with (German):
+Translate with (German):
 
-        «««
-        ### Ihr Programm ausführen { #run-your-program }
-        »»»
+```
+### Ihr Programm ausführen { #run-your-program }
+```
 
-    Do NOT translate with (German):
+Do NOT translate with (German):
 
-        «««
-        ### Führen Sie Ihr Programm aus { #run-your-program }
-        »»»
+```
+### Führen Sie Ihr Programm aus { #run-your-program }
+```
 
-2) Make sure that the translated part of the heading does not end with a period.
+- Make sure that the translated part of the heading does not end with a period.
 
 Example:
 
-    Source (English):
+Source (English):
 
-        «««
-        ## Another module with `APIRouter` { #another-module-with-apirouter }
-        »»»
+```
+## Another module with `APIRouter` { #another-module-with-apirouter }
+```
 
-    Translate with (German):
+Translate with (German):
 
-        «««
-        ## Ein weiteres Modul mit `APIRouter` { #another-module-with-apirouter }
-        »»»
+```
+## Ein weiteres Modul mit `APIRouter` { #another-module-with-apirouter }
+```
 
-    Do NOT translate with (German) – notice the added period:
+Do NOT translate with (German) – notice the added period:
 
-        «««
-        ## Ein weiteres Modul mit `APIRouter`. { #another-module-with-apirouter }
-        »»»
+```
+## Ein weiteres Modul mit `APIRouter`. { #another-module-with-apirouter }
+```
 
-3) Replace occurrences of literal « - » (a space followed by a hyphen followed by a space) with « – » (a space followed by a dash followed by a space) in the translated part of the heading.
+- Replace occurrences of literal ` - ` (a space followed by a hyphen followed by a space) with ` – ` (a space followed by a dash followed by a space) in the translated part of the heading.
 
 Example:
 
-    Source (English):
+Source (English):
 
-        «««
-        # FastAPI in Containers - Docker { #fastapi-in-containers-docker }
-        »»»
+```
+# FastAPI in Containers - Docker { #fastapi-in-containers-docker }
+```
 
-    Translate with (German) – notice the dash:
+Translate with (German) – notice the dash:
 
-        «««
-        # FastAPI in Containern – Docker { #fastapi-in-containers-docker }
-        »»»
+```
+# FastAPI in Containern – Docker { #fastapi-in-containers-docker }
+```
 
-    Do NOT translate with (German) – notice the hyphen:
+Do NOT translate with (German) – notice the hyphen:
 
-        «««
-        # FastAPI in Containern - Docker { #fastapi-in-containers-docker }
-        »»»
+```
+# FastAPI in Containern - Docker { #fastapi-in-containers-docker }
+```
 
-3.1) Do not apply rule 3 when there is no space before or no space after the hyphen.
+- Do not apply rule 3 when there is no space before or no space after the hyphen.
 
 Example:
 
-    Source (English):
+Source (English):
 
-        «««
-        ## Type hints and annotations { #type-hints-and-annotations }
-        »»»
+```
+## Type hints and annotations { #type-hints-and-annotations }
+```
 
-    Translate with (German) – notice the hyphen:
+Translate with (German) - notice the hyphen:
 
-        «««
-        ## Typhinweise und -annotationen { #type-hints-and-annotations }
-        »»»
+```
+## Typhinweise und -annotationen { #type-hints-and-annotations }
+```
 
-    Do NOT translate with (German) – notice the dash:
+Do NOT translate with (German) - notice the dash:
 
-        «««
-        ## Typhinweise und –annotationen { #type-hints-and-annotations }
-        »»»
+```
+## Typhinweise und –annotationen { #type-hints-and-annotations }
+```
 
-3.2) Do not apply rule 3 to the untranslated part of the heading inside curly brackets, which you shall not translate.
+- Do not modify the hyphens in the content in headers inside of curly braces, which you shall not translate.
 
-
-### German instructions, when to use and when not to use hyphens in words (written in first person, which is you)
+### German instructions, when to use and when not to use hyphens in words (written in first person, which is you).
 
 In der Regel versuche ich so weit wie möglich Worte zusammenzuschreiben, also ohne Bindestrich, es sei denn, es ist Konkretesding-Klassevondingen, etwa «Pydantic-Modell» (aber: «Datenbankmodell»), «Python-Modul» (aber: «Standardmodul»). Ich setze auch einen Bindestrich, wenn er die gleichen Buchstaben verbindet, etwa «Enum-Member», «Cloud-Dienst», «Template-Engine». Oder wenn das Wort sonst einfach zu lang wird, etwa, «Performance-Optimierung». Oder um etwas visuell besser zu dokumentieren, etwa «Pfadoperation-Dekorator»,  «Pfadoperation-Funktion».
 
@@ -219,123 +203,122 @@ In der Regel versuche ich so weit wie möglich Worte zusammenzuschreiben, also o
 
 Ich versuche nicht, alles einzudeutschen. Das bezieht sich besonders auf Begriffe aus dem Bereich der Programmierung. Ich wandele zwar korrekt in Großschreibung um und setze Bindestriche, wo notwendig, aber ansonsten lasse ich solch ein Wort unverändert. Beispielsweise wird aus dem englischen Wort «string» in der deutschen Übersetzung «String», aber nicht «Zeichenkette». Oder aus dem englischen Wort «request body» wird in der deutschen Übersetzung «Requestbody», aber nicht «Anfragekörper». Oder aus dem englischen «response» wird im Deutschen «Response», aber nicht «Antwort».
 
-
 ### List of English terms and their preferred German translations
 
-Below is a list of English terms and their preferred German translations, separated by a colon («:»). Use these translations, do not use your own. If an existing translation does not use these terms, update it to use them. In the below list, a term or a translation may be followed by an explanation in brackets, which explains when to translate the term this way. If a translation is preceded by «NOT», then that means: do NOT use this translation for this term. English nouns, starting with the word «the», have the German genus – «der», «die», «das» – prepended to their German translation, to help you to grammatically decline them in the translation. They are given in singular case, unless they have «(plural)» attached, which means they are given in plural case. Verbs are given in the full infinitive – starting with the word «to».
+Below is a list of English terms and their preferred German translations, separated by a colon (:). Use these translations, do not use your own. If an existing translation does not use these terms, update it to use them. In the below list, a term or a translation may be followed by an explanation in brackets, which explains when to translate the term this way. If a translation is preceded by `NOT`, then that means: do NOT use this translation for this term. English nouns, starting with the word `the`, have the German genus – `der`, `die`, `das` – prepended to their German translation, to help you to grammatically decline them in the translation. They are given in singular case, unless they have `(plural)` attached, which means they are given in plural case. Verbs are given in the full infinitive – starting with the word `to`.
 
-* «/// check»: «/// check | Testen»
-* «/// danger»: «/// danger | Gefahr»
-* «/// info»: «/// info | Info»
-* «/// note | Technical Details»: «/// note | Technische Details»
-* «/// note»: «/// note | Hinweis»
-* «/// tip»: «/// tip | Tipp»
-* «/// warning»: «/// warning | Achtung»
-* «you»: «Sie»
-* «your»: «Ihr»
-* «e.g»: «z. B.»
-* «etc.»: «usw.»
-* «ref»: «Ref.»
-* «the Tutorial - User guide»: «das Tutorial – Benutzerhandbuch»
-* «the Advanced User Guide»: «das Handbuch für fortgeschrittene Benutzer»
-* «the SQLModel docs»: «die SQLModel-Dokumentation»
-* «the docs»: «die Dokumentation» (use singular case)
-* «the env var»: «die Umgebungsvariable»
-* «the `PATH` environment variable»: «die `PATH`-Umgebungsvariable»
-* «the `PATH`»: «der `PATH`»
-* «the `requirements.txt`»: «die `requirements.txt`»
-* «the API Router»: «der API-Router»
-* «the Authorization-Header»: «der Autorisierungsheader»
-* «the `Authorization`-Header»: «der `Authorization`-Header»
-* «the background task»: «der Hintergrundtask»
-* «the button»: «der Button»
-* «the cloud provider»: «der Cloudanbieter»
-* «the CLI»: «Das CLI»
-* «the coverage»: «Die Testabdeckung»
-* «the command line interface»: «Das Kommandozeileninterface»
-* «the default value»: «der Defaultwert»
-* «the default value»: NOT «der Standardwert»
-* «the default declaration»: «die Default-Deklaration»
-* «the deployment»: «das Deployment»
-* «the dict»: «das Dict»
-* «the dictionary»: «das Dictionary»
-* «the enumeration»: «die Enumeration»
-* «the enum»: «das Enum»
-* «the engine»: «die Engine»
-* «the error response»: «die Error-Response»
-* «the event»: «das Event»
-* «the exception»: «die Exception»
-* «the exception handler»: «der Exceptionhandler»
-* «the form model»: «das Formularmodell»
-* «the form body»: «der Formularbody»
-* «the header»: «der Header»
-* «the headers» (plural): «die Header»
-* «in headers» (plural): «in Headern»
-* «the forwarded header»: «der Forwarded-Header»
-* «the lifespan event»: «das Lifespan-Event»
-* «the lock»: «der Lock»
-* «the locking»: «das Locking»
-* «the mobile application»: «die Mobile-Anwendung»
-* «the model object»: «das Modellobjekt»
-* «the mounting»: «das Mounten»
-* «mounted»: «gemountet»
-* «the origin»: «das Origin»
-* «the override»: «Die Überschreibung»
-* «the parameter»: «der Parameter»
-* «the parameters» (plural): «die Parameter»
-* «the function parameter»: «der Funktionsparameter»
-* «the default parameter»: «der Defaultparameter»
-* «the body parameter»: «der Body-Parameter»
-* «the request body parameter»: «der Requestbody-Parameter»
-* «the path parameter»: «der Pfad-Parameter»
-* «the query parameter»: «der Query-Parameter»
-* «the cookie parameter»: «der Cookie-Parameter»
-* «the header parameter»: «der Header-Parameter»
-* «the form parameter»: «der Formular-Parameter»
-* «the payload»: «die Payload»
-* «the performance»: NOT «die Performance»
-* «the query»: «die Query»
-* «the recap»: «die Zusammenfassung»
-* «the request» (what the client sends to the server): «der Request»
-* «the request body»: «der Requestbody»
-* «the request bodies» (plural): «die Requestbodys»
-* «the response» (what the server sends back to the client): «die Response»
-* «the return type»: «der Rückgabetyp»
-* «the return value»: «der Rückgabewert»
-* «the startup» (the event of the app): «der Startup»
-* «the shutdown» (the event of the app): «der Shutdown»
-* «the startup event»: «das Startup-Event»
-* «the shutdown event»: «das Shutdown-Event»
-* «the startup» (of the server): «das Hochfahren»
-* «the startup» (the company): «das Startup»
-* «the SDK»: «das SDK»
-* «the tag»: «der Tag»
-* «the type annotation»: «die Typannotation»
-* «the type hint»: «der Typhinweis»
-* «the wildcard»: «die Wildcard»
-* «the worker class»: «die Workerklasse»
-* «the worker class»: NOT «die Arbeiterklasse»
-* «the worker process»: «der Workerprozess»
-* «the worker process»: NOT «der Arbeiterprozess»
-* «to commit»: «committen»
-* «to deploy» (in the cloud): «deployen»
-* «to modify»: «ändern»
-* «to serve» (an application): «bereitstellen»
-* «to serve» (a response): «ausliefern»
-* «to serve»: NOT «bedienen»
-* «to upgrade»: «aktualisieren»
-* «to wrap»: «wrappen»
-* «to wrap»: NOT «hüllen»
-* «`foo` as a `type`»: «`foo` vom Typ `type`»
-* «`foo` as a `type`»: «`foo`, ein `type`»
-* «FastAPI's X»: «FastAPIs X»
-* «Starlette's Y»: «Starlettes Y»
-* «X is case-sensitive»: «Groß-/Klein­schrei­bung ist relevant in X»
-* «X is case-insensitive»: «Groß-/Klein­schrei­bung ist nicht relevant in X»
-* «standard Python»: «Standard-Python»
-* «deprecated»: «deprecatet»
+* /// check: /// check | Testen
+* /// danger: /// danger | Gefahr
+* /// info: /// info | Info
+* /// note | Technical Details: /// note | Technische Details
+* /// note: /// note | Hinweis
+* /// tip: /// tip | Tipp
+* /// warning: /// warning | Achtung
+* you: Sie
+* your: Ihr
+* e.g: z. B.
+* etc.: usw.
+* ref: Ref.
+* the Tutorial - User guide: das Tutorial – Benutzerhandbuch
+* the Advanced User Guide: das Handbuch für fortgeschrittene Benutzer
+* the SQLModel docs: die SQLModel-Dokumentation
+* the docs: die Dokumentation (use singular case)
+* the env var: die Umgebungsvariable
+* the `PATH` environment variable: die `PATH`-Umgebungsvariable
+* the `PATH`: der `PATH`
+* the `requirements.txt`: die `requirements.txt`
+* the API Router: der API-Router
+* the Authorization-Header: der Autorisierungsheader
+* the `Authorization`-Header: der `Authorization`-Header
+* the background task: der Hintergrundtask
+* the button: der Button
+* the cloud provider: der Cloudanbieter
+* the CLI: Das CLI
+* the coverage: Die Testabdeckung
+* the command line interface: Das Kommandozeileninterface
+* the default value: der Defaultwert
+* the default value: NOT der Standardwert
+* the default declaration: die Default-Deklaration
+* the deployment: das Deployment
+* the dict: das Dict
+* the dictionary: das Dictionary
+* the enumeration: die Enumeration
+* the enum: das Enum
+* the engine: die Engine
+* the error response: die Error-Response
+* the event: das Event
+* the exception: die Exception
+* the exception handler: der Exceptionhandler
+* the form model: das Formularmodell
+* the form body: der Formularbody
+* the header: der Header
+* the headers (plural): die Header
+* in headers (plural): in Headern
+* the forwarded header: der Forwarded-Header
+* the lifespan event: das Lifespan-Event
+* the lock: der Lock
+* the locking: das Locking
+* the mobile application: die Mobile-Anwendung
+* the model object: das Modellobjekt
+* the mounting: das Mounten
+* mounted: gemountet
+* the origin: das Origin
+* the override: Die Überschreibung
+* the parameter: der Parameter
+* the parameters (plural): die Parameter
+* the function parameter: der Funktionsparameter
+* the default parameter: der Defaultparameter
+* the body parameter: der Body-Parameter
+* the request body parameter: der Requestbody-Parameter
+* the path parameter: der Pfad-Parameter
+* the query parameter: der Query-Parameter
+* the cookie parameter: der Cookie-Parameter
+* the header parameter: der Header-Parameter
+* the form parameter: der Formular-Parameter
+* the payload: die Payload
+* the performance: NOT die Performance
+* the query: die Query
+* the recap: die Zusammenfassung
+* the request (what the client sends to the server): der Request
+* the request body: der Requestbody
+* the request bodies (plural): die Requestbodys
+* the response (what the server sends back to the client): die Response
+* the return type: der Rückgabetyp
+* the return value: der Rückgabewert
+* the startup (the event of the app): der Startup
+* the shutdown (the event of the app): der Shutdown
+* the startup event: das Startup-Event
+* the shutdown event: das Shutdown-Event
+* the startup (of the server): das Hochfahren
+* the startup (the company): das Startup
+* the SDK: das SDK
+* the tag: der Tag
+* the type annotation: die Typannotation
+* the type hint: der Typhinweis
+* the wildcard: die Wildcard
+* the worker class: die Workerklasse
+* the worker class: NOT die Arbeiterklasse
+* the worker process: der Workerprozess
+* the worker process: NOT der Arbeiterprozess
+* to commit: committen
+* to deploy (in the cloud): deployen
+* to modify: ändern
+* to serve (an application): bereitstellen
+* to serve (a response): ausliefern
+* to serve: NOT bedienen
+* to upgrade: aktualisieren
+* to wrap: wrappen
+* to wrap: NOT hüllen
+* `foo` as a `type`: `foo` vom Typ `type`
+* `foo` as a `type`: `foo`, ein `type`
+* FastAPI's X: FastAPIs X
+* Starlette's Y: Starlettes Y
+* X is case-sensitive: Groß-/Klein­schrei­bung ist relevant in X
+* X is case-insensitive: Groß-/Klein­schrei­bung ist nicht relevant in X
+* standard Python: Standard-Python
+* deprecated: deprecatet
 
 
 ### Other rules
 
-Preserve indentation. Keep emoticons. Encode in utf-8. Use Linux line breaks (LF).
+Preserve indentation. Keep emojis. Encode in utf-8. Use Linux line breaks (LF).

docs/en/docs/_llm-test.md

@@ -6,7 +6,7 @@ Tests added here will be seen by all designers of language specific prompts.
 
 Use as follows:
 
-* Have a language specific prompt – `docs/{language code}/llm-prompt.md`.
+* Have a language specific prompt - `docs/{language code}/llm-prompt.md`.
 * Do a fresh translation of this document into your desired target language (see e.g. the `translate-page` command of the `translate.py`). This will create the translation under `docs/{language code}/docs/_llm-test.md`.
 * Check if things are okay in the translation.
 * If necessary, improve your language specific prompt, the general prompt, or the English document.

docs/en/docs/release-notes.md

@@ -7,6 +7,30 @@ hide:
 
 ## Latest Changes
 
+### Translations
+
+* 🔧 Add LLM prompt file for Turkish, generated from the existing translations. PR [#14547](https://github.com/fastapi/fastapi/pull/14547) by [@tiangolo](https://github.com/tiangolo).
+* 🔧 Add LLM prompt file for Traditional Chinese, generated from the existing translations. PR [#14550](https://github.com/fastapi/fastapi/pull/14550) by [@tiangolo](https://github.com/tiangolo).
+* 🔧 Add LLM prompt file for Simplified Chinese, generated from the existing translations. PR [#14549](https://github.com/fastapi/fastapi/pull/14549) by [@tiangolo](https://github.com/tiangolo).
+
+### Internal
+
+* 🌐 Update translation prompts. PR [#14619](https://github.com/fastapi/fastapi/pull/14619) by [@tiangolo](https://github.com/tiangolo).
+* 🔨 Update LLM translation script to guide reviewers to change the prompt. PR [#14614](https://github.com/fastapi/fastapi/pull/14614) by [@tiangolo](https://github.com/tiangolo).
+* 👷 Do not run translations on cron while finishing updating existing languages. PR [#14613](https://github.com/fastapi/fastapi/pull/14613) by [@tiangolo](https://github.com/tiangolo).
+* 🔥 Remove test variants for Pydantic v1 in test_request_params. PR [#14612](https://github.com/fastapi/fastapi/pull/14612) by [@tiangolo](https://github.com/tiangolo).
+* 🔥 Remove Pydantic v1  specific test variants. PR [#14611](https://github.com/fastapi/fastapi/pull/14611) by [@tiangolo](https://github.com/tiangolo).
+
+## 0.128.0
+
+### Breaking Changes
+
+* ➖ Drop support for `pydantic.v1`. PR [#14609](https://github.com/fastapi/fastapi/pull/14609) by [@tiangolo](https://github.com/tiangolo).
+
+### Internal
+
+* ✅ Run performance tests only on Pydantic v2. PR [#14608](https://github.com/fastapi/fastapi/pull/14608) by [@tiangolo](https://github.com/tiangolo).
+
 ## 0.127.1
 
 ### Refactors

docs/ja/llm-prompt.md

@@ -6,23 +6,23 @@ Language code: ja.
 
 ### Grammar and tone
 
-1) Use polite, instructional Japanese (です/ます調).
-2) Keep the tone concise and technical (match existing Japanese FastAPI docs).
+- Use polite, instructional Japanese (です/ます調).
+- Keep the tone concise and technical (match existing Japanese FastAPI docs).
 
 ### Headings
 
-1) Follow the existing Japanese style: short, descriptive headings (often noun phrases), e.g. 「チェック」.
-2) Do not add a trailing period at the end of headings.
+- Follow the existing Japanese style: short, descriptive headings (often noun phrases), e.g. 「チェック」.
+- Do not add a trailing period at the end of headings.
 
 ### Quotes
 
-1) Prefer Japanese corner brackets 「」 in normal prose when quoting a term.
-2) Do not change quotes inside inline code, code blocks, URLs, or file paths.
+- Prefer Japanese corner brackets 「」 in normal prose when quoting a term.
+- Do not change quotes inside inline code, code blocks, URLs, or file paths.
 
 ### Ellipsis
 
-1) Keep ellipsis style consistent with existing Japanese docs (commonly `...`).
-2) Never change `...` in code, URLs, or CLI examples.
+- Keep ellipsis style consistent with existing Japanese docs (commonly `...`).
+- Never change `...` in code, URLs, or CLI examples.
 
 ### Preferred translations / glossary
 

docs/ko/llm-prompt.md

@@ -6,23 +6,23 @@ Language code: ko.
 
 ### Grammar and tone
 
-1) Use polite, instructional Korean (e.g. 합니다/하세요 style).
-2) Keep the tone consistent with the existing Korean FastAPI docs.
+- Use polite, instructional Korean (e.g. 합니다/하세요 style).
+- Keep the tone consistent with the existing Korean FastAPI docs.
 
 ### Headings
 
-1) Follow existing Korean heading style (short, action-oriented headings like “확인하기”).
-2) Do not add trailing punctuation to headings.
+- Follow existing Korean heading style (short, action-oriented headings like “확인하기”).
+- Do not add trailing punctuation to headings.
 
 ### Quotes
 
-1) Keep quote style consistent with the existing Korean docs.
-2) Never change quotes inside inline code, code blocks, URLs, or file paths.
+- Keep quote style consistent with the existing Korean docs.
+- Never change quotes inside inline code, code blocks, URLs, or file paths.
 
 ### Ellipsis
 
-1) Keep ellipsis style consistent with existing Korean docs (often `...`).
-2) Never change `...` in code, URLs, or CLI examples.
+- Keep ellipsis style consistent with existing Korean docs (often `...`).
+- Never change `...` in code, URLs, or CLI examples.
 
 ### Preferred translations / glossary
 

docs/missing-translation.md

@@ -4,6 +4,6 @@ This page hasn’t been translated into your language yet. 🌍
 
 We’re currently switching to an automated translation system 🤖, which will help keep all translations complete and up to date.
 
-Learn more: [Contributing – Translations](https://fastapi.tiangolo.com/contributing/#translations){.internal-link target=_blank}
+Learn more: [Contributing - Translations](https://fastapi.tiangolo.com/contributing/#translations){.internal-link target=_blank}
 
 ///

docs/pt/llm-prompt.md

@@ -14,15 +14,15 @@ When translating documentation into Portuguese, use neutral and widely understan
 
 For the next terms, use the following translations:
 
-* «/// check»: «/// check | Verifique»
-* «/// danger»: «/// danger | Cuidado»
-* «/// info»: «/// info | Informação»
-* «/// note | Technical Details»: «/// note | Detalhes Técnicos»
-* «/// info | Very Technical Details»: «/// note | Detalhes Técnicos Avançados»
-* «/// note»: «/// note | Nota»
-* «/// tip»: «/// tip | Dica»
-* «/// warning»: «/// warning | Atenção»
-* «(you should)»: «(você deveria)»
+* /// check: /// check | Verifique
+* /// danger: /// danger | Cuidado
+* /// info: /// info | Informação
+* /// note | Technical Details: /// note | Detalhes Técnicos
+* /// info | Very Technical Details: /// note | Detalhes Técnicos Avançados
+* /// note: /// note | Nota
+* /// tip: /// tip | Dica
+* /// warning: /// warning | Atenção
+* (you should): (você deveria)
 * async context manager: gerenciador de contexto assíncrono
 * autocomplete: autocompletar
 * autocompletion: preenchimento automático

docs/tr/llm-prompt.md

@@ -0,0 +1,52 @@
+### Target language
+
+Translate to Turkish (Türkçe).
+
+Language code: tr.
+
+### Grammar and tone
+
+- Use instructional Turkish, consistent with existing Turkish docs.
+- Use imperative/guide language when appropriate (e.g. “açalım”, “gidin”, “kopyalayalım”).
+
+### Headings
+
+- Follow existing Turkish heading style (Title Case where used; no trailing period).
+
+### Quotes
+
+- Alıntı stili mevcut Türkçe dokümanlarla tutarlı tutun (genellikle metin içinde ASCII tırnak işaretleri kullanılır).
+- Satır içi kod, kod blokları, URL'ler veya dosya yolları içindeki tırnak işaretlerini asla değiştirmeyin.
+
+### Ellipsis
+
+- Üç nokta (...) stili mevcut Türkçe dokümanlarla tutarlı tutun.
+- Kod, URL veya CLI örneklerindeki `...` ifadesini asla değiştirmeyin.
+
+### Preferred translations / glossary
+
+Do not translate technical terms like path, route, request, response, query, body, cookie, and header, keep them as is.
+
+- Suffixing is very important, when adding Turkish suffixes to the English words, do that based on the pronunciation of the word and with an apostrophe.
+
+- Suffixes also changes based on what word comes next in Turkish too, here is an example:
+
+"Server'a gelen request'leri intercept... " or this could have been "request'e", "request'i" etc.
+
+- Some words are tricky like "path'e" can't be used like "path'a" but it could have been "path'i" "path'leri" etc.
+
+- You can use a more instructional style, that is consistent with the document, you can add the Turkish version of the term in parenthesis if it is not something very obvious, or an advanced concept, but do not over do it, do it only the first time it is mentioned, but keep the English term as the primary word.
+
+### `///` admonitions
+
+- Keep the admonition keyword in English (do not translate `note`, `tip`, etc.).
+- If a title is present, prefer these canonical titles:
+
+- `/// note | Not`
+- `/// note | Teknik Detaylar`
+- `/// tip | İpucu`
+- `/// warning | Uyarı`
+- `/// info | Bilgi`
+- `/// check | Ek bilgi`
+
+Prefer `İpucu` over `Ipucu`.

docs/uk/llm-prompt.md

@@ -6,23 +6,23 @@ Language code: uk.
 
 ### Grammar and tone
 
-1) Use polite/formal address consistent with existing Ukrainian docs (use “ви/ваш”).
-2) Keep the tone concise and technical.
+- Use polite/formal address consistent with existing Ukrainian docs (use “ви/ваш”).
+- Keep the tone concise and technical.
 
 ### Headings
 
-1) Follow existing Ukrainian heading style; keep headings short and instructional.
-2) Do not add trailing punctuation to headings.
+- Follow existing Ukrainian heading style; keep headings short and instructional.
+- Do not add trailing punctuation to headings.
 
 ### Quotes
 
-1) Prefer Ukrainian guillemets «…» for quoted terms in prose, matching existing Ukrainian docs.
-2) Never change quotes inside inline code, code blocks, URLs, or file paths.
+- Prefer Ukrainian guillemets «…» for quoted terms in prose, matching existing Ukrainian docs.
+- Never change quotes inside inline code, code blocks, URLs, or file paths.
 
 ### Ellipsis
 
-1) Keep ellipsis style consistent with existing Ukrainian docs.
-2) Never change `...` in code, URLs, or CLI examples.
+- Keep ellipsis style consistent with existing Ukrainian docs.
+- Never change `...` in code, URLs, or CLI examples.
 
 ### Preferred translations / glossary
 
@@ -35,8 +35,8 @@ Use the following preferred translations when they apply in documentation prose:
 
 ### `///` admonitions
 
-1) Keep the admonition keyword in English (do not translate `note`, `tip`, etc.).
-2) If a title is present, prefer these canonical titles (choose one canonical form where variants exist):
+- Keep the admonition keyword in English (do not translate `note`, `tip`, etc.).
+- If a title is present, prefer these canonical titles (choose one canonical form where variants exist):
 
 - `/// note | Примітка`
 - `/// note | Технічні деталі`

docs/zh-hant/llm-prompt.md

@@ -0,0 +1,60 @@
+### Target language
+
+Translate to Traditional Chinese (繁體中文).
+
+Language code: zh-hant.
+
+### Grammar and tone
+
+- Use clear, concise technical Traditional Chinese consistent with existing docs.
+- Address the reader naturally (commonly using “你/你的”).
+
+### Headings
+
+- Follow existing Traditional Chinese heading style (short and descriptive).
+- Do not add trailing punctuation to headings.
+
+### Quotes and punctuation
+
+- Keep punctuation style consistent with existing Traditional Chinese docs (they often mix English terms like “FastAPI” with Chinese text).
+- Never change punctuation inside inline code, code blocks, URLs, or file paths.
+- For more details, please follow the [Chinese Copywriting Guidelines](https://github.com/sparanoid/chinese-copywriting-guidelines).
+
+### Ellipsis
+
+- Keep ellipsis style consistent within each document, prefer `...` over `……`.
+- Never change ellipsis in code, URLs, or CLI examples.
+
+### Preferred translations / glossary
+
+- Should avoid using simplified Chinese characters and terms. Always examine if the translation can be easily comprehended by the Traditional Chinese readers.
+- For some Python-specific terms like "pickle", "list", "dict" etc, we don't have to translate them.
+- Use the following preferred translations when they apply in documentation prose:
+
+- request (HTTP): 請求
+- response (HTTP): 回應
+- path operation: 路徑操作
+- path operation function: 路徑操作函式
+
+The translation can optionally include the original English text only in the first occurrence of each page (e.g. "路徑操作 (path operation)") if the translation is hard to be comprehended by most of the Chinese readers.
+
+### `///` admonitions
+
+1) Keep the admonition keyword in English (do not translate `note`, `tip`, etc.).
+2) Many Traditional Chinese docs currently omit titles in `///` blocks; that is OK.
+3) If a generic title is present, prefer these canonical titles:
+
+- `/// note | 注意`
+
+Notes:
+
+- `details` blocks exist; keep `/// details` as-is and translate only the title after `|`.
+- Example canonical titles used in existing docs:
+
+```
+/// details | 上述指令的含義
+```
+
+```
+/// details | 關於 `requirements.txt`
+```

docs/zh/llm-prompt.md

@@ -0,0 +1,46 @@
+### Target language
+
+Translate to Simplified Chinese (简体中文).
+
+Language code: zh.
+
+### Grammar and tone
+
+- Use clear, concise technical Chinese consistent with existing docs.
+- Address the reader naturally (commonly using “你/你的”).
+
+### Headings
+
+- Follow existing Simplified Chinese heading style (short and descriptive).
+- Do not add trailing punctuation to headings.
+- If a heading contains only the name of a FastAPI feature, do not translate it.
+
+### Quotes and punctuation
+
+- Keep punctuation style consistent with existing Simplified Chinese docs (they often mix English terms like “FastAPI” with Chinese text).
+- Never change punctuation inside inline code, code blocks, URLs, or file paths.
+
+### Ellipsis
+
+- Keep ellipsis style consistent within each document, prefer `...` over  `……`.
+- Never change ellipsis in code, URLs, or CLI examples.
+
+### Preferred translations / glossary
+
+Use the following preferred translations when they apply in documentation prose:
+
+- request (HTTP): 请求
+- response (HTTP): 响应
+- path operation: 路径操作
+- path operation function: 路径操作函数
+
+### `///` admonitions
+
+- Keep the admonition keyword in English (do not translate `note`, `tip`, etc.).
+- If a title is present, prefer these canonical titles:
+
+- `/// tip | 提示`
+- `/// note | 注意`
+- `/// warning | 警告`
+- `/// info | 信息`
+- `/// danger | 危险`

docs_src/request_form_models/tutorial002_pv1_an_py39.py

@@ -1,20 +0,0 @@
-from typing import Annotated
-
-from fastapi import FastAPI
-from fastapi.temp_pydantic_v1_params import Form
-from pydantic.v1 import BaseModel
-
-app = FastAPI()
-
-
-class FormData(BaseModel):
-    username: str
-    password: str
-
-    class Config:
-        extra = "forbid"
-
-
-@app.post("/login/")
-async def login(data: Annotated[FormData, Form()]):
-    return data

docs_src/request_form_models/tutorial002_pv1_py39.py

@@ -1,18 +0,0 @@
-from fastapi import FastAPI
-from fastapi.temp_pydantic_v1_params import Form
-from pydantic.v1 import BaseModel
-
-app = FastAPI()
-
-
-class FormData(BaseModel):
-    username: str
-    password: str
-
-    class Config:
-        extra = "forbid"
-
-
-@app.post("/login/")
-async def login(data: FormData = Form()):
-    return data

fastapi/__init__.py

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

fastapi/_compat/__init__.py

@@ -1,43 +1,9 @@
-from .main import BaseConfig as BaseConfig
-from .main import PydanticSchemaGenerationError as PydanticSchemaGenerationError
-from .main import RequiredParam as RequiredParam
-from .main import Undefined as Undefined
-from .main import UndefinedType as UndefinedType
-from .main import Url as Url
-from .main import Validator as Validator
-from .main import _get_model_config as _get_model_config
-from .main import _is_error_wrapper as _is_error_wrapper
-from .main import _is_model_class as _is_model_class
-from .main import _is_model_field as _is_model_field
-from .main import _is_undefined as _is_undefined
-from .main import _model_dump as _model_dump
-from .main import copy_field_info as copy_field_info
-from .main import create_body_model as create_body_model
-from .main import evaluate_forwardref as evaluate_forwardref
-from .main import get_annotation_from_field_info as get_annotation_from_field_info
-from .main import get_cached_model_fields as get_cached_model_fields
-from .main import get_compat_model_name_map as get_compat_model_name_map
-from .main import get_definitions as get_definitions
-from .main import get_missing_field_error as get_missing_field_error
-from .main import get_schema_from_model_field as get_schema_from_model_field
-from .main import is_bytes_field as is_bytes_field
-from .main import is_bytes_sequence_field as is_bytes_sequence_field
-from .main import is_scalar_field as is_scalar_field
-from .main import is_scalar_sequence_field as is_scalar_sequence_field
-from .main import is_sequence_field as is_sequence_field
-from .main import serialize_sequence_value as serialize_sequence_value
-from .main import (
-    with_info_plain_validator_function as with_info_plain_validator_function,
-)
-from .may_v1 import CoreSchema as CoreSchema
-from .may_v1 import GetJsonSchemaHandler as GetJsonSchemaHandler
-from .may_v1 import JsonSchemaValue as JsonSchemaValue
-from .may_v1 import _normalize_errors as _normalize_errors
-from .model_field import ModelField as ModelField
 from .shared import PYDANTIC_V2 as PYDANTIC_V2
 from .shared import PYDANTIC_VERSION_MINOR_TUPLE as PYDANTIC_VERSION_MINOR_TUPLE
 from .shared import annotation_is_pydantic_v1 as annotation_is_pydantic_v1
 from .shared import field_annotation_is_scalar as field_annotation_is_scalar
+from .shared import is_pydantic_v1_model_class as is_pydantic_v1_model_class
+from .shared import is_pydantic_v1_model_instance as is_pydantic_v1_model_instance
 from .shared import (
     is_uploadfile_or_nonable_uploadfile_annotation as is_uploadfile_or_nonable_uploadfile_annotation,
 )
@@ -47,3 +13,29 @@ from .shared import (
 from .shared import lenient_issubclass as lenient_issubclass
 from .shared import sequence_types as sequence_types
 from .shared import value_is_sequence as value_is_sequence
+from .v2 import BaseConfig as BaseConfig
+from .v2 import ModelField as ModelField
+from .v2 import PydanticSchemaGenerationError as PydanticSchemaGenerationError
+from .v2 import RequiredParam as RequiredParam
+from .v2 import Undefined as Undefined
+from .v2 import UndefinedType as UndefinedType
+from .v2 import Url as Url
+from .v2 import Validator as Validator
+from .v2 import _regenerate_error_with_loc as _regenerate_error_with_loc
+from .v2 import copy_field_info as copy_field_info
+from .v2 import create_body_model as create_body_model
+from .v2 import evaluate_forwardref as evaluate_forwardref
+from .v2 import get_cached_model_fields as get_cached_model_fields
+from .v2 import get_compat_model_name_map as get_compat_model_name_map
+from .v2 import get_definitions as get_definitions
+from .v2 import get_missing_field_error as get_missing_field_error
+from .v2 import get_schema_from_model_field as get_schema_from_model_field
+from .v2 import is_bytes_field as is_bytes_field
+from .v2 import is_bytes_sequence_field as is_bytes_sequence_field
+from .v2 import is_scalar_field as is_scalar_field
+from .v2 import is_scalar_sequence_field as is_scalar_sequence_field
+from .v2 import is_sequence_field as is_sequence_field
+from .v2 import serialize_sequence_value as serialize_sequence_value
+from .v2 import (
+    with_info_plain_validator_function as with_info_plain_validator_function,
+)

fastapi/_compat/main.py

@@ -1,264 +0,0 @@
-import sys
-from collections.abc import Sequence
-from functools import lru_cache
-from typing import (
-    Any,
-)
-
-from fastapi._compat import may_v1
-from fastapi._compat.shared import lenient_issubclass
-from fastapi.types import ModelNameMap
-from pydantic import BaseModel
-from typing_extensions import Literal
-
-from . import v2
-from .model_field import ModelField
-from .v2 import BaseConfig as BaseConfig
-from .v2 import FieldInfo as FieldInfo
-from .v2 import PydanticSchemaGenerationError as PydanticSchemaGenerationError
-from .v2 import RequiredParam as RequiredParam
-from .v2 import Undefined as Undefined
-from .v2 import UndefinedType as UndefinedType
-from .v2 import Url as Url
-from .v2 import Validator as Validator
-from .v2 import evaluate_forwardref as evaluate_forwardref
-from .v2 import get_missing_field_error as get_missing_field_error
-from .v2 import (
-    with_info_plain_validator_function as with_info_plain_validator_function,
-)
-
-
-@lru_cache
-def get_cached_model_fields(model: type[BaseModel]) -> list[ModelField]:
-    if lenient_issubclass(model, may_v1.BaseModel):
-        from fastapi._compat import v1
-
-        return v1.get_model_fields(model)  # type: ignore[arg-type,return-value]
-    else:
-        from . import v2
-
-        return v2.get_model_fields(model)  # type: ignore[return-value]
-
-
-def _is_undefined(value: object) -> bool:
-    if isinstance(value, may_v1.UndefinedType):
-        return True
-
-    return isinstance(value, v2.UndefinedType)
-
-
-def _get_model_config(model: BaseModel) -> Any:
-    if isinstance(model, may_v1.BaseModel):
-        from fastapi._compat import v1
-
-        return v1._get_model_config(model)
-
-    return v2._get_model_config(model)
-
-
-def _model_dump(
-    model: BaseModel, mode: Literal["json", "python"] = "json", **kwargs: Any
-) -> Any:
-    if isinstance(model, may_v1.BaseModel):
-        from fastapi._compat import v1
-
-        return v1._model_dump(model, mode=mode, **kwargs)
-
-    return v2._model_dump(model, mode=mode, **kwargs)
-
-
-def _is_error_wrapper(exc: Exception) -> bool:
-    if isinstance(exc, may_v1.ErrorWrapper):
-        return True
-
-    return isinstance(exc, v2.ErrorWrapper)
-
-
-def copy_field_info(*, field_info: FieldInfo, annotation: Any) -> FieldInfo:
-    if isinstance(field_info, may_v1.FieldInfo):
-        from fastapi._compat import v1
-
-        return v1.copy_field_info(field_info=field_info, annotation=annotation)
-
-    return v2.copy_field_info(field_info=field_info, annotation=annotation)
-
-
-def create_body_model(
-    *, fields: Sequence[ModelField], model_name: str
-) -> type[BaseModel]:
-    if fields and isinstance(fields[0], may_v1.ModelField):
-        from fastapi._compat import v1
-
-        return v1.create_body_model(fields=fields, model_name=model_name)
-
-    return v2.create_body_model(fields=fields, model_name=model_name)  # type: ignore[arg-type]
-
-
-def get_annotation_from_field_info(
-    annotation: Any, field_info: FieldInfo, field_name: str
-) -> Any:
-    if isinstance(field_info, may_v1.FieldInfo):
-        from fastapi._compat import v1
-
-        return v1.get_annotation_from_field_info(
-            annotation=annotation, field_info=field_info, field_name=field_name
-        )
-
-    return v2.get_annotation_from_field_info(
-        annotation=annotation, field_info=field_info, field_name=field_name
-    )
-
-
-def is_bytes_field(field: ModelField) -> bool:
-    if isinstance(field, may_v1.ModelField):
-        from fastapi._compat import v1
-
-        return v1.is_bytes_field(field)
-
-    return v2.is_bytes_field(field)  # type: ignore[arg-type]
-
-
-def is_bytes_sequence_field(field: ModelField) -> bool:
-    if isinstance(field, may_v1.ModelField):
-        from fastapi._compat import v1
-
-        return v1.is_bytes_sequence_field(field)
-
-    return v2.is_bytes_sequence_field(field)  # type: ignore[arg-type]
-
-
-def is_scalar_field(field: ModelField) -> bool:
-    if isinstance(field, may_v1.ModelField):
-        from fastapi._compat import v1
-
-        return v1.is_scalar_field(field)
-
-    return v2.is_scalar_field(field)  # type: ignore[arg-type]
-
-
-def is_scalar_sequence_field(field: ModelField) -> bool:
-    return v2.is_scalar_sequence_field(field)  # type: ignore[arg-type]
-
-
-def is_sequence_field(field: ModelField) -> bool:
-    if isinstance(field, may_v1.ModelField):
-        from fastapi._compat import v1
-
-        return v1.is_sequence_field(field)
-
-    return v2.is_sequence_field(field)  # type: ignore[arg-type]
-
-
-def serialize_sequence_value(*, field: ModelField, value: Any) -> Sequence[Any]:
-    if isinstance(field, may_v1.ModelField):
-        from fastapi._compat import v1
-
-        return v1.serialize_sequence_value(field=field, value=value)
-
-    return v2.serialize_sequence_value(field=field, value=value)  # type: ignore[arg-type]
-
-
-def get_compat_model_name_map(fields: list[ModelField]) -> ModelNameMap:
-    v1_model_fields = [
-        field for field in fields if isinstance(field, may_v1.ModelField)
-    ]
-    if v1_model_fields:
-        from fastapi._compat import v1
-
-        v1_flat_models = v1.get_flat_models_from_fields(
-            v1_model_fields,  # type: ignore[arg-type]
-            known_models=set(),
-        )
-        all_flat_models = v1_flat_models
-    else:
-        all_flat_models = set()
-
-    v2_model_fields = [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]
-
-    model_name_map = v2.get_model_name_map(all_flat_models)  # type: ignore[arg-type]
-    return model_name_map
-
-
-def get_definitions(
-    *,
-    fields: list[ModelField],
-    model_name_map: ModelNameMap,
-    separate_input_output_schemas: bool = True,
-) -> tuple[
-    dict[
-        tuple[ModelField, Literal["validation", "serialization"]],
-        may_v1.JsonSchemaValue,
-    ],
-    dict[str, dict[str, Any]],
-]:
-    if sys.version_info < (3, 14):
-        v1_fields = [field for field in fields if isinstance(field, may_v1.ModelField)]
-        v1_field_maps, v1_definitions = may_v1.get_definitions(
-            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,
-            separate_input_output_schemas=separate_input_output_schemas,
-        )
-        all_definitions = {**v1_definitions, **v2_definitions}
-        all_field_maps = {**v1_field_maps, **v2_field_maps}  # type: ignore[misc]
-        return all_field_maps, all_definitions
-
-    # Pydantic v1 is not supported since Python 3.14
-    else:
-        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,
-        )
-        return v2_field_maps, v2_definitions
-
-
-def get_schema_from_model_field(
-    *,
-    field: ModelField,
-    model_name_map: ModelNameMap,
-    field_mapping: dict[
-        tuple[ModelField, Literal["validation", "serialization"]],
-        may_v1.JsonSchemaValue,
-    ],
-    separate_input_output_schemas: bool = True,
-) -> dict[str, Any]:
-    if isinstance(field, may_v1.ModelField):
-        from fastapi._compat import v1
-
-        return v1.get_schema_from_model_field(
-            field=field,
-            model_name_map=model_name_map,
-            field_mapping=field_mapping,
-            separate_input_output_schemas=separate_input_output_schemas,
-        )
-
-    return v2.get_schema_from_model_field(
-        field=field,  # type: ignore[arg-type]
-        model_name_map=model_name_map,
-        field_mapping=field_mapping,  # type: ignore[arg-type]
-        separate_input_output_schemas=separate_input_output_schemas,
-    )
-
-
-def _is_model_field(value: Any) -> bool:
-    if isinstance(value, may_v1.ModelField):
-        return True
-
-    return isinstance(value, v2.ModelField)
-
-
-def _is_model_class(value: Any) -> bool:
-    if lenient_issubclass(value, may_v1.BaseModel):
-        return True
-
-    return lenient_issubclass(value, v2.BaseModel)  # type: ignore[attr-defined]

fastapi/_compat/may_v1.py

@@ -1,124 +0,0 @@
-import sys
-from collections.abc import Sequence
-from typing import Any, Literal, Union
-
-from fastapi.types import ModelNameMap
-
-if sys.version_info >= (3, 14):
-
-    class AnyUrl:
-        pass
-
-    class BaseConfig:
-        pass
-
-    class BaseModel:
-        pass
-
-    class Color:
-        pass
-
-    class CoreSchema:
-        pass
-
-    class ErrorWrapper:
-        pass
-
-    class FieldInfo:
-        pass
-
-    class GetJsonSchemaHandler:
-        pass
-
-    class JsonSchemaValue:
-        pass
-
-    class ModelField:
-        pass
-
-    class NameEmail:
-        pass
-
-    class RequiredParam:
-        pass
-
-    class SecretBytes:
-        pass
-
-    class SecretStr:
-        pass
-
-    class Undefined:
-        pass
-
-    class UndefinedType:
-        pass
-
-    class Url:
-        pass
-
-    from .v2 import ValidationError, create_model
-
-    def get_definitions(
-        *,
-        fields: list[ModelField],
-        model_name_map: ModelNameMap,
-        separate_input_output_schemas: bool = True,
-    ) -> tuple[
-        dict[
-            tuple[ModelField, Literal["validation", "serialization"]], JsonSchemaValue
-        ],
-        dict[str, dict[str, Any]],
-    ]:
-        return {}, {}  # pragma: no cover
-
-
-else:
-    from .v1 import AnyUrl as AnyUrl
-    from .v1 import BaseConfig as BaseConfig
-    from .v1 import BaseModel as BaseModel
-    from .v1 import Color as Color
-    from .v1 import CoreSchema as CoreSchema
-    from .v1 import ErrorWrapper as ErrorWrapper
-    from .v1 import FieldInfo as FieldInfo
-    from .v1 import GetJsonSchemaHandler as GetJsonSchemaHandler
-    from .v1 import JsonSchemaValue as JsonSchemaValue
-    from .v1 import ModelField as ModelField
-    from .v1 import NameEmail as NameEmail
-    from .v1 import RequiredParam as RequiredParam
-    from .v1 import SecretBytes as SecretBytes
-    from .v1 import SecretStr as SecretStr
-    from .v1 import Undefined as Undefined
-    from .v1 import UndefinedType as UndefinedType
-    from .v1 import Url as Url
-    from .v1 import ValidationError, create_model
-    from .v1 import get_definitions as get_definitions
-
-
-RequestErrorModel: type[BaseModel] = create_model("Request")
-
-
-def _normalize_errors(errors: Sequence[Any]) -> list[dict[str, Any]]:
-    use_errors: list[Any] = []
-    for error in errors:
-        if isinstance(error, ErrorWrapper):
-            new_errors = ValidationError(
-                errors=[error], model=RequestErrorModel
-            ).errors()
-            use_errors.extend(new_errors)
-        elif isinstance(error, list):
-            use_errors.extend(_normalize_errors(error))
-        else:
-            use_errors.append(error)
-    return use_errors
-
-
-def _regenerate_error_with_loc(
-    *, errors: Sequence[Any], loc_prefix: tuple[Union[str, int], ...]
-) -> list[dict[str, Any]]:
-    updated_loc_errors: list[Any] = [
-        {**err, "loc": loc_prefix + err.get("loc", ())}
-        for err in _normalize_errors(errors)
-    ]
-
-    return updated_loc_errors

fastapi/_compat/model_field.py

@@ -1,50 +0,0 @@
-from typing import (
-    Any,
-    Union,
-)
-
-from fastapi.types import IncEx
-from pydantic.fields import FieldInfo
-from typing_extensions import Literal, Protocol
-
-
-class ModelField(Protocol):
-    field_info: "FieldInfo"
-    name: str
-    mode: Literal["validation", "serialization"] = "validation"
-    _version: Literal["v1", "v2"] = "v1"
-
-    @property
-    def alias(self) -> str: ...
-
-    @property
-    def required(self) -> bool: ...
-
-    @property
-    def default(self) -> Any: ...
-
-    @property
-    def type_(self) -> Any: ...
-
-    def get_default(self) -> Any: ...
-
-    def validate(
-        self,
-        value: Any,
-        values: dict[str, Any] = {},  # noqa: B006
-        *,
-        loc: tuple[Union[int, str], ...] = (),
-    ) -> tuple[Any, Union[list[dict[str, Any]], None]]: ...
-
-    def serialize(
-        self,
-        value: Any,
-        *,
-        mode: Literal["json", "python"] = "json",
-        include: Union[IncEx, None] = None,
-        exclude: Union[IncEx, None] = None,
-        by_alias: bool = True,
-        exclude_unset: bool = False,
-        exclude_defaults: bool = False,
-        exclude_none: bool = False,
-    ) -> Any: ...

fastapi/_compat/shared.py

@@ -1,6 +1,7 @@
 import sys
 import types
 import typing
+import warnings
 from collections import deque
 from collections.abc import Mapping, Sequence
 from dataclasses import is_dataclass
@@ -10,7 +11,6 @@ from typing import (
     Union,
 )
 
-from fastapi._compat import may_v1
 from fastapi.types import UnionType
 from pydantic import BaseModel
 from pydantic.version import VERSION as PYDANTIC_VERSION
@@ -81,9 +81,7 @@ def value_is_sequence(value: Any) -> bool:
 
 def _annotation_is_complex(annotation: Union[type[Any], None]) -> bool:
     return (
-        lenient_issubclass(
-            annotation, (BaseModel, may_v1.BaseModel, Mapping, UploadFile)
-        )
+        lenient_issubclass(annotation, (BaseModel, Mapping, UploadFile))
         or _annotation_is_sequence(annotation)
         or is_dataclass(annotation)
     )
@@ -179,13 +177,27 @@ def is_uploadfile_sequence_annotation(annotation: Any) -> bool:
     )
 
 
+def is_pydantic_v1_model_instance(obj: Any) -> bool:
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore", UserWarning)
+        from pydantic import v1
+    return isinstance(obj, v1.BaseModel)
+
+
+def is_pydantic_v1_model_class(cls: Any) -> bool:
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore", UserWarning)
+        from pydantic import v1
+    return lenient_issubclass(cls, v1.BaseModel)
+
+
 def annotation_is_pydantic_v1(annotation: Any) -> bool:
-    if lenient_issubclass(annotation, may_v1.BaseModel):
+    if is_pydantic_v1_model_class(annotation):
         return True
     origin = get_origin(annotation)
     if origin is Union or origin is UnionType:
         for arg in get_args(annotation):
-            if lenient_issubclass(arg, may_v1.BaseModel):
+            if is_pydantic_v1_model_class(arg):
                 return True
     if field_annotation_is_sequence(annotation):
         for sub_annotation in get_args(annotation):

fastapi/_compat/v1.py

@@ -1,222 +0,0 @@
-from collections.abc import Sequence
-from copy import copy
-from dataclasses import dataclass, is_dataclass
-from enum import Enum
-from typing import (
-    Any,
-    Callable,
-    Union,
-)
-
-from fastapi._compat import shared
-from fastapi.openapi.constants import REF_PREFIX as REF_PREFIX
-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 typing_extensions import Literal
-
-PYDANTIC_VERSION_MINOR_TUPLE = tuple(int(x) for x in PYDANTIC_VERSION.split(".")[:2])
-PYDANTIC_V2 = PYDANTIC_VERSION_MINOR_TUPLE[0] == 2
-# Keeping old "Required" functionality from Pydantic V1, without
-# shadowing typing.Required.
-RequiredParam: Any = Ellipsis
-
-
-GetJsonSchemaHandler = Any
-JsonSchemaValue = dict[str, Any]
-CoreSchema = Any
-Url = AnyUrl
-
-sequence_shapes = {
-    SHAPE_LIST,
-    SHAPE_SET,
-    SHAPE_FROZENSET,
-    SHAPE_TUPLE,
-    SHAPE_SEQUENCE,
-    SHAPE_TUPLE_ELLIPSIS,
-}
-sequence_shape_to_type = {
-    SHAPE_LIST: list,
-    SHAPE_SET: set,
-    SHAPE_TUPLE: tuple,
-    SHAPE_SEQUENCE: list,
-    SHAPE_TUPLE_ELLIPSIS: list,
-}
-
-
-@dataclass
-class GenerateJsonSchema:
-    ref_template: str
-
-
-class PydanticSchemaGenerationError(Exception):
-    pass
-
-
-RequestErrorModel: type[BaseModel] = create_model("Request")
-
-
-def with_info_plain_validator_function(
-    function: Callable[..., Any],
-    *,
-    ref: Union[str, None] = None,
-    metadata: Any = None,
-    serialization: Any = None,
-) -> Any:
-    return {}
-
-
-def get_model_definitions(
-    *,
-    flat_models: set[Union[type[BaseModel], type[Enum]]],
-    model_name_map: dict[Union[type[BaseModel], type[Enum]], str],
-) -> dict[str, Any]:
-    definitions: dict[str, dict[str, Any]] = {}
-    for model in flat_models:
-        m_schema, m_definitions, m_nested_models = model_process_schema(
-            model, model_name_map=model_name_map, ref_prefix=REF_PREFIX
-        )
-        definitions.update(m_definitions)
-        model_name = model_name_map[model]
-        definitions[model_name] = m_schema
-    for m_schema in definitions.values():
-        if "description" in m_schema:
-            m_schema["description"] = m_schema["description"].split("\f")[0]
-    return definitions
-
-
-def is_pv1_scalar_field(field: ModelField) -> bool:
-    from fastapi import params
-
-    field_info = field.field_info
-    if not (
-        field.shape == SHAPE_SINGLETON
-        and not lenient_issubclass(field.type_, BaseModel)
-        and not lenient_issubclass(field.type_, dict)
-        and not shared.field_annotation_is_sequence(field.type_)
-        and not is_dataclass(field.type_)
-        and not isinstance(field_info, params.Body)
-    ):
-        return False
-    if field.sub_fields:
-        if not all(is_pv1_scalar_field(f) for f in field.sub_fields):
-            return False
-    return True
-
-
-def _model_dump(
-    model: BaseModel, mode: Literal["json", "python"] = "json", **kwargs: Any
-) -> Any:
-    return model.dict(**kwargs)
-
-
-def _get_model_config(model: BaseModel) -> Any:
-    return model.__config__
-
-
-def get_schema_from_model_field(
-    *,
-    field: ModelField,
-    model_name_map: ModelNameMap,
-    field_mapping: dict[
-        tuple[ModelField, Literal["validation", "serialization"]], JsonSchemaValue
-    ],
-    separate_input_output_schemas: bool = True,
-) -> dict[str, Any]:
-    return field_schema(
-        field,
-        model_name_map=model_name_map,  # type: ignore[arg-type]
-        ref_prefix=REF_PREFIX,
-    )[0]
-
-
-# def get_compat_model_name_map(fields: List[ModelField]) -> ModelNameMap:
-#     models = get_flat_models_from_fields(fields, known_models=set())
-#     return get_model_name_map(models)  # type: ignore[no-any-return]
-
-
-def get_definitions(
-    *,
-    fields: list[ModelField],
-    model_name_map: ModelNameMap,
-    separate_input_output_schemas: bool = True,
-) -> tuple[
-    dict[tuple[ModelField, Literal["validation", "serialization"]], JsonSchemaValue],
-    dict[str, dict[str, Any]],
-]:
-    models = get_flat_models_from_fields(fields, known_models=set())
-    return {}, get_model_definitions(flat_models=models, model_name_map=model_name_map)  # type: ignore[arg-type]
-
-
-def is_scalar_field(field: ModelField) -> bool:
-    return is_pv1_scalar_field(field)
-
-
-def is_sequence_field(field: ModelField) -> bool:
-    return field.shape in sequence_shapes or shared._annotation_is_sequence(field.type_)
-
-
-def is_bytes_field(field: ModelField) -> bool:
-    return lenient_issubclass(field.type_, bytes)
-
-
-def is_bytes_sequence_field(field: ModelField) -> bool:
-    return field.shape in sequence_shapes and lenient_issubclass(field.type_, bytes)
-
-
-def copy_field_info(*, field_info: FieldInfo, annotation: Any) -> FieldInfo:
-    return copy(field_info)
-
-
-def serialize_sequence_value(*, field: ModelField, value: Any) -> Sequence[Any]:
-    return sequence_shape_to_type[field.shape](value)  # type: ignore[no-any-return]
-
-
-def create_body_model(
-    *, fields: Sequence[ModelField], model_name: str
-) -> type[BaseModel]:
-    BodyModel = create_model(model_name)
-    for f in fields:
-        BodyModel.__fields__[f.name] = f
-    return BodyModel
-
-
-def get_model_fields(model: type[BaseModel]) -> list[ModelField]:
-    return list(model.__fields__.values())

fastapi/_compat/v2.py

@@ -4,6 +4,7 @@ from collections.abc import Sequence
 from copy import copy, deepcopy
 from dataclasses import dataclass, is_dataclass
 from enum import Enum
+from functools import lru_cache
 from typing import (
     Annotated,
     Any,
@@ -11,7 +12,7 @@ from typing import (
     cast,
 )
 
-from fastapi._compat import may_v1, shared
+from fastapi._compat import shared
 from fastapi.openapi.constants import REF_TEMPLATE
 from fastapi.types import IncEx, ModelNameMap, UnionType
 from pydantic import BaseModel, ConfigDict, Field, TypeAdapter, create_model
@@ -175,7 +176,7 @@ class ModelField:
                 None,
             )
         except ValidationError as exc:
-            return None, may_v1._regenerate_error_with_loc(
+            return None, _regenerate_error_with_loc(
                 errors=exc.errors(include_url=False), loc_prefix=loc
             )
 
@@ -210,22 +211,6 @@ class ModelField:
         return id(self)
 
 
-def get_annotation_from_field_info(
-    annotation: Any, field_info: FieldInfo, field_name: str
-) -> Any:
-    return annotation
-
-
-def _model_dump(
-    model: BaseModel, mode: Literal["json", "python"] = "json", **kwargs: Any
-) -> Any:
-    return model.model_dump(mode=mode, **kwargs)
-
-
-def _get_model_config(model: BaseModel) -> Any:
-    return model.model_config
-
-
 def _has_computed_fields(field: ModelField) -> bool:
     computed_fields = field._type_adapter.core_schema.get("schema", {}).get(
         "computed_fields", []
@@ -490,6 +475,11 @@ def get_model_fields(model: type[BaseModel]) -> list[ModelField]:
     return model_fields
 
 
+@lru_cache
+def get_cached_model_fields(model: type[BaseModel]) -> list[ModelField]:
+    return get_model_fields(model)  # type: ignore[return-value]
+
+
 # Duplicate of several schema functions from Pydantic v1 to make them compatible with
 # Pydantic v2 and allow mixing the models
 
@@ -503,22 +493,23 @@ def normalize_name(name: str) -> str:
 
 def get_model_name_map(unique_models: TypeModelSet) -> dict[TypeModelOrEnum, str]:
     name_model_map = {}
-    conflicting_names: set[str] = set()
     for model in unique_models:
         model_name = normalize_name(model.__name__)
-        if model_name in conflicting_names:
-            model_name = get_long_model_name(model)
-            name_model_map[model_name] = model
-        elif model_name in name_model_map:
-            conflicting_names.add(model_name)
-            conflicting_model = name_model_map.pop(model_name)
-            name_model_map[get_long_model_name(conflicting_model)] = conflicting_model
-            name_model_map[get_long_model_name(model)] = model
-        else:
-            name_model_map[model_name] = model
+        name_model_map[model_name] = model
     return {v: k for k, v in name_model_map.items()}
 
 
+def get_compat_model_name_map(fields: list[ModelField]) -> ModelNameMap:
+    all_flat_models = set()
+
+    v2_model_fields = [field for field in fields if isinstance(field, ModelField)]
+    v2_flat_models = 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]
+
+    model_name_map = get_model_name_map(all_flat_models)  # type: ignore[arg-type]
+    return model_name_map
+
+
 def get_flat_models_from_model(
     model: type["BaseModel"], known_models: Union[TypeModelSet, None] = None
 ) -> TypeModelSet:
@@ -567,5 +558,11 @@ def get_flat_models_from_fields(
     return known_models
 
 
-def get_long_model_name(model: TypeModelOrEnum) -> str:
-    return f"{model.__module__}__{model.__qualname__}".replace(".", "__")
+def _regenerate_error_with_loc(
+    *, errors: Sequence[Any], loc_prefix: tuple[Union[str, int], ...]
+) -> list[dict[str, Any]]:
+    updated_loc_errors: list[Any] = [
+        {**err, "loc": loc_prefix + err.get("loc", ())} for err in errors
+    ]
+
+    return updated_loc_errors

fastapi/datastructures.py

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import (
     Annotated,
     Any,
@@ -9,11 +10,7 @@ from typing import (
 )
 
 from annotated_doc import Doc
-from fastapi._compat import (
-    CoreSchema,
-    GetJsonSchemaHandler,
-    JsonSchemaValue,
-)
+from pydantic import GetJsonSchemaHandler
 from starlette.datastructures import URL as URL  # noqa: F401
 from starlette.datastructures import Address as Address  # noqa: F401
 from starlette.datastructures import FormData as FormData  # noqa: F401
@@ -142,14 +139,14 @@ class UploadFile(StarletteUploadFile):
 
     @classmethod
     def __get_pydantic_json_schema__(
-        cls, core_schema: CoreSchema, handler: GetJsonSchemaHandler
-    ) -> JsonSchemaValue:
+        cls, core_schema: Mapping[str, Any], handler: GetJsonSchemaHandler
+    ) -> dict[str, Any]:
         return {"type": "string", "format": "binary"}
 
     @classmethod
     def __get_pydantic_core_schema__(
-        cls, source: type[Any], handler: Callable[[Any], CoreSchema]
-    ) -> CoreSchema:
+        cls, source: type[Any], handler: Callable[[Any], Mapping[str, Any]]
+    ) -> Mapping[str, Any]:
         from ._compat.v2 import with_info_plain_validator_function
 
         return with_info_plain_validator_function(cls._validate)

fastapi/dependencies/utils.py

@@ -1,7 +1,6 @@
 import dataclasses
 import inspect
 import sys
-import warnings
 from collections.abc import Coroutine, Mapping, Sequence
 from contextlib import AsyncExitStack, contextmanager
 from copy import copy, deepcopy
@@ -22,13 +21,11 @@ from fastapi._compat import (
     ModelField,
     RequiredParam,
     Undefined,
-    _is_error_wrapper,
-    _is_model_class,
+    _regenerate_error_with_loc,
     copy_field_info,
     create_body_model,
     evaluate_forwardref,
     field_annotation_is_scalar,
-    get_annotation_from_field_info,
     get_cached_model_fields,
     get_missing_field_error,
     is_bytes_field,
@@ -39,19 +36,17 @@ from fastapi._compat import (
     is_uploadfile_or_nonable_uploadfile_annotation,
     is_uploadfile_sequence_annotation,
     lenient_issubclass,
-    may_v1,
     sequence_types,
     serialize_sequence_value,
     value_is_sequence,
 )
-from fastapi._compat.shared import annotation_is_pydantic_v1
 from fastapi.background import BackgroundTasks
 from fastapi.concurrency import (
     asynccontextmanager,
     contextmanager_in_threadpool,
 )
 from fastapi.dependencies.models import Dependant
-from fastapi.exceptions import DependencyScopeError, FastAPIDeprecationWarning
+from fastapi.exceptions import DependencyScopeError
 from fastapi.logger import logger
 from fastapi.security.oauth2 import SecurityScopes
 from fastapi.types import DependencyCacheKey
@@ -72,8 +67,6 @@ from starlette.responses import Response
 from starlette.websockets import WebSocket
 from typing_extensions import Literal, get_args, get_origin
 
-from .. import temp_pydantic_v1_params
-
 multipart_not_installed_error = (
     'Form data requires "python-multipart" to be installed. \n'
     'You can install "python-multipart" with: \n\n'
@@ -189,7 +182,7 @@ def _get_flat_fields_from_params(fields: list[ModelField]) -> list[ModelField]:
     if not fields:
         return fields
     first_field = fields[0]
-    if len(fields) == 1 and _is_model_class(first_field.type_):
+    if len(fields) == 1 and lenient_issubclass(first_field.type_, BaseModel):
         fields_to_extract = get_cached_model_fields(first_field.type_)
         return fields_to_extract
     return fields
@@ -323,16 +316,7 @@ def get_dependant(
             )
             continue
         assert param_details.field is not None
-        if isinstance(param_details.field, may_v1.ModelField):
-            warnings.warn(
-                "pydantic.v1 is deprecated and will soon stop being supported by FastAPI."
-                f" Please update the param {param_name}: {param_details.type_annotation!r}.",
-                category=FastAPIDeprecationWarning,
-                stacklevel=5,
-            )
-        if isinstance(
-            param_details.field.field_info, (params.Body, temp_pydantic_v1_params.Body)
-        ):
+        if isinstance(param_details.field.field_info, params.Body):
             dependant.body_params.append(param_details.field)
         else:
             add_param_to_fields(field=param_details.field, dependant=dependant)
@@ -391,7 +375,7 @@ def analyze_param(
         fastapi_annotations = [
             arg
             for arg in annotated_args[1:]
-            if isinstance(arg, (FieldInfo, may_v1.FieldInfo, params.Depends))
+            if isinstance(arg, (FieldInfo, params.Depends))
         ]
         fastapi_specific_annotations = [
             arg
@@ -400,30 +384,27 @@ def analyze_param(
                 arg,
                 (
                     params.Param,
-                    temp_pydantic_v1_params.Param,
                     params.Body,
-                    temp_pydantic_v1_params.Body,
                     params.Depends,
                 ),
             )
         ]
         if fastapi_specific_annotations:
-            fastapi_annotation: Union[
-                FieldInfo, may_v1.FieldInfo, params.Depends, None
-            ] = fastapi_specific_annotations[-1]
+            fastapi_annotation: Union[FieldInfo, params.Depends, None] = (
+                fastapi_specific_annotations[-1]
+            )
         else:
             fastapi_annotation = None
         # Set default for Annotated FieldInfo
-        if isinstance(fastapi_annotation, (FieldInfo, may_v1.FieldInfo)):
+        if isinstance(fastapi_annotation, FieldInfo):
             # Copy `field_info` because we mutate `field_info.default` below.
             field_info = copy_field_info(
                 field_info=fastapi_annotation,  # type: ignore[arg-type]
                 annotation=use_annotation,
             )
-            assert field_info.default in {
-                Undefined,
-                may_v1.Undefined,
-            } or field_info.default in {RequiredParam, may_v1.RequiredParam}, (
+            assert (
+                field_info.default == Undefined or field_info.default == RequiredParam
+            ), (
                 f"`{field_info.__class__.__name__}` default value cannot be set in"
                 f" `Annotated` for {param_name!r}. Set the default value with `=` instead."
             )
@@ -447,7 +428,7 @@ def analyze_param(
         )
         depends = value
     # Get FieldInfo from default value
-    elif isinstance(value, (FieldInfo, may_v1.FieldInfo)):
+    elif isinstance(value, FieldInfo):
         assert field_info is None, (
             "Cannot specify FastAPI annotations in `Annotated` and default value"
             f" together for {param_name!r}"
@@ -491,14 +472,7 @@ def analyze_param(
         ) or is_uploadfile_sequence_annotation(type_annotation):
             field_info = params.File(annotation=use_annotation, default=default_value)
         elif not field_annotation_is_scalar(annotation=type_annotation):
-            if annotation_is_pydantic_v1(use_annotation):
-                field_info = temp_pydantic_v1_params.Body(  # type: ignore[assignment]
-                    annotation=use_annotation, default=default_value
-                )
-            else:
-                field_info = params.Body(
-                    annotation=use_annotation, default=default_value
-                )
+            field_info = params.Body(annotation=use_annotation, default=default_value)
         else:
             field_info = params.Query(annotation=use_annotation, default=default_value)
 
@@ -507,23 +481,17 @@ def analyze_param(
     if field_info is not None:
         # Handle field_info.in_
         if is_path_param:
-            assert isinstance(
-                field_info, (params.Path, temp_pydantic_v1_params.Path)
-            ), (
+            assert isinstance(field_info, params.Path), (
                 f"Cannot use `{field_info.__class__.__name__}` for path param"
                 f" {param_name!r}"
             )
         elif (
-            isinstance(field_info, (params.Param, temp_pydantic_v1_params.Param))
+            isinstance(field_info, params.Param)
             and getattr(field_info, "in_", None) is None
         ):
             field_info.in_ = params.ParamTypes.query
-        use_annotation_from_field_info = get_annotation_from_field_info(
-            use_annotation,
-            field_info,
-            param_name,
-        )
-        if isinstance(field_info, (params.Form, temp_pydantic_v1_params.Form)):
+        use_annotation_from_field_info = use_annotation
+        if isinstance(field_info, params.Form):
             ensure_multipart_is_installed()
         if not field_info.alias and getattr(field_info, "convert_underscores", None):
             alias = param_name.replace("_", "-")
@@ -535,20 +503,19 @@ def analyze_param(
             type_=use_annotation_from_field_info,
             default=field_info.default,
             alias=alias,
-            required=field_info.default
-            in (RequiredParam, may_v1.RequiredParam, Undefined),
+            required=field_info.default in (RequiredParam, Undefined),
             field_info=field_info,
         )
         if is_path_param:
             assert is_scalar_field(field=field), (
                 "Path params must be of one of the supported types"
             )
-        elif isinstance(field_info, (params.Query, temp_pydantic_v1_params.Query)):
+        elif isinstance(field_info, params.Query):
             assert (
                 is_scalar_field(field)
                 or is_scalar_sequence_field(field)
                 or (
-                    _is_model_class(field.type_)
+                    lenient_issubclass(field.type_, BaseModel)
                     # For Pydantic v1
                     and getattr(field, "shape", 1) == 1
                 )
@@ -742,10 +709,8 @@ def _validate_value_with_model_field(
         else:
             return deepcopy(field.default), []
     v_, errors_ = field.validate(value, values, loc=loc)
-    if _is_error_wrapper(errors_):  # type: ignore[arg-type]
-        return None, [errors_]
-    elif isinstance(errors_, list):
-        new_errors = may_v1._regenerate_error_with_loc(errors=errors_, loc_prefix=())
+    if isinstance(errors_, list):
+        new_errors = _regenerate_error_with_loc(errors=errors_, loc_prefix=())
         return None, new_errors
     else:
         return v_, []
@@ -762,7 +727,7 @@ def _get_multidict_value(
     if (
         value is None
         or (
-            isinstance(field.field_info, (params.Form, temp_pydantic_v1_params.Form))
+            isinstance(field.field_info, params.Form)
             and isinstance(value, str)  # For type checks
             and value == ""
         )
@@ -832,7 +797,7 @@ def request_params_to_args(
 
     if single_not_embedded_field:
         field_info = first_field.field_info
-        assert isinstance(field_info, (params.Param, temp_pydantic_v1_params.Param)), (
+        assert isinstance(field_info, params.Param), (
             "Params must be subclasses of Param"
         )
         loc: tuple[str, ...] = (field_info.in_.value,)
@@ -844,7 +809,7 @@ def request_params_to_args(
     for field in fields:
         value = _get_multidict_value(field, received_params)
         field_info = field.field_info
-        assert isinstance(field_info, (params.Param, temp_pydantic_v1_params.Param)), (
+        assert isinstance(field_info, params.Param), (
             "Params must be subclasses of Param"
         )
         loc = (field_info.in_.value, get_validation_alias(field))
@@ -871,7 +836,7 @@ def is_union_of_base_models(field_type: Any) -> bool:
     union_args = get_args(field_type)
 
     for arg in union_args:
-        if not _is_model_class(arg):
+        if not lenient_issubclass(arg, BaseModel):
             return False
 
     return True
@@ -893,8 +858,8 @@ def _should_embed_body_fields(fields: list[ModelField]) -> bool:
     # If it's a Form (or File) field, it has to be a BaseModel (or a union of BaseModels) to be top level
     # otherwise it has to be embedded, so that the key value pair can be extracted
     if (
-        isinstance(first_field.field_info, (params.Form, temp_pydantic_v1_params.Form))
-        and not _is_model_class(first_field.type_)
+        isinstance(first_field.field_info, params.Form)
+        and not lenient_issubclass(first_field.type_, BaseModel)
         and not is_union_of_base_models(first_field.type_)
     ):
         return True
@@ -911,14 +876,14 @@ async def _extract_form_body(
         value = _get_multidict_value(field, received_body)
         field_info = field.field_info
         if (
-            isinstance(field_info, (params.File, temp_pydantic_v1_params.File))
+            isinstance(field_info, params.File)
             and is_bytes_field(field)
             and isinstance(value, UploadFile)
         ):
             value = await value.read()
         elif (
             is_bytes_sequence_field(field)
-            and isinstance(field_info, (params.File, temp_pydantic_v1_params.File))
+            and isinstance(field_info, params.File)
             and value_is_sequence(value)
         ):
             # For types
@@ -964,7 +929,7 @@ async def request_body_to_args(
 
     if (
         single_not_embedded_field
-        and _is_model_class(first_field.type_)
+        and lenient_issubclass(first_field.type_, BaseModel)
         and isinstance(received_body, FormData)
     ):
         fields_to_extract = get_cached_model_fields(first_field.type_)
@@ -1029,28 +994,15 @@ def get_body_field(
         BodyFieldInfo_kwargs["default"] = None
     if any(isinstance(f.field_info, params.File) for f in flat_dependant.body_params):
         BodyFieldInfo: type[params.Body] = params.File
-    elif any(
-        isinstance(f.field_info, temp_pydantic_v1_params.File)
-        for f in flat_dependant.body_params
-    ):
-        BodyFieldInfo: type[temp_pydantic_v1_params.Body] = temp_pydantic_v1_params.File  # type: ignore[no-redef]
     elif any(isinstance(f.field_info, params.Form) for f in flat_dependant.body_params):
         BodyFieldInfo = params.Form
-    elif any(
-        isinstance(f.field_info, temp_pydantic_v1_params.Form)
-        for f in flat_dependant.body_params
-    ):
-        BodyFieldInfo = temp_pydantic_v1_params.Form  # type: ignore[assignment]
     else:
-        if annotation_is_pydantic_v1(BodyModel):
-            BodyFieldInfo = temp_pydantic_v1_params.Body  # type: ignore[assignment]
-        else:
-            BodyFieldInfo = params.Body
+        BodyFieldInfo = params.Body
 
         body_param_media_types = [
             f.field_info.media_type
             for f in flat_dependant.body_params
-            if isinstance(f.field_info, (params.Body, temp_pydantic_v1_params.Body))
+            if isinstance(f.field_info, params.Body)
         ]
         if len(set(body_param_media_types)) == 1:
             BodyFieldInfo_kwargs["media_type"] = body_param_media_types[0]

fastapi/encoders.py

@@ -18,14 +18,18 @@ from typing import Annotated, Any, Callable, Optional, Union
 from uuid import UUID
 
 from annotated_doc import Doc
-from fastapi._compat import may_v1
+from fastapi.exceptions import PydanticV1NotSupportedError
 from fastapi.types import IncEx
 from pydantic import BaseModel
 from pydantic.color import Color
 from pydantic.networks import AnyUrl, NameEmail
 from pydantic.types import SecretBytes, SecretStr
+from pydantic_core import PydanticUndefinedType
 
-from ._compat import Url, _is_undefined, _model_dump
+from ._compat import (
+    Url,
+    is_pydantic_v1_model_instance,
+)
 
 
 # Taken from Pydantic v1 as is
@@ -63,7 +67,6 @@ def decimal_encoder(dec_value: Decimal) -> Union[int, float]:
 ENCODERS_BY_TYPE: dict[type[Any], Callable[[Any], Any]] = {
     bytes: lambda o: o.decode(),
     Color: str,
-    may_v1.Color: str,
     datetime.date: isoformat,
     datetime.datetime: isoformat,
     datetime.time: isoformat,
@@ -80,19 +83,14 @@ ENCODERS_BY_TYPE: dict[type[Any], Callable[[Any], Any]] = {
     IPv6Interface: str,
     IPv6Network: str,
     NameEmail: str,
-    may_v1.NameEmail: str,
     Path: str,
     Pattern: lambda o: o.pattern,
     SecretBytes: str,
-    may_v1.SecretBytes: str,
     SecretStr: str,
-    may_v1.SecretStr: str,
     set: list,
     UUID: str,
     Url: str,
-    may_v1.Url: str,
     AnyUrl: str,
-    may_v1.AnyUrl: str,
 }
 
 
@@ -224,15 +222,8 @@ def jsonable_encoder(
         include = set(include)
     if exclude is not None and not isinstance(exclude, (set, dict)):
         exclude = set(exclude)
-    if isinstance(obj, (BaseModel, may_v1.BaseModel)):
-        # TODO: remove when deprecating Pydantic v1
-        encoders: dict[Any, Any] = {}
-        if isinstance(obj, may_v1.BaseModel):
-            encoders = getattr(obj.__config__, "json_encoders", {})
-            if custom_encoder:
-                encoders = {**encoders, **custom_encoder}
-        obj_dict = _model_dump(
-            obj,  # type: ignore[arg-type]
+    if isinstance(obj, BaseModel):
+        obj_dict = obj.model_dump(
             mode="json",
             include=include,
             exclude=exclude,
@@ -241,14 +232,10 @@ def jsonable_encoder(
             exclude_none=exclude_none,
             exclude_defaults=exclude_defaults,
         )
-        if "__root__" in obj_dict:
-            obj_dict = obj_dict["__root__"]
         return jsonable_encoder(
             obj_dict,
             exclude_none=exclude_none,
             exclude_defaults=exclude_defaults,
-            # TODO: remove when deprecating Pydantic v1
-            custom_encoder=encoders,
             sqlalchemy_safe=sqlalchemy_safe,
         )
     if dataclasses.is_dataclass(obj):
@@ -271,7 +258,7 @@ def jsonable_encoder(
         return str(obj)
     if isinstance(obj, (str, int, float, type(None))):
         return obj
-    if _is_undefined(obj):
+    if isinstance(obj, PydanticUndefinedType):
         return None
     if isinstance(obj, dict):
         encoded_dict = {}
@@ -331,7 +318,11 @@ def jsonable_encoder(
     for encoder, classes_tuple in encoders_by_class_tuples.items():
         if isinstance(obj, classes_tuple):
             return encoder(obj)
-
+    if is_pydantic_v1_model_instance(obj):
+        raise PydanticV1NotSupportedError(
+            "pydantic.v1 models are no longer supported by FastAPI."
+            f" Please update the model {obj!r}."
+        )
     try:
         data = dict(obj)
     except Exception as e:

fastapi/exceptions.py

@@ -233,6 +233,12 @@ class ResponseValidationError(ValidationException):
         self.body = body
 
 
+class PydanticV1NotSupportedError(FastAPIError):
+    """
+    A pydantic.v1 model is used, which is no longer supported.
+    """
+
+
 class FastAPIDeprecationWarning(UserWarning):
     """
     A custom deprecation warning as DeprecationWarning is ignored

fastapi/openapi/models.py

@@ -1,15 +1,15 @@
-from collections.abc import Iterable
+from collections.abc import Iterable, Mapping
 from enum import Enum
 from typing import Annotated, Any, Callable, Optional, Union
 
-from fastapi._compat import (
-    CoreSchema,
-    GetJsonSchemaHandler,
-    JsonSchemaValue,
-    with_info_plain_validator_function,
-)
+from fastapi._compat import with_info_plain_validator_function
 from fastapi.logger import logger
-from pydantic import AnyUrl, BaseModel, Field
+from pydantic import (
+    AnyUrl,
+    BaseModel,
+    Field,
+    GetJsonSchemaHandler,
+)
 from typing_extensions import Literal, TypedDict
 from typing_extensions import deprecated as typing_deprecated
 
@@ -43,14 +43,14 @@ except ImportError:  # pragma: no cover
 
         @classmethod
         def __get_pydantic_json_schema__(
-            cls, core_schema: CoreSchema, handler: GetJsonSchemaHandler
-        ) -> JsonSchemaValue:
+            cls, core_schema: Mapping[str, Any], handler: GetJsonSchemaHandler
+        ) -> dict[str, Any]:
             return {"type": "string", "format": "email"}
 
         @classmethod
         def __get_pydantic_core_schema__(
-            cls, source: type[Any], handler: Callable[[Any], CoreSchema]
-        ) -> CoreSchema:
+            cls, source: type[Any], handler: Callable[[Any], Mapping[str, Any]]
+        ) -> Mapping[str, Any]:
             return with_info_plain_validator_function(cls._validate)
 
 

fastapi/openapi/utils.py

@@ -6,7 +6,6 @@ from typing import Any, Optional, Union, cast
 
 from fastapi import routing
 from fastapi._compat import (
-    JsonSchemaValue,
     ModelField,
     Undefined,
     get_compat_model_name_map,
@@ -39,8 +38,6 @@ from starlette.responses import JSONResponse
 from starlette.routing import BaseRoute
 from typing_extensions import Literal
 
-from .._compat import _is_model_field
-
 validation_error_definition = {
     "title": "ValidationError",
     "type": "object",
@@ -109,7 +106,7 @@ def _get_openapi_operation_parameters(
     dependant: Dependant,
     model_name_map: ModelNameMap,
     field_mapping: dict[
-        tuple[ModelField, Literal["validation", "serialization"]], JsonSchemaValue
+        tuple[ModelField, Literal["validation", "serialization"]], dict[str, Any]
     ],
     separate_input_output_schemas: bool = True,
 ) -> list[dict[str, Any]]:
@@ -182,13 +179,13 @@ def get_openapi_operation_request_body(
     body_field: Optional[ModelField],
     model_name_map: ModelNameMap,
     field_mapping: dict[
-        tuple[ModelField, Literal["validation", "serialization"]], JsonSchemaValue
+        tuple[ModelField, Literal["validation", "serialization"]], dict[str, Any]
     ],
     separate_input_output_schemas: bool = True,
 ) -> Optional[dict[str, Any]]:
     if not body_field:
         return None
-    assert _is_model_field(body_field)
+    assert isinstance(body_field, ModelField)
     body_schema = get_schema_from_model_field(
         field=body_field,
         model_name_map=model_name_map,
@@ -265,7 +262,7 @@ def get_openapi_path(
     operation_ids: set[str],
     model_name_map: ModelNameMap,
     field_mapping: dict[
-        tuple[ModelField, Literal["validation", "serialization"]], JsonSchemaValue
+        tuple[ModelField, Literal["validation", "serialization"]], dict[str, Any]
     ],
     separate_input_output_schemas: bool = True,
 ) -> tuple[dict[str, Any], dict[str, Any], dict[str, Any]]:
@@ -457,7 +454,7 @@ def get_fields_from_routes(
             route, routing.APIRoute
         ):
             if route.body_field:
-                assert _is_model_field(route.body_field), (
+                assert isinstance(route.body_field, ModelField), (
                     "A request body must be a Pydantic Field"
                 )
                 body_fields_from_routes.append(route.body_field)

fastapi/param_functions.py

@@ -5,6 +5,7 @@ from annotated_doc import Doc
 from fastapi import params
 from fastapi._compat import Undefined
 from fastapi.openapi.models import Example
+from pydantic import AliasChoices, AliasPath
 from typing_extensions import Literal, deprecated
 
 _Unset: Any = Undefined
@@ -54,10 +55,8 @@ def Path(  # noqa: N802
             """
         ),
     ] = _Unset,
-    # TODO: update when deprecating Pydantic v1, import these types
-    # validation_alias: str | AliasPath | AliasChoices | None
     validation_alias: Annotated[
-        Union[str, None],
+        Union[str, AliasPath, AliasChoices, None],
         Doc(
             """
             'Whitelist' validation step. The parameter field will be the single one
@@ -379,10 +378,8 @@ def Query(  # noqa: N802
             """
         ),
     ] = _Unset,
-    # TODO: update when deprecating Pydantic v1, import these types
-    # validation_alias: str | AliasPath | AliasChoices | None
     validation_alias: Annotated[
-        Union[str, None],
+        Union[str, AliasPath, AliasChoices, None],
         Doc(
             """
             'Whitelist' validation step. The parameter field will be the single one
@@ -683,10 +680,8 @@ def Header(  # noqa: N802
             """
         ),
     ] = _Unset,
-    # TODO: update when deprecating Pydantic v1, import these types
-    # validation_alias: str | AliasPath | AliasChoices | None
     validation_alias: Annotated[
-        Union[str, None],
+        Union[str, AliasPath, AliasChoices, None],
         Doc(
             """
             'Whitelist' validation step. The parameter field will be the single one
@@ -999,10 +994,8 @@ def Cookie(  # noqa: N802
             """
         ),
     ] = _Unset,
-    # TODO: update when deprecating Pydantic v1, import these types
-    # validation_alias: str | AliasPath | AliasChoices | None
     validation_alias: Annotated[
-        Union[str, None],
+        Union[str, AliasPath, AliasChoices, None],
         Doc(
             """
             'Whitelist' validation step. The parameter field will be the single one
@@ -1326,10 +1319,8 @@ def Body(  # noqa: N802
             """
         ),
     ] = _Unset,
-    # TODO: update when deprecating Pydantic v1, import these types
-    # validation_alias: str | AliasPath | AliasChoices | None
     validation_alias: Annotated[
-        Union[str, None],
+        Union[str, AliasPath, AliasChoices, None],
         Doc(
             """
             'Whitelist' validation step. The parameter field will be the single one
@@ -1641,10 +1632,8 @@ def Form(  # noqa: N802
             """
         ),
     ] = _Unset,
-    # TODO: update when deprecating Pydantic v1, import these types
-    # validation_alias: str | AliasPath | AliasChoices | None
     validation_alias: Annotated[
-        Union[str, None],
+        Union[str, AliasPath, AliasChoices, None],
         Doc(
             """
             'Whitelist' validation step. The parameter field will be the single one
@@ -1955,10 +1944,8 @@ def File(  # noqa: N802
             """
         ),
     ] = _Unset,
-    # TODO: update when deprecating Pydantic v1, import these types
-    # validation_alias: str | AliasPath | AliasChoices | None
     validation_alias: Annotated[
-        Union[str, None],
+        Union[str, AliasPath, AliasChoices, None],
         Doc(
             """
             'Whitelist' validation step. The parameter field will be the single one

fastapi/params.py

@@ -6,6 +6,7 @@ from typing import Annotated, Any, Callable, Optional, Union
 
 from fastapi.exceptions import FastAPIDeprecationWarning
 from fastapi.openapi.models import Example
+from pydantic import AliasChoices, AliasPath
 from pydantic.fields import FieldInfo
 from typing_extensions import Literal, deprecated
 
@@ -34,9 +35,7 @@ class Param(FieldInfo):  # type: ignore[misc]
         annotation: Optional[Any] = None,
         alias: Optional[str] = None,
         alias_priority: Union[int, None] = _Unset,
-        # TODO: update when deprecating Pydantic v1, import these types
-        # validation_alias: str | AliasPath | AliasChoices | None
-        validation_alias: Union[str, None] = None,
+        validation_alias: Union[str, AliasPath, AliasChoices, None] = None,
         serialization_alias: Union[str, None] = None,
         title: Optional[str] = None,
         description: Optional[str] = None,
@@ -147,9 +146,7 @@ class Path(Param):  # type: ignore[misc]
         annotation: Optional[Any] = None,
         alias: Optional[str] = None,
         alias_priority: Union[int, None] = _Unset,
-        # TODO: update when deprecating Pydantic v1, import these types
-        # validation_alias: str | AliasPath | AliasChoices | None
-        validation_alias: Union[str, None] = None,
+        validation_alias: Union[str, AliasPath, AliasChoices, None] = None,
         serialization_alias: Union[str, None] = None,
         title: Optional[str] = None,
         description: Optional[str] = None,
@@ -233,9 +230,7 @@ class Query(Param):  # type: ignore[misc]
         annotation: Optional[Any] = None,
         alias: Optional[str] = None,
         alias_priority: Union[int, None] = _Unset,
-        # TODO: update when deprecating Pydantic v1, import these types
-        # validation_alias: str | AliasPath | AliasChoices | None
-        validation_alias: Union[str, None] = None,
+        validation_alias: Union[str, AliasPath, AliasChoices, None] = None,
         serialization_alias: Union[str, None] = None,
         title: Optional[str] = None,
         description: Optional[str] = None,
@@ -317,9 +312,7 @@ class Header(Param):  # type: ignore[misc]
         annotation: Optional[Any] = None,
         alias: Optional[str] = None,
         alias_priority: Union[int, None] = _Unset,
-        # TODO: update when deprecating Pydantic v1, import these types
-        # validation_alias: str | AliasPath | AliasChoices | None
-        validation_alias: Union[str, None] = None,
+        validation_alias: Union[str, AliasPath, AliasChoices, None] = None,
         serialization_alias: Union[str, None] = None,
         convert_underscores: bool = True,
         title: Optional[str] = None,
@@ -403,9 +396,7 @@ class Cookie(Param):  # type: ignore[misc]
         annotation: Optional[Any] = None,
         alias: Optional[str] = None,
         alias_priority: Union[int, None] = _Unset,
-        # TODO: update when deprecating Pydantic v1, import these types
-        # validation_alias: str | AliasPath | AliasChoices | None
-        validation_alias: Union[str, None] = None,
+        validation_alias: Union[str, AliasPath, AliasChoices, None] = None,
         serialization_alias: Union[str, None] = None,
         title: Optional[str] = None,
         description: Optional[str] = None,
@@ -487,9 +478,7 @@ class Body(FieldInfo):  # type: ignore[misc]
         media_type: str = "application/json",
         alias: Optional[str] = None,
         alias_priority: Union[int, None] = _Unset,
-        # TODO: update when deprecating Pydantic v1, import these types
-        # validation_alias: str | AliasPath | AliasChoices | None
-        validation_alias: Union[str, None] = None,
+        validation_alias: Union[str, AliasPath, AliasChoices, None] = None,
         serialization_alias: Union[str, None] = None,
         title: Optional[str] = None,
         description: Optional[str] = None,
@@ -600,9 +589,7 @@ class Form(Body):  # type: ignore[misc]
         media_type: str = "application/x-www-form-urlencoded",
         alias: Optional[str] = None,
         alias_priority: Union[int, None] = _Unset,
-        # TODO: update when deprecating Pydantic v1, import these types
-        # validation_alias: str | AliasPath | AliasChoices | None
-        validation_alias: Union[str, None] = None,
+        validation_alias: Union[str, AliasPath, AliasChoices, None] = None,
         serialization_alias: Union[str, None] = None,
         title: Optional[str] = None,
         description: Optional[str] = None,
@@ -684,9 +671,7 @@ class File(Form):  # type: ignore[misc]
         media_type: str = "multipart/form-data",
         alias: Optional[str] = None,
         alias_priority: Union[int, None] = _Unset,
-        # TODO: update when deprecating Pydantic v1, import these types
-        # validation_alias: str | AliasPath | AliasChoices | None
-        validation_alias: Union[str, None] = None,
+        validation_alias: Union[str, AliasPath, AliasChoices, None] = None,
         serialization_alias: Union[str, None] = None,
         title: Optional[str] = None,
         description: Optional[str] = None,

fastapi/routing.py

@@ -2,7 +2,6 @@ import email.message
 import functools
 import inspect
 import json
-import warnings
 from collections.abc import (
     AsyncIterator,
     Awaitable,
@@ -22,16 +21,12 @@ from typing import (
 )
 
 from annotated_doc import Doc
-from fastapi import params, temp_pydantic_v1_params
+from fastapi import params
 from fastapi._compat import (
     ModelField,
     Undefined,
-    _get_model_config,
-    _model_dump,
-    _normalize_errors,
     annotation_is_pydantic_v1,
     lenient_issubclass,
-    may_v1,
 )
 from fastapi.datastructures import Default, DefaultPlaceholder
 from fastapi.dependencies.models import Dependant
@@ -47,8 +42,8 @@ from fastapi.dependencies.utils import (
 from fastapi.encoders import jsonable_encoder
 from fastapi.exceptions import (
     EndpointContext,
-    FastAPIDeprecationWarning,
     FastAPIError,
+    PydanticV1NotSupportedError,
     RequestValidationError,
     ResponseValidationError,
     WebSocketRequestValidationError,
@@ -148,51 +143,6 @@ def websocket_session(
     return app
 
 
-def _prepare_response_content(
-    res: Any,
-    *,
-    exclude_unset: bool,
-    exclude_defaults: bool = False,
-    exclude_none: bool = False,
-) -> Any:
-    if isinstance(res, may_v1.BaseModel):
-        read_with_orm_mode = getattr(_get_model_config(res), "read_with_orm_mode", None)  # type: ignore[arg-type]
-        if read_with_orm_mode:
-            # Let from_orm extract the data from this model instead of converting
-            # it now to a dict.
-            # Otherwise, there's no way to extract lazy data that requires attribute
-            # access instead of dict iteration, e.g. lazy relationships.
-            return res
-        return _model_dump(
-            res,  # type: ignore[arg-type]
-            by_alias=True,
-            exclude_unset=exclude_unset,
-            exclude_defaults=exclude_defaults,
-            exclude_none=exclude_none,
-        )
-    elif isinstance(res, list):
-        return [
-            _prepare_response_content(
-                item,
-                exclude_unset=exclude_unset,
-                exclude_defaults=exclude_defaults,
-                exclude_none=exclude_none,
-            )
-            for item in res
-        ]
-    elif isinstance(res, dict):
-        return {
-            k: _prepare_response_content(
-                v,
-                exclude_unset=exclude_unset,
-                exclude_defaults=exclude_defaults,
-                exclude_none=exclude_none,
-            )
-            for k, v in res.items()
-        }
-    return res
-
-
 def _merge_lifespan_context(
     original_context: Lifespan[Any], nested_context: Lifespan[Any]
 ) -> Lifespan[Any]:
@@ -252,14 +202,6 @@ async def serialize_response(
 ) -> Any:
     if field:
         errors = []
-        if not hasattr(field, "serialize"):
-            # pydantic v1
-            response_content = _prepare_response_content(
-                response_content,
-                exclude_unset=exclude_unset,
-                exclude_defaults=exclude_defaults,
-                exclude_none=exclude_none,
-            )
         if is_coroutine:
             value, errors_ = field.validate(response_content, {}, loc=("response",))
         else:
@@ -268,28 +210,15 @@ async def serialize_response(
             )
         if isinstance(errors_, list):
             errors.extend(errors_)
-        elif errors_:
-            errors.append(errors_)
         if errors:
             ctx = endpoint_ctx or EndpointContext()
             raise ResponseValidationError(
-                errors=_normalize_errors(errors),
+                errors=errors,
                 body=response_content,
                 endpoint_ctx=ctx,
             )
 
-        if hasattr(field, "serialize"):
-            return field.serialize(
-                value,
-                include=include,
-                exclude=exclude,
-                by_alias=by_alias,
-                exclude_unset=exclude_unset,
-                exclude_defaults=exclude_defaults,
-                exclude_none=exclude_none,
-            )
-
-        return jsonable_encoder(
+        return field.serialize(
             value,
             include=include,
             exclude=exclude,
@@ -298,6 +227,7 @@ async def serialize_response(
             exclude_defaults=exclude_defaults,
             exclude_none=exclude_none,
         )
+
     else:
         return jsonable_encoder(response_content)
 
@@ -332,9 +262,7 @@ def get_request_handler(
 ) -> Callable[[Request], Coroutine[Any, Any, Response]]:
     assert dependant.call is not None, "dependant.call must be a function"
     is_coroutine = dependant.is_coroutine_callable
-    is_body_form = body_field and isinstance(
-        body_field.field_info, (params.Form, temp_pydantic_v1_params.Form)
-    )
+    is_body_form = body_field and isinstance(body_field.field_info, params.Form)
     if isinstance(response_class, DefaultPlaceholder):
         actual_response_class: type[Response] = response_class.value
     else:
@@ -464,7 +392,7 @@ def get_request_handler(
                 response.headers.raw.extend(solved_result.response.headers.raw)
         if errors:
             validation_error = RequestValidationError(
-                _normalize_errors(errors), body=body, endpoint_ctx=endpoint_ctx
+                errors, body=body, endpoint_ctx=endpoint_ctx
             )
             raise validation_error
 
@@ -503,7 +431,7 @@ def get_websocket_app(
         )
         if solved_result.errors:
             raise WebSocketRequestValidationError(
-                _normalize_errors(solved_result.errors),
+                solved_result.errors,
                 endpoint_ctx=endpoint_ctx,
             )
         assert dependant.call is not None, "dependant.call must be a function"
@@ -638,11 +566,9 @@ class APIRoute(routing.Route):
             )
             response_name = "Response_" + self.unique_id
             if annotation_is_pydantic_v1(self.response_model):
-                warnings.warn(
-                    "pydantic.v1 is deprecated and will soon stop being supported by FastAPI."
-                    f" Please update the response model {self.response_model!r}.",
-                    category=FastAPIDeprecationWarning,
-                    stacklevel=4,
+                raise PydanticV1NotSupportedError(
+                    "pydantic.v1 models are no longer supported by FastAPI."
+                    f" Please update the response model {self.response_model!r}."
                 )
             self.response_field = create_model_field(
                 name=response_name,
@@ -678,11 +604,9 @@ class APIRoute(routing.Route):
                 )
                 response_name = f"Response_{additional_status_code}_{self.unique_id}"
                 if annotation_is_pydantic_v1(model):
-                    warnings.warn(
-                        "pydantic.v1 is deprecated and will soon stop being supported by FastAPI."
-                        f" In responses={{}}, please update {model}.",
-                        category=FastAPIDeprecationWarning,
-                        stacklevel=4,
+                    raise PydanticV1NotSupportedError(
+                        "pydantic.v1 models are no longer supported by FastAPI."
+                        f" In responses={{}}, please update {model}."
                     )
                 response_field = create_model_field(
                     name=response_name, type_=model, mode="serialization"

fastapi/temp_pydantic_v1_params.py

@@ -1,718 +0,0 @@
-import warnings
-from typing import Annotated, Any, Callable, Optional, Union
-
-from fastapi.exceptions import FastAPIDeprecationWarning
-from fastapi.openapi.models import Example
-from fastapi.params import ParamTypes
-from typing_extensions import deprecated
-
-from ._compat.may_v1 import FieldInfo, Undefined
-
-_Unset: Any = Undefined
-
-
-class Param(FieldInfo):
-    in_: ParamTypes
-
-    def __init__(
-        self,
-        default: Any = Undefined,
-        *,
-        default_factory: Union[Callable[[], Any], None] = _Unset,
-        annotation: Optional[Any] = None,
-        alias: Optional[str] = None,
-        alias_priority: Union[int, None] = _Unset,
-        # TODO: update when deprecating Pydantic v1, import these types
-        # validation_alias: str | AliasPath | AliasChoices | None
-        validation_alias: Union[str, None] = None,
-        serialization_alias: Union[str, None] = None,
-        title: Optional[str] = None,
-        description: Optional[str] = None,
-        gt: Optional[float] = None,
-        ge: Optional[float] = None,
-        lt: Optional[float] = None,
-        le: Optional[float] = None,
-        min_length: Optional[int] = None,
-        max_length: Optional[int] = None,
-        pattern: Optional[str] = None,
-        regex: Annotated[
-            Optional[str],
-            deprecated(
-                "Deprecated in FastAPI 0.100.0 and Pydantic v2, use `pattern` instead."
-            ),
-        ] = None,
-        discriminator: Union[str, None] = None,
-        strict: Union[bool, None] = _Unset,
-        multiple_of: Union[float, None] = _Unset,
-        allow_inf_nan: Union[bool, None] = _Unset,
-        max_digits: Union[int, None] = _Unset,
-        decimal_places: Union[int, None] = _Unset,
-        examples: Optional[list[Any]] = None,
-        example: Annotated[
-            Optional[Any],
-            deprecated(
-                "Deprecated in OpenAPI 3.1.0 that now uses JSON Schema 2020-12, "
-                "although still supported. Use examples instead."
-            ),
-        ] = _Unset,
-        openapi_examples: Optional[dict[str, Example]] = None,
-        deprecated: Union[deprecated, str, bool, None] = None,
-        include_in_schema: bool = True,
-        json_schema_extra: Union[dict[str, Any], None] = None,
-        **extra: Any,
-    ):
-        if example is not _Unset:
-            warnings.warn(
-                "`example` has been deprecated, please use `examples` instead",
-                category=FastAPIDeprecationWarning,
-                stacklevel=4,
-            )
-        self.example = example
-        self.include_in_schema = include_in_schema
-        self.openapi_examples = openapi_examples
-        kwargs = dict(
-            default=default,
-            default_factory=default_factory,
-            alias=alias,
-            title=title,
-            description=description,
-            gt=gt,
-            ge=ge,
-            lt=lt,
-            le=le,
-            min_length=min_length,
-            max_length=max_length,
-            discriminator=discriminator,
-            multiple_of=multiple_of,
-            allow_inf_nan=allow_inf_nan,
-            max_digits=max_digits,
-            decimal_places=decimal_places,
-            **extra,
-        )
-        if examples is not None:
-            kwargs["examples"] = examples
-        if regex is not None:
-            warnings.warn(
-                "`regex` has been deprecated, please use `pattern` instead",
-                category=FastAPIDeprecationWarning,
-                stacklevel=4,
-            )
-        current_json_schema_extra = json_schema_extra or extra
-        kwargs["deprecated"] = deprecated
-        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}
-
-        super().__init__(**use_kwargs)
-
-    def __repr__(self) -> str:
-        return f"{self.__class__.__name__}({self.default})"
-
-
-class Path(Param):
-    in_ = ParamTypes.path
-
-    def __init__(
-        self,
-        default: Any = ...,
-        *,
-        default_factory: Union[Callable[[], Any], None] = _Unset,
-        annotation: Optional[Any] = None,
-        alias: Optional[str] = None,
-        alias_priority: Union[int, None] = _Unset,
-        # TODO: update when deprecating Pydantic v1, import these types
-        # validation_alias: str | AliasPath | AliasChoices | None
-        validation_alias: Union[str, None] = None,
-        serialization_alias: Union[str, None] = None,
-        title: Optional[str] = None,
-        description: Optional[str] = None,
-        gt: Optional[float] = None,
-        ge: Optional[float] = None,
-        lt: Optional[float] = None,
-        le: Optional[float] = None,
-        min_length: Optional[int] = None,
-        max_length: Optional[int] = None,
-        pattern: Optional[str] = None,
-        regex: Annotated[
-            Optional[str],
-            deprecated(
-                "Deprecated in FastAPI 0.100.0 and Pydantic v2, use `pattern` instead."
-            ),
-        ] = None,
-        discriminator: Union[str, None] = None,
-        strict: Union[bool, None] = _Unset,
-        multiple_of: Union[float, None] = _Unset,
-        allow_inf_nan: Union[bool, None] = _Unset,
-        max_digits: Union[int, None] = _Unset,
-        decimal_places: Union[int, None] = _Unset,
-        examples: Optional[list[Any]] = None,
-        example: Annotated[
-            Optional[Any],
-            deprecated(
-                "Deprecated in OpenAPI 3.1.0 that now uses JSON Schema 2020-12, "
-                "although still supported. Use examples instead."
-            ),
-        ] = _Unset,
-        openapi_examples: Optional[dict[str, Example]] = None,
-        deprecated: Union[deprecated, str, bool, None] = None,
-        include_in_schema: bool = True,
-        json_schema_extra: Union[dict[str, Any], None] = None,
-        **extra: Any,
-    ):
-        assert default is ..., "Path parameters cannot have a default value"
-        self.in_ = self.in_
-        super().__init__(
-            default=default,
-            default_factory=default_factory,
-            annotation=annotation,
-            alias=alias,
-            alias_priority=alias_priority,
-            validation_alias=validation_alias,
-            serialization_alias=serialization_alias,
-            title=title,
-            description=description,
-            gt=gt,
-            ge=ge,
-            lt=lt,
-            le=le,
-            min_length=min_length,
-            max_length=max_length,
-            pattern=pattern,
-            regex=regex,
-            discriminator=discriminator,
-            strict=strict,
-            multiple_of=multiple_of,
-            allow_inf_nan=allow_inf_nan,
-            max_digits=max_digits,
-            decimal_places=decimal_places,
-            deprecated=deprecated,
-            example=example,
-            examples=examples,
-            openapi_examples=openapi_examples,
-            include_in_schema=include_in_schema,
-            json_schema_extra=json_schema_extra,
-            **extra,
-        )
-
-
-class Query(Param):
-    in_ = ParamTypes.query
-
-    def __init__(
-        self,
-        default: Any = Undefined,
-        *,
-        default_factory: Union[Callable[[], Any], None] = _Unset,
-        annotation: Optional[Any] = None,
-        alias: Optional[str] = None,
-        alias_priority: Union[int, None] = _Unset,
-        # TODO: update when deprecating Pydantic v1, import these types
-        # validation_alias: str | AliasPath | AliasChoices | None
-        validation_alias: Union[str, None] = None,
-        serialization_alias: Union[str, None] = None,
-        title: Optional[str] = None,
-        description: Optional[str] = None,
-        gt: Optional[float] = None,
-        ge: Optional[float] = None,
-        lt: Optional[float] = None,
-        le: Optional[float] = None,
-        min_length: Optional[int] = None,
-        max_length: Optional[int] = None,
-        pattern: Optional[str] = None,
-        regex: Annotated[
-            Optional[str],
-            deprecated(
-                "Deprecated in FastAPI 0.100.0 and Pydantic v2, use `pattern` instead."
-            ),
-        ] = None,
-        discriminator: Union[str, None] = None,
-        strict: Union[bool, None] = _Unset,
-        multiple_of: Union[float, None] = _Unset,
-        allow_inf_nan: Union[bool, None] = _Unset,
-        max_digits: Union[int, None] = _Unset,
-        decimal_places: Union[int, None] = _Unset,
-        examples: Optional[list[Any]] = None,
-        example: Annotated[
-            Optional[Any],
-            deprecated(
-                "Deprecated in OpenAPI 3.1.0 that now uses JSON Schema 2020-12, "
-                "although still supported. Use examples instead."
-            ),
-        ] = _Unset,
-        openapi_examples: Optional[dict[str, Example]] = None,
-        deprecated: Union[deprecated, str, bool, None] = None,
-        include_in_schema: bool = True,
-        json_schema_extra: Union[dict[str, Any], None] = None,
-        **extra: Any,
-    ):
-        super().__init__(
-            default=default,
-            default_factory=default_factory,
-            annotation=annotation,
-            alias=alias,
-            alias_priority=alias_priority,
-            validation_alias=validation_alias,
-            serialization_alias=serialization_alias,
-            title=title,
-            description=description,
-            gt=gt,
-            ge=ge,
-            lt=lt,
-            le=le,
-            min_length=min_length,
-            max_length=max_length,
-            pattern=pattern,
-            regex=regex,
-            discriminator=discriminator,
-            strict=strict,
-            multiple_of=multiple_of,
-            allow_inf_nan=allow_inf_nan,
-            max_digits=max_digits,
-            decimal_places=decimal_places,
-            deprecated=deprecated,
-            example=example,
-            examples=examples,
-            openapi_examples=openapi_examples,
-            include_in_schema=include_in_schema,
-            json_schema_extra=json_schema_extra,
-            **extra,
-        )
-
-
-class Header(Param):
-    in_ = ParamTypes.header
-
-    def __init__(
-        self,
-        default: Any = Undefined,
-        *,
-        default_factory: Union[Callable[[], Any], None] = _Unset,
-        annotation: Optional[Any] = None,
-        alias: Optional[str] = None,
-        alias_priority: Union[int, None] = _Unset,
-        # TODO: update when deprecating Pydantic v1, import these types
-        # validation_alias: str | AliasPath | AliasChoices | None
-        validation_alias: Union[str, None] = None,
-        serialization_alias: Union[str, None] = None,
-        convert_underscores: bool = True,
-        title: Optional[str] = None,
-        description: Optional[str] = None,
-        gt: Optional[float] = None,
-        ge: Optional[float] = None,
-        lt: Optional[float] = None,
-        le: Optional[float] = None,
-        min_length: Optional[int] = None,
-        max_length: Optional[int] = None,
-        pattern: Optional[str] = None,
-        regex: Annotated[
-            Optional[str],
-            deprecated(
-                "Deprecated in FastAPI 0.100.0 and Pydantic v2, use `pattern` instead."
-            ),
-        ] = None,
-        discriminator: Union[str, None] = None,
-        strict: Union[bool, None] = _Unset,
-        multiple_of: Union[float, None] = _Unset,
-        allow_inf_nan: Union[bool, None] = _Unset,
-        max_digits: Union[int, None] = _Unset,
-        decimal_places: Union[int, None] = _Unset,
-        examples: Optional[list[Any]] = None,
-        example: Annotated[
-            Optional[Any],
-            deprecated(
-                "Deprecated in OpenAPI 3.1.0 that now uses JSON Schema 2020-12, "
-                "although still supported. Use examples instead."
-            ),
-        ] = _Unset,
-        openapi_examples: Optional[dict[str, Example]] = None,
-        deprecated: Union[deprecated, str, bool, None] = None,
-        include_in_schema: bool = True,
-        json_schema_extra: Union[dict[str, Any], None] = None,
-        **extra: Any,
-    ):
-        self.convert_underscores = convert_underscores
-        super().__init__(
-            default=default,
-            default_factory=default_factory,
-            annotation=annotation,
-            alias=alias,
-            alias_priority=alias_priority,
-            validation_alias=validation_alias,
-            serialization_alias=serialization_alias,
-            title=title,
-            description=description,
-            gt=gt,
-            ge=ge,
-            lt=lt,
-            le=le,
-            min_length=min_length,
-            max_length=max_length,
-            pattern=pattern,
-            regex=regex,
-            discriminator=discriminator,
-            strict=strict,
-            multiple_of=multiple_of,
-            allow_inf_nan=allow_inf_nan,
-            max_digits=max_digits,
-            decimal_places=decimal_places,
-            deprecated=deprecated,
-            example=example,
-            examples=examples,
-            openapi_examples=openapi_examples,
-            include_in_schema=include_in_schema,
-            json_schema_extra=json_schema_extra,
-            **extra,
-        )
-
-
-class Cookie(Param):
-    in_ = ParamTypes.cookie
-
-    def __init__(
-        self,
-        default: Any = Undefined,
-        *,
-        default_factory: Union[Callable[[], Any], None] = _Unset,
-        annotation: Optional[Any] = None,
-        alias: Optional[str] = None,
-        alias_priority: Union[int, None] = _Unset,
-        # TODO: update when deprecating Pydantic v1, import these types
-        # validation_alias: str | AliasPath | AliasChoices | None
-        validation_alias: Union[str, None] = None,
-        serialization_alias: Union[str, None] = None,
-        title: Optional[str] = None,
-        description: Optional[str] = None,
-        gt: Optional[float] = None,
-        ge: Optional[float] = None,
-        lt: Optional[float] = None,
-        le: Optional[float] = None,
-        min_length: Optional[int] = None,
-        max_length: Optional[int] = None,
-        pattern: Optional[str] = None,
-        regex: Annotated[
-            Optional[str],
-            deprecated(
-                "Deprecated in FastAPI 0.100.0 and Pydantic v2, use `pattern` instead."
-            ),
-        ] = None,
-        discriminator: Union[str, None] = None,
-        strict: Union[bool, None] = _Unset,
-        multiple_of: Union[float, None] = _Unset,
-        allow_inf_nan: Union[bool, None] = _Unset,
-        max_digits: Union[int, None] = _Unset,
-        decimal_places: Union[int, None] = _Unset,
-        examples: Optional[list[Any]] = None,
-        example: Annotated[
-            Optional[Any],
-            deprecated(
-                "Deprecated in OpenAPI 3.1.0 that now uses JSON Schema 2020-12, "
-                "although still supported. Use examples instead."
-            ),
-        ] = _Unset,
-        openapi_examples: Optional[dict[str, Example]] = None,
-        deprecated: Union[deprecated, str, bool, None] = None,
-        include_in_schema: bool = True,
-        json_schema_extra: Union[dict[str, Any], None] = None,
-        **extra: Any,
-    ):
-        super().__init__(
-            default=default,
-            default_factory=default_factory,
-            annotation=annotation,
-            alias=alias,
-            alias_priority=alias_priority,
-            validation_alias=validation_alias,
-            serialization_alias=serialization_alias,
-            title=title,
-            description=description,
-            gt=gt,
-            ge=ge,
-            lt=lt,
-            le=le,
-            min_length=min_length,
-            max_length=max_length,
-            pattern=pattern,
-            regex=regex,
-            discriminator=discriminator,
-            strict=strict,
-            multiple_of=multiple_of,
-            allow_inf_nan=allow_inf_nan,
-            max_digits=max_digits,
-            decimal_places=decimal_places,
-            deprecated=deprecated,
-            example=example,
-            examples=examples,
-            openapi_examples=openapi_examples,
-            include_in_schema=include_in_schema,
-            json_schema_extra=json_schema_extra,
-            **extra,
-        )
-
-
-class Body(FieldInfo):
-    def __init__(
-        self,
-        default: Any = Undefined,
-        *,
-        default_factory: Union[Callable[[], Any], None] = _Unset,
-        annotation: Optional[Any] = None,
-        embed: Union[bool, None] = None,
-        media_type: str = "application/json",
-        alias: Optional[str] = None,
-        alias_priority: Union[int, None] = _Unset,
-        # TODO: update when deprecating Pydantic v1, import these types
-        # validation_alias: str | AliasPath | AliasChoices | None
-        validation_alias: Union[str, None] = None,
-        serialization_alias: Union[str, None] = None,
-        title: Optional[str] = None,
-        description: Optional[str] = None,
-        gt: Optional[float] = None,
-        ge: Optional[float] = None,
-        lt: Optional[float] = None,
-        le: Optional[float] = None,
-        min_length: Optional[int] = None,
-        max_length: Optional[int] = None,
-        pattern: Optional[str] = None,
-        regex: Annotated[
-            Optional[str],
-            deprecated(
-                "Deprecated in FastAPI 0.100.0 and Pydantic v2, use `pattern` instead."
-            ),
-        ] = None,
-        discriminator: Union[str, None] = None,
-        strict: Union[bool, None] = _Unset,
-        multiple_of: Union[float, None] = _Unset,
-        allow_inf_nan: Union[bool, None] = _Unset,
-        max_digits: Union[int, None] = _Unset,
-        decimal_places: Union[int, None] = _Unset,
-        examples: Optional[list[Any]] = None,
-        example: Annotated[
-            Optional[Any],
-            deprecated(
-                "Deprecated in OpenAPI 3.1.0 that now uses JSON Schema 2020-12, "
-                "although still supported. Use examples instead."
-            ),
-        ] = _Unset,
-        openapi_examples: Optional[dict[str, Example]] = None,
-        deprecated: Union[deprecated, str, bool, None] = None,
-        include_in_schema: bool = True,
-        json_schema_extra: Union[dict[str, Any], None] = None,
-        **extra: Any,
-    ):
-        self.embed = embed
-        self.media_type = media_type
-        if example is not _Unset:
-            warnings.warn(
-                "`example` has been deprecated, please use `examples` instead",
-                category=FastAPIDeprecationWarning,
-                stacklevel=4,
-            )
-        self.example = example
-        self.include_in_schema = include_in_schema
-        self.openapi_examples = openapi_examples
-        kwargs = dict(
-            default=default,
-            default_factory=default_factory,
-            alias=alias,
-            title=title,
-            description=description,
-            gt=gt,
-            ge=ge,
-            lt=lt,
-            le=le,
-            min_length=min_length,
-            max_length=max_length,
-            discriminator=discriminator,
-            multiple_of=multiple_of,
-            allow_inf_nan=allow_inf_nan,
-            max_digits=max_digits,
-            decimal_places=decimal_places,
-            **extra,
-        )
-        if examples is not None:
-            kwargs["examples"] = examples
-        if regex is not None:
-            warnings.warn(
-                "`regex` has been deprecated, please use `pattern` instead",
-                category=FastAPIDeprecationWarning,
-                stacklevel=4,
-            )
-        current_json_schema_extra = json_schema_extra or extra
-        kwargs["deprecated"] = deprecated
-        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}
-
-        super().__init__(**use_kwargs)
-
-    def __repr__(self) -> str:
-        return f"{self.__class__.__name__}({self.default})"
-
-
-class Form(Body):
-    def __init__(
-        self,
-        default: Any = Undefined,
-        *,
-        default_factory: Union[Callable[[], Any], None] = _Unset,
-        annotation: Optional[Any] = None,
-        media_type: str = "application/x-www-form-urlencoded",
-        alias: Optional[str] = None,
-        alias_priority: Union[int, None] = _Unset,
-        # TODO: update when deprecating Pydantic v1, import these types
-        # validation_alias: str | AliasPath | AliasChoices | None
-        validation_alias: Union[str, None] = None,
-        serialization_alias: Union[str, None] = None,
-        title: Optional[str] = None,
-        description: Optional[str] = None,
-        gt: Optional[float] = None,
-        ge: Optional[float] = None,
-        lt: Optional[float] = None,
-        le: Optional[float] = None,
-        min_length: Optional[int] = None,
-        max_length: Optional[int] = None,
-        pattern: Optional[str] = None,
-        regex: Annotated[
-            Optional[str],
-            deprecated(
-                "Deprecated in FastAPI 0.100.0 and Pydantic v2, use `pattern` instead."
-            ),
-        ] = None,
-        discriminator: Union[str, None] = None,
-        strict: Union[bool, None] = _Unset,
-        multiple_of: Union[float, None] = _Unset,
-        allow_inf_nan: Union[bool, None] = _Unset,
-        max_digits: Union[int, None] = _Unset,
-        decimal_places: Union[int, None] = _Unset,
-        examples: Optional[list[Any]] = None,
-        example: Annotated[
-            Optional[Any],
-            deprecated(
-                "Deprecated in OpenAPI 3.1.0 that now uses JSON Schema 2020-12, "
-                "although still supported. Use examples instead."
-            ),
-        ] = _Unset,
-        openapi_examples: Optional[dict[str, Example]] = None,
-        deprecated: Union[deprecated, str, bool, None] = None,
-        include_in_schema: bool = True,
-        json_schema_extra: Union[dict[str, Any], None] = None,
-        **extra: Any,
-    ):
-        super().__init__(
-            default=default,
-            default_factory=default_factory,
-            annotation=annotation,
-            media_type=media_type,
-            alias=alias,
-            alias_priority=alias_priority,
-            validation_alias=validation_alias,
-            serialization_alias=serialization_alias,
-            title=title,
-            description=description,
-            gt=gt,
-            ge=ge,
-            lt=lt,
-            le=le,
-            min_length=min_length,
-            max_length=max_length,
-            pattern=pattern,
-            regex=regex,
-            discriminator=discriminator,
-            strict=strict,
-            multiple_of=multiple_of,
-            allow_inf_nan=allow_inf_nan,
-            max_digits=max_digits,
-            decimal_places=decimal_places,
-            deprecated=deprecated,
-            example=example,
-            examples=examples,
-            openapi_examples=openapi_examples,
-            include_in_schema=include_in_schema,
-            json_schema_extra=json_schema_extra,
-            **extra,
-        )
-
-
-class File(Form):
-    def __init__(
-        self,
-        default: Any = Undefined,
-        *,
-        default_factory: Union[Callable[[], Any], None] = _Unset,
-        annotation: Optional[Any] = None,
-        media_type: str = "multipart/form-data",
-        alias: Optional[str] = None,
-        alias_priority: Union[int, None] = _Unset,
-        # TODO: update when deprecating Pydantic v1, import these types
-        # validation_alias: str | AliasPath | AliasChoices | None
-        validation_alias: Union[str, None] = None,
-        serialization_alias: Union[str, None] = None,
-        title: Optional[str] = None,
-        description: Optional[str] = None,
-        gt: Optional[float] = None,
-        ge: Optional[float] = None,
-        lt: Optional[float] = None,
-        le: Optional[float] = None,
-        min_length: Optional[int] = None,
-        max_length: Optional[int] = None,
-        pattern: Optional[str] = None,
-        regex: Annotated[
-            Optional[str],
-            deprecated(
-                "Deprecated in FastAPI 0.100.0 and Pydantic v2, use `pattern` instead."
-            ),
-        ] = None,
-        discriminator: Union[str, None] = None,
-        strict: Union[bool, None] = _Unset,
-        multiple_of: Union[float, None] = _Unset,
-        allow_inf_nan: Union[bool, None] = _Unset,
-        max_digits: Union[int, None] = _Unset,
-        decimal_places: Union[int, None] = _Unset,
-        examples: Optional[list[Any]] = None,
-        example: Annotated[
-            Optional[Any],
-            deprecated(
-                "Deprecated in OpenAPI 3.1.0 that now uses JSON Schema 2020-12, "
-                "although still supported. Use examples instead."
-            ),
-        ] = _Unset,
-        openapi_examples: Optional[dict[str, Example]] = None,
-        deprecated: Union[deprecated, str, bool, None] = None,
-        include_in_schema: bool = True,
-        json_schema_extra: Union[dict[str, Any], None] = None,
-        **extra: Any,
-    ):
-        super().__init__(
-            default=default,
-            default_factory=default_factory,
-            annotation=annotation,
-            media_type=media_type,
-            alias=alias,
-            alias_priority=alias_priority,
-            validation_alias=validation_alias,
-            serialization_alias=serialization_alias,
-            title=title,
-            description=description,
-            gt=gt,
-            ge=ge,
-            lt=lt,
-            le=le,
-            min_length=min_length,
-            max_length=max_length,
-            pattern=pattern,
-            regex=regex,
-            discriminator=discriminator,
-            strict=strict,
-            multiple_of=multiple_of,
-            allow_inf_nan=allow_inf_nan,
-            max_digits=max_digits,
-            decimal_places=decimal_places,
-            deprecated=deprecated,
-            example=example,
-            examples=examples,
-            openapi_examples=openapi_examples,
-            include_in_schema=include_in_schema,
-            json_schema_extra=json_schema_extra,
-            **extra,
-        )

fastapi/utils.py

@@ -6,7 +6,6 @@ from typing import (
     Any,
     Optional,
     Union,
-    cast,
 )
 from weakref import WeakKeyDictionary
 
@@ -19,11 +18,9 @@ from fastapi._compat import (
     UndefinedType,
     Validator,
     annotation_is_pydantic_v1,
-    lenient_issubclass,
-    may_v1,
 )
 from fastapi.datastructures import DefaultPlaceholder, DefaultType
-from fastapi.exceptions import FastAPIDeprecationWarning
+from fastapi.exceptions import FastAPIDeprecationWarning, PydanticV1NotSupportedError
 from pydantic import BaseModel
 from pydantic.fields import FieldInfo
 from typing_extensions import Literal
@@ -83,52 +80,18 @@ def create_model_field(
     mode: Literal["validation", "serialization"] = "validation",
     version: Literal["1", "auto"] = "auto",
 ) -> ModelField:
+    if annotation_is_pydantic_v1(type_):
+        raise PydanticV1NotSupportedError(
+            "pydantic.v1 models are no longer supported by FastAPI."
+            f" Please update the response model {type_!r}."
+        )
     class_validators = class_validators or {}
 
-    v1_model_config = may_v1.BaseConfig
-    v1_field_info = field_info or may_v1.FieldInfo()
-    v1_kwargs = {
-        "name": name,
-        "field_info": v1_field_info,
-        "type_": type_,
-        "class_validators": class_validators,
-        "default": default,
-        "required": required,
-        "model_config": v1_model_config,
-        "alias": alias,
-    }
-
-    if (
-        annotation_is_pydantic_v1(type_)
-        or isinstance(field_info, may_v1.FieldInfo)
-        or version == "1"
-    ):
-        from fastapi._compat import v1
-
-        try:
-            return v1.ModelField(**v1_kwargs)  # type: ignore[return-value]
-        except RuntimeError:
-            raise fastapi.exceptions.FastAPIError(
-                _invalid_args_message.format(type_=type_)
-            ) from None
-    else:
-        field_info = field_info or FieldInfo(
-            annotation=type_, default=default, alias=alias
-        )
-        kwargs = {"mode": mode, "name": name, "field_info": field_info}
-        try:
-            return v2.ModelField(**kwargs)  # type: ignore[return-value,arg-type]
-        except PydanticSchemaGenerationError:
-            raise fastapi.exceptions.FastAPIError(
-                _invalid_args_message.format(type_=type_)
-            ) from None
-    # Pydantic v2 is not installed, but it's not a Pydantic v1 ModelField, it could be
-    # a Pydantic v1 type, like a constrained int
-    from fastapi._compat import v1
-
+    field_info = field_info or FieldInfo(annotation=type_, default=default, alias=alias)
+    kwargs = {"mode": mode, "name": name, "field_info": field_info}
     try:
-        return v1.ModelField(**v1_kwargs)
-    except RuntimeError:
+        return v2.ModelField(**kwargs)  # type: ignore[return-value,arg-type]
+    except PydanticSchemaGenerationError:
         raise fastapi.exceptions.FastAPIError(
             _invalid_args_message.format(type_=type_)
         ) from None
@@ -139,57 +102,7 @@ def create_cloned_field(
     *,
     cloned_types: Optional[MutableMapping[type[BaseModel], type[BaseModel]]] = None,
 ) -> ModelField:
-    if isinstance(field, v2.ModelField):
-        return field
-
-    from fastapi._compat import v1
-
-    # cloned_types caches already cloned types to support recursive models and improve
-    # performance by avoiding unnecessary cloning
-    if cloned_types is None:
-        cloned_types = _CLONED_TYPES_CACHE
-
-    original_type = field.type_
-    use_type = original_type
-    if lenient_issubclass(original_type, v1.BaseModel):
-        original_type = cast(type[v1.BaseModel], original_type)
-        use_type = cloned_types.get(original_type)
-        if use_type is None:
-            use_type = v1.create_model(original_type.__name__, __base__=original_type)
-            cloned_types[original_type] = use_type
-            for f in original_type.__fields__.values():
-                use_type.__fields__[f.name] = create_cloned_field(
-                    f,
-                    cloned_types=cloned_types,
-                )
-    new_field = create_model_field(name=field.name, type_=use_type, version="1")
-    new_field.has_alias = field.has_alias  # type: ignore[attr-defined]
-    new_field.alias = field.alias  # type: ignore[misc]
-    new_field.class_validators = field.class_validators  # type: ignore[attr-defined]
-    new_field.default = field.default  # type: ignore[misc]
-    new_field.default_factory = field.default_factory  # type: ignore[attr-defined]
-    new_field.required = field.required  # type: ignore[misc]
-    new_field.model_config = field.model_config  # type: ignore[attr-defined]
-    new_field.field_info = field.field_info
-    new_field.allow_none = field.allow_none  # type: ignore[attr-defined]
-    new_field.validate_always = field.validate_always  # type: ignore[attr-defined]
-    if field.sub_fields:  # type: ignore[attr-defined]
-        new_field.sub_fields = [  # type: ignore[attr-defined]
-            create_cloned_field(sub_field, cloned_types=cloned_types)
-            for sub_field in field.sub_fields  # type: ignore[attr-defined]
-        ]
-    if field.key_field:  # type: ignore[attr-defined]
-        new_field.key_field = create_cloned_field(  # type: ignore[attr-defined]
-            field.key_field,  # type: ignore[attr-defined]
-            cloned_types=cloned_types,
-        )
-    new_field.validators = field.validators  # type: ignore[attr-defined]
-    new_field.pre_validators = field.pre_validators  # type: ignore[attr-defined]
-    new_field.post_validators = field.post_validators  # type: ignore[attr-defined]
-    new_field.parse_json = field.parse_json  # type: ignore[attr-defined]
-    new_field.shape = field.shape  # type: ignore[attr-defined]
-    new_field.populate_validators()  # type: ignore[attr-defined]
-    return new_field
+    return field
 
 
 def generate_operation_id_for_path(

pyproject.toml

@@ -199,14 +199,22 @@ omit = [
     "docs_src/dependencies/tutorial008_an_py39.py",  # difficult to mock
     "docs_src/dependencies/tutorial013_an_py310.py",  # temporary code example?
     "docs_src/dependencies/tutorial014_an_py310.py",  # temporary code example?
-    # Pydantic V1
+    # Pydantic v1 migration, no longer tested
+    "docs_src/pydantic_v1_in_v2/tutorial001_an_py310.py",
+    "docs_src/pydantic_v1_in_v2/tutorial001_an_py39.py",
+    "docs_src/pydantic_v1_in_v2/tutorial002_an_py310.py",
+    "docs_src/pydantic_v1_in_v2/tutorial002_an_py39.py",
+    "docs_src/pydantic_v1_in_v2/tutorial003_an_py310.py",
+    "docs_src/pydantic_v1_in_v2/tutorial003_an_py39.py",
+    "docs_src/pydantic_v1_in_v2/tutorial004_an_py310.py",
+    "docs_src/pydantic_v1_in_v2/tutorial004_an_py39.py",
+    # TODO: remove when removing this file, after updating translations, Pydantic v1
     "docs_src/schema_extra_example/tutorial001_pv1_py310.py",
-    "docs_src/query_param_models/tutorial002_pv1_py310.py",
-    "docs_src/query_param_models/tutorial002_pv1_an_py310.py",
-    "docs_src/header_param_models/tutorial002_pv1_py310.py",
-    "docs_src/header_param_models/tutorial002_pv1_an_py310.py",
-    "docs_src/cookie_param_models/tutorial002_pv1_py310.py",
-    "docs_src/cookie_param_models/tutorial002_pv1_an_py310.py",
+    "docs_src/schema_extra_example/tutorial001_pv1_py39.py",
+    "docs_src/path_operation_advanced_configuration/tutorial007_pv1_py39.py",
+    "docs_src/settings/app03_py39/config_pv1.py",
+    "docs_src/settings/app03_an_py39/config_pv1.py",
+    "docs_src/settings/tutorial001_pv1_py39.py",
 ]
 
 [tool.coverage.report]

requirements-tests.txt

@@ -4,7 +4,7 @@ pytest >=7.1.3,<9.0.0
 coverage[toml] >= 6.5.0,< 8.0
 mypy ==1.14.1
 dirty-equals ==0.9.0
-sqlmodel==0.0.27
+sqlmodel==0.0.31
 flask >=1.1.2,<4.0.0
 strawberry-graphql >=0.200.0,< 1.0.0
 anyio[trio] >=3.2.1,<5.0.0

scripts/general-llm-prompt.md

@@ -0,0 +1,528 @@
+### Your task
+
+Translate an English original content to a target language.
+
+The original content is written in Markdown, write the translation in Markdown as well.
+
+The original content will be surrounded by triple percentage signs (%%%). Do not include the triple percentage signs in the translation.
+
+### Technical terms in English
+
+For technical terms in English that don't have a common translation term, use the original term in English.
+
+### Content of code snippets
+
+Do not translate the content of code snippets, keep the original in English. For example, `list`, `dict`, keep them as is.
+
+### Content of code blocks
+
+Do not translate the content of code blocks, except for comments in the language which the code block uses.
+
+Examples:
+
+Source (English) - The code block is a bash code example with one comment:
+
+```bash
+# Print greeting
+echo "Hello, World!"
+```
+
+Result (German):
+
+```bash
+# Gruß ausgeben
+echo "Hello, World!"
+```
+
+Source (English) - The code block is a console example containing HTML tags. No comments, so nothing to change here:
+
+```console
+$ <font color="#4E9A06">fastapi</font> run <u style="text-decoration-style:solid">main.py</u>
+<span style="background-color:#009485"><font color="#D3D7CF"> FastAPI </font></span>  Starting server
+        Searching for package file structure
+```
+
+Result (German):
+
+```console
+$ <font color="#4E9A06">fastapi</font> run <u style="text-decoration-style:solid">main.py</u>
+<span style="background-color:#009485"><font color="#D3D7CF"> FastAPI </font></span>  Starting server
+        Searching for package file structure
+```
+
+Source (English) - The code block is a console example containing 5 comments:
+
+
+```console
+// Go to the home directory
+$ cd
+// Create a directory for all your code projects
+$ mkdir code
+// Enter into that code directory
+$ cd code
+// Create a directory for this project
+$ mkdir awesome-project
+// Enter into that project directory
+$ cd awesome-project
+```
+
+Result (German):
+
+```console
+// Gehe zum Home-Verzeichnis
+$ cd
+// Erstelle ein Verzeichnis für alle Ihre Code-Projekte
+$ mkdir code
+// Gehe in dieses Code-Verzeichnis
+$ cd code
+// Erstelle ein Verzeichnis für dieses Projekt
+$ mkdir awesome-project
+// Gehe in dieses Projektverzeichnis
+$ cd awesome-project
+```
+
+If there is an existing translation and its Mermaid diagram is in sync with the Mermaid diagram in the English source, except a few translated words, then use the Mermaid diagram of the existing translation. The human editor of the translation translated these words in the Mermaid diagram. Keep these translations, do not revert them back to the English source.
+
+Example:
+
+Source (English):
+
+```mermaid
+flowchart LR
+    subgraph global[global env]
+        harry-1[harry v1]
+    end
+    subgraph stone-project[philosophers-stone project]
+        stone(philosophers-stone) -->|requires| harry-1
+    end
+```
+
+Existing translation (German) - has three translations:
+
+```mermaid
+flowchart LR
+    subgraph global[globale Umgebung]
+        harry-1[harry v1]
+    end
+    subgraph stone-project[philosophers-stone-Projekt]
+        stone(philosophers-stone) -->|benötigt| harry-1
+    end
+```
+
+Result (German) - you change nothing:
+
+```mermaid
+flowchart LR
+    subgraph global[globale Umgebung]
+        harry-1[harry v1]
+    end
+    subgraph stone-project[philosophers-stone-Projekt]
+        stone(philosophers-stone) -->|benötigt| harry-1
+    end
+```
+
+### Special blocks
+
+There are special blocks of notes, tips and others that look like:
+
+/// note
+Here goes a note
+///
+
+To translate it, keep the same line and add the translation after a vertical bar.
+
+For example, if you were translating to Spanish, you would write:
+
+/// note | Nota
+
+Some examples in Spanish:
+
+Source (English):
+
+/// tip
+
+Result (Spanish):
+
+/// tip | Consejo
+
+Source (English):
+
+/// details | Preview
+
+Result (Spanish):
+
+/// details | Vista previa
+
+### Tab blocks
+
+There are special blocks surrounded by four slashes (////). They mark text, which will be rendered as part of a tab in the final document. The scheme is:
+
+//// tab | {tab title}
+{tab content, may span many lines}
+////
+
+Keep everything before the vertical bar (|) as is, including the vertical bar. Translate the tab title. Translate the tab content, applying the rules you know. Keep the four block closing slashes as is.
+
+Examples:
+
+Source (English):
+
+//// tab | Python 3.8+ non-Annotated
+Hello
+////
+
+Result (German):
+
+//// tab | Python 3.8+ nicht annotiert
+Hallo
+////
+
+Source (English) - Here there is nothing to translate in the tab title:
+
+//// tab | Linux, macOS, Windows Bash
+Hello again
+////
+
+Result (German):
+
+//// tab | Linux, macOS, Windows Bash
+Hallo wieder
+////
+
+### Headings
+
+Every Markdown heading in the English text (all levels) ends with a part inside curly brackets. This part denotes the hash of this heading, which is used in links to this heading. In translations, translate the heading, but do not translate this hash part, so that links do not break.
+
+Examples of how to translate a heading:
+
+Source (English):
+
+```
+## Alternative API docs { #alternative-api-docs }
+```
+
+Result (Spanish):
+
+```
+## Documentación de la API alternativa { #alternative-api-docs }
+```
+
+Source (English):
+
+```
+### Example { #example }
+```
+
+Result (German):
+
+```
+### Beispiel { #example }
+```
+
+### Links
+
+Use the following rules for links (apply both to Markdown-style links ([text](url)) and to HTML-style <a href="url">text</a> tags):
+
+- For relative URLs, only translate the link text. Do not translate the URL or its parts.
+
+Example:
+
+Source (English):
+
+```
+[One of the fastest Python frameworks available](#performance)
+```
+
+Result (German):
+
+```
+[Eines der schnellsten verfügbaren Python-Frameworks](#performance)
+```
+
+- For absolute URLs which DO NOT start EXACTLY with https://fastapi.tiangolo.com, only translate the link text and leave the URL unchanged.
+
+Example:
+
+Source (English):
+
+```
+<a href="https://sqlmodel.tiangolo.com/" class="external-link" target="_blank">SQLModel docs</a>
+```
+
+Result (German):
+
+```
+<a href="https://sqlmodel.tiangolo.com/" class="external-link" target="_blank">SQLModel-Dokumentation</a>
+```
+
+- For absolute URLs which DO start EXACTLY with https://fastapi.tiangolo.com, only translate the link text and change the URL by adding the language code (https://fastapi.tiangolo.com/{language_code}[rest part of the url]).
+
+Example:
+
+Source (English):
+
+```
+<a href="https://fastapi.tiangolo.com/tutorial/path-params/#documentation" class="external-link" target="_blank">Documentation</a>
+```
+
+Result (Spanish):
+
+```
+<a href="https://fastapi.tiangolo.com/es/tutorial/path-params/#documentation" class="external-link" target="_blank">Documentación</a>
+```
+
+- Do not add language codes for URLs that point to static assets (e.g., images, CSS, JavaScript).
+
+Example:
+
+Source (English):
+
+```
+<a href="https://fastapi.tiangolo.com/img/something.jpg" class="external-link" target="_blank">Something</a>
+```
+
+Result (Spanish):
+
+```
+<a href="https://fastapi.tiangolo.com/img/something.jpg" class="external-link" target="_blank">Algo</a>
+```
+
+- For internal links, only translate link text.
+
+Example:
+
+Source (English):
+
+```
+[Create Pull Requests](help-fastapi.md#create-a-pull-request){.internal-link target=_blank}
+```
+
+Result (German):
+
+```
+[Pull Requests erzeugen](help-fastapi.md#create-a-pull-request){.internal-link target=_blank}
+```
+
+- Do not translate anchor fragments in links (the part after `#`), as they must remain the same to work correctly.
+
+- If an existing translation has a link with an anchor fragment different to the anchor fragment in the English source, then this is an error. Fix this by using the anchor fragment of the English source.
+
+Example:
+
+Source (English):
+
+```
+[Body - Multiple Parameters: Singular values in body](body-multiple-params.md#singular-values-in-body){.internal-link target=_blank}
+```
+
+Existing wrong translation (German) - notice the wrongly translated anchor fragment:
+
+```
+[Body - Mehrere Parameter: Einfache Werte im Body](body-multiple-params.md#einzelne-werte-im-body){.internal-link target=_blank}.
+```
+
+Result (German) - you fix the anchor fragment:
+
+```
+[Body - Mehrere Parameter: Einfache Werte im Body](body-multiple-params.md#singular-values-in-body){.internal-link target=_blank}.
+```
+
+- Do not add anchor fragments at will, even if this makes sense. If the English source has no anchor, don't add one.
+
+Example:
+
+Source (English):
+
+```
+Create a [virtual environment](../virtual-environments.md){.internal-link target=_blank}
+```
+
+Wrong translation in German - Anchor added to the URL.
+
+```
+Erstelle eine [virtuelle Umgebung](../virtual-environments.md#create-a-virtual-environment){.internal-link target=_blank}
+```
+
+Good translation (German) - URL stays like in the English source.
+
+```
+Erstelle eine [Virtuelle Umgebung](../virtual-environments.md){.internal-link target=_blank}
+```
+
+### HTML abbr elements
+
+Translate HTML abbr elements (`<abbr title="description">text</abbr>`) as follows:
+
+- If the text surrounded by the abbr element is an abbreviation (the text may be surrounded by further HTML or Markdown markup or quotes, for example <code>text</code> or `text` or "text", ignore that further markup when deciding if the text is an abbreviation), and if the description (the text inside the title attribute) contains the full phrase for this abbreviation, then append a dash (-) to the full phrase, followed by the translation of the full phrase.
+
+Conversion scheme:
+
+Source (English):
+
+```
+<abbr title="{full phrase}">{abbreviation}</abbr>
+```
+
+Result:
+
+```
+<abbr title="{full phrase} - {translation of full phrase}">{abbreviation}</abbr>
+```
+
+Examples:
+
+Source (English):
+
+```
+<abbr title="Internet of Things">IoT</abbr>
+<abbr title="Central Processing Unit">CPU</abbr>
+<abbr title="too long; didn't read"><strong>TL;DR:</strong></abbr>
+```
+
+Result (German):
+
+```
+<abbr title="Internet of Things - Internet der Dinge">IoT</abbr>
+<abbr title="Central Processing Unit - Zentrale Verarbeitungseinheit">CPU</abbr>
+<abbr title="too long; didn't read - zu lang; hab's nicht gelesen"><strong>TL;DR:</strong></abbr>
+```
+
+- If the language to which you translate mostly uses the letters of the ASCII char set (for example Spanish, French, German, but not Russian, Chinese) and if the translation of the full phrase is identical to, or starts with the same letters as the original full phrase, then only give the translation of the full phrase.
+
+Conversion scheme:
+
+Source (English):
+
+```
+<abbr title="{full phrase}">{abbreviation}</abbr>
+```
+
+Result:
+
+```
+<abbr title="{translation of full phrase}">{abbreviation}</abbr>
+```
+
+Examples:
+
+Source (English):
+
+```
+<abbr title="JSON Web Tokens">JWT</abbr>
+<abbr title="Enumeration">Enum</abbr>
+<abbr title="Asynchronous Server Gateway Interface">ASGI</abbr>
+```
+
+Result (German):
+
+```
+<abbr title="JSON Web Tokens">JWT</abbr>
+<abbr title="Enumeration">Enum</abbr>
+<abbr title="Asynchrones Server-Gateway-Interface">ASGI</abbr>
+```
+
+- If the description is not a full phrase for an abbreviation which the abbr element surrounds, but some other information, then just translate the description.
+
+Conversion scheme:
+
+Source (English):
+
+```
+<abbr title="{description}">{text}</abbr>
+```
+
+Result:
+
+```
+<abbr title="{translation of description}">{translation of text}</abbr>
+```
+
+Examples:
+
+    Source (English):
+
+```
+<abbr title="also known as: endpoints, routes">path</abbr>
+<abbr title="a program that checks for code errors">linter</abbr>
+<abbr title="converting the string that comes from an HTTP request into Python data">parsing</abbr>
+<abbr title="before 2023-03">0.95.0</abbr>
+<abbr title="2023-08-26">at the time of writing this</abbr>
+```
+
+Result (German):
+
+```
+<abbr title="auch bekannt als: Endpunkte, Routen">Pfad</abbr>
+<abbr title="Programm das auf Fehler im Code prüft">Linter</abbr>
+<abbr title="Konvertieren des Strings eines HTTP-Requests in Python-Daten">Parsen</abbr>
+<abbr title="vor 2023-03">0.95.0</abbr>
+<abbr title="2023-08-26">zum Zeitpunkt als das hier geschrieben wurde</abbr>
+```
+
+- If the text surrounded by the abbr element is an abbreviation and the description contains both the full phrase for that abbreviation, and other information, separated by a colon (`:`), then append a dash (`-`) and the translation of the full phrase to the original full phrase and translate the other information.
+
+Conversion scheme:
+
+Source (English):
+
+```
+<abbr title="{full phrase}: {other information}">{abbreviation}</abbr>
+```
+
+Result:
+
+```
+<abbr title="{full phrase} - {translation of full phrase}: {translation of other information}">{abbreviation}</abbr>
+```
+
+Examples:
+
+Source (English):
+
+```
+<abbr title="Input/Output: disk reading or writing, network communication.">I/O</abbr>
+<abbr title="Content Delivery Network: service, that provides static files.">CDN</abbr>
+<abbr title="Integrated Development Environment: similar to a code editor">IDE</abbr>
+```
+
+Result (German):
+
+```
+<abbr title="Input/Output - Eingabe/Ausgabe: Lesen oder Schreiben auf der Festplatte, Netzwerkkommunikation.">I/O</abbr>
+<abbr title="Content Delivery Network - Inhalte auslieferndes Netzwerk: Dienst, der statische Dateien bereitstellt.">CDN</abbr>
+<abbr title="Integrated Development Environment - Integrierte Entwicklungsumgebung: Ähnlich einem Code-Editor">IDE</abbr>
+```
+
+- You can leave the original full phrase away, if the translated full phrase is identical or starts with the same letters as the original full phrase.
+
+Conversion scheme:
+
+Source (English):
+
+```
+<abbr title="{full phrase}: {information}">{abbreviation}</abbr>
+```
+
+Result:
+
+```
+<abbr title="{translation of full phrase}: {translation of information}">{abbreviation}</abbr>
+```
+
+Example:
+
+Source (English):
+
+```
+<abbr title="Object Relational Mapper: a fancy term for a library where some classes represent SQL tables and instances represent rows in those tables">ORM</abbr>
+```
+
+Result (German):
+
+```
+<abbr title="Objektrelationaler Mapper: Ein Fachbegriff für eine Bibliothek, in der einige Klassen SQL-Tabellen und Instanzen Zeilen in diesen Tabellen darstellen">ORM</abbr>
+```
+
+- If there is an existing translation, and it has ADDITIONAL abbr elements in a sentence, and these additional abbr elements do not exist in the related sentence in the English text, then KEEP those additional abbr elements in the translation. Do not remove them. Except when you remove the whole sentence from the translation, because the whole sentence was removed from the English text, then also remove the abbr element. The reasoning for this rule is, that such additional abbr elements are manually added by the human editor of the translation, in order to translate or explain an English word to the human readers of the translation. These additional abbr elements would not make sense in the English text, but they do make sense in the translation. So keep them in the translation, even though they are not part of the English text. This rule only applies to abbr elements.
+
+- Apply above rules also when there is an existing translation! Make sure that all title attributes in abbr elements get properly translated or updated, using the schemes given above. However, leave the ADDITIONAL abbr's described above alone. Do not change their formatting or content.

scripts/translate.py

@@ -25,650 +25,8 @@ non_translated_sections = (
     "contributing.md",
 )
 
-
-general_prompt = """
-### About literal text in this prompt
-
-1) In the following instructions (after I say: `The above rules are in effect now`) the two characters `«` and `»` will be used to surround LITERAL TEXT, which is text or characters you shall interpret literally. The `«` and the `»` are not part of the literal text, they are the meta characters denoting it.
-
-2) Furthermore, text surrounded by `«««` and `»»»` is a BLOCK OF LITERAL TEXT which spans multiple lines. To get its content, dedent all lines of the block until the `«««` and `»»»` are at column zero, then remove the newline (`\n`) after the `«««` and the newline before the `»»»`. The `«««` and the `»»»` are not part of the literal text block, they are the meta characters denoting it.
-
-3) If you see backticks or any other quotes inside literal text – inside `«` and `»` –  or inside blocks of literal text – inside `«««` and `»»»` – then interpret them as literal characters, do NOT interpret them as meta characters.
-
-The above rules are in effect now.
-
-
-### Definitions of terms used in this prompt
-
-"backtick"
-
-    The character «`»
-    Unicode U+0060 (GRAVE ACCENT)
-
-"single backtick"
-
-    A single backtick – «`»
-
-"triple backticks"
-
-    Three backticks in a row – «```»
-
-"neutral double quote"
-
-    The character «"»
-    Unicode U+0022 (QUOTATION MARK)
-
-"neutral single quote"
-
-    The character «'»
-    Unicode U+0027 (APOSTROPHE)
-
-"English double typographic quotes"
-
-    The characters «“» and «”»
-    Unicode U+201C (LEFT DOUBLE QUOTATION MARK) and Unicode U+201D (RIGHT DOUBLE QUOTATION MARK)
-
-"English single typographic quotes"
-
-    The characters «‘» and «’»
-    Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and Unicode U+2019 (RIGHT SINGLE QUOTATION MARK)
-
-"code snippet"
-
-    Also called "inline code". Text in a Markdown document which is surrounded by single backticks. A paragraph in a Markdown document can have a more than one code snippet.
-
-    Example:
-
-        «««
-        `i am a code snippet`
-        »»»
-
-    Example:
-
-        «««
-        `first code snippet` `second code snippet` `third code snippet`
-        »»»
-
-"code block"
-
-    Text in a Markdown document which is surrounded by triple backticks. Spreads multiple lines.
-
-    Example:
-
-        «««
-        ```
-        Hello
-        World
-        ```
-        »»»
-
-    Example:
-
-        «««
-        ```python
-        print("hello World")
-        ```
-        »»»
-
-"HTML element"
-
-    a HTML opening tag – e.g. «<div>» – and a HTML closing tag – e.g. «</div>» – surrounding text or other HTML elements.
-
-
-### Your task
-
-Translate an English text – the original content – to a target language.
-
-The original content is written in Markdown, write the translation in Markdown as well.
-
-The original content will be surrounded by triple percentage signs («%%%»). Do not include the triple percentage signs in the translation.
-
-
-### Technical terms in English
-
-For technical terms in English that don't have a common translation term, use the original term in English.
-
-
-### Content of code snippets
-
-Do not translate the content of code snippets, keep the original in English. For example, «`list`», «`dict`», keep them as is.
-
-
-### Content of code blocks
-
-Do not translate the content of code blocks, except for comments in the language which the code block uses.
-
-Examples:
-
-    Source (English) – The code block is a bash code example with one comment:
-
-        «««
-        ```bash
-        # Print greeting
-        echo "Hello, World!"
-        ```
-        »»»
-
-    Result (German):
-
-        «««
-        ```bash
-        # Gruß ausgeben
-        echo "Hello, World!"
-        ```
-        »»»
-
-    Source (English) – The code block is a console example containing HTML tags. No comments, so nothing to change here:
-
-        «««
-        ```console
-        $ <font color="#4E9A06">fastapi</font> run <u style="text-decoration-style:solid">main.py</u>
-        <span style="background-color:#009485"><font color="#D3D7CF"> FastAPI </font></span>  Starting server
-                Searching for package file structure
-        ```
-        »»»
-
-    Result (German):
-
-        «««
-        ```console
-        $ <font color="#4E9A06">fastapi</font> run <u style="text-decoration-style:solid">main.py</u>
-        <span style="background-color:#009485"><font color="#D3D7CF"> FastAPI </font></span>  Starting server
-                Searching for package file structure
-        ```
-        »»»
-
-    Source (English) – The code block is a console example containing 5 comments:
-
-        «««
-        ```console
-        // Go to the home directory
-        $ cd
-        // Create a directory for all your code projects
-        $ mkdir code
-        // Enter into that code directory
-        $ cd code
-        // Create a directory for this project
-        $ mkdir awesome-project
-        // Enter into that project directory
-        $ cd awesome-project
-        ```
-        »»»
-
-    Result (German):
-
-        «««
-        ```console
-        // Gehe zum Home-Verzeichnis
-        $ cd
-        // Erstelle ein Verzeichnis für alle Ihre Code-Projekte
-        $ mkdir code
-        // Gehe in dieses Code-Verzeichnis
-        $ cd code
-        // Erstelle ein Verzeichnis für dieses Projekt
-        $ mkdir awesome-project
-        // Gehe in dieses Projektverzeichnis
-        $ cd awesome-project
-        ```
-        »»»
-
-If there is an existing translation and its Mermaid diagram is in sync with the Mermaid diagram in the English source, except a few translated words, then use the Mermaid diagram of the existing translation. The human editor of the translation translated these words in the Mermaid diagram. Keep these translations, do not revert them back to the English source.
-
-Example:
-
-    Source (English):
-
-        «««
-        ```mermaid
-        flowchart LR
-            subgraph global[global env]
-                harry-1[harry v1]
-            end
-            subgraph stone-project[philosophers-stone project]
-                stone(philosophers-stone) -->|requires| harry-1
-            end
-        ```
-        »»»
-
-    Existing translation (German) – has three translations:
-
-        «««
-        ```mermaid
-        flowchart LR
-            subgraph global[globale Umgebung]
-                harry-1[harry v1]
-            end
-            subgraph stone-project[philosophers-stone-Projekt]
-                stone(philosophers-stone) -->|benötigt| harry-1
-            end
-        ```
-        »»»
-
-    Result (German) – you change nothing:
-
-        «««
-        ```mermaid
-        flowchart LR
-            subgraph global[globale Umgebung]
-                harry-1[harry v1]
-            end
-            subgraph stone-project[philosophers-stone-Projekt]
-                stone(philosophers-stone) -->|benötigt| harry-1
-            end
-        ```
-        »»»
-
-
-### Special blocks
-
-There are special blocks of notes, tips and others that look like:
-
-    «««
-    /// note
-    »»»
-
-To translate it, keep the same line and add the translation after a vertical bar.
-
-For example, if you were translating to Spanish, you would write:
-
-    «««
-    /// note | Nota
-    »»»
-
-Some examples in Spanish:
-
-    Source:
-
-        «««
-        /// tip
-        »»»
-
-    Result:
-
-        «««
-        /// tip | Consejo
-        »»»
-
-    Source:
-
-        «««
-        /// details | Preview
-        »»»
-
-    Result:
-
-        «««
-        /// details | Vista previa
-        »»»
-
-
-### Tab blocks
-
-There are special blocks surrounded by four slashes («////»). They mark text, which will be rendered as part of a tab in the final document. The scheme is:
-
-    //// tab | {tab title}
-    {tab content, may span many lines}
-    ////
-
-Keep everything before the vertical bar («|») as is, including the vertical bar. Translate the tab title. Translate the tab content, applying the rules you know. Keep the four block closing slashes as is.
-
-Examples:
-
-    Source (English):
-
-        «««
-        //// tab | Python 3.8+ non-Annotated
-        Hello
-        ////
-        »»»
-
-    Result (German):
-
-        «««
-        //// tab | Python 3.8+ nicht annotiert
-        Hallo
-        ////
-        »»»
-
-    Source (English) – Here there is nothing to translate in the tab title:
-
-        «««
-        //// tab | Linux, macOS, Windows Bash
-        Hello again
-        ////
-        »»»
-
-    Result (German):
-
-        «««
-        //// tab | Linux, macOS, Windows Bash
-        Hallo wieder
-        ////
-        »»»
-
-
-### Headings
-
-Every Markdown heading in the English text (all levels) ends with a part inside curly brackets. This part denotes the hash of this heading, which is used in links to this heading. In translations, translate the heading, but do not translate this hash part, so that links do not break.
-
-Examples of how to translate a heading:
-
-    Source (English):
-
-        «««
-        ## Alternative API docs { #alternative-api-docs }
-        »»»
-
-    Result (Spanish):
-
-        «««
-        ## Documentación de la API alternativa { #alternative-api-docs }
-        »»»
-
-    Source (English):
-
-        «««
-        ### Example { #example }
-        »»»
-
-    Result (German):
-
-        «««
-        ### Beispiel { #example }
-        »»»
-
-
-### Links
-
-Use the following rules for links (apply both to Markdown-style links ([text](url)) and to HTML-style <a> tags):
-
-1) For relative URLs, only translate link text. Do not translate the URL or its parts
-
-Example:
-
-    Source (English):
-
-        «««
-        [One of the fastest Python frameworks available](#performance)
-        »»»
-
-    Result (German):
-
-        «««
-        [Eines der schnellsten verfügbaren Python-Frameworks](#performance)
-        »»»
-
-2) For absolute URLs which DO NOT start EXACTLY with «https://fastapi.tiangolo.com», only translate link text and leave the URL unchanged.
-
-Example:
-
-    Source (English):
-
-        «««
-        <a href="https://sqlmodel.tiangolo.com/" class="external-link" target="_blank">SQLModel docs</a>
-        »»»
-
-    Result (German):
-
-        «««
-        <a href="https://sqlmodel.tiangolo.com/" class="external-link" target="_blank">SQLModel-Dokumentation</a>
-        »»»
-
-3) For absolute URLs which DO start EXACTLY with «https://fastapi.tiangolo.com», only translate link text and change the URL by adding language code («https://fastapi.tiangolo.com/{language_code}[rest part of the url]»).
-
-Example:
-
-    Source (English):
-
-        «««
-        <a href="https://fastapi.tiangolo.com/tutorial/path-params/#documentation" class="external-link" target="_blank">Documentation</a>
-        »»»
-
-    Result (Spanish):
-
-        «««
-        <a href="https://fastapi.tiangolo.com/es/tutorial/path-params/#documentation" class="external-link" target="_blank">Documentación</a>
-        »»»
-
-3.1) Do not add language codes for URLs that point to static assets (e.g., images, CSS, JavaScript).
-
-Example:
-
-    Source (English):
-
-        «««
-        <a href="https://fastapi.tiangolo.com/img/something.jpg" class="external-link" target="_blank">Something</a>
-        »»»
-
-    Result (Spanish):
-
-        «««
-        <a href="https://fastapi.tiangolo.com/img/something.jpg" class="external-link" target="_blank">Algo</a>
-        »»»
-
-4) For internal links, only translate link text.
-
-Example:
-
-    Source (English):
-
-        «««
-        [Create Pull Requests](help-fastapi.md#create-a-pull-request){.internal-link target=_blank}
-        »»»
-
-    Result (German):
-
-        «««
-        [Pull Requests erzeugen](help-fastapi.md#create-a-pull-request){.internal-link target=_blank}
-        »»»
-
-5) Do not translate anchor fragments in links (the part after «#»), as they must remain the same to work correctly.
-
-5.1) If an existing translation has a link with an anchor fragment different to the anchor fragment in the English source, then this is an error. Fix this by using the anchor fragment of the English source.
-
-Example:
-
-    Source (English):
-
-        «««
-        [Body - Multiple Parameters: Singular values in body](body-multiple-params.md#singular-values-in-body){.internal-link target=_blank}
-        »»»
-
-    Existing wrong translation (German) – notice the wrongly translated anchor fragment:
-
-        «««
-        [Body – Mehrere Parameter: Einfache Werte im Body](body-multiple-params.md#einzelne-werte-im-body){.internal-link target=_blank}.
-        »»»
-
-    Result (German) – you fix the anchor fragment:
-
-        «««
-        [Body – Mehrere Parameter: Einfache Werte im Body](body-multiple-params.md#singular-values-in-body){.internal-link target=_blank}.
-        »»»
-
-5.2) Do not add anchor fragments at will, even if this makes sense. If the English source has no anchor, don't add one.
-
-Example:
-
-    Source (English):
-
-        «««
-        Create a [virtual environment](../virtual-environments.md){.internal-link target=_blank}
-        »»»
-
-    Wrong translation (German) – Anchor added to the URL.
-
-        «««
-        Erstelle eine [virtuelle Umgebung](../virtual-environments.md#create-a-virtual-environment){.internal-link target=_blank}
-        »»»
-
-    Good translation (German) – URL stays like in the English source.
-
-        «««
-        Erstelle eine [Virtuelle Umgebung](../virtual-environments.md){.internal-link target=_blank}
-        »»»
-
-
-### HTML abbr elements
-
-Translate HTML abbr elements («<abbr title="description">text</abbr>») as follows:
-
-1) If the text surrounded by the abbr element is an abbreviation (the text may be surrounded by further HTML or Markdown markup or quotes, for example «<code>text</code>» or «`text`» or «"text"», ignore that further markup when deciding if the text is an abbreviation), and if the description (the text inside the title attribute) contains the full phrase for this abbreviation, then append a dash («–») to the full phrase, followed by the translation of the full phrase.
-
-Conversion scheme:
-
-    Source (English):
-
-        <abbr title="{full phrase}">{abbreviation}</abbr>
-
-    Result:
-
-        <abbr title="{full phrase} – {translation of full phrase}">{abbreviation}</abbr>
-
-Examples:
-
-    Source (English):
-
-        «««
-        <abbr title="Internet of Things">IoT</abbr>
-        <abbr title="Central Processing Unit">CPU</abbr>
-        <abbr title="too long; didn't read"><strong>TL;DR:</strong></abbr>
-        »»»
-
-    Result (German):
-
-        «««
-        <abbr title="Internet of Things – Internet der Dinge">IoT</abbr>
-        <abbr title="Central Processing Unit – Zentrale Verarbeitungseinheit">CPU</abbr>
-        <abbr title="too long; didn't read – zu lang; hab's nicht gelesen"><strong>TL;DR:</strong></abbr>
-        »»»
-
-1.1) If the language to which you translate mostly uses the letters of the ASCII char set (for example Spanish, French, German, but not Russian, Chinese) and if the translation of the full phrase is identical to, or starts with the same letters as the original full phrase, then only give the translation of the full phrase.
-
-Conversion scheme:
-
-    Source (English):
-
-        <abbr title="{full phrase}">{abbreviation}</abbr>
-
-    Result:
-
-        <abbr title="{translation of full phrase}">{abbreviation}</abbr>
-
-Examples:
-
-    Source (English):
-
-        «««
-        <abbr title="JSON Web Tokens">JWT</abbr>
-        <abbr title="Enumeration">Enum</abbr>
-        <abbr title="Asynchronous Server Gateway Interface">ASGI</abbr>
-        »»»
-
-    Result (German):
-
-        «««
-        <abbr title="JSON Web Tokens">JWT</abbr>
-        <abbr title="Enumeration">Enum</abbr>
-        <abbr title="Asynchrones Server-Gateway-Interface">ASGI</abbr>
-        »»»
-
-2) If the description is not a full phrase for an abbreviation which the abbr element surrounds, but some other information, then just translate the description.
-
-Conversion scheme:
-
-    Source (English):
-
-        <abbr title="{description}">{text}</abbr>
-
-    Result:
-
-        <abbr title="{translation of description}">{translation of text}</abbr>
-
-Examples:
-
-    Source (English):
-
-        «««
-        <abbr title="also known as: endpoints, routes">path</abbr>
-        <abbr title="a program that checks for code errors">linter</abbr>
-        <abbr title="converting the string that comes from an HTTP request into Python data">parsing</abbr>
-        <abbr title="before 2023-03">0.95.0</abbr>
-        <abbr title="2023-08-26">at the time of writing this</abbr>
-        »»»
-
-    Result (German):
-
-        «««
-        <abbr title="auch bekannt als: Endpunkte, Routen">Pfad</abbr>
-        <abbr title="Programm das auf Fehler im Code prüft">Linter</abbr>
-        <abbr title="Konvertieren des Strings eines HTTP-Requests in Python-Daten">Parsen</abbr>
-        <abbr title="vor 2023-03">0.95.0</abbr>
-        <abbr title="2023-08-26">zum Zeitpunkt als das hier geschrieben wurde</abbr>
-        »»»
-
-
-3) If the text surrounded by the abbr element is an abbreviation and the description contains both the full phrase for that abbreviation, and other information, separated by a colon («:»), then append a dash («–») and the translation of the full phrase to the original full phrase and translate the other information.
-
-Conversion scheme:
-
-    Source (English):
-
-        <abbr title="{full phrase}: {other information}">{abbreviation}</abbr>
-
-    Result:
-
-        <abbr title="{full phrase} – {translation of full phrase}: {translation of other information}">{abbreviation}</abbr>
-
-Examples:
-
-    Source (English):
-
-        «««
-        <abbr title="Input/Output: disk reading or writing, network communication.">I/O</abbr>
-        <abbr title="Content Delivery Network: service, that provides static files.">CDN</abbr>
-        <abbr title="Integrated Development Environment: similar to a code editor">IDE</abbr>
-        »»»
-
-    Result (German):
-
-        «««
-        <abbr title="Input/Output – Eingabe/Ausgabe: Lesen oder Schreiben auf der Festplatte, Netzwerkkommunikation.">I/O</abbr>
-        <abbr title="Content Delivery Network – Inhalte auslieferndes Netzwerk: Dienst, der statische Dateien bereitstellt.">CDN</abbr>
-        <abbr title="Integrated Development Environment – Integrierte Entwicklungsumgebung: Ähnlich einem Code-Editor">IDE</abbr>
-        »»»
-
-3.1) Like in rule 2.1, you can leave the original full phrase away, if the translated full phrase is identical or starts with the same letters as the original full phrase.
-
-Conversion scheme:
-
-    Source (English):
-
-        <abbr title="{full phrase}: {information}">{abbreviation}</abbr>
-
-    Result:
-
-        <abbr title="{translation of full phrase}: {translation of information}">{abbreviation}</abbr>
-
-Example:
-
-    Source (English):
-
-        «««
-        <abbr title="Object Relational Mapper: a fancy term for a library where some classes represent SQL tables and instances represent rows in those tables">ORM</abbr>
-        »»»
-
-    Result (German):
-
-        «««
-        <abbr title="Objektrelationaler Mapper: Ein Fachbegriff für eine Bibliothek, in der einige Klassen SQL-Tabellen und Instanzen Zeilen in diesen Tabellen darstellen">ORM</abbr>
-        »»»
-
-4) If there is an existing translation, and it has ADDITIONAL abbr elements in a sentence, and these additional abbr elements do not exist in the related sentence in the English text, then KEEP those additional abbr elements in the translation. Do not remove them. Except when you remove the whole sentence from the translation, because the whole sentence was removed from the English text, then also remove the abbr element. The reasoning for this rule is, that such additional abbr elements are manually added by the human editor of the translation, in order to translate or explain an English word to the human readers of the translation. These additional abbr elements would not make sense in the English text, but they do make sense in the translation. So keep them in the translation, even though they are not part of the English text. This rule only applies to abbr elements.
-
-5) Apply above rules also when there is an existing translation! Make sure that all title attributes in abbr elements get properly translated or updated, using the schemes given above. However, leave the ADDITIONAL abbr's from rule 4 alone. Do not change their formatting or content.
-
-"""
+general_prompt_path = Path(__file__).absolute().parent / "llm-general-prompt.md"
+general_prompt = general_prompt_path.read_text(encoding="utf-8")
 
 app = typer.Typer()
 
@@ -1036,9 +394,13 @@ def make_pr(
     print("Creating PR")
     g = Github(github_token)
     gh_repo = g.get_repo(github_repository)
-    pr = gh_repo.create_pull(
-        title=message, body=message, base="master", head=branch_name
+    body = (
+        message
+        + "\n\nThis PR was created automatically using LLMs."
+        + f"\n\nIt uses the prompt file https://github.com/fastapi/fastapi/blob/master/docs/{language}/llm-prompt.md."
+        + "\n\nIn most cases, it's better to make PRs updating that file so that the LLM can do a better job generating the translations than suggesting changes in this PR."
     )
+    pr = gh_repo.create_pull(title=message, body=body, base="master", head=branch_name)
     print(f"Created PR: {pr.number}")
     print("Finished")
 

tests/benchmarks/test_general_performance.py

@@ -1,13 +1,12 @@
 import json
 import sys
-import warnings
 from collections.abc import Iterator
 from typing import Annotated, Any
 
 import pytest
 from fastapi import Depends, FastAPI
-from fastapi.exceptions import FastAPIDeprecationWarning
 from fastapi.testclient import TestClient
+from pydantic import BaseModel
 
 if "--codspeed" not in sys.argv:
     pytest.skip(
@@ -47,148 +46,143 @@ def dep_b(a: Annotated[int, Depends(dep_a)]):
     return a + 2
 
 
-@pytest.fixture(
-    scope="module",
-    params=[
-        "pydantic-v2",
-        "pydantic-v1",
-    ],
-)
-def basemodel_class(request: pytest.FixtureRequest) -> type[Any]:
-    if request.param == "pydantic-v2":
-        from pydantic import BaseModel
+class ItemIn(BaseModel):
+    name: str
+    value: int
 
-        return BaseModel
-    else:
-        from pydantic.v1 import BaseModel
 
-        return BaseModel
+class ItemOut(BaseModel):
+    name: str
+    value: int
+    dep: int
+
+
+class LargeIn(BaseModel):
+    items: list[dict[str, Any]]
+    metadata: dict[str, Any]
+
+
+class LargeOut(BaseModel):
+    items: list[dict[str, Any]]
+    metadata: dict[str, Any]
+
+
+app = FastAPI()
+
+
+@app.post("/sync/validated", response_model=ItemOut)
+def sync_validated(item: ItemIn, dep: Annotated[int, Depends(dep_b)]):
+    return ItemOut(name=item.name, value=item.value, dep=dep)
+
+
+@app.get("/sync/dict-no-response-model")
+def sync_dict_no_response_model():
+    return {"name": "foo", "value": 123}
+
+
+@app.get("/sync/dict-with-response-model", response_model=ItemOut)
+def sync_dict_with_response_model(
+    dep: Annotated[int, Depends(dep_b)],
+):
+    return {"name": "foo", "value": 123, "dep": dep}
+
+
+@app.get("/sync/model-no-response-model")
+def sync_model_no_response_model(dep: Annotated[int, Depends(dep_b)]):
+    return ItemOut(name="foo", value=123, dep=dep)
+
+
+@app.get("/sync/model-with-response-model", response_model=ItemOut)
+def sync_model_with_response_model(dep: Annotated[int, Depends(dep_b)]):
+    return ItemOut(name="foo", value=123, dep=dep)
+
+
+@app.post("/async/validated", response_model=ItemOut)
+async def async_validated(
+    item: ItemIn,
+    dep: Annotated[int, Depends(dep_b)],
+):
+    return ItemOut(name=item.name, value=item.value, dep=dep)
+
+
+@app.post("/sync/large-receive")
+def sync_large_receive(payload: LargeIn):
+    return {"received": len(payload.items)}
+
+
+@app.post("/async/large-receive")
+async def async_large_receive(payload: LargeIn):
+    return {"received": len(payload.items)}
+
+
+@app.get("/sync/large-dict-no-response-model")
+def sync_large_dict_no_response_model():
+    return LARGE_PAYLOAD
+
+
+@app.get("/sync/large-dict-with-response-model", response_model=LargeOut)
+def sync_large_dict_with_response_model():
+    return LARGE_PAYLOAD
+
+
+@app.get("/sync/large-model-no-response-model")
+def sync_large_model_no_response_model():
+    return LargeOut(items=LARGE_ITEMS, metadata=LARGE_METADATA)
+
+
+@app.get("/sync/large-model-with-response-model", response_model=LargeOut)
+def sync_large_model_with_response_model():
+    return LargeOut(items=LARGE_ITEMS, metadata=LARGE_METADATA)
+
+
+@app.get("/async/large-dict-no-response-model")
+async def async_large_dict_no_response_model():
+    return LARGE_PAYLOAD
+
+
+@app.get("/async/large-dict-with-response-model", response_model=LargeOut)
+async def async_large_dict_with_response_model():
+    return LARGE_PAYLOAD
+
+
+@app.get("/async/large-model-no-response-model")
+async def async_large_model_no_response_model():
+    return LargeOut(items=LARGE_ITEMS, metadata=LARGE_METADATA)
+
+
+@app.get("/async/large-model-with-response-model", response_model=LargeOut)
+async def async_large_model_with_response_model():
+    return LargeOut(items=LARGE_ITEMS, metadata=LARGE_METADATA)
+
+
+@app.get("/async/dict-no-response-model")
+async def async_dict_no_response_model():
+    return {"name": "foo", "value": 123}
+
+
+@app.get("/async/dict-with-response-model", response_model=ItemOut)
+async def async_dict_with_response_model(
+    dep: Annotated[int, Depends(dep_b)],
+):
+    return {"name": "foo", "value": 123, "dep": dep}
+
+
+@app.get("/async/model-no-response-model")
+async def async_model_no_response_model(
+    dep: Annotated[int, Depends(dep_b)],
+):
+    return ItemOut(name="foo", value=123, dep=dep)
+
+
+@app.get("/async/model-with-response-model", response_model=ItemOut)
+async def async_model_with_response_model(
+    dep: Annotated[int, Depends(dep_b)],
+):
+    return ItemOut(name="foo", value=123, dep=dep)
 
 
 @pytest.fixture(scope="module")
-def app(basemodel_class: type[Any]) -> FastAPI:
-    class ItemIn(basemodel_class):
-        name: str
-        value: int
-
-    class ItemOut(basemodel_class):
-        name: str
-        value: int
-        dep: int
-
-    class LargeIn(basemodel_class):
-        items: list[dict[str, Any]]
-        metadata: dict[str, Any]
-
-    class LargeOut(basemodel_class):
-        items: list[dict[str, Any]]
-        metadata: dict[str, Any]
-
-    app = FastAPI()
-
-    with warnings.catch_warnings(record=True):
-        warnings.filterwarnings(
-            "ignore",
-            message=r"pydantic\.v1 is deprecated and will soon stop being supported by FastAPI\..*",
-            category=FastAPIDeprecationWarning,
-        )
-
-        @app.post("/sync/validated", response_model=ItemOut)
-        def sync_validated(item: ItemIn, dep: Annotated[int, Depends(dep_b)]):
-            return ItemOut(name=item.name, value=item.value, dep=dep)
-
-        @app.get("/sync/dict-no-response-model")
-        def sync_dict_no_response_model():
-            return {"name": "foo", "value": 123}
-
-        @app.get("/sync/dict-with-response-model", response_model=ItemOut)
-        def sync_dict_with_response_model(
-            dep: Annotated[int, Depends(dep_b)],
-        ):
-            return {"name": "foo", "value": 123, "dep": dep}
-
-        @app.get("/sync/model-no-response-model")
-        def sync_model_no_response_model(dep: Annotated[int, Depends(dep_b)]):
-            return ItemOut(name="foo", value=123, dep=dep)
-
-        @app.get("/sync/model-with-response-model", response_model=ItemOut)
-        def sync_model_with_response_model(dep: Annotated[int, Depends(dep_b)]):
-            return ItemOut(name="foo", value=123, dep=dep)
-
-        @app.post("/async/validated", response_model=ItemOut)
-        async def async_validated(
-            item: ItemIn,
-            dep: Annotated[int, Depends(dep_b)],
-        ):
-            return ItemOut(name=item.name, value=item.value, dep=dep)
-
-        @app.post("/sync/large-receive")
-        def sync_large_receive(payload: LargeIn):
-            return {"received": len(payload.items)}
-
-        @app.post("/async/large-receive")
-        async def async_large_receive(payload: LargeIn):
-            return {"received": len(payload.items)}
-
-        @app.get("/sync/large-dict-no-response-model")
-        def sync_large_dict_no_response_model():
-            return LARGE_PAYLOAD
-
-        @app.get("/sync/large-dict-with-response-model", response_model=LargeOut)
-        def sync_large_dict_with_response_model():
-            return LARGE_PAYLOAD
-
-        @app.get("/sync/large-model-no-response-model")
-        def sync_large_model_no_response_model():
-            return LargeOut(items=LARGE_ITEMS, metadata=LARGE_METADATA)
-
-        @app.get("/sync/large-model-with-response-model", response_model=LargeOut)
-        def sync_large_model_with_response_model():
-            return LargeOut(items=LARGE_ITEMS, metadata=LARGE_METADATA)
-
-        @app.get("/async/large-dict-no-response-model")
-        async def async_large_dict_no_response_model():
-            return LARGE_PAYLOAD
-
-        @app.get("/async/large-dict-with-response-model", response_model=LargeOut)
-        async def async_large_dict_with_response_model():
-            return LARGE_PAYLOAD
-
-        @app.get("/async/large-model-no-response-model")
-        async def async_large_model_no_response_model():
-            return LargeOut(items=LARGE_ITEMS, metadata=LARGE_METADATA)
-
-        @app.get("/async/large-model-with-response-model", response_model=LargeOut)
-        async def async_large_model_with_response_model():
-            return LargeOut(items=LARGE_ITEMS, metadata=LARGE_METADATA)
-
-        @app.get("/async/dict-no-response-model")
-        async def async_dict_no_response_model():
-            return {"name": "foo", "value": 123}
-
-        @app.get("/async/dict-with-response-model", response_model=ItemOut)
-        async def async_dict_with_response_model(
-            dep: Annotated[int, Depends(dep_b)],
-        ):
-            return {"name": "foo", "value": 123, "dep": dep}
-
-        @app.get("/async/model-no-response-model")
-        async def async_model_no_response_model(
-            dep: Annotated[int, Depends(dep_b)],
-        ):
-            return ItemOut(name="foo", value=123, dep=dep)
-
-        @app.get("/async/model-with-response-model", response_model=ItemOut)
-        async def async_model_with_response_model(
-            dep: Annotated[int, Depends(dep_b)],
-        ):
-            return ItemOut(name="foo", value=123, dep=dep)
-
-    return app
-
-
-@pytest.fixture(scope="module")
-def client(app: FastAPI) -> Iterator[TestClient]:
+def client() -> Iterator[TestClient]:
     with TestClient(app) as client:
         yield client
 

tests/test_additional_properties_bool.py

@@ -1,6 +1,5 @@
 from typing import Union
 
-from dirty_equals import IsDict
 from fastapi import FastAPI
 from fastapi.testclient import TestClient
 from pydantic import BaseModel, ConfigDict
@@ -52,19 +51,13 @@ def test_openapi_schema():
                     "requestBody": {
                         "content": {
                             "application/json": {
-                                "schema": IsDict(
-                                    {
-                                        "anyOf": [
-                                            {"$ref": "#/components/schemas/Foo"},
-                                            {"type": "null"},
-                                        ],
-                                        "title": "Foo",
-                                    }
-                                )
-                                | IsDict(
-                                    # TODO: remove when deprecating Pydantic v1
-                                    {"$ref": "#/components/schemas/Foo"}
-                                )
+                                "schema": {
+                                    "anyOf": [
+                                        {"$ref": "#/components/schemas/Foo"},
+                                        {"type": "null"},
+                                    ],
+                                    "title": "Foo",
+                                }
                             }
                         }
                     },

tests/test_additional_responses_custom_model_in_callback.py

@@ -1,6 +1,6 @@
-from dirty_equals import IsDict
 from fastapi import APIRouter, FastAPI
 from fastapi.testclient import TestClient
+from inline_snapshot import snapshot
 from pydantic import BaseModel, HttpUrl
 from starlette.responses import JSONResponse
 
@@ -32,121 +32,114 @@ client = TestClient(app)
 def test_openapi_schema():
     response = client.get("/openapi.json")
     assert response.status_code == 200, response.text
-    assert response.json() == {
-        "openapi": "3.1.0",
-        "info": {"title": "FastAPI", "version": "0.1.0"},
-        "paths": {
-            "/": {
-                "post": {
-                    "summary": "Main Route",
-                    "operationId": "main_route__post",
-                    "parameters": [
-                        {
-                            "required": True,
-                            "schema": IsDict(
-                                {
-                                    "title": "Callback Url",
-                                    "minLength": 1,
-                                    "type": "string",
-                                    "format": "uri",
-                                }
-                            )
-                            # TODO: remove when deprecating Pydantic v1
-                            | IsDict(
-                                {
+    assert response.json() == snapshot(
+        {
+            "openapi": "3.1.0",
+            "info": {"title": "FastAPI", "version": "0.1.0"},
+            "paths": {
+                "/": {
+                    "post": {
+                        "summary": "Main Route",
+                        "operationId": "main_route__post",
+                        "parameters": [
+                            {
+                                "required": True,
+                                "schema": {
                                     "title": "Callback Url",
                                     "maxLength": 2083,
                                     "minLength": 1,
                                     "type": "string",
                                     "format": "uri",
-                                }
-                            ),
-                            "name": "callback_url",
-                            "in": "query",
-                        }
-                    ],
-                    "responses": {
-                        "200": {
-                            "description": "Successful Response",
-                            "content": {"application/json": {"schema": {}}},
+                                },
+                                "name": "callback_url",
+                                "in": "query",
+                            }
+                        ],
+                        "responses": {
+                            "200": {
+                                "description": "Successful Response",
+                                "content": {"application/json": {"schema": {}}},
+                            },
+                            "422": {
+                                "description": "Validation Error",
+                                "content": {
+                                    "application/json": {
+                                        "schema": {
+                                            "$ref": "#/components/schemas/HTTPValidationError"
+                                        }
+                                    }
+                                },
+                            },
                         },
-                        "422": {
-                            "description": "Validation Error",
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "$ref": "#/components/schemas/HTTPValidationError"
+                        "callbacks": {
+                            "callback_route": {
+                                "{$callback_url}/callback/": {
+                                    "get": {
+                                        "summary": "Callback Route",
+                                        "operationId": "callback_route__callback_url__callback__get",
+                                        "responses": {
+                                            "400": {
+                                                "content": {
+                                                    "application/json": {
+                                                        "schema": {
+                                                            "$ref": "#/components/schemas/CustomModel"
+                                                        }
+                                                    }
+                                                },
+                                                "description": "Bad Request",
+                                            },
+                                            "200": {
+                                                "description": "Successful Response",
+                                                "content": {
+                                                    "application/json": {"schema": {}}
+                                                },
+                                            },
+                                        },
                                     }
                                 }
-                            },
+                            }
+                        },
+                    }
+                }
+            },
+            "components": {
+                "schemas": {
+                    "CustomModel": {
+                        "title": "CustomModel",
+                        "required": ["a"],
+                        "type": "object",
+                        "properties": {"a": {"title": "A", "type": "integer"}},
+                    },
+                    "HTTPValidationError": {
+                        "title": "HTTPValidationError",
+                        "type": "object",
+                        "properties": {
+                            "detail": {
+                                "title": "Detail",
+                                "type": "array",
+                                "items": {
+                                    "$ref": "#/components/schemas/ValidationError"
+                                },
+                            }
                         },
                     },
-                    "callbacks": {
-                        "callback_route": {
-                            "{$callback_url}/callback/": {
-                                "get": {
-                                    "summary": "Callback Route",
-                                    "operationId": "callback_route__callback_url__callback__get",
-                                    "responses": {
-                                        "400": {
-                                            "content": {
-                                                "application/json": {
-                                                    "schema": {
-                                                        "$ref": "#/components/schemas/CustomModel"
-                                                    }
-                                                }
-                                            },
-                                            "description": "Bad Request",
-                                        },
-                                        "200": {
-                                            "description": "Successful Response",
-                                            "content": {
-                                                "application/json": {"schema": {}}
-                                            },
-                                        },
-                                    },
-                                }
-                            }
-                        }
+                    "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"},
+                        },
                     },
                 }
-            }
-        },
-        "components": {
-            "schemas": {
-                "CustomModel": {
-                    "title": "CustomModel",
-                    "required": ["a"],
-                    "type": "object",
-                    "properties": {"a": {"title": "A", "type": "integer"}},
-                },
-                "HTTPValidationError": {
-                    "title": "HTTPValidationError",
-                    "type": "object",
-                    "properties": {
-                        "detail": {
-                            "title": "Detail",
-                            "type": "array",
-                            "items": {"$ref": "#/components/schemas/ValidationError"},
-                        }
-                    },
-                },
-                "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"},
-                    },
-                },
-            }
-        },
-    }
+            },
+        }
+    )

tests/test_annotated.py

@@ -1,7 +1,6 @@
 from typing import Annotated
 
 import pytest
-from dirty_equals import IsDict
 from fastapi import APIRouter, FastAPI, Query
 from fastapi.testclient import TestClient
 
@@ -32,44 +31,23 @@ client = TestClient(app)
 
 foo_is_missing = {
     "detail": [
-        IsDict(
-            {
-                "loc": ["query", "foo"],
-                "msg": "Field required",
-                "type": "missing",
-                "input": None,
-            }
-        )
-        # TODO: remove when deprecating Pydantic v1
-        | IsDict(
-            {
-                "loc": ["query", "foo"],
-                "msg": "field required",
-                "type": "value_error.missing",
-            }
-        )
+        {
+            "loc": ["query", "foo"],
+            "msg": "Field required",
+            "type": "missing",
+            "input": None,
+        }
     ]
 }
 foo_is_short = {
     "detail": [
-        IsDict(
-            {
-                "ctx": {"min_length": 1},
-                "loc": ["query", "foo"],
-                "msg": "String should have at least 1 character",
-                "type": "string_too_short",
-                "input": "",
-            }
-        )
-        # TODO: remove when deprecating Pydantic v1
-        | IsDict(
-            {
-                "ctx": {"limit_value": 1},
-                "loc": ["query", "foo"],
-                "msg": "ensure this value has at least 1 characters",
-                "type": "value_error.any_str.min_length",
-            }
-        )
+        {
+            "ctx": {"min_length": 1},
+            "loc": ["query", "foo"],
+            "msg": "String should have at least 1 character",
+            "type": "string_too_short",
+            "input": "",
+        }
     ]
 }
 

tests/test_application.py

@@ -1,5 +1,4 @@
 import pytest
-from dirty_equals import IsDict
 from fastapi.testclient import TestClient
 
 from .main import app
@@ -274,14 +273,10 @@ def test_openapi_schema():
                             "name": "item_id",
                             "in": "path",
                             "required": True,
-                            "schema": IsDict(
-                                {
-                                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                                    "title": "Item Id",
-                                }
-                            )
-                            # TODO: remove when deprecating Pydantic v1
-                            | IsDict({"title": "Item Id", "type": "string"}),
+                            "schema": {
+                                "anyOf": [{"type": "string"}, {"type": "null"}],
+                                "title": "Item Id",
+                            },
                         }
                     ],
                 }
@@ -984,14 +979,10 @@ def test_openapi_schema():
                             "name": "query",
                             "in": "query",
                             "required": False,
-                            "schema": IsDict(
-                                {
-                                    "anyOf": [{"type": "integer"}, {"type": "null"}],
-                                    "title": "Query",
-                                }
-                            )
-                            # TODO: remove when deprecating Pydantic v1
-                            | IsDict({"title": "Query", "type": "integer"}),
+                            "schema": {
+                                "anyOf": [{"type": "integer"}, {"type": "null"}],
+                                "title": "Query",
+                            },
                         }
                     ],
                 }

tests/test_compat.py

@@ -1,20 +1,16 @@
-from typing import Any, Union
+from typing import Union
 
 from fastapi import FastAPI, UploadFile
 from fastapi._compat import (
     Undefined,
-    _get_model_config,
-    get_cached_model_fields,
-    is_scalar_field,
     is_uploadfile_sequence_annotation,
-    may_v1,
 )
 from fastapi._compat.shared import is_bytes_sequence_annotation
 from fastapi.testclient import TestClient
 from pydantic import BaseModel, ConfigDict
 from pydantic.fields import FieldInfo
 
-from .utils import needs_py310, needs_py_lt_314
+from .utils import needs_py310
 
 
 def test_model_field_default_required():
@@ -26,35 +22,6 @@ def test_model_field_default_required():
     assert field.default is Undefined
 
 
-@needs_py_lt_314
-def test_v1_plain_validator_function():
-    from fastapi._compat import v1
-
-    # For coverage
-    def func(v):  # pragma: no cover
-        return v
-
-    result = v1.with_info_plain_validator_function(func)
-    assert result == {}
-
-
-def test_is_model_field():
-    # For coverage
-    from fastapi._compat import _is_model_field
-
-    assert not _is_model_field(str)
-
-
-def test_get_model_config():
-    # For coverage in Pydantic v2
-    class Foo(BaseModel):
-        model_config = ConfigDict(from_attributes=True)
-
-    foo = Foo()
-    config = _get_model_config(foo)
-    assert config == {"from_attributes": True}
-
-
 def test_complex():
     app = FastAPI()
 
@@ -165,33 +132,3 @@ def test_serialize_sequence_value_with_none_first_in_union():
     result = v2.serialize_sequence_value(field=field, value=["x", "y"])
     assert result == ["x", "y"]
     assert isinstance(result, list)
-
-
-@needs_py_lt_314
-def test_is_pv1_scalar_field():
-    from fastapi._compat import v1
-
-    # For coverage
-    class Model(v1.BaseModel):
-        foo: Union[str, dict[str, Any]]
-
-    fields = v1.get_model_fields(Model)
-    assert not is_scalar_field(fields[0])
-
-
-@needs_py_lt_314
-def test_get_model_fields_cached():
-    from fastapi._compat import v1
-
-    class Model(may_v1.BaseModel):
-        foo: str
-
-    non_cached_fields = v1.get_model_fields(Model)
-    non_cached_fields2 = v1.get_model_fields(Model)
-    cached_fields = get_cached_model_fields(Model)
-    cached_fields2 = get_cached_model_fields(Model)
-    for f1, f2 in zip(cached_fields, cached_fields2):
-        assert f1 is f2
-
-    assert non_cached_fields is not non_cached_fields2
-    assert cached_fields is cached_fields2

tests/test_datetime_custom_encoder.py

@@ -1,12 +1,9 @@
-import warnings
 from datetime import datetime, timezone
 
 from fastapi import FastAPI
 from fastapi.testclient import TestClient
 from pydantic import BaseModel
 
-from .utils import needs_pydanticv1
-
 
 def test_pydanticv2():
     from pydantic import field_serializer
@@ -29,34 +26,3 @@ def test_pydanticv2():
     with client:
         response = client.get("/model")
     assert response.json() == {"dt_field": "2019-01-01T08:00:00+00:00"}
-
-
-# TODO: remove when deprecating Pydantic v1
-@needs_pydanticv1
-def test_pydanticv1():
-    from pydantic import v1
-
-    class ModelWithDatetimeField(v1.BaseModel):
-        dt_field: datetime
-
-        class Config:
-            json_encoders = {
-                datetime: lambda dt: dt.replace(
-                    microsecond=0, tzinfo=timezone.utc
-                ).isoformat()
-            }
-
-    app = FastAPI()
-    model = ModelWithDatetimeField(dt_field=datetime(2019, 1, 1, 8))
-
-    with warnings.catch_warnings(record=True):
-        warnings.simplefilter("always")
-
-        @app.get("/model", response_model=ModelWithDatetimeField)
-        def get_model():
-            return model
-
-    client = TestClient(app)
-    with client:
-        response = client.get("/model")
-    assert response.json() == {"dt_field": "2019-01-01T08:00:00+00:00"}

tests/test_dependency_duplicates.py

@@ -1,4 +1,3 @@
-from dirty_equals import IsDict
 from fastapi import Depends, FastAPI
 from fastapi.testclient import TestClient
 from pydantic import BaseModel
@@ -46,29 +45,16 @@ async def no_duplicates_sub(
 def test_no_duplicates_invalid():
     response = client.post("/no-duplicates", json={"item": {"data": "myitem"}})
     assert response.status_code == 422, response.text
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["body", "item2"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["body", "item2"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["body", "item2"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
 
 
 def test_no_duplicates():

tests/test_dependency_overrides.py

@@ -1,7 +1,6 @@
 from typing import Optional
 
 import pytest
-from dirty_equals import IsDict
 from fastapi import APIRouter, Depends, FastAPI
 from fastapi.testclient import TestClient
 
@@ -54,29 +53,16 @@ async def overrider_dependency_with_sub(msg: dict = Depends(overrider_sub_depend
 def test_main_depends():
     response = client.get("/main-depends/")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["query", "q"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "q"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["query", "q"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
 
 
 def test_main_depends_q_foo():
@@ -100,29 +86,16 @@ def test_main_depends_q_foo_skip_100_limit_200():
 def test_decorator_depends():
     response = client.get("/decorator-depends/")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["query", "q"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "q"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["query", "q"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
 
 
 def test_decorator_depends_q_foo():
@@ -140,29 +113,16 @@ def test_decorator_depends_q_foo_skip_100_limit_200():
 def test_router_depends():
     response = client.get("/router-depends/")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["query", "q"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "q"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["query", "q"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
 
 
 def test_router_depends_q_foo():
@@ -186,29 +146,16 @@ def test_router_depends_q_foo_skip_100_limit_200():
 def test_router_decorator_depends():
     response = client.get("/router-decorator-depends/")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["query", "q"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "q"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["query", "q"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
 
 
 def test_router_decorator_depends_q_foo():
@@ -272,29 +219,17 @@ def test_override_with_sub_main_depends():
     app.dependency_overrides[common_parameters] = overrider_dependency_with_sub
     response = client.get("/main-depends/")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["query", "k"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "k"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["query", "k"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
+
     app.dependency_overrides = {}
 
 
@@ -302,29 +237,17 @@ def test_override_with_sub__main_depends_q_foo():
     app.dependency_overrides[common_parameters] = overrider_dependency_with_sub
     response = client.get("/main-depends/?q=foo")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["query", "k"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "k"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["query", "k"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
+
     app.dependency_overrides = {}
 
 
@@ -340,29 +263,17 @@ def test_override_with_sub_decorator_depends():
     app.dependency_overrides[common_parameters] = overrider_dependency_with_sub
     response = client.get("/decorator-depends/")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["query", "k"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "k"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["query", "k"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
+
     app.dependency_overrides = {}
 
 
@@ -370,29 +281,17 @@ def test_override_with_sub_decorator_depends_q_foo():
     app.dependency_overrides[common_parameters] = overrider_dependency_with_sub
     response = client.get("/decorator-depends/?q=foo")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["query", "k"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "k"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["query", "k"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
+
     app.dependency_overrides = {}
 
 
@@ -408,29 +307,17 @@ def test_override_with_sub_router_depends():
     app.dependency_overrides[common_parameters] = overrider_dependency_with_sub
     response = client.get("/router-depends/")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["query", "k"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "k"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["query", "k"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
+
     app.dependency_overrides = {}
 
 
@@ -438,29 +325,17 @@ def test_override_with_sub_router_depends_q_foo():
     app.dependency_overrides[common_parameters] = overrider_dependency_with_sub
     response = client.get("/router-depends/?q=foo")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["query", "k"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "k"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["query", "k"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
+
     app.dependency_overrides = {}
 
 
@@ -476,29 +351,17 @@ def test_override_with_sub_router_decorator_depends():
     app.dependency_overrides[common_parameters] = overrider_dependency_with_sub
     response = client.get("/router-decorator-depends/")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["query", "k"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "k"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["query", "k"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
+
     app.dependency_overrides = {}
 
 
@@ -506,29 +369,17 @@ def test_override_with_sub_router_decorator_depends_q_foo():
     app.dependency_overrides[common_parameters] = overrider_dependency_with_sub
     response = client.get("/router-decorator-depends/?q=foo")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["query", "k"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "k"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["query", "k"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
+
     app.dependency_overrides = {}
 
 

tests/test_extra_routes.py

@@ -1,6 +1,5 @@
 from typing import Optional
 
-from dirty_equals import IsDict
 from fastapi import FastAPI
 from fastapi.responses import JSONResponse
 from fastapi.testclient import TestClient
@@ -328,14 +327,10 @@ def test_openapi_schema():
                     "type": "object",
                     "properties": {
                         "name": {"title": "Name", "type": "string"},
-                        "price": IsDict(
-                            {
-                                "title": "Price",
-                                "anyOf": [{"type": "number"}, {"type": "null"}],
-                            }
-                        )
-                        # TODO: remove when deprecating Pydantic v1
-                        | IsDict({"title": "Price", "type": "number"}),
+                        "price": {
+                            "title": "Price",
+                            "anyOf": [{"type": "number"}, {"type": "null"}],
+                        },
                     },
                 },
                 "ValidationError": {

tests/test_filter_pydantic_sub_model/app_pv1.py

@@ -1,45 +0,0 @@
-import warnings
-from typing import Optional
-
-from fastapi import Depends, FastAPI
-from pydantic.v1 import BaseModel, validator
-
-app = FastAPI()
-
-
-class ModelB(BaseModel):
-    username: str
-
-
-class ModelC(ModelB):
-    password: str
-
-
-class ModelA(BaseModel):
-    name: str
-    description: Optional[str] = None
-    model_b: ModelB
-    tags: dict[str, str] = {}
-
-    @validator("name")
-    def lower_username(cls, name: str, values):
-        if not name.endswith("A"):
-            raise ValueError("name must end in A")
-        return name
-
-
-async def get_model_c() -> ModelC:
-    return ModelC(username="test-user", password="test-password")
-
-
-with warnings.catch_warnings(record=True):
-    warnings.simplefilter("always")
-
-    @app.get("/model/{name}", response_model=ModelA)
-    async def get_model_a(name: str, model_c=Depends(get_model_c)):
-        return {
-            "name": name,
-            "description": "model-a-desc",
-            "model_b": model_c,
-            "tags": {"key1": "value1", "key2": "value2"},
-        }

tests/test_filter_pydantic_sub_model/test_filter_pydantic_sub_model_pv1.py

@@ -1,146 +0,0 @@
-import pytest
-from fastapi.exceptions import ResponseValidationError
-from fastapi.testclient import TestClient
-from inline_snapshot import snapshot
-
-from ..utils import needs_pydanticv1
-
-
-@pytest.fixture(name="client")
-def get_client():
-    from .app_pv1 import app
-
-    client = TestClient(app)
-    return client
-
-
-@needs_pydanticv1
-def test_filter_sub_model(client: TestClient):
-    response = client.get("/model/modelA")
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "name": "modelA",
-        "description": "model-a-desc",
-        "model_b": {"username": "test-user"},
-        "tags": {"key1": "value1", "key2": "value2"},
-    }
-
-
-@needs_pydanticv1
-def test_validator_is_cloned(client: TestClient):
-    with pytest.raises(ResponseValidationError) as err:
-        client.get("/model/modelX")
-    assert err.value.errors() == [
-        {
-            "loc": ("response", "name"),
-            "msg": "name must end in A",
-            "type": "value_error",
-        }
-    ]
-
-
-@needs_pydanticv1
-def test_openapi_schema(client: TestClient):
-    response = client.get("/openapi.json")
-    assert response.status_code == 200, response.text
-    assert response.json() == snapshot(
-        {
-            "openapi": "3.1.0",
-            "info": {"title": "FastAPI", "version": "0.1.0"},
-            "paths": {
-                "/model/{name}": {
-                    "get": {
-                        "summary": "Get Model A",
-                        "operationId": "get_model_a_model__name__get",
-                        "parameters": [
-                            {
-                                "required": True,
-                                "schema": {"title": "Name", "type": "string"},
-                                "name": "name",
-                                "in": "path",
-                            }
-                        ],
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/ModelA"
-                                        }
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                }
-            },
-            "components": {
-                "schemas": {
-                    "HTTPValidationError": {
-                        "title": "HTTPValidationError",
-                        "type": "object",
-                        "properties": {
-                            "detail": {
-                                "title": "Detail",
-                                "type": "array",
-                                "items": {
-                                    "$ref": "#/components/schemas/ValidationError"
-                                },
-                            }
-                        },
-                    },
-                    "ModelA": {
-                        "title": "ModelA",
-                        "required": ["name", "model_b"],
-                        "type": "object",
-                        "properties": {
-                            "name": {"title": "Name", "type": "string"},
-                            "description": {"title": "Description", "type": "string"},
-                            "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": {
-                        "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"},
-                        },
-                    },
-                }
-            },
-        }
-    )

tests/test_filter_pydantic_sub_model_pv2.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 import pytest
-from dirty_equals import HasRepr, IsDict, IsOneOf
+from dirty_equals import HasRepr
 from fastapi import Depends, FastAPI
 from fastapi.exceptions import ResponseValidationError
 from fastapi.testclient import TestClient
@@ -63,23 +63,13 @@ def test_validator_is_cloned(client: TestClient):
     with pytest.raises(ResponseValidationError) as err:
         client.get("/model/modelX")
     assert err.value.errors() == [
-        IsDict(
-            {
-                "type": "value_error",
-                "loc": ("response", "name"),
-                "msg": "Value error, name must end in A",
-                "input": "modelX",
-                "ctx": {"error": HasRepr("ValueError('name must end in A')")},
-            }
-        )
-        | IsDict(
-            # TODO remove when deprecating Pydantic v1
-            {
-                "loc": ("response", "name"),
-                "msg": "name must end in A",
-                "type": "value_error",
-            }
-        )
+        {
+            "type": "value_error",
+            "loc": ("response", "name"),
+            "msg": "Value error, name must end in A",
+            "input": "modelX",
+            "ctx": {"error": HasRepr("ValueError('name must end in A')")},
+        }
     ]
 
 
@@ -145,23 +135,14 @@ def test_openapi_schema(client: TestClient):
                     },
                     "ModelA": {
                         "title": "ModelA",
-                        "required": IsOneOf(
-                            ["name", "description", "foo"],
-                            # TODO remove when deprecating Pydantic v1
-                            ["name", "foo"],
-                        ),
+                        "required": ["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"}),
+                            "description": {
+                                "title": "Description",
+                                "anyOf": [{"type": "string"}, {"type": "null"}],
+                            },
                             "foo": {"$ref": "#/components/schemas/ModelB"},
                             "tags": {
                                 "additionalProperties": {"type": "string"},

tests/test_forms_single_model.py

@@ -1,6 +1,5 @@
 from typing import Annotated, Optional
 
-from dirty_equals import IsDict
 from fastapi import FastAPI, Form
 from fastapi.testclient import TestClient
 from pydantic import BaseModel, Field
@@ -79,68 +78,37 @@ def test_invalid_data():
         },
     )
     assert response.status_code == 422, response.text
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "int_parsing",
-                    "loc": ["body", "age"],
-                    "msg": "Input should be a valid integer, unable to parse string as an integer",
-                    "input": "seventy",
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["body", "age"],
-                    "msg": "value is not a valid integer",
-                    "type": "type_error.integer",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "int_parsing",
+                "loc": ["body", "age"],
+                "msg": "Input should be a valid integer, unable to parse string as an integer",
+                "input": "seventy",
+            }
+        ]
+    }
 
 
 def test_no_data():
     response = client.post("/form/")
     assert response.status_code == 422, response.text
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["body", "username"],
-                    "msg": "Field required",
-                    "input": {"tags": ["foo", "bar"], "with": "nothing"},
-                },
-                {
-                    "type": "missing",
-                    "loc": ["body", "lastname"],
-                    "msg": "Field required",
-                    "input": {"tags": ["foo", "bar"], "with": "nothing"},
-                },
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["body", "username"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                },
-                {
-                    "loc": ["body", "lastname"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                },
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["body", "username"],
+                "msg": "Field required",
+                "input": {"tags": ["foo", "bar"], "with": "nothing"},
+            },
+            {
+                "type": "missing",
+                "loc": ["body", "lastname"],
+                "msg": "Field required",
+                "input": {"tags": ["foo", "bar"], "with": "nothing"},
+            },
+        ]
+    }
 
 
 def test_extra_param_single():

tests/test_get_model_definitions_formfeed_escape.py

@@ -1,25 +1,12 @@
-import warnings
-
 import pytest
 from fastapi import FastAPI
 from fastapi.testclient import TestClient
 from inline_snapshot import snapshot
 
-from .utils import needs_pydanticv1
 
-
-@pytest.fixture(
-    name="client",
-    params=[
-        pytest.param("pydantic-v1", marks=needs_pydanticv1),
-        "pydantic-v2",
-    ],
-)
-def client_fixture(request: pytest.FixtureRequest) -> TestClient:
-    if request.param == "pydantic-v1":
-        from pydantic.v1 import BaseModel
-    else:
-        from pydantic import BaseModel
+@pytest.fixture(name="client")
+def client_fixture() -> TestClient:
+    from pydantic import BaseModel
 
     class Address(BaseModel):
         """
@@ -38,28 +25,12 @@ def client_fixture(request: pytest.FixtureRequest) -> TestClient:
 
     app = FastAPI()
 
-    if request.param == "pydantic-v1":
-        with warnings.catch_warnings(record=True):
-            warnings.simplefilter("always")
-
-            @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"
-                    ),
-                )
-    else:
-
-        @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"
-                ),
-            )
+    @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)
     return client

tests/test_infer_param_optionality.py

@@ -1,6 +1,5 @@
 from typing import Optional
 
-from dirty_equals import IsDict
 from fastapi import APIRouter, FastAPI
 from fastapi.testclient import TestClient
 
@@ -163,16 +162,10 @@ def test_openapi_schema():
                             "required": False,
                             "name": "user_id",
                             "in": "query",
-                            "schema": IsDict(
-                                {
-                                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                                    "title": "User Id",
-                                }
-                            )
-                            | IsDict(
-                                # TODO: remove when deprecating Pydantic v1
-                                {"title": "User Id", "type": "string"}
-                            ),
+                            "schema": {
+                                "anyOf": [{"type": "string"}, {"type": "null"}],
+                                "title": "User Id",
+                            },
                         }
                     ],
                     "responses": {
@@ -208,16 +201,10 @@ def test_openapi_schema():
                             "required": False,
                             "name": "user_id",
                             "in": "query",
-                            "schema": IsDict(
-                                {
-                                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                                    "title": "User Id",
-                                }
-                            )
-                            | IsDict(
-                                # TODO: remove when deprecating Pydantic v1
-                                {"title": "User Id", "type": "string"}
-                            ),
+                            "schema": {
+                                "anyOf": [{"type": "string"}, {"type": "null"}],
+                                "title": "User Id",
+                            },
                         },
                     ],
                     "responses": {
@@ -247,16 +234,10 @@ def test_openapi_schema():
                             "required": True,
                             "name": "user_id",
                             "in": "path",
-                            "schema": IsDict(
-                                {
-                                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                                    "title": "User Id",
-                                }
-                            )
-                            | IsDict(
-                                # TODO: remove when deprecating Pydantic v1
-                                {"title": "User Id", "type": "string"}
-                            ),
+                            "schema": {
+                                "anyOf": [{"type": "string"}, {"type": "null"}],
+                                "title": "User Id",
+                            },
                         }
                     ],
                     "responses": {
@@ -292,16 +273,10 @@ def test_openapi_schema():
                             "required": True,
                             "name": "user_id",
                             "in": "path",
-                            "schema": IsDict(
-                                {
-                                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                                    "title": "User Id",
-                                }
-                            )
-                            | IsDict(
-                                # TODO: remove when deprecating Pydantic v1
-                                {"title": "User Id", "type": "string"}
-                            ),
+                            "schema": {
+                                "anyOf": [{"type": "string"}, {"type": "null"}],
+                                "title": "User Id",
+                            },
                         },
                     ],
                     "responses": {

tests/test_inherited_custom_class.py

@@ -5,8 +5,6 @@ from fastapi import FastAPI
 from fastapi.testclient import TestClient
 from pydantic import BaseModel
 
-from .utils import needs_pydanticv1
-
 
 class MyUuid:
     def __init__(self, uuid_string: str):
@@ -67,46 +65,3 @@ def test_pydanticv2():
     assert response_pydantic.json() == {
         "a_uuid": "b8799909-f914-42de-91bc-95c819218d01"
     }
-
-
-# TODO: remove when deprecating Pydantic v1
-@needs_pydanticv1
-def test_pydanticv1():
-    from pydantic import v1
-
-    app = FastAPI()
-
-    @app.get("/fast_uuid")
-    def return_fast_uuid():
-        asyncpg_uuid = MyUuid("a10ff360-3b1e-4984-a26f-d3ab460bdb51")
-        assert isinstance(asyncpg_uuid, uuid.UUID)
-        assert type(asyncpg_uuid) is not uuid.UUID
-        with pytest.raises(TypeError):
-            vars(asyncpg_uuid)
-        return {"fast_uuid": asyncpg_uuid}
-
-    class SomeCustomClass(v1.BaseModel):
-        class Config:
-            arbitrary_types_allowed = True
-            json_encoders = {uuid.UUID: str}
-
-        a_uuid: MyUuid
-
-    @app.get("/get_custom_class")
-    def return_some_user():
-        # Test that the fix also works for custom pydantic classes
-        return SomeCustomClass(a_uuid=MyUuid("b8799909-f914-42de-91bc-95c819218d01"))
-
-    client = TestClient(app)
-
-    with client:
-        response_simple = client.get("/fast_uuid")
-        response_pydantic = client.get("/get_custom_class")
-
-    assert response_simple.json() == {
-        "fast_uuid": "a10ff360-3b1e-4984-a26f-d3ab460bdb51"
-    }
-
-    assert response_pydantic.json() == {
-        "a_uuid": "b8799909-f914-42de-91bc-95c819218d01"
-    }

tests/test_jsonable_encoder.py

@@ -1,3 +1,4 @@
+import warnings
 from collections import deque
 from dataclasses import dataclass
 from datetime import datetime, timezone
@@ -5,15 +6,14 @@ from decimal import Decimal
 from enum import Enum
 from math import isinf, isnan
 from pathlib import PurePath, PurePosixPath, PureWindowsPath
-from typing import Optional
+from typing import Optional, TypedDict
 
 import pytest
 from fastapi._compat import Undefined
 from fastapi.encoders import jsonable_encoder
+from fastapi.exceptions import PydanticV1NotSupportedError
 from pydantic import BaseModel, Field, ValidationError
 
-from .utils import needs_pydanticv1
-
 
 class Person:
     def __init__(self, name: str):
@@ -156,29 +156,17 @@ def test_encode_custom_json_encoders_model_pydanticv2():
     assert jsonable_encoder(subclass_model) == {"dt_field": "2019-01-01T08:00:00+00:00"}
 
 
-# TODO: remove when deprecating Pydantic v1
-@needs_pydanticv1
-def test_encode_custom_json_encoders_model_pydanticv1():
-    from pydantic import v1
+def test_json_encoder_error_with_pydanticv1():
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore", UserWarning)
+        from pydantic import v1
 
-    class ModelWithCustomEncoder(v1.BaseModel):
-        dt_field: datetime
+    class ModelV1(v1.BaseModel):
+        name: str
 
-        class Config:
-            json_encoders = {
-                datetime: lambda dt: dt.replace(
-                    microsecond=0, tzinfo=timezone.utc
-                ).isoformat()
-            }
-
-    class ModelWithCustomEncoderSubclass(ModelWithCustomEncoder):
-        class Config:
-            pass
-
-    model = ModelWithCustomEncoder(dt_field=datetime(2019, 1, 1, 8))
-    assert jsonable_encoder(model) == {"dt_field": "2019-01-01T08:00:00+00:00"}
-    subclass_model = ModelWithCustomEncoderSubclass(dt_field=datetime(2019, 1, 1, 8))
-    assert jsonable_encoder(subclass_model) == {"dt_field": "2019-01-01T08:00:00+00:00"}
+    data = ModelV1(name="test")
+    with pytest.raises(PydanticV1NotSupportedError):
+        jsonable_encoder(data)
 
 
 def test_encode_model_with_config():
@@ -214,25 +202,27 @@ def test_encode_model_with_default():
     }
 
 
-@needs_pydanticv1
 def test_custom_encoders():
-    from pydantic import v1
-
     class safe_datetime(datetime):
         pass
 
-    class MyModel(v1.BaseModel):
+    class MyDict(TypedDict):
         dt_field: safe_datetime
 
-    instance = MyModel(dt_field=safe_datetime.now())
+    instance = MyDict(dt_field=safe_datetime.now())
 
     encoded_instance = jsonable_encoder(
         instance, custom_encoder={safe_datetime: lambda o: o.strftime("%H:%M:%S")}
     )
-    assert encoded_instance["dt_field"] == instance.dt_field.strftime("%H:%M:%S")
+    assert encoded_instance["dt_field"] == instance["dt_field"].strftime("%H:%M:%S")
+
+    encoded_instance = jsonable_encoder(
+        instance, custom_encoder={datetime: lambda o: o.strftime("%H:%M:%S")}
+    )
+    assert encoded_instance["dt_field"] == instance["dt_field"].strftime("%H:%M:%S")
 
     encoded_instance2 = jsonable_encoder(instance)
-    assert encoded_instance2["dt_field"] == instance.dt_field.isoformat()
+    assert encoded_instance2["dt_field"] == instance["dt_field"].isoformat()
 
 
 def test_custom_enum_encoders():
@@ -287,17 +277,6 @@ def test_encode_pure_path():
     assert jsonable_encoder({"path": test_path}) == {"path": str(test_path)}
 
 
-@needs_pydanticv1
-def test_encode_root():
-    from pydantic import v1
-
-    class ModelWithRoot(v1.BaseModel):
-        __root__: str
-
-    model = ModelWithRoot(__root__="Foo")
-    assert jsonable_encoder(model) == "Foo"
-
-
 def test_decimal_encoder_float():
     data = {"value": Decimal(1.23)}
     assert jsonable_encoder(data) == {"value": 1.23}

tests/test_multi_body_errors.py

@@ -1,8 +1,9 @@
 from decimal import Decimal
 
-from dirty_equals import IsDict, IsOneOf
+from dirty_equals import IsOneOf
 from fastapi import FastAPI
 from fastapi.testclient import TestClient
+from inline_snapshot import snapshot
 from pydantic import BaseModel, condecimal
 
 app = FastAPI()
@@ -24,109 +25,65 @@ client = TestClient(app)
 def test_put_correct_body():
     response = client.post("/items/", json=[{"name": "Foo", "age": 5}])
     assert response.status_code == 200, response.text
-    assert response.json() == {
-        "item": [
-            {
-                "name": "Foo",
-                "age": IsOneOf(
-                    5,
-                    # TODO: remove when deprecating Pydantic v1
-                    "5",
-                ),
-            }
-        ]
-    }
+    assert response.json() == snapshot(
+        {
+            "item": [
+                {
+                    "name": "Foo",
+                    "age": "5",
+                }
+            ]
+        }
+    )
 
 
 def test_jsonable_encoder_requiring_error():
     response = client.post("/items/", json=[{"name": "Foo", "age": -1.0}])
     assert response.status_code == 422, response.text
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "greater_than",
-                    "loc": ["body", 0, "age"],
-                    "msg": "Input should be greater than 0",
-                    "input": -1.0,
-                    "ctx": {"gt": 0},
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "ctx": {"limit_value": 0.0},
-                    "loc": ["body", 0, "age"],
-                    "msg": "ensure this value is greater than 0",
-                    "type": "value_error.number.not_gt",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "greater_than",
+                "loc": ["body", 0, "age"],
+                "msg": "Input should be greater than 0",
+                "input": -1.0,
+                "ctx": {"gt": 0},
+            }
+        ]
+    }
 
 
 def test_put_incorrect_body_multiple():
     response = client.post("/items/", json=[{"age": "five"}, {"age": "six"}])
     assert response.status_code == 422, response.text
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["body", 0, "name"],
-                    "msg": "Field required",
-                    "input": {"age": "five"},
-                },
-                {
-                    "type": "decimal_parsing",
-                    "loc": ["body", 0, "age"],
-                    "msg": "Input should be a valid decimal",
-                    "input": "five",
-                },
-                {
-                    "type": "missing",
-                    "loc": ["body", 1, "name"],
-                    "msg": "Field required",
-                    "input": {"age": "six"},
-                },
-                {
-                    "type": "decimal_parsing",
-                    "loc": ["body", 1, "age"],
-                    "msg": "Input should be a valid decimal",
-                    "input": "six",
-                },
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["body", 0, "name"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                },
-                {
-                    "loc": ["body", 0, "age"],
-                    "msg": "value is not a valid decimal",
-                    "type": "type_error.decimal",
-                },
-                {
-                    "loc": ["body", 1, "name"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                },
-                {
-                    "loc": ["body", 1, "age"],
-                    "msg": "value is not a valid decimal",
-                    "type": "type_error.decimal",
-                },
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["body", 0, "name"],
+                "msg": "Field required",
+                "input": {"age": "five"},
+            },
+            {
+                "type": "decimal_parsing",
+                "loc": ["body", 0, "age"],
+                "msg": "Input should be a valid decimal",
+                "input": "five",
+            },
+            {
+                "type": "missing",
+                "loc": ["body", 1, "name"],
+                "msg": "Field required",
+                "input": {"age": "six"},
+            },
+            {
+                "type": "decimal_parsing",
+                "loc": ["body", 1, "age"],
+                "msg": "Input should be a valid decimal",
+                "input": "six",
+            },
+        ]
+    }
 
 
 def test_openapi_schema():
@@ -179,31 +136,21 @@ def test_openapi_schema():
                     "type": "object",
                     "properties": {
                         "name": {"title": "Name", "type": "string"},
-                        "age": IsDict(
-                            {
-                                "title": "Age",
-                                "anyOf": [
-                                    {"exclusiveMinimum": 0.0, "type": "number"},
-                                    IsOneOf(
-                                        # pydantic < 2.12.0
-                                        {"type": "string"},
-                                        # pydantic >= 2.12.0
-                                        {
-                                            "type": "string",
-                                            "pattern": r"^(?!^[-+.]*$)[+-]?0*\d*\.?\d*$",
-                                        },
-                                    ),
-                                ],
-                            }
-                        )
-                        | IsDict(
-                            # TODO: remove when deprecating Pydantic v1
-                            {
-                                "title": "Age",
-                                "exclusiveMinimum": 0.0,
-                                "type": "number",
-                            }
-                        ),
+                        "age": {
+                            "title": "Age",
+                            "anyOf": [
+                                {"exclusiveMinimum": 0.0, "type": "number"},
+                                IsOneOf(
+                                    # pydantic < 2.12.0
+                                    {"type": "string"},
+                                    # pydantic >= 2.12.0
+                                    {
+                                        "type": "string",
+                                        "pattern": r"^(?!^[-+.]*$)[+-]?0*\d*\.?\d*$",
+                                    },
+                                ),
+                            ],
+                        },
                     },
                 },
                 "ValidationError": {

tests/test_multi_query_errors.py

@@ -1,4 +1,3 @@
-from dirty_equals import IsDict
 from fastapi import FastAPI, Query
 from fastapi.testclient import TestClient
 
@@ -22,40 +21,22 @@ def test_multi_query():
 def test_multi_query_incorrect():
     response = client.get("/items/?q=five&q=six")
     assert response.status_code == 422, response.text
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "int_parsing",
-                    "loc": ["query", "q", 0],
-                    "msg": "Input should be a valid integer, unable to parse string as an integer",
-                    "input": "five",
-                },
-                {
-                    "type": "int_parsing",
-                    "loc": ["query", "q", 1],
-                    "msg": "Input should be a valid integer, unable to parse string as an integer",
-                    "input": "six",
-                },
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "q", 0],
-                    "msg": "value is not a valid integer",
-                    "type": "type_error.integer",
-                },
-                {
-                    "loc": ["query", "q", 1],
-                    "msg": "value is not a valid integer",
-                    "type": "type_error.integer",
-                },
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "int_parsing",
+                "loc": ["query", "q", 0],
+                "msg": "Input should be a valid integer, unable to parse string as an integer",
+                "input": "five",
+            },
+            {
+                "type": "int_parsing",
+                "loc": ["query", "q", 1],
+                "msg": "Input should be a valid integer, unable to parse string as an integer",
+                "input": "six",
+            },
+        ]
+    }
 
 
 def test_openapi_schema():

tests/test_openapi_examples.py

@@ -1,6 +1,5 @@
 from typing import Union
 
-from dirty_equals import IsDict
 from fastapi import Body, Cookie, FastAPI, Header, Path, Query
 from fastapi.testclient import TestClient
 from pydantic import BaseModel
@@ -155,26 +154,12 @@ def test_openapi_schema():
                     "requestBody": {
                         "content": {
                             "application/json": {
-                                "schema": IsDict(
-                                    {
-                                        "$ref": "#/components/schemas/Item",
-                                        "examples": [
-                                            {"data": "Data in Body examples, example1"}
-                                        ],
-                                    }
-                                )
-                                | IsDict(
-                                    {
-                                        # TODO: remove when deprecating Pydantic v1
-                                        "allOf": [
-                                            {"$ref": "#/components/schemas/Item"}
-                                        ],
-                                        "title": "Item",
-                                        "examples": [
-                                            {"data": "Data in Body examples, example1"}
-                                        ],
-                                    }
-                                ),
+                                "schema": {
+                                    "$ref": "#/components/schemas/Item",
+                                    "examples": [
+                                        {"data": "Data in Body examples, example1"}
+                                    ],
+                                },
                                 "examples": {
                                     "Example One": {
                                         "summary": "Example One Summary",
@@ -265,27 +250,14 @@ def test_openapi_schema():
                             "name": "data",
                             "in": "query",
                             "required": False,
-                            "schema": IsDict(
-                                {
-                                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                                    "examples": [
-                                        "json_schema_query1",
-                                        "json_schema_query2",
-                                    ],
-                                    "title": "Data",
-                                }
-                            )
-                            | IsDict(
-                                # TODO: remove when deprecating Pydantic v1
-                                {
-                                    "examples": [
-                                        "json_schema_query1",
-                                        "json_schema_query2",
-                                    ],
-                                    "type": "string",
-                                    "title": "Data",
-                                }
-                            ),
+                            "schema": {
+                                "anyOf": [{"type": "string"}, {"type": "null"}],
+                                "examples": [
+                                    "json_schema_query1",
+                                    "json_schema_query2",
+                                ],
+                                "title": "Data",
+                            },
                             "examples": {
                                 "Query One": {
                                     "summary": "Query One Summary",
@@ -323,27 +295,14 @@ def test_openapi_schema():
                             "name": "data",
                             "in": "header",
                             "required": False,
-                            "schema": IsDict(
-                                {
-                                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                                    "examples": [
-                                        "json_schema_header1",
-                                        "json_schema_header2",
-                                    ],
-                                    "title": "Data",
-                                }
-                            )
-                            | IsDict(
-                                # TODO: remove when deprecating Pydantic v1
-                                {
-                                    "type": "string",
-                                    "examples": [
-                                        "json_schema_header1",
-                                        "json_schema_header2",
-                                    ],
-                                    "title": "Data",
-                                }
-                            ),
+                            "schema": {
+                                "anyOf": [{"type": "string"}, {"type": "null"}],
+                                "examples": [
+                                    "json_schema_header1",
+                                    "json_schema_header2",
+                                ],
+                                "title": "Data",
+                            },
                             "examples": {
                                 "Header One": {
                                     "summary": "Header One Summary",
@@ -381,27 +340,14 @@ def test_openapi_schema():
                             "name": "data",
                             "in": "cookie",
                             "required": False,
-                            "schema": IsDict(
-                                {
-                                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                                    "examples": [
-                                        "json_schema_cookie1",
-                                        "json_schema_cookie2",
-                                    ],
-                                    "title": "Data",
-                                }
-                            )
-                            | IsDict(
-                                # TODO: remove when deprecating Pydantic v1
-                                {
-                                    "type": "string",
-                                    "examples": [
-                                        "json_schema_cookie1",
-                                        "json_schema_cookie2",
-                                    ],
-                                    "title": "Data",
-                                }
-                            ),
+                            "schema": {
+                                "anyOf": [{"type": "string"}, {"type": "null"}],
+                                "examples": [
+                                    "json_schema_cookie1",
+                                    "json_schema_cookie2",
+                                ],
+                                "title": "Data",
+                            },
                             "examples": {
                                 "Cookie One": {
                                     "summary": "Cookie One Summary",

tests/test_openapi_query_parameter_extension.py

@@ -1,6 +1,5 @@
 from typing import Optional
 
-from dirty_equals import IsDict
 from fastapi import FastAPI
 from fastapi.testclient import TestClient
 
@@ -53,21 +52,11 @@ def test_openapi():
                     "parameters": [
                         {
                             "required": False,
-                            "schema": IsDict(
-                                {
-                                    "anyOf": [{"type": "integer"}, {"type": "null"}],
-                                    "default": 50,
-                                    "title": "Standard Query Param",
-                                }
-                            )
-                            | IsDict(
-                                # TODO: remove when deprecating Pydantic v1
-                                {
-                                    "title": "Standard Query Param",
-                                    "type": "integer",
-                                    "default": 50,
-                                }
-                            ),
+                            "schema": {
+                                "anyOf": [{"type": "integer"}, {"type": "null"}],
+                                "default": 50,
+                                "title": "Standard Query Param",
+                            },
                             "name": "standard_query_param",
                             "in": "query",
                         },

tests/test_openapi_servers.py

@@ -1,6 +1,6 @@
-from dirty_equals import IsOneOf
 from fastapi import FastAPI
 from fastapi.testclient import TestClient
+from inline_snapshot import snapshot
 
 app = FastAPI(
     servers=[
@@ -30,39 +30,31 @@ def test_app():
 def test_openapi_schema():
     response = client.get("/openapi.json")
     assert response.status_code == 200, response.text
-    assert response.json() == {
-        "openapi": "3.1.0",
-        "info": {"title": "FastAPI", "version": "0.1.0"},
-        "servers": [
-            {"url": "/", "description": "Default, relative server"},
-            {
-                "url": IsOneOf(
-                    "http://staging.localhost.tiangolo.com:8000/",
-                    # TODO: remove when deprecating Pydantic v1
-                    "http://staging.localhost.tiangolo.com:8000",
-                ),
-                "description": "Staging but actually localhost still",
-            },
-            {
-                "url": IsOneOf(
-                    "https://prod.example.com/",
-                    # TODO: remove when deprecating Pydantic v1
-                    "https://prod.example.com",
-                )
-            },
-        ],
-        "paths": {
-            "/foo": {
-                "get": {
-                    "summary": "Foo",
-                    "operationId": "foo_foo_get",
-                    "responses": {
-                        "200": {
-                            "description": "Successful Response",
-                            "content": {"application/json": {"schema": {}}},
-                        }
-                    },
+    assert response.json() == snapshot(
+        {
+            "openapi": "3.1.0",
+            "info": {"title": "FastAPI", "version": "0.1.0"},
+            "servers": [
+                {"url": "/", "description": "Default, relative server"},
+                {
+                    "url": "http://staging.localhost.tiangolo.com:8000",
+                    "description": "Staging but actually localhost still",
+                },
+                {"url": "https://prod.example.com"},
+            ],
+            "paths": {
+                "/foo": {
+                    "get": {
+                        "summary": "Foo",
+                        "operationId": "foo_foo_get",
+                        "responses": {
+                            "200": {
+                                "description": "Successful Response",
+                                "content": {"application/json": {"schema": {}}},
+                            }
+                        },
+                    }
                 }
-            }
-        },
-    }
+            },
+        }
+    )

tests/test_params_repr.py

@@ -1,6 +1,5 @@
 from typing import Any
 
-from dirty_equals import IsOneOf
 from fastapi.params import Body, Cookie, Header, Param, Path, Query
 
 test_data: list[Any] = ["teststr", None, ..., 1, []]
@@ -19,11 +18,7 @@ def test_param_repr_none():
 
 
 def test_param_repr_ellipsis():
-    assert repr(Param(...)) == IsOneOf(
-        "Param(PydanticUndefined)",
-        # TODO: remove when deprecating Pydantic v1
-        "Param(Ellipsis)",
-    )
+    assert repr(Param(...)) == "Param(PydanticUndefined)"
 
 
 def test_param_repr_number():
@@ -35,16 +30,8 @@ def test_param_repr_list():
 
 
 def test_path_repr():
-    assert repr(Path()) == IsOneOf(
-        "Path(PydanticUndefined)",
-        # TODO: remove when deprecating Pydantic v1
-        "Path(Ellipsis)",
-    )
-    assert repr(Path(...)) == IsOneOf(
-        "Path(PydanticUndefined)",
-        # TODO: remove when deprecating Pydantic v1
-        "Path(Ellipsis)",
-    )
+    assert repr(Path()) == "Path(PydanticUndefined)"
+    assert repr(Path(...)) == "Path(PydanticUndefined)"
 
 
 def test_query_repr_str():
@@ -56,11 +43,7 @@ def test_query_repr_none():
 
 
 def test_query_repr_ellipsis():
-    assert repr(Query(...)) == IsOneOf(
-        "Query(PydanticUndefined)",
-        # TODO: remove when deprecating Pydantic v1
-        "Query(Ellipsis)",
-    )
+    assert repr(Query(...)) == "Query(PydanticUndefined)"
 
 
 def test_query_repr_number():
@@ -80,11 +63,7 @@ def test_header_repr_none():
 
 
 def test_header_repr_ellipsis():
-    assert repr(Header(...)) == IsOneOf(
-        "Header(PydanticUndefined)",
-        # TODO: remove when deprecating Pydantic v1
-        "Header(Ellipsis)",
-    )
+    assert repr(Header(...)) == "Header(PydanticUndefined)"
 
 
 def test_header_repr_number():
@@ -104,11 +83,7 @@ def test_cookie_repr_none():
 
 
 def test_cookie_repr_ellipsis():
-    assert repr(Cookie(...)) == IsOneOf(
-        "Cookie(PydanticUndefined)",
-        # TODO: remove when deprecating Pydantic v1
-        "Cookie(Ellipsis)",
-    )
+    assert repr(Cookie(...)) == "Cookie(PydanticUndefined)"
 
 
 def test_cookie_repr_number():
@@ -128,11 +103,7 @@ def test_body_repr_none():
 
 
 def test_body_repr_ellipsis():
-    assert repr(Body(...)) == IsOneOf(
-        "Body(PydanticUndefined)",
-        # TODO: remove when deprecating Pydantic v1
-        "Body(Ellipsis)",
-    )
+    assert repr(Body(...)) == "Body(PydanticUndefined)"
 
 
 def test_body_repr_number():

tests/test_pydantic_v1_deprecation_warnings.py

@@ -1,99 +0,0 @@
-import sys
-
-import pytest
-from fastapi.exceptions import FastAPIDeprecationWarning
-
-from tests.utils import skip_module_if_py_gte_314
-
-if sys.version_info >= (3, 14):
-    skip_module_if_py_gte_314()
-
-from fastapi import FastAPI
-from fastapi._compat.v1 import BaseModel
-from fastapi.testclient import TestClient
-
-
-def test_warns_pydantic_v1_model_in_endpoint_param() -> None:
-    class ParamModelV1(BaseModel):
-        name: str
-
-    app = FastAPI()
-
-    with pytest.warns(
-        FastAPIDeprecationWarning,
-        match=r"pydantic\.v1 is deprecated.*Please update the param data:",
-    ):
-
-        @app.post("/param")
-        def endpoint(data: ParamModelV1):
-            return data
-
-    client = TestClient(app)
-    response = client.post("/param", json={"name": "test"})
-    assert response.status_code == 200, response.text
-    assert response.json() == {"name": "test"}
-
-
-def test_warns_pydantic_v1_model_in_return_type() -> None:
-    class ReturnModelV1(BaseModel):
-        name: str
-
-    app = FastAPI()
-
-    with pytest.warns(
-        FastAPIDeprecationWarning,
-        match=r"pydantic\.v1 is deprecated.*Please update the response model",
-    ):
-
-        @app.get("/return")
-        def endpoint() -> ReturnModelV1:
-            return ReturnModelV1(name="test")
-
-    client = TestClient(app)
-    response = client.get("/return")
-    assert response.status_code == 200, response.text
-    assert response.json() == {"name": "test"}
-
-
-def test_warns_pydantic_v1_model_in_response_model() -> None:
-    class ResponseModelV1(BaseModel):
-        name: str
-
-    app = FastAPI()
-
-    with pytest.warns(
-        FastAPIDeprecationWarning,
-        match=r"pydantic\.v1 is deprecated.*Please update the response model",
-    ):
-
-        @app.get("/response-model", response_model=ResponseModelV1)
-        def endpoint():
-            return {"name": "test"}
-
-    client = TestClient(app)
-    response = client.get("/response-model")
-    assert response.status_code == 200, response.text
-    assert response.json() == {"name": "test"}
-
-
-def test_warns_pydantic_v1_model_in_additional_responses_model() -> None:
-    class ErrorModelV1(BaseModel):
-        detail: str
-
-    app = FastAPI()
-
-    with pytest.warns(
-        FastAPIDeprecationWarning,
-        match=r"pydantic\.v1 is deprecated.*In responses=\{\}, please update",
-    ):
-
-        @app.get(
-            "/responses", response_model=None, responses={400: {"model": ErrorModelV1}}
-        )
-        def endpoint():
-            return {"ok": True}
-
-    client = TestClient(app)
-    response = client.get("/responses")
-    assert response.status_code == 200, response.text
-    assert response.json() == {"ok": True}

tests/test_pydantic_v1_error.py

@@ -0,0 +1,97 @@
+import sys
+import warnings
+from typing import Union
+
+import pytest
+
+from tests.utils import skip_module_if_py_gte_314
+
+if sys.version_info >= (3, 14):
+    skip_module_if_py_gte_314()
+
+from fastapi import FastAPI
+from fastapi.exceptions import PydanticV1NotSupportedError
+
+with warnings.catch_warnings():
+    warnings.simplefilter("ignore", UserWarning)
+    from pydantic.v1 import BaseModel
+
+
+def test_raises_pydantic_v1_model_in_endpoint_param() -> None:
+    class ParamModelV1(BaseModel):
+        name: str
+
+    app = FastAPI()
+
+    with pytest.raises(PydanticV1NotSupportedError):
+
+        @app.post("/param")
+        def endpoint(data: ParamModelV1):  # pragma: no cover
+            return data
+
+
+def test_raises_pydantic_v1_model_in_return_type() -> None:
+    class ReturnModelV1(BaseModel):
+        name: str
+
+    app = FastAPI()
+
+    with pytest.raises(PydanticV1NotSupportedError):
+
+        @app.get("/return")
+        def endpoint() -> ReturnModelV1:  # pragma: no cover
+            return ReturnModelV1(name="test")
+
+
+def test_raises_pydantic_v1_model_in_response_model() -> None:
+    class ResponseModelV1(BaseModel):
+        name: str
+
+    app = FastAPI()
+
+    with pytest.raises(PydanticV1NotSupportedError):
+
+        @app.get("/response-model", response_model=ResponseModelV1)
+        def endpoint():  # pragma: no cover
+            return {"name": "test"}
+
+
+def test_raises_pydantic_v1_model_in_additional_responses_model() -> None:
+    class ErrorModelV1(BaseModel):
+        detail: str
+
+    app = FastAPI()
+
+    with pytest.raises(PydanticV1NotSupportedError):
+
+        @app.get(
+            "/responses", response_model=None, responses={400: {"model": ErrorModelV1}}
+        )
+        def endpoint():  # pragma: no cover
+            return {"ok": True}
+
+
+def test_raises_pydantic_v1_model_in_union() -> None:
+    class ModelV1A(BaseModel):
+        name: str
+
+    app = FastAPI()
+
+    with pytest.raises(PydanticV1NotSupportedError):
+
+        @app.post("/union")
+        def endpoint(data: Union[dict, ModelV1A]):  # pragma: no cover
+            return data
+
+
+def test_raises_pydantic_v1_model_in_sequence() -> None:
+    class ModelV1A(BaseModel):
+        name: str
+
+    app = FastAPI()
+
+    with pytest.raises(PydanticV1NotSupportedError):
+
+        @app.post("/sequence")
+        def endpoint(data: list[ModelV1A]):  # pragma: no cover
+            return data

tests/test_pydantic_v1_v2_01.py

@@ -1,439 +0,0 @@
-import sys
-import warnings
-from typing import Any, Union
-
-from tests.utils import skip_module_if_py_gte_314
-
-if sys.version_info >= (3, 14):
-    skip_module_if_py_gte_314()
-
-from fastapi import FastAPI
-from fastapi._compat.v1 import BaseModel
-from fastapi.testclient import TestClient
-from inline_snapshot import snapshot
-
-
-class SubItem(BaseModel):
-    name: str
-
-
-class Item(BaseModel):
-    title: str
-    size: int
-    description: Union[str, None] = None
-    sub: SubItem
-    multi: list[SubItem] = []
-
-
-app = FastAPI()
-
-with warnings.catch_warnings(record=True):
-    warnings.simplefilter("always")
-
-    @app.post("/simple-model")
-    def handle_simple_model(data: SubItem) -> SubItem:
-        return data
-
-    @app.post("/simple-model-filter", response_model=SubItem)
-    def handle_simple_model_filter(data: SubItem) -> Any:
-        extended_data = data.dict()
-        extended_data.update({"secret_price": 42})
-        return extended_data
-
-    @app.post("/item")
-    def handle_item(data: Item) -> Item:
-        return data
-
-    @app.post("/item-filter", response_model=Item)
-    def handle_item_filter(data: Item) -> Any:
-        extended_data = data.dict()
-        extended_data.update({"secret_data": "classified", "internal_id": 12345})
-        extended_data["sub"].update({"internal_id": 67890})
-        return extended_data
-
-
-client = TestClient(app)
-
-
-def test_old_simple_model():
-    response = client.post(
-        "/simple-model",
-        json={"name": "Foo"},
-    )
-    assert response.status_code == 200, response.text
-    assert response.json() == {"name": "Foo"}
-
-
-def test_old_simple_model_validation_error():
-    response = client.post(
-        "/simple-model",
-        json={"wrong_name": "Foo"},
-    )
-    assert response.status_code == 422, response.text
-    assert response.json() == snapshot(
-        {
-            "detail": [
-                {
-                    "loc": ["body", "name"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
-
-
-def test_old_simple_model_filter():
-    response = client.post(
-        "/simple-model-filter",
-        json={"name": "Foo"},
-    )
-    assert response.status_code == 200, response.text
-    assert response.json() == {"name": "Foo"}
-
-
-def test_item_model():
-    response = client.post(
-        "/item",
-        json={
-            "title": "Test Item",
-            "size": 100,
-            "description": "This is a test item",
-            "sub": {"name": "SubItem1"},
-            "multi": [{"name": "Multi1"}, {"name": "Multi2"}],
-        },
-    )
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "title": "Test Item",
-        "size": 100,
-        "description": "This is a test item",
-        "sub": {"name": "SubItem1"},
-        "multi": [{"name": "Multi1"}, {"name": "Multi2"}],
-    }
-
-
-def test_item_model_minimal():
-    response = client.post(
-        "/item",
-        json={"title": "Minimal Item", "size": 50, "sub": {"name": "SubMin"}},
-    )
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "title": "Minimal Item",
-        "size": 50,
-        "description": None,
-        "sub": {"name": "SubMin"},
-        "multi": [],
-    }
-
-
-def test_item_model_validation_errors():
-    response = client.post(
-        "/item",
-        json={"title": "Missing fields"},
-    )
-    assert response.status_code == 422, response.text
-    error_detail = response.json()["detail"]
-    assert len(error_detail) == 2
-    assert {
-        "loc": ["body", "size"],
-        "msg": "field required",
-        "type": "value_error.missing",
-    } in error_detail
-    assert {
-        "loc": ["body", "sub"],
-        "msg": "field required",
-        "type": "value_error.missing",
-    } in error_detail
-
-
-def test_item_model_nested_validation_error():
-    response = client.post(
-        "/item",
-        json={"title": "Test Item", "size": 100, "sub": {"wrong_field": "test"}},
-    )
-    assert response.status_code == 422, response.text
-    assert response.json() == snapshot(
-        {
-            "detail": [
-                {
-                    "loc": ["body", "sub", "name"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
-
-
-def test_item_model_invalid_type():
-    response = client.post(
-        "/item",
-        json={"title": "Test Item", "size": "not_a_number", "sub": {"name": "SubItem"}},
-    )
-    assert response.status_code == 422, response.text
-    assert response.json() == snapshot(
-        {
-            "detail": [
-                {
-                    "loc": ["body", "size"],
-                    "msg": "value is not a valid integer",
-                    "type": "type_error.integer",
-                }
-            ]
-        }
-    )
-
-
-def test_item_filter():
-    response = client.post(
-        "/item-filter",
-        json={
-            "title": "Filtered Item",
-            "size": 200,
-            "description": "Test filtering",
-            "sub": {"name": "SubFiltered"},
-            "multi": [],
-        },
-    )
-    assert response.status_code == 200, response.text
-    result = response.json()
-    assert result == {
-        "title": "Filtered Item",
-        "size": 200,
-        "description": "Test filtering",
-        "sub": {"name": "SubFiltered"},
-        "multi": [],
-    }
-    assert "secret_data" not in result
-    assert "internal_id" not in result
-
-
-def test_openapi_schema():
-    response = client.get("/openapi.json")
-    assert response.status_code == 200, response.text
-    assert response.json() == snapshot(
-        {
-            "openapi": "3.1.0",
-            "info": {"title": "FastAPI", "version": "0.1.0"},
-            "paths": {
-                "/simple-model": {
-                    "post": {
-                        "summary": "Handle Simple Model",
-                        "operationId": "handle_simple_model_simple_model_post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "allOf": [
-                                            {"$ref": "#/components/schemas/SubItem"}
-                                        ],
-                                        "title": "Data",
-                                    }
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/SubItem"
-                                        }
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-                "/simple-model-filter": {
-                    "post": {
-                        "summary": "Handle Simple Model Filter",
-                        "operationId": "handle_simple_model_filter_simple_model_filter_post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "allOf": [
-                                            {"$ref": "#/components/schemas/SubItem"}
-                                        ],
-                                        "title": "Data",
-                                    }
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/SubItem"
-                                        }
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-                "/item": {
-                    "post": {
-                        "summary": "Handle Item",
-                        "operationId": "handle_item_item_post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "allOf": [
-                                            {"$ref": "#/components/schemas/Item"}
-                                        ],
-                                        "title": "Data",
-                                    }
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {"$ref": "#/components/schemas/Item"}
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-                "/item-filter": {
-                    "post": {
-                        "summary": "Handle Item Filter",
-                        "operationId": "handle_item_filter_item_filter_post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "allOf": [
-                                            {"$ref": "#/components/schemas/Item"}
-                                        ],
-                                        "title": "Data",
-                                    }
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {"$ref": "#/components/schemas/Item"}
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-            },
-            "components": {
-                "schemas": {
-                    "HTTPValidationError": {
-                        "properties": {
-                            "detail": {
-                                "items": {
-                                    "$ref": "#/components/schemas/ValidationError"
-                                },
-                                "type": "array",
-                                "title": "Detail",
-                            }
-                        },
-                        "type": "object",
-                        "title": "HTTPValidationError",
-                    },
-                    "Item": {
-                        "properties": {
-                            "title": {"type": "string", "title": "Title"},
-                            "size": {"type": "integer", "title": "Size"},
-                            "description": {"type": "string", "title": "Description"},
-                            "sub": {"$ref": "#/components/schemas/SubItem"},
-                            "multi": {
-                                "items": {"$ref": "#/components/schemas/SubItem"},
-                                "type": "array",
-                                "title": "Multi",
-                                "default": [],
-                            },
-                        },
-                        "type": "object",
-                        "required": ["title", "size", "sub"],
-                        "title": "Item",
-                    },
-                    "SubItem": {
-                        "properties": {"name": {"type": "string", "title": "Name"}},
-                        "type": "object",
-                        "required": ["name"],
-                        "title": "SubItem",
-                    },
-                    "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_list.py

@@ -1,682 +0,0 @@
-import sys
-import warnings
-from typing import Any, Union
-
-from tests.utils import skip_module_if_py_gte_314
-
-if sys.version_info >= (3, 14):
-    skip_module_if_py_gte_314()
-
-from fastapi import FastAPI
-from fastapi._compat.v1 import BaseModel
-from fastapi.testclient import TestClient
-from inline_snapshot import snapshot
-
-
-class SubItem(BaseModel):
-    name: str
-
-
-class Item(BaseModel):
-    title: str
-    size: int
-    description: Union[str, None] = None
-    sub: SubItem
-    multi: list[SubItem] = []
-
-
-app = FastAPI()
-
-
-with warnings.catch_warnings(record=True):
-    warnings.simplefilter("always")
-
-    @app.post("/item")
-    def handle_item(data: Item) -> list[Item]:
-        return [data, data]
-
-    @app.post("/item-filter", response_model=list[Item])
-    def handle_item_filter(data: Item) -> Any:
-        extended_data = data.dict()
-        extended_data.update({"secret_data": "classified", "internal_id": 12345})
-        extended_data["sub"].update({"internal_id": 67890})
-        return [extended_data, extended_data]
-
-    @app.post("/item-list")
-    def handle_item_list(data: list[Item]) -> Item:
-        if data:
-            return data[0]
-        return Item(title="", size=0, sub=SubItem(name=""))
-
-    @app.post("/item-list-filter", response_model=Item)
-    def handle_item_list_filter(data: list[Item]) -> Any:
-        if data:
-            extended_data = data[0].dict()
-            extended_data.update({"secret_data": "classified", "internal_id": 12345})
-            extended_data["sub"].update({"internal_id": 67890})
-            return extended_data
-        return Item(title="", size=0, sub=SubItem(name=""))
-
-    @app.post("/item-list-to-list")
-    def handle_item_list_to_list(data: list[Item]) -> list[Item]:
-        return data
-
-    @app.post("/item-list-to-list-filter", response_model=list[Item])
-    def handle_item_list_to_list_filter(data: list[Item]) -> Any:
-        if data:
-            extended_data = data[0].dict()
-            extended_data.update({"secret_data": "classified", "internal_id": 12345})
-            extended_data["sub"].update({"internal_id": 67890})
-            return [extended_data, extended_data]
-        return []
-
-
-client = TestClient(app)
-
-
-def test_item_to_list():
-    response = client.post(
-        "/item",
-        json={
-            "title": "Test Item",
-            "size": 100,
-            "description": "This is a test item",
-            "sub": {"name": "SubItem1"},
-            "multi": [{"name": "Multi1"}, {"name": "Multi2"}],
-        },
-    )
-    assert response.status_code == 200, response.text
-    result = response.json()
-    assert isinstance(result, list)
-    assert len(result) == 2
-    for item in result:
-        assert item == {
-            "title": "Test Item",
-            "size": 100,
-            "description": "This is a test item",
-            "sub": {"name": "SubItem1"},
-            "multi": [{"name": "Multi1"}, {"name": "Multi2"}],
-        }
-
-
-def test_item_to_list_filter():
-    response = client.post(
-        "/item-filter",
-        json={
-            "title": "Filtered Item",
-            "size": 200,
-            "description": "Test filtering",
-            "sub": {"name": "SubFiltered"},
-            "multi": [],
-        },
-    )
-    assert response.status_code == 200, response.text
-    result = response.json()
-    assert isinstance(result, list)
-    assert len(result) == 2
-    for item in result:
-        assert item == {
-            "title": "Filtered Item",
-            "size": 200,
-            "description": "Test filtering",
-            "sub": {"name": "SubFiltered"},
-            "multi": [],
-        }
-        # Verify secret fields are filtered out
-        assert "secret_data" not in item
-        assert "internal_id" not in item
-        assert "internal_id" not in item["sub"]
-
-
-def test_list_to_item():
-    response = client.post(
-        "/item-list",
-        json=[
-            {"title": "First Item", "size": 50, "sub": {"name": "First Sub"}},
-            {"title": "Second Item", "size": 75, "sub": {"name": "Second Sub"}},
-        ],
-    )
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "title": "First Item",
-        "size": 50,
-        "description": None,
-        "sub": {"name": "First Sub"},
-        "multi": [],
-    }
-
-
-def test_list_to_item_empty():
-    response = client.post(
-        "/item-list",
-        json=[],
-    )
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "title": "",
-        "size": 0,
-        "description": None,
-        "sub": {"name": ""},
-        "multi": [],
-    }
-
-
-def test_list_to_item_filter():
-    response = client.post(
-        "/item-list-filter",
-        json=[
-            {
-                "title": "First Item",
-                "size": 100,
-                "sub": {"name": "First Sub"},
-                "multi": [{"name": "Multi1"}],
-            },
-            {"title": "Second Item", "size": 200, "sub": {"name": "Second Sub"}},
-        ],
-    )
-    assert response.status_code == 200, response.text
-    result = response.json()
-    assert result == {
-        "title": "First Item",
-        "size": 100,
-        "description": None,
-        "sub": {"name": "First Sub"},
-        "multi": [{"name": "Multi1"}],
-    }
-    # Verify secret fields are filtered out
-    assert "secret_data" not in result
-    assert "internal_id" not in result
-
-
-def test_list_to_item_filter_no_data():
-    response = client.post("/item-list-filter", json=[])
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "title": "",
-        "size": 0,
-        "description": None,
-        "sub": {"name": ""},
-        "multi": [],
-    }
-
-
-def test_list_to_list():
-    input_items = [
-        {"title": "Item 1", "size": 10, "sub": {"name": "Sub1"}},
-        {
-            "title": "Item 2",
-            "size": 20,
-            "description": "Second item",
-            "sub": {"name": "Sub2"},
-            "multi": [{"name": "M1"}, {"name": "M2"}],
-        },
-        {"title": "Item 3", "size": 30, "sub": {"name": "Sub3"}},
-    ]
-    response = client.post(
-        "/item-list-to-list",
-        json=input_items,
-    )
-    assert response.status_code == 200, response.text
-    result = response.json()
-    assert isinstance(result, list)
-    assert len(result) == 3
-    assert result[0] == {
-        "title": "Item 1",
-        "size": 10,
-        "description": None,
-        "sub": {"name": "Sub1"},
-        "multi": [],
-    }
-    assert result[1] == {
-        "title": "Item 2",
-        "size": 20,
-        "description": "Second item",
-        "sub": {"name": "Sub2"},
-        "multi": [{"name": "M1"}, {"name": "M2"}],
-    }
-    assert result[2] == {
-        "title": "Item 3",
-        "size": 30,
-        "description": None,
-        "sub": {"name": "Sub3"},
-        "multi": [],
-    }
-
-
-def test_list_to_list_filter():
-    response = client.post(
-        "/item-list-to-list-filter",
-        json=[{"title": "Item 1", "size": 100, "sub": {"name": "Sub1"}}],
-    )
-    assert response.status_code == 200, response.text
-    result = response.json()
-    assert isinstance(result, list)
-    assert len(result) == 2
-    for item in result:
-        assert item == {
-            "title": "Item 1",
-            "size": 100,
-            "description": None,
-            "sub": {"name": "Sub1"},
-            "multi": [],
-        }
-        # Verify secret fields are filtered out
-        assert "secret_data" not in item
-        assert "internal_id" not in item
-
-
-def test_list_to_list_filter_no_data():
-    response = client.post(
-        "/item-list-to-list-filter",
-        json=[],
-    )
-    assert response.status_code == 200, response.text
-    assert response.json() == []
-
-
-def test_list_validation_error():
-    response = client.post(
-        "/item-list",
-        json=[
-            {"title": "Valid Item", "size": 100, "sub": {"name": "Sub1"}},
-            {
-                "title": "Invalid Item"
-                # Missing required fields: size and sub
-            },
-        ],
-    )
-    assert response.status_code == 422, response.text
-    error_detail = response.json()["detail"]
-    assert len(error_detail) == 2
-    assert {
-        "loc": ["body", 1, "size"],
-        "msg": "field required",
-        "type": "value_error.missing",
-    } in error_detail
-    assert {
-        "loc": ["body", 1, "sub"],
-        "msg": "field required",
-        "type": "value_error.missing",
-    } in error_detail
-
-
-def test_list_nested_validation_error():
-    response = client.post(
-        "/item-list",
-        json=[
-            {"title": "Item with bad sub", "size": 100, "sub": {"wrong_field": "value"}}
-        ],
-    )
-    assert response.status_code == 422, response.text
-    assert response.json() == snapshot(
-        {
-            "detail": [
-                {
-                    "loc": ["body", 0, "sub", "name"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
-
-
-def test_list_type_validation_error():
-    response = client.post(
-        "/item-list",
-        json=[{"title": "Item", "size": "not_a_number", "sub": {"name": "Sub"}}],
-    )
-    assert response.status_code == 422, response.text
-    assert response.json() == snapshot(
-        {
-            "detail": [
-                {
-                    "loc": ["body", 0, "size"],
-                    "msg": "value is not a valid integer",
-                    "type": "type_error.integer",
-                }
-            ]
-        }
-    )
-
-
-def test_invalid_list_structure():
-    response = client.post(
-        "/item-list",
-        json={"title": "Not a list", "size": 100, "sub": {"name": "Sub"}},
-    )
-    assert response.status_code == 422, response.text
-    assert response.json() == snapshot(
-        {
-            "detail": [
-                {
-                    "loc": ["body"],
-                    "msg": "value is not a valid list",
-                    "type": "type_error.list",
-                }
-            ]
-        }
-    )
-
-
-def test_openapi_schema():
-    response = client.get("/openapi.json")
-    assert response.status_code == 200, response.text
-    assert response.json() == snapshot(
-        {
-            "openapi": "3.1.0",
-            "info": {"title": "FastAPI", "version": "0.1.0"},
-            "paths": {
-                "/item": {
-                    "post": {
-                        "summary": "Handle Item",
-                        "operationId": "handle_item_item_post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "allOf": [
-                                            {"$ref": "#/components/schemas/Item"}
-                                        ],
-                                        "title": "Data",
-                                    }
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "items": {
-                                                "$ref": "#/components/schemas/Item"
-                                            },
-                                            "type": "array",
-                                            "title": "Response Handle Item Item Post",
-                                        }
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-                "/item-filter": {
-                    "post": {
-                        "summary": "Handle Item Filter",
-                        "operationId": "handle_item_filter_item_filter_post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "allOf": [
-                                            {"$ref": "#/components/schemas/Item"}
-                                        ],
-                                        "title": "Data",
-                                    }
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "items": {
-                                                "$ref": "#/components/schemas/Item"
-                                            },
-                                            "type": "array",
-                                            "title": "Response Handle Item Filter Item Filter Post",
-                                        }
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-                "/item-list": {
-                    "post": {
-                        "summary": "Handle Item List",
-                        "operationId": "handle_item_list_item_list_post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "items": {"$ref": "#/components/schemas/Item"},
-                                        "type": "array",
-                                        "title": "Data",
-                                    }
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {"$ref": "#/components/schemas/Item"}
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-                "/item-list-filter": {
-                    "post": {
-                        "summary": "Handle Item List Filter",
-                        "operationId": "handle_item_list_filter_item_list_filter_post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "items": {"$ref": "#/components/schemas/Item"},
-                                        "type": "array",
-                                        "title": "Data",
-                                    }
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {"$ref": "#/components/schemas/Item"}
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-                "/item-list-to-list": {
-                    "post": {
-                        "summary": "Handle Item List To List",
-                        "operationId": "handle_item_list_to_list_item_list_to_list_post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "items": {"$ref": "#/components/schemas/Item"},
-                                        "type": "array",
-                                        "title": "Data",
-                                    }
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "items": {
-                                                "$ref": "#/components/schemas/Item"
-                                            },
-                                            "type": "array",
-                                            "title": "Response Handle Item List To List Item List To List Post",
-                                        }
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-                "/item-list-to-list-filter": {
-                    "post": {
-                        "summary": "Handle Item List To List Filter",
-                        "operationId": "handle_item_list_to_list_filter_item_list_to_list_filter_post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "items": {"$ref": "#/components/schemas/Item"},
-                                        "type": "array",
-                                        "title": "Data",
-                                    }
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "items": {
-                                                "$ref": "#/components/schemas/Item"
-                                            },
-                                            "type": "array",
-                                            "title": "Response Handle Item List To List Filter Item List To List Filter Post",
-                                        }
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-            },
-            "components": {
-                "schemas": {
-                    "HTTPValidationError": {
-                        "properties": {
-                            "detail": {
-                                "items": {
-                                    "$ref": "#/components/schemas/ValidationError"
-                                },
-                                "type": "array",
-                                "title": "Detail",
-                            }
-                        },
-                        "type": "object",
-                        "title": "HTTPValidationError",
-                    },
-                    "Item": {
-                        "properties": {
-                            "title": {"type": "string", "title": "Title"},
-                            "size": {"type": "integer", "title": "Size"},
-                            "description": {"type": "string", "title": "Description"},
-                            "sub": {"$ref": "#/components/schemas/SubItem"},
-                            "multi": {
-                                "items": {"$ref": "#/components/schemas/SubItem"},
-                                "type": "array",
-                                "title": "Multi",
-                                "default": [],
-                            },
-                        },
-                        "type": "object",
-                        "required": ["title", "size", "sub"],
-                        "title": "Item",
-                    },
-                    "SubItem": {
-                        "properties": {"name": {"type": "string", "title": "Name"}},
-                        "type": "object",
-                        "required": ["name"],
-                        "title": "SubItem",
-                    },
-                    "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/main.py

@@ -1,137 +0,0 @@
-import warnings
-
-from fastapi import FastAPI
-
-from . import modelsv1, modelsv2, modelsv2b
-
-app = FastAPI()
-
-with warnings.catch_warnings(record=True):
-    warnings.simplefilter("always")
-
-    @app.post("/v1-to-v2/item")
-    def handle_v1_item_to_v2(data: modelsv1.Item) -> modelsv2.Item:
-        return modelsv2.Item(
-            new_title=data.title,
-            new_size=data.size,
-            new_description=data.description,
-            new_sub=modelsv2.SubItem(new_sub_name=data.sub.name),
-            new_multi=[modelsv2.SubItem(new_sub_name=s.name) for s in data.multi],
-        )
-
-    @app.post("/v2-to-v1/item")
-    def handle_v2_item_to_v1(data: modelsv2.Item) -> modelsv1.Item:
-        return modelsv1.Item(
-            title=data.new_title,
-            size=data.new_size,
-            description=data.new_description,
-            sub=modelsv1.SubItem(name=data.new_sub.new_sub_name),
-            multi=[modelsv1.SubItem(name=s.new_sub_name) for s in data.new_multi],
-        )
-
-    @app.post("/v1-to-v2/item-to-list")
-    def handle_v1_item_to_v2_list(data: modelsv1.Item) -> list[modelsv2.Item]:
-        converted = modelsv2.Item(
-            new_title=data.title,
-            new_size=data.size,
-            new_description=data.description,
-            new_sub=modelsv2.SubItem(new_sub_name=data.sub.name),
-            new_multi=[modelsv2.SubItem(new_sub_name=s.name) for s in data.multi],
-        )
-        return [converted, converted]
-
-    @app.post("/v1-to-v2/list-to-list")
-    def handle_v1_list_to_v2_list(data: list[modelsv1.Item]) -> list[modelsv2.Item]:
-        result = []
-        for item in data:
-            result.append(
-                modelsv2.Item(
-                    new_title=item.title,
-                    new_size=item.size,
-                    new_description=item.description,
-                    new_sub=modelsv2.SubItem(new_sub_name=item.sub.name),
-                    new_multi=[
-                        modelsv2.SubItem(new_sub_name=s.name) for s in item.multi
-                    ],
-                )
-            )
-        return result
-
-    @app.post("/v1-to-v2/list-to-item")
-    def handle_v1_list_to_v2_item(data: list[modelsv1.Item]) -> modelsv2.Item:
-        if data:
-            item = data[0]
-            return modelsv2.Item(
-                new_title=item.title,
-                new_size=item.size,
-                new_description=item.description,
-                new_sub=modelsv2.SubItem(new_sub_name=item.sub.name),
-                new_multi=[modelsv2.SubItem(new_sub_name=s.name) for s in item.multi],
-            )
-        return modelsv2.Item(
-            new_title="", new_size=0, new_sub=modelsv2.SubItem(new_sub_name="")
-        )
-
-    @app.post("/v2-to-v1/item-to-list")
-    def handle_v2_item_to_v1_list(data: modelsv2.Item) -> list[modelsv1.Item]:
-        converted = modelsv1.Item(
-            title=data.new_title,
-            size=data.new_size,
-            description=data.new_description,
-            sub=modelsv1.SubItem(name=data.new_sub.new_sub_name),
-            multi=[modelsv1.SubItem(name=s.new_sub_name) for s in data.new_multi],
-        )
-        return [converted, converted]
-
-    @app.post("/v2-to-v1/list-to-list")
-    def handle_v2_list_to_v1_list(data: list[modelsv2.Item]) -> list[modelsv1.Item]:
-        result = []
-        for item in data:
-            result.append(
-                modelsv1.Item(
-                    title=item.new_title,
-                    size=item.new_size,
-                    description=item.new_description,
-                    sub=modelsv1.SubItem(name=item.new_sub.new_sub_name),
-                    multi=[
-                        modelsv1.SubItem(name=s.new_sub_name) for s in item.new_multi
-                    ],
-                )
-            )
-        return result
-
-    @app.post("/v2-to-v1/list-to-item")
-    def handle_v2_list_to_v1_item(data: list[modelsv2.Item]) -> modelsv1.Item:
-        if data:
-            item = data[0]
-            return modelsv1.Item(
-                title=item.new_title,
-                size=item.new_size,
-                description=item.new_description,
-                sub=modelsv1.SubItem(name=item.new_sub.new_sub_name),
-                multi=[modelsv1.SubItem(name=s.new_sub_name) for s in item.new_multi],
-            )
-        return modelsv1.Item(title="", size=0, sub=modelsv1.SubItem(name=""))
-
-    @app.post("/v2-to-v1/same-name")
-    def handle_v2_same_name_to_v1(
-        item1: modelsv2.Item, item2: modelsv2b.Item
-    ) -> modelsv1.Item:
-        return modelsv1.Item(
-            title=item1.new_title,
-            size=item2.dup_size,
-            description=item1.new_description,
-            sub=modelsv1.SubItem(name=item1.new_sub.new_sub_name),
-            multi=[modelsv1.SubItem(name=s.dup_sub_name) for s in item2.dup_multi],
-        )
-
-    @app.post("/v2-to-v1/list-of-items-to-list-of-items")
-    def handle_v2_items_in_list_to_v1_item_in_list(
-        data1: list[modelsv2.ItemInList], data2: list[modelsv2b.ItemInList]
-    ) -> list[modelsv1.ItemInList]:
-        item1 = data1[0]
-        item2 = data2[0]
-        return [
-            modelsv1.ItemInList(name1=item1.name2),
-            modelsv1.ItemInList(name1=item2.dup_name2),
-        ]

tests/test_pydantic_v1_v2_multifile/modelsv1.py

@@ -1,19 +0,0 @@
-from typing import Union
-
-from fastapi._compat.v1 import BaseModel
-
-
-class SubItem(BaseModel):
-    name: str
-
-
-class Item(BaseModel):
-    title: str
-    size: int
-    description: Union[str, None] = None
-    sub: SubItem
-    multi: list[SubItem] = []
-
-
-class ItemInList(BaseModel):
-    name1: str

tests/test_pydantic_v1_v2_multifile/modelsv2.py

@@ -1,19 +0,0 @@
-from typing import Union
-
-from pydantic import BaseModel
-
-
-class SubItem(BaseModel):
-    new_sub_name: str
-
-
-class Item(BaseModel):
-    new_title: str
-    new_size: int
-    new_description: Union[str, None] = None
-    new_sub: SubItem
-    new_multi: list[SubItem] = []
-
-
-class ItemInList(BaseModel):
-    name2: str

tests/test_pydantic_v1_v2_multifile/modelsv2b.py

@@ -1,19 +0,0 @@
-from typing import Union
-
-from pydantic import BaseModel
-
-
-class SubItem(BaseModel):
-    dup_sub_name: str
-
-
-class Item(BaseModel):
-    dup_title: str
-    dup_size: int
-    dup_description: Union[str, None] = None
-    dup_sub: SubItem
-    dup_multi: list[SubItem] = []
-
-
-class ItemInList(BaseModel):
-    dup_name2: str

tests/test_pydantic_v1_v2_multifile/test_multifile.py

@@ -1,951 +0,0 @@
-import sys
-
-from tests.utils import skip_module_if_py_gte_314
-
-if sys.version_info >= (3, 14):
-    skip_module_if_py_gte_314()
-
-from fastapi.testclient import TestClient
-from inline_snapshot import snapshot
-
-from .main import app
-
-client = TestClient(app)
-
-
-def test_v1_to_v2_item():
-    response = client.post(
-        "/v1-to-v2/item",
-        json={"title": "Test", "size": 10, "sub": {"name": "SubTest"}},
-    )
-    assert response.status_code == 200
-    assert response.json() == {
-        "new_title": "Test",
-        "new_size": 10,
-        "new_description": None,
-        "new_sub": {"new_sub_name": "SubTest"},
-        "new_multi": [],
-    }
-
-
-def test_v2_to_v1_item():
-    response = client.post(
-        "/v2-to-v1/item",
-        json={
-            "new_title": "NewTest",
-            "new_size": 20,
-            "new_sub": {"new_sub_name": "NewSubTest"},
-        },
-    )
-    assert response.status_code == 200
-    assert response.json() == {
-        "title": "NewTest",
-        "size": 20,
-        "description": None,
-        "sub": {"name": "NewSubTest"},
-        "multi": [],
-    }
-
-
-def test_v1_to_v2_item_to_list():
-    response = client.post(
-        "/v1-to-v2/item-to-list",
-        json={"title": "ListTest", "size": 30, "sub": {"name": "SubListTest"}},
-    )
-    assert response.status_code == 200
-    assert response.json() == [
-        {
-            "new_title": "ListTest",
-            "new_size": 30,
-            "new_description": None,
-            "new_sub": {"new_sub_name": "SubListTest"},
-            "new_multi": [],
-        },
-        {
-            "new_title": "ListTest",
-            "new_size": 30,
-            "new_description": None,
-            "new_sub": {"new_sub_name": "SubListTest"},
-            "new_multi": [],
-        },
-    ]
-
-
-def test_v1_to_v2_list_to_list():
-    response = client.post(
-        "/v1-to-v2/list-to-list",
-        json=[
-            {"title": "Item1", "size": 40, "sub": {"name": "Sub1"}},
-            {"title": "Item2", "size": 50, "sub": {"name": "Sub2"}},
-        ],
-    )
-    assert response.status_code == 200
-    assert response.json() == [
-        {
-            "new_title": "Item1",
-            "new_size": 40,
-            "new_description": None,
-            "new_sub": {"new_sub_name": "Sub1"},
-            "new_multi": [],
-        },
-        {
-            "new_title": "Item2",
-            "new_size": 50,
-            "new_description": None,
-            "new_sub": {"new_sub_name": "Sub2"},
-            "new_multi": [],
-        },
-    ]
-
-
-def test_v1_to_v2_list_to_item():
-    response = client.post(
-        "/v1-to-v2/list-to-item",
-        json=[
-            {"title": "FirstItem", "size": 60, "sub": {"name": "FirstSub"}},
-            {"title": "SecondItem", "size": 70, "sub": {"name": "SecondSub"}},
-        ],
-    )
-    assert response.status_code == 200
-    assert response.json() == {
-        "new_title": "FirstItem",
-        "new_size": 60,
-        "new_description": None,
-        "new_sub": {"new_sub_name": "FirstSub"},
-        "new_multi": [],
-    }
-
-
-def test_v2_to_v1_item_to_list():
-    response = client.post(
-        "/v2-to-v1/item-to-list",
-        json={
-            "new_title": "ListNew",
-            "new_size": 80,
-            "new_sub": {"new_sub_name": "SubListNew"},
-        },
-    )
-    assert response.status_code == 200
-    assert response.json() == [
-        {
-            "title": "ListNew",
-            "size": 80,
-            "description": None,
-            "sub": {"name": "SubListNew"},
-            "multi": [],
-        },
-        {
-            "title": "ListNew",
-            "size": 80,
-            "description": None,
-            "sub": {"name": "SubListNew"},
-            "multi": [],
-        },
-    ]
-
-
-def test_v2_to_v1_list_to_list():
-    response = client.post(
-        "/v2-to-v1/list-to-list",
-        json=[
-            {
-                "new_title": "New1",
-                "new_size": 90,
-                "new_sub": {"new_sub_name": "NewSub1"},
-            },
-            {
-                "new_title": "New2",
-                "new_size": 100,
-                "new_sub": {"new_sub_name": "NewSub2"},
-            },
-        ],
-    )
-    assert response.status_code == 200
-    assert response.json() == [
-        {
-            "title": "New1",
-            "size": 90,
-            "description": None,
-            "sub": {"name": "NewSub1"},
-            "multi": [],
-        },
-        {
-            "title": "New2",
-            "size": 100,
-            "description": None,
-            "sub": {"name": "NewSub2"},
-            "multi": [],
-        },
-    ]
-
-
-def test_v2_to_v1_list_to_item():
-    response = client.post(
-        "/v2-to-v1/list-to-item",
-        json=[
-            {
-                "new_title": "FirstNew",
-                "new_size": 110,
-                "new_sub": {"new_sub_name": "FirstNewSub"},
-            },
-            {
-                "new_title": "SecondNew",
-                "new_size": 120,
-                "new_sub": {"new_sub_name": "SecondNewSub"},
-            },
-        ],
-    )
-    assert response.status_code == 200
-    assert response.json() == {
-        "title": "FirstNew",
-        "size": 110,
-        "description": None,
-        "sub": {"name": "FirstNewSub"},
-        "multi": [],
-    }
-
-
-def test_v1_to_v2_list_to_item_empty():
-    response = client.post("/v1-to-v2/list-to-item", json=[])
-    assert response.status_code == 200
-    assert response.json() == {
-        "new_title": "",
-        "new_size": 0,
-        "new_description": None,
-        "new_sub": {"new_sub_name": ""},
-        "new_multi": [],
-    }
-
-
-def test_v2_to_v1_list_to_item_empty():
-    response = client.post("/v2-to-v1/list-to-item", json=[])
-    assert response.status_code == 200
-    assert response.json() == {
-        "title": "",
-        "size": 0,
-        "description": None,
-        "sub": {"name": ""},
-        "multi": [],
-    }
-
-
-def test_v2_same_name_to_v1():
-    response = client.post(
-        "/v2-to-v1/same-name",
-        json={
-            "item1": {
-                "new_title": "Title1",
-                "new_size": 100,
-                "new_description": "Description1",
-                "new_sub": {"new_sub_name": "Sub1"},
-                "new_multi": [{"new_sub_name": "Multi1"}],
-            },
-            "item2": {
-                "dup_title": "Title2",
-                "dup_size": 200,
-                "dup_description": "Description2",
-                "dup_sub": {"dup_sub_name": "Sub2"},
-                "dup_multi": [
-                    {"dup_sub_name": "Multi2a"},
-                    {"dup_sub_name": "Multi2b"},
-                ],
-            },
-        },
-    )
-    assert response.status_code == 200
-    assert response.json() == {
-        "title": "Title1",
-        "size": 200,
-        "description": "Description1",
-        "sub": {"name": "Sub1"},
-        "multi": [{"name": "Multi2a"}, {"name": "Multi2b"}],
-    }
-
-
-def test_v2_items_in_list_to_v1_item_in_list():
-    response = client.post(
-        "/v2-to-v1/list-of-items-to-list-of-items",
-        json={
-            "data1": [{"name2": "Item1"}, {"name2": "Item2"}],
-            "data2": [{"dup_name2": "Item3"}, {"dup_name2": "Item4"}],
-        },
-    )
-    assert response.status_code == 200, response.text
-    assert response.json() == [
-        {"name1": "Item1"},
-        {"name1": "Item3"},
-    ]
-
-
-def test_openapi_schema():
-    response = client.get("/openapi.json")
-    assert response.status_code == 200
-    assert response.json() == snapshot(
-        {
-            "openapi": "3.1.0",
-            "info": {"title": "FastAPI", "version": "0.1.0"},
-            "paths": {
-                "/v1-to-v2/item": {
-                    "post": {
-                        "summary": "Handle V1 Item To V2",
-                        "operationId": "handle_v1_item_to_v2_v1_to_v2_item_post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "allOf": [
-                                            {
-                                                "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv1__Item"
-                                            }
-                                        ],
-                                        "title": "Data",
-                                    }
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__Item"
-                                        }
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-                "/v2-to-v1/item": {
-                    "post": {
-                        "summary": "Handle V2 Item To V1",
-                        "operationId": "handle_v2_item_to_v1_v2_to_v1_item_post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__Item-Input"
-                                    },
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv1__Item"
-                                        }
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-                "/v1-to-v2/item-to-list": {
-                    "post": {
-                        "summary": "Handle V1 Item To V2 List",
-                        "operationId": "handle_v1_item_to_v2_list_v1_to_v2_item_to_list_post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "allOf": [
-                                            {
-                                                "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv1__Item"
-                                            }
-                                        ],
-                                        "title": "Data",
-                                    }
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "items": {
-                                                "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__Item"
-                                            },
-                                            "type": "array",
-                                            "title": "Response Handle V1 Item To V2 List V1 To V2 Item To List Post",
-                                        }
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-                "/v1-to-v2/list-to-list": {
-                    "post": {
-                        "summary": "Handle V1 List To V2 List",
-                        "operationId": "handle_v1_list_to_v2_list_v1_to_v2_list_to_list_post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "items": {
-                                            "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv1__Item"
-                                        },
-                                        "type": "array",
-                                        "title": "Data",
-                                    }
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "items": {
-                                                "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__Item"
-                                            },
-                                            "type": "array",
-                                            "title": "Response Handle V1 List To V2 List V1 To V2 List To List Post",
-                                        }
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-                "/v1-to-v2/list-to-item": {
-                    "post": {
-                        "summary": "Handle V1 List To V2 Item",
-                        "operationId": "handle_v1_list_to_v2_item_v1_to_v2_list_to_item_post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "items": {
-                                            "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv1__Item"
-                                        },
-                                        "type": "array",
-                                        "title": "Data",
-                                    }
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__Item"
-                                        }
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-                "/v2-to-v1/item-to-list": {
-                    "post": {
-                        "summary": "Handle V2 Item To V1 List",
-                        "operationId": "handle_v2_item_to_v1_list_v2_to_v1_item_to_list_post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__Item-Input"
-                                    },
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "items": {
-                                                "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv1__Item"
-                                            },
-                                            "type": "array",
-                                            "title": "Response Handle V2 Item To V1 List V2 To V1 Item To List Post",
-                                        }
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-                "/v2-to-v1/list-to-list": {
-                    "post": {
-                        "summary": "Handle V2 List To V1 List",
-                        "operationId": "handle_v2_list_to_v1_list_v2_to_v1_list_to_list_post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "items": {
-                                            "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__Item-Input"
-                                        },
-                                        "type": "array",
-                                        "title": "Data",
-                                    }
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "items": {
-                                                "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv1__Item"
-                                            },
-                                            "type": "array",
-                                            "title": "Response Handle V2 List To V1 List V2 To V1 List To List Post",
-                                        }
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-                "/v2-to-v1/list-to-item": {
-                    "post": {
-                        "summary": "Handle V2 List To V1 Item",
-                        "operationId": "handle_v2_list_to_v1_item_v2_to_v1_list_to_item_post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "items": {
-                                            "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv2__Item-Input"
-                                        },
-                                        "type": "array",
-                                        "title": "Data",
-                                    }
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv1__Item"
-                                        }
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-                "/v2-to-v1/same-name": {
-                    "post": {
-                        "summary": "Handle V2 Same Name To V1",
-                        "operationId": "handle_v2_same_name_to_v1_v2_to_v1_same_name_post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "$ref": "#/components/schemas/Body_handle_v2_same_name_to_v1_v2_to_v1_same_name_post"
-                                    }
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv1__Item"
-                                        }
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-                "/v2-to-v1/list-of-items-to-list-of-items": {
-                    "post": {
-                        "summary": "Handle V2 Items In List To V1 Item In List",
-                        "operationId": "handle_v2_items_in_list_to_v1_item_in_list_v2_to_v1_list_of_items_to_list_of_items_post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "$ref": "#/components/schemas/Body_handle_v2_items_in_list_to_v1_item_in_list_v2_to_v1_list_of_items_to_list_of_items_post"
-                                    }
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "items": {
-                                                "$ref": "#/components/schemas/tests__test_pydantic_v1_v2_multifile__modelsv1__ItemInList"
-                                            },
-                                            "type": "array",
-                                            "title": "Response Handle V2 Items In List To V1 Item In List V2 To V1 List Of Items To List Of Items Post",
-                                        }
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-            },
-            "components": {
-                "schemas": {
-                    "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",
-                        "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": {
-                                "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": {
-                            "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",
-                    },
-                },
-            },
-        }
-    )

tests/test_pydantic_v1_v2_noneable.py

@@ -1,692 +0,0 @@
-import sys
-import warnings
-from typing import Any, Union
-
-from tests.utils import skip_module_if_py_gte_314
-
-if sys.version_info >= (3, 14):
-    skip_module_if_py_gte_314()
-
-from fastapi import FastAPI
-from fastapi._compat.v1 import BaseModel
-from fastapi.testclient import TestClient
-from inline_snapshot import snapshot
-from pydantic import BaseModel as NewBaseModel
-
-
-class SubItem(BaseModel):
-    name: str
-
-
-class Item(BaseModel):
-    title: str
-    size: int
-    description: Union[str, None] = None
-    sub: SubItem
-    multi: list[SubItem] = []
-
-
-class NewSubItem(NewBaseModel):
-    new_sub_name: str
-
-
-class NewItem(NewBaseModel):
-    new_title: str
-    new_size: int
-    new_description: Union[str, None] = None
-    new_sub: NewSubItem
-    new_multi: list[NewSubItem] = []
-
-
-app = FastAPI()
-
-with warnings.catch_warnings(record=True):
-    warnings.simplefilter("always")
-
-    @app.post("/v1-to-v2/")
-    def handle_v1_item_to_v2(data: Item) -> Union[NewItem, None]:
-        if data.size < 0:
-            return None
-        return NewItem(
-            new_title=data.title,
-            new_size=data.size,
-            new_description=data.description,
-            new_sub=NewSubItem(new_sub_name=data.sub.name),
-            new_multi=[NewSubItem(new_sub_name=s.name) for s in data.multi],
-        )
-
-    @app.post("/v1-to-v2/item-filter", response_model=Union[NewItem, None])
-    def handle_v1_item_to_v2_filter(data: Item) -> Any:
-        if data.size < 0:
-            return None
-        result = {
-            "new_title": data.title,
-            "new_size": data.size,
-            "new_description": data.description,
-            "new_sub": {
-                "new_sub_name": data.sub.name,
-                "new_sub_secret": "sub_hidden",
-            },
-            "new_multi": [
-                {"new_sub_name": s.name, "new_sub_secret": "sub_hidden"}
-                for s in data.multi
-            ],
-            "secret": "hidden_v1_to_v2",
-        }
-        return result
-
-    @app.post("/v2-to-v1/item")
-    def handle_v2_item_to_v1(data: NewItem) -> Union[Item, None]:
-        if data.new_size < 0:
-            return None
-        return Item(
-            title=data.new_title,
-            size=data.new_size,
-            description=data.new_description,
-            sub=SubItem(name=data.new_sub.new_sub_name),
-            multi=[SubItem(name=s.new_sub_name) for s in data.new_multi],
-        )
-
-    @app.post("/v2-to-v1/item-filter", response_model=Union[Item, None])
-    def handle_v2_item_to_v1_filter(data: NewItem) -> Any:
-        if data.new_size < 0:
-            return None
-        result = {
-            "title": data.new_title,
-            "size": data.new_size,
-            "description": data.new_description,
-            "sub": {"name": data.new_sub.new_sub_name, "sub_secret": "sub_hidden"},
-            "multi": [
-                {"name": s.new_sub_name, "sub_secret": "sub_hidden"}
-                for s in data.new_multi
-            ],
-            "secret": "hidden_v2_to_v1",
-        }
-        return result
-
-
-client = TestClient(app)
-
-
-def test_v1_to_v2_item_success():
-    response = client.post(
-        "/v1-to-v2/",
-        json={
-            "title": "Old Item",
-            "size": 100,
-            "description": "V1 description",
-            "sub": {"name": "V1 Sub"},
-            "multi": [{"name": "M1"}, {"name": "M2"}],
-        },
-    )
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "new_title": "Old Item",
-        "new_size": 100,
-        "new_description": "V1 description",
-        "new_sub": {"new_sub_name": "V1 Sub"},
-        "new_multi": [{"new_sub_name": "M1"}, {"new_sub_name": "M2"}],
-    }
-
-
-def test_v1_to_v2_item_returns_none():
-    response = client.post(
-        "/v1-to-v2/",
-        json={"title": "Invalid Item", "size": -10, "sub": {"name": "Sub"}},
-    )
-    assert response.status_code == 200, response.text
-    assert response.json() is None
-
-
-def test_v1_to_v2_item_minimal():
-    response = client.post(
-        "/v1-to-v2/", json={"title": "Minimal", "size": 50, "sub": {"name": "MinSub"}}
-    )
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "new_title": "Minimal",
-        "new_size": 50,
-        "new_description": None,
-        "new_sub": {"new_sub_name": "MinSub"},
-        "new_multi": [],
-    }
-
-
-def test_v1_to_v2_item_filter_success():
-    response = client.post(
-        "/v1-to-v2/item-filter",
-        json={
-            "title": "Filtered Item",
-            "size": 50,
-            "sub": {"name": "Sub"},
-            "multi": [{"name": "Multi1"}],
-        },
-    )
-    assert response.status_code == 200, response.text
-    result = response.json()
-    assert result["new_title"] == "Filtered Item"
-    assert result["new_size"] == 50
-    assert result["new_sub"]["new_sub_name"] == "Sub"
-    assert result["new_multi"][0]["new_sub_name"] == "Multi1"
-    # Verify secret fields are filtered out
-    assert "secret" not in result
-    assert "new_sub_secret" not in result["new_sub"]
-    assert "new_sub_secret" not in result["new_multi"][0]
-
-
-def test_v1_to_v2_item_filter_returns_none():
-    response = client.post(
-        "/v1-to-v2/item-filter",
-        json={"title": "Invalid", "size": -1, "sub": {"name": "Sub"}},
-    )
-    assert response.status_code == 200, response.text
-    assert response.json() is None
-
-
-def test_v2_to_v1_item_success():
-    response = client.post(
-        "/v2-to-v1/item",
-        json={
-            "new_title": "New Item",
-            "new_size": 200,
-            "new_description": "V2 description",
-            "new_sub": {"new_sub_name": "V2 Sub"},
-            "new_multi": [{"new_sub_name": "N1"}, {"new_sub_name": "N2"}],
-        },
-    )
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "title": "New Item",
-        "size": 200,
-        "description": "V2 description",
-        "sub": {"name": "V2 Sub"},
-        "multi": [{"name": "N1"}, {"name": "N2"}],
-    }
-
-
-def test_v2_to_v1_item_returns_none():
-    response = client.post(
-        "/v2-to-v1/item",
-        json={
-            "new_title": "Invalid New",
-            "new_size": -5,
-            "new_sub": {"new_sub_name": "NewSub"},
-        },
-    )
-    assert response.status_code == 200, response.text
-    assert response.json() is None
-
-
-def test_v2_to_v1_item_minimal():
-    response = client.post(
-        "/v2-to-v1/item",
-        json={
-            "new_title": "MinimalNew",
-            "new_size": 75,
-            "new_sub": {"new_sub_name": "MinNewSub"},
-        },
-    )
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "title": "MinimalNew",
-        "size": 75,
-        "description": None,
-        "sub": {"name": "MinNewSub"},
-        "multi": [],
-    }
-
-
-def test_v2_to_v1_item_filter_success():
-    response = client.post(
-        "/v2-to-v1/item-filter",
-        json={
-            "new_title": "Filtered New",
-            "new_size": 75,
-            "new_sub": {"new_sub_name": "NewSub"},
-            "new_multi": [],
-        },
-    )
-    assert response.status_code == 200, response.text
-    result = response.json()
-    assert result["title"] == "Filtered New"
-    assert result["size"] == 75
-    assert result["sub"]["name"] == "NewSub"
-    # Verify secret fields are filtered out
-    assert "secret" not in result
-    assert "sub_secret" not in result["sub"]
-
-
-def test_v2_to_v1_item_filter_returns_none():
-    response = client.post(
-        "/v2-to-v1/item-filter",
-        json={
-            "new_title": "Invalid Filtered",
-            "new_size": -100,
-            "new_sub": {"new_sub_name": "Sub"},
-        },
-    )
-    assert response.status_code == 200, response.text
-    assert response.json() is None
-
-
-def test_v1_to_v2_validation_error():
-    response = client.post("/v1-to-v2/", json={"title": "Missing fields"})
-    assert response.status_code == 422, response.text
-    assert response.json() == snapshot(
-        {
-            "detail": [
-                {
-                    "loc": ["body", "size"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                },
-                {
-                    "loc": ["body", "sub"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                },
-            ]
-        }
-    )
-
-
-def test_v1_to_v2_nested_validation_error():
-    response = client.post(
-        "/v1-to-v2/",
-        json={"title": "Bad sub", "size": 100, "sub": {"wrong_field": "value"}},
-    )
-    assert response.status_code == 422, response.text
-    error_detail = response.json()["detail"]
-    assert len(error_detail) == 1
-    assert error_detail[0]["loc"] == ["body", "sub", "name"]
-
-
-def test_v1_to_v2_type_validation_error():
-    response = client.post(
-        "/v1-to-v2/",
-        json={"title": "Bad type", "size": "not_a_number", "sub": {"name": "Sub"}},
-    )
-    assert response.status_code == 422, response.text
-    error_detail = response.json()["detail"]
-    assert len(error_detail) == 1
-    assert error_detail[0]["loc"] == ["body", "size"]
-
-
-def test_v2_to_v1_validation_error():
-    response = client.post("/v2-to-v1/item", json={"new_title": "Missing fields"})
-    assert response.status_code == 422, response.text
-    assert response.json() == snapshot(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["body", "new_size"],
-                    "msg": "Field required",
-                    "input": {"new_title": "Missing fields"},
-                },
-                {
-                    "type": "missing",
-                    "loc": ["body", "new_sub"],
-                    "msg": "Field required",
-                    "input": {"new_title": "Missing fields"},
-                },
-            ]
-        }
-    )
-
-
-def test_v2_to_v1_nested_validation_error():
-    response = client.post(
-        "/v2-to-v1/item",
-        json={
-            "new_title": "Bad sub",
-            "new_size": 200,
-            "new_sub": {"wrong_field": "value"},
-        },
-    )
-    assert response.status_code == 422, response.text
-    assert response.json() == snapshot(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["body", "new_sub", "new_sub_name"],
-                    "msg": "Field required",
-                    "input": {"wrong_field": "value"},
-                }
-            ]
-        }
-    )
-
-
-def test_v2_to_v1_type_validation_error():
-    response = client.post(
-        "/v2-to-v1/item",
-        json={
-            "new_title": "Bad type",
-            "new_size": "not_a_number",
-            "new_sub": {"new_sub_name": "Sub"},
-        },
-    )
-    assert response.status_code == 422, response.text
-    assert response.json() == snapshot(
-        {
-            "detail": [
-                {
-                    "type": "int_parsing",
-                    "loc": ["body", "new_size"],
-                    "msg": "Input should be a valid integer, unable to parse string as an integer",
-                    "input": "not_a_number",
-                }
-            ]
-        }
-    )
-
-
-def test_v1_to_v2_with_multi_items():
-    response = client.post(
-        "/v1-to-v2/",
-        json={
-            "title": "Complex Item",
-            "size": 300,
-            "description": "Item with multiple sub-items",
-            "sub": {"name": "Main Sub"},
-            "multi": [{"name": "Sub1"}, {"name": "Sub2"}, {"name": "Sub3"}],
-        },
-    )
-    assert response.status_code == 200, response.text
-    assert response.json() == snapshot(
-        {
-            "new_title": "Complex Item",
-            "new_size": 300,
-            "new_description": "Item with multiple sub-items",
-            "new_sub": {"new_sub_name": "Main Sub"},
-            "new_multi": [
-                {"new_sub_name": "Sub1"},
-                {"new_sub_name": "Sub2"},
-                {"new_sub_name": "Sub3"},
-            ],
-        }
-    )
-
-
-def test_v2_to_v1_with_multi_items():
-    response = client.post(
-        "/v2-to-v1/item",
-        json={
-            "new_title": "Complex New Item",
-            "new_size": 400,
-            "new_description": "New item with multiple sub-items",
-            "new_sub": {"new_sub_name": "Main New Sub"},
-            "new_multi": [{"new_sub_name": "NewSub1"}, {"new_sub_name": "NewSub2"}],
-        },
-    )
-    assert response.status_code == 200, response.text
-    assert response.json() == snapshot(
-        {
-            "title": "Complex New Item",
-            "size": 400,
-            "description": "New item with multiple sub-items",
-            "sub": {"name": "Main New Sub"},
-            "multi": [{"name": "NewSub1"}, {"name": "NewSub2"}],
-        }
-    )
-
-
-def test_openapi_schema():
-    response = client.get("/openapi.json")
-    assert response.status_code == 200, response.text
-    assert response.json() == snapshot(
-        {
-            "openapi": "3.1.0",
-            "info": {"title": "FastAPI", "version": "0.1.0"},
-            "paths": {
-                "/v1-to-v2/": {
-                    "post": {
-                        "summary": "Handle V1 Item To V2",
-                        "operationId": "handle_v1_item_to_v2_v1_to_v2__post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "allOf": [
-                                            {"$ref": "#/components/schemas/Item"}
-                                        ],
-                                        "title": "Data",
-                                    }
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "anyOf": [
-                                                {
-                                                    "$ref": "#/components/schemas/NewItem"
-                                                },
-                                                {"type": "null"},
-                                            ],
-                                            "title": "Response Handle V1 Item To V2 V1 To V2  Post",
-                                        }
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-                "/v1-to-v2/item-filter": {
-                    "post": {
-                        "summary": "Handle V1 Item To V2 Filter",
-                        "operationId": "handle_v1_item_to_v2_filter_v1_to_v2_item_filter_post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "allOf": [
-                                            {"$ref": "#/components/schemas/Item"}
-                                        ],
-                                        "title": "Data",
-                                    }
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "anyOf": [
-                                                {
-                                                    "$ref": "#/components/schemas/NewItem"
-                                                },
-                                                {"type": "null"},
-                                            ],
-                                            "title": "Response Handle V1 Item To V2 Filter V1 To V2 Item Filter Post",
-                                        }
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-                "/v2-to-v1/item": {
-                    "post": {
-                        "summary": "Handle V2 Item To V1",
-                        "operationId": "handle_v2_item_to_v1_v2_to_v1_item_post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {"$ref": "#/components/schemas/NewItem"}
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {"$ref": "#/components/schemas/Item"}
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-                "/v2-to-v1/item-filter": {
-                    "post": {
-                        "summary": "Handle V2 Item To V1 Filter",
-                        "operationId": "handle_v2_item_to_v1_filter_v2_to_v1_item_filter_post",
-                        "requestBody": {
-                            "content": {
-                                "application/json": {
-                                    "schema": {"$ref": "#/components/schemas/NewItem"}
-                                }
-                            },
-                            "required": True,
-                        },
-                        "responses": {
-                            "200": {
-                                "description": "Successful Response",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {"$ref": "#/components/schemas/Item"}
-                                    }
-                                },
-                            },
-                            "422": {
-                                "description": "Validation Error",
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "$ref": "#/components/schemas/HTTPValidationError"
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    }
-                },
-            },
-            "components": {
-                "schemas": {
-                    "HTTPValidationError": {
-                        "properties": {
-                            "detail": {
-                                "items": {
-                                    "$ref": "#/components/schemas/ValidationError"
-                                },
-                                "type": "array",
-                                "title": "Detail",
-                            }
-                        },
-                        "type": "object",
-                        "title": "HTTPValidationError",
-                    },
-                    "Item": {
-                        "properties": {
-                            "title": {"type": "string", "title": "Title"},
-                            "size": {"type": "integer", "title": "Size"},
-                            "description": {"type": "string", "title": "Description"},
-                            "sub": {"$ref": "#/components/schemas/SubItem"},
-                            "multi": {
-                                "items": {"$ref": "#/components/schemas/SubItem"},
-                                "type": "array",
-                                "title": "Multi",
-                                "default": [],
-                            },
-                        },
-                        "type": "object",
-                        "required": ["title", "size", "sub"],
-                        "title": "Item",
-                    },
-                    "NewItem": {
-                        "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/NewSubItem"},
-                            "new_multi": {
-                                "items": {"$ref": "#/components/schemas/NewSubItem"},
-                                "type": "array",
-                                "title": "New Multi",
-                                "default": [],
-                            },
-                        },
-                        "type": "object",
-                        "required": ["new_title", "new_size", "new_sub"],
-                        "title": "NewItem",
-                    },
-                    "NewSubItem": {
-                        "properties": {
-                            "new_sub_name": {"type": "string", "title": "New Sub Name"}
-                        },
-                        "type": "object",
-                        "required": ["new_sub_name"],
-                        "title": "NewSubItem",
-                    },
-                    "SubItem": {
-                        "properties": {"name": {"type": "string", "title": "Name"}},
-                        "type": "object",
-                        "required": ["name"],
-                        "title": "SubItem",
-                    },
-                    "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_query.py

@@ -1,4 +1,3 @@
-from dirty_equals import IsDict
 from fastapi.testclient import TestClient
 
 from .main import app
@@ -9,29 +8,16 @@ client = TestClient(app)
 def test_query():
     response = client.get("/query")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["query", "query"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "query"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["query", "query"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
 
 
 def test_query_query_baz():
@@ -43,29 +29,16 @@ def test_query_query_baz():
 def test_query_not_declared_baz():
     response = client.get("/query?not_declared=baz")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["query", "query"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "query"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["query", "query"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
 
 
 def test_query_optional():
@@ -89,29 +62,16 @@ def test_query_optional_not_declared_baz():
 def test_query_int():
     response = client.get("/query/int")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["query", "query"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "query"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["query", "query"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
 
 
 def test_query_int_query_42():
@@ -123,85 +83,46 @@ def test_query_int_query_42():
 def test_query_int_query_42_5():
     response = client.get("/query/int?query=42.5")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "int_parsing",
-                    "loc": ["query", "query"],
-                    "msg": "Input should be a valid integer, unable to parse string as an integer",
-                    "input": "42.5",
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "query"],
-                    "msg": "value is not a valid integer",
-                    "type": "type_error.integer",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "int_parsing",
+                "loc": ["query", "query"],
+                "msg": "Input should be a valid integer, unable to parse string as an integer",
+                "input": "42.5",
+            }
+        ]
+    }
 
 
 def test_query_int_query_baz():
     response = client.get("/query/int?query=baz")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "int_parsing",
-                    "loc": ["query", "query"],
-                    "msg": "Input should be a valid integer, unable to parse string as an integer",
-                    "input": "baz",
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "query"],
-                    "msg": "value is not a valid integer",
-                    "type": "type_error.integer",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "int_parsing",
+                "loc": ["query", "query"],
+                "msg": "Input should be a valid integer, unable to parse string as an integer",
+                "input": "baz",
+            }
+        ]
+    }
 
 
 def test_query_int_not_declared_baz():
     response = client.get("/query/int?not_declared=baz")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["query", "query"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "query"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["query", "query"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
 
 
 def test_query_int_optional():
@@ -219,29 +140,16 @@ def test_query_int_optional_query_50():
 def test_query_int_optional_query_foo():
     response = client.get("/query/int/optional?query=foo")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "int_parsing",
-                    "loc": ["query", "query"],
-                    "msg": "Input should be a valid integer, unable to parse string as an integer",
-                    "input": "foo",
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "query"],
-                    "msg": "value is not a valid integer",
-                    "type": "type_error.integer",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "int_parsing",
+                "loc": ["query", "query"],
+                "msg": "Input should be a valid integer, unable to parse string as an integer",
+                "input": "foo",
+            }
+        ]
+    }
 
 
 def test_query_int_default():
@@ -259,29 +167,16 @@ def test_query_int_default_query_50():
 def test_query_int_default_query_foo():
     response = client.get("/query/int/default?query=foo")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "int_parsing",
-                    "loc": ["query", "query"],
-                    "msg": "Input should be a valid integer, unable to parse string as an integer",
-                    "input": "foo",
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "query"],
-                    "msg": "value is not a valid integer",
-                    "type": "type_error.integer",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "int_parsing",
+                "loc": ["query", "query"],
+                "msg": "Input should be a valid integer, unable to parse string as an integer",
+                "input": "foo",
+            }
+        ]
+    }
 
 
 def test_query_param():
@@ -299,29 +194,16 @@ def test_query_param_query_50():
 def test_query_param_required():
     response = client.get("/query/param-required")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["query", "query"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "query"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["query", "query"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
 
 
 def test_query_param_required_query_50():
@@ -333,29 +215,16 @@ def test_query_param_required_query_50():
 def test_query_param_required_int():
     response = client.get("/query/param-required/int")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["query", "query"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "query"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["query", "query"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
 
 
 def test_query_param_required_int_query_50():
@@ -367,29 +236,16 @@ def test_query_param_required_int_query_50():
 def test_query_param_required_int_query_foo():
     response = client.get("/query/param-required/int?query=foo")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "int_parsing",
-                    "loc": ["query", "query"],
-                    "msg": "Input should be a valid integer, unable to parse string as an integer",
-                    "input": "foo",
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "query"],
-                    "msg": "value is not a valid integer",
-                    "type": "type_error.integer",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "int_parsing",
+                "loc": ["query", "query"],
+                "msg": "Input should be a valid integer, unable to parse string as an integer",
+                "input": "foo",
+            }
+        ]
+    }
 
 
 def test_query_frozenset_query_1_query_1_query_2():

tests/test_read_with_orm_mode.py

@@ -1,12 +1,9 @@
-import warnings
 from typing import Any
 
 from fastapi import FastAPI
 from fastapi.testclient import TestClient
 from pydantic import BaseModel, ConfigDict
 
-from .utils import needs_pydanticv1
-
 
 def test_read_with_orm_mode() -> None:
     class PersonBase(BaseModel):
@@ -44,50 +41,3 @@ def test_read_with_orm_mode() -> None:
     assert data["name"] == person_data["name"]
     assert data["lastname"] == person_data["lastname"]
     assert data["full_name"] == person_data["name"] + " " + person_data["lastname"]
-
-
-@needs_pydanticv1
-def test_read_with_orm_mode_pv1() -> None:
-    from pydantic import v1
-
-    class PersonBase(v1.BaseModel):
-        name: str
-        lastname: str
-
-    class Person(PersonBase):
-        @property
-        def full_name(self) -> str:
-            return f"{self.name} {self.lastname}"
-
-        class Config:
-            orm_mode = True
-            read_with_orm_mode = True
-
-    class PersonCreate(PersonBase):
-        pass
-
-    class PersonRead(PersonBase):
-        full_name: str
-
-        class Config:
-            orm_mode = True
-
-    app = FastAPI()
-
-    with warnings.catch_warnings(record=True):
-        warnings.simplefilter("always")
-
-        @app.post("/people/", response_model=PersonRead)
-        def create_person(person: PersonCreate) -> Any:
-            db_person = Person.from_orm(person)
-            return db_person
-
-    client = TestClient(app)
-
-    person_data = {"name": "Dive", "lastname": "Wilson"}
-    response = client.post("/people/", json=person_data)
-    data = response.json()
-    assert response.status_code == 200, response.text
-    assert data["name"] == person_data["name"]
-    assert data["lastname"] == person_data["lastname"]
-    assert data["full_name"] == person_data["name"] + " " + person_data["lastname"]

tests/test_regex_deprecated_body.py

@@ -1,10 +1,10 @@
 from typing import Annotated
 
 import pytest
-from dirty_equals import IsDict
 from fastapi import FastAPI, Form
 from fastapi.exceptions import FastAPIDeprecationWarning
 from fastapi.testclient import TestClient
+from inline_snapshot import snapshot
 
 from .utils import needs_py310
 
@@ -47,31 +47,17 @@ def test_query_nonregexquery():
     client = get_client()
     response = client.post("/items/", data={"q": "nonregexquery"})
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "string_pattern_mismatch",
-                    "loc": ["body", "q"],
-                    "msg": "String should match pattern '^fixedquery$'",
-                    "input": "nonregexquery",
-                    "ctx": {"pattern": "^fixedquery$"},
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "ctx": {"pattern": "^fixedquery$"},
-                    "loc": ["body", "q"],
-                    "msg": 'string does not match regex "^fixedquery$"',
-                    "type": "value_error.str.regex",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "string_pattern_mismatch",
+                "loc": ["body", "q"],
+                "msg": "String should match pattern '^fixedquery$'",
+                "input": "nonregexquery",
+                "ctx": {"pattern": "^fixedquery$"},
+            }
+        ]
+    }
 
 
 @needs_py310
@@ -79,104 +65,88 @@ def test_openapi_schema():
     client = get_client()
     response = client.get("/openapi.json")
     assert response.status_code == 200, response.text
-    # insert_assert(response.json())
-    assert response.json() == {
-        "openapi": "3.1.0",
-        "info": {"title": "FastAPI", "version": "0.1.0"},
-        "paths": {
-            "/items/": {
-                "post": {
-                    "summary": "Read Items",
-                    "operationId": "read_items_items__post",
-                    "requestBody": {
-                        "content": {
-                            "application/x-www-form-urlencoded": {
-                                "schema": IsDict(
-                                    {
-                                        "allOf": [
-                                            {
-                                                "$ref": "#/components/schemas/Body_read_items_items__post"
-                                            }
-                                        ],
-                                        "title": "Body",
-                                    }
-                                )
-                                | IsDict(
-                                    # TODO: remove when deprecating Pydantic v1
-                                    {
+    assert response.json() == snapshot(
+        {
+            "openapi": "3.1.0",
+            "info": {"title": "FastAPI", "version": "0.1.0"},
+            "paths": {
+                "/items/": {
+                    "post": {
+                        "summary": "Read Items",
+                        "operationId": "read_items_items__post",
+                        "requestBody": {
+                            "content": {
+                                "application/x-www-form-urlencoded": {
+                                    "schema": {
                                         "$ref": "#/components/schemas/Body_read_items_items__post"
                                     }
-                                )
-                            }
-                        }
-                    },
-                    "responses": {
-                        "200": {
-                            "description": "Successful Response",
-                            "content": {"application/json": {"schema": {}}},
-                        },
-                        "422": {
-                            "description": "Validation Error",
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "$ref": "#/components/schemas/HTTPValidationError"
-                                    }
                                 }
+                            }
+                        },
+                        "responses": {
+                            "200": {
+                                "description": "Successful Response",
+                                "content": {"application/json": {"schema": {}}},
+                            },
+                            "422": {
+                                "description": "Validation Error",
+                                "content": {
+                                    "application/json": {
+                                        "schema": {
+                                            "$ref": "#/components/schemas/HTTPValidationError"
+                                        }
+                                    }
+                                },
                             },
                         },
-                    },
+                    }
                 }
-            }
-        },
-        "components": {
-            "schemas": {
-                "Body_read_items_items__post": {
-                    "properties": {
-                        "q": IsDict(
-                            {
+            },
+            "components": {
+                "schemas": {
+                    "Body_read_items_items__post": {
+                        "properties": {
+                            "q": {
                                 "anyOf": [
                                     {"type": "string", "pattern": "^fixedquery$"},
                                     {"type": "null"},
                                 ],
                                 "title": "Q",
                             }
-                        )
-                        | IsDict(
-                            # TODO: remove when deprecating Pydantic v1
-                            {"type": "string", "pattern": "^fixedquery$", "title": "Q"}
-                        )
-                    },
-                    "type": "object",
-                    "title": "Body_read_items_items__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",
+                        "title": "Body_read_items_items__post",
                     },
-                    "type": "object",
-                    "required": ["loc", "msg", "type"],
-                    "title": "ValidationError",
-                },
-            }
-        },
-    }
+                    "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_regex_deprecated_params.py

@@ -1,7 +1,6 @@
 from typing import Annotated
 
 import pytest
-from dirty_equals import IsDict
 from fastapi import FastAPI, Query
 from fastapi.exceptions import FastAPIDeprecationWarning
 from fastapi.testclient import TestClient
@@ -47,31 +46,17 @@ def test_query_params_str_validations_item_query_nonregexquery():
     client = get_client()
     response = client.get("/items/", params={"q": "nonregexquery"})
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "string_pattern_mismatch",
-                    "loc": ["query", "q"],
-                    "msg": "String should match pattern '^fixedquery$'",
-                    "input": "nonregexquery",
-                    "ctx": {"pattern": "^fixedquery$"},
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "ctx": {"pattern": "^fixedquery$"},
-                    "loc": ["query", "q"],
-                    "msg": 'string does not match regex "^fixedquery$"',
-                    "type": "value_error.str.regex",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "string_pattern_mismatch",
+                "loc": ["query", "q"],
+                "msg": "String should match pattern '^fixedquery$'",
+                "input": "nonregexquery",
+                "ctx": {"pattern": "^fixedquery$"},
+            }
+        ]
+    }
 
 
 @needs_py310
@@ -93,23 +78,13 @@ def test_openapi_schema():
                             "name": "q",
                             "in": "query",
                             "required": False,
-                            "schema": IsDict(
-                                {
-                                    "anyOf": [
-                                        {"type": "string", "pattern": "^fixedquery$"},
-                                        {"type": "null"},
-                                    ],
-                                    "title": "Q",
-                                }
-                            )
-                            | IsDict(
-                                # TODO: remove when deprecating Pydantic v1
-                                {
-                                    "type": "string",
-                                    "pattern": "^fixedquery$",
-                                    "title": "Q",
-                                }
-                            ),
+                            "schema": {
+                                "anyOf": [
+                                    {"type": "string", "pattern": "^fixedquery$"},
+                                    {"type": "null"},
+                                ],
+                                "title": "Q",
+                            },
                         }
                     ],
                     "responses": {

tests/test_request_params/test_body/test_list.py

@@ -1,7 +1,7 @@
 from typing import Annotated, Union
 
 import pytest
-from dirty_equals import IsDict, IsOneOf, IsPartialDict
+from dirty_equals import IsOneOf, IsPartialDict
 from fastapi import Body, FastAPI
 from fastapi.testclient import TestClient
 from pydantic import BaseModel, Field
@@ -59,28 +59,16 @@ def test_required_list_str_missing(path: str, json: Union[dict, None]):
     client = TestClient(app)
     response = client.post(path, json=json)
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": IsOneOf(["body", "p"], ["body"]),
-                    "msg": "Field required",
-                    "input": IsOneOf(None, {}),
-                }
-            ]
-        }
-    ) | IsDict(
-        {
-            "detail": [
-                {
-                    "loc": IsOneOf(["body", "p"], ["body"]),
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": IsOneOf(["body", "p"], ["body"]),
+                "msg": "Field required",
+                "input": IsOneOf(None, {}),
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(
@@ -148,29 +136,16 @@ def test_required_list_alias_missing(path: str, json: Union[dict, None]):
     client = TestClient(app)
     response = client.post(path, json=json)
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": IsOneOf(["body", "p_alias"], ["body"]),
-                    "msg": "Field required",
-                    "input": IsOneOf(None, {}),
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": IsOneOf(["body", "p_alias"], ["body"]),
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": IsOneOf(["body", "p_alias"], ["body"]),
+                "msg": "Field required",
+                "input": IsOneOf(None, {}),
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(
@@ -181,29 +156,16 @@ def test_required_list_alias_by_name(path: str):
     client = TestClient(app)
     response = client.post(path, json={"p": ["hello", "world"]})
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["body", "p_alias"],
-                    "msg": "Field required",
-                    "input": IsOneOf(None, {"p": ["hello", "world"]}),
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["body", "p_alias"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["body", "p_alias"],
+                "msg": "Field required",
+                "input": IsOneOf(None, {"p": ["hello", "world"]}),
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(

tests/test_request_params/test_body/test_optional_list.py

@@ -1,7 +1,6 @@
 from typing import Annotated, Optional
 
 import pytest
-from dirty_equals import IsDict
 from fastapi import Body, FastAPI
 from fastapi.testclient import TestClient
 from pydantic import BaseModel, Field
@@ -38,30 +37,19 @@ def test_optional_list_str_schema(path: str):
     openapi = app.openapi()
     body_model_name = get_body_model_name(openapi, path)
 
-    assert app.openapi()["components"]["schemas"][body_model_name] == IsDict(
-        {
-            "properties": {
-                "p": {
-                    "anyOf": [
-                        {"items": {"type": "string"}, "type": "array"},
-                        {"type": "null"},
-                    ],
-                    "title": "P",
-                },
+    assert app.openapi()["components"]["schemas"][body_model_name] == {
+        "properties": {
+            "p": {
+                "anyOf": [
+                    {"items": {"type": "string"}, "type": "array"},
+                    {"type": "null"},
+                ],
+                "title": "P",
             },
-            "title": body_model_name,
-            "type": "object",
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "properties": {
-                "p": {"items": {"type": "string"}, "type": "array", "title": "P"},
-            },
-            "title": body_model_name,
-            "type": "object",
-        }
-    )
+        },
+        "title": body_model_name,
+        "type": "object",
+    }
 
 
 def test_optional_list_str_missing():
@@ -75,29 +63,16 @@ def test_model_optional_list_str_missing():
     client = TestClient(app)
     response = client.post("/model-optional-list-str")
     assert response.status_code == 422, response.text
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "input": None,
-                    "loc": ["body"],
-                    "msg": "Field required",
-                    "type": "missing",
-                },
-            ],
-        }
-    ) | IsDict(
-        {
-            # TODO: remove when deprecating Pydantic v1
-            "detail": [
-                {
-                    "loc": ["body"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                },
-            ],
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "input": None,
+                "loc": ["body"],
+                "msg": "Field required",
+                "type": "missing",
+            },
+        ],
+    }
 
 
 @pytest.mark.parametrize(
@@ -153,34 +128,19 @@ def test_optional_list_str_alias_schema(path: str):
     openapi = app.openapi()
     body_model_name = get_body_model_name(openapi, path)
 
-    assert app.openapi()["components"]["schemas"][body_model_name] == IsDict(
-        {
-            "properties": {
-                "p_alias": {
-                    "anyOf": [
-                        {"items": {"type": "string"}, "type": "array"},
-                        {"type": "null"},
-                    ],
-                    "title": "P Alias",
-                },
+    assert app.openapi()["components"]["schemas"][body_model_name] == {
+        "properties": {
+            "p_alias": {
+                "anyOf": [
+                    {"items": {"type": "string"}, "type": "array"},
+                    {"type": "null"},
+                ],
+                "title": "P Alias",
             },
-            "title": body_model_name,
-            "type": "object",
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "properties": {
-                "p_alias": {
-                    "items": {"type": "string"},
-                    "type": "array",
-                    "title": "P Alias",
-                },
-            },
-            "title": body_model_name,
-            "type": "object",
-        }
-    )
+        },
+        "title": body_model_name,
+        "type": "object",
+    }
 
 
 def test_optional_list_alias_missing():
@@ -194,29 +154,16 @@ def test_model_optional_list_alias_missing():
     client = TestClient(app)
     response = client.post("/model-optional-list-alias")
     assert response.status_code == 422, response.text
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "input": None,
-                    "loc": ["body"],
-                    "msg": "Field required",
-                    "type": "missing",
-                },
-            ],
-        }
-    ) | IsDict(
-        {
-            # TODO: remove when deprecating Pydantic v1
-            "detail": [
-                {
-                    "loc": ["body"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                },
-            ],
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "input": None,
+                "loc": ["body"],
+                "msg": "Field required",
+                "type": "missing",
+            },
+        ],
+    }
 
 
 @pytest.mark.parametrize(
@@ -289,34 +236,19 @@ def test_optional_list_validation_alias_schema(path: str):
     openapi = app.openapi()
     body_model_name = get_body_model_name(openapi, path)
 
-    assert app.openapi()["components"]["schemas"][body_model_name] == IsDict(
-        {
-            "properties": {
-                "p_val_alias": {
-                    "anyOf": [
-                        {"items": {"type": "string"}, "type": "array"},
-                        {"type": "null"},
-                    ],
-                    "title": "P Val Alias",
-                },
+    assert app.openapi()["components"]["schemas"][body_model_name] == {
+        "properties": {
+            "p_val_alias": {
+                "anyOf": [
+                    {"items": {"type": "string"}, "type": "array"},
+                    {"type": "null"},
+                ],
+                "title": "P Val Alias",
             },
-            "title": body_model_name,
-            "type": "object",
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "properties": {
-                "p_val_alias": {
-                    "items": {"type": "string"},
-                    "type": "array",
-                    "title": "P Val Alias",
-                },
-            },
-            "title": body_model_name,
-            "type": "object",
-        }
-    )
+        },
+        "title": body_model_name,
+        "type": "object",
+    }
 
 
 def test_optional_list_validation_alias_missing():
@@ -330,29 +262,16 @@ def test_model_optional_list_validation_alias_missing():
     client = TestClient(app)
     response = client.post("/model-optional-list-validation-alias")
     assert response.status_code == 422, response.text
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "input": None,
-                    "loc": ["body"],
-                    "msg": "Field required",
-                    "type": "missing",
-                },
-            ],
-        }
-    ) | IsDict(
-        {
-            # TODO: remove when deprecating Pydantic v1
-            "detail": [
-                {
-                    "loc": ["body"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                },
-            ],
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "input": None,
+                "loc": ["body"],
+                "msg": "Field required",
+                "type": "missing",
+            },
+        ],
+    }
 
 
 @pytest.mark.parametrize(
@@ -438,34 +357,19 @@ def test_optional_list_alias_and_validation_alias_schema(path: str):
     openapi = app.openapi()
     body_model_name = get_body_model_name(openapi, path)
 
-    assert app.openapi()["components"]["schemas"][body_model_name] == IsDict(
-        {
-            "properties": {
-                "p_val_alias": {
-                    "anyOf": [
-                        {"items": {"type": "string"}, "type": "array"},
-                        {"type": "null"},
-                    ],
-                    "title": "P Val Alias",
-                },
+    assert app.openapi()["components"]["schemas"][body_model_name] == {
+        "properties": {
+            "p_val_alias": {
+                "anyOf": [
+                    {"items": {"type": "string"}, "type": "array"},
+                    {"type": "null"},
+                ],
+                "title": "P Val Alias",
             },
-            "title": body_model_name,
-            "type": "object",
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "properties": {
-                "p_val_alias": {
-                    "items": {"type": "string"},
-                    "type": "array",
-                    "title": "P Val Alias",
-                },
-            },
-            "title": body_model_name,
-            "type": "object",
-        }
-    )
+        },
+        "title": body_model_name,
+        "type": "object",
+    }
 
 
 def test_optional_list_alias_and_validation_alias_missing():
@@ -479,29 +383,16 @@ def test_model_optional_list_alias_and_validation_alias_missing():
     client = TestClient(app)
     response = client.post("/model-optional-list-alias-and-validation-alias")
     assert response.status_code == 422, response.text
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "input": None,
-                    "loc": ["body"],
-                    "msg": "Field required",
-                    "type": "missing",
-                },
-            ],
-        }
-    ) | IsDict(
-        {
-            # TODO: remove when deprecating Pydantic v1
-            "detail": [
-                {
-                    "loc": ["body"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                },
-            ],
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "input": None,
+                "loc": ["body"],
+                "msg": "Field required",
+                "type": "missing",
+            },
+        ],
+    }
 
 
 @pytest.mark.parametrize(

tests/test_request_params/test_body/test_optional_str.py

@@ -1,7 +1,6 @@
 from typing import Annotated, Optional
 
 import pytest
-from dirty_equals import IsDict
 from fastapi import Body, FastAPI
 from fastapi.testclient import TestClient
 from pydantic import BaseModel, Field
@@ -36,27 +35,16 @@ def test_optional_str_schema(path: str):
     openapi = app.openapi()
     body_model_name = get_body_model_name(openapi, path)
 
-    assert app.openapi()["components"]["schemas"][body_model_name] == IsDict(
-        {
-            "properties": {
-                "p": {
-                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                    "title": "P",
-                },
+    assert app.openapi()["components"]["schemas"][body_model_name] == {
+        "properties": {
+            "p": {
+                "anyOf": [{"type": "string"}, {"type": "null"}],
+                "title": "P",
             },
-            "title": body_model_name,
-            "type": "object",
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "properties": {
-                "p": {"type": "string", "title": "P"},
-            },
-            "title": body_model_name,
-            "type": "object",
-        }
-    )
+        },
+        "title": body_model_name,
+        "type": "object",
+    }
 
 
 def test_optional_str_missing():
@@ -70,29 +58,16 @@ def test_model_optional_str_missing():
     client = TestClient(app)
     response = client.post("/model-optional-str")
     assert response.status_code == 422, response.text
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "input": None,
-                    "loc": ["body"],
-                    "msg": "Field required",
-                    "type": "missing",
-                },
-            ],
-        }
-    ) | IsDict(
-        {
-            # TODO: remove when deprecating Pydantic v1
-            "detail": [
-                {
-                    "loc": ["body"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                },
-            ],
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "input": None,
+                "loc": ["body"],
+                "msg": "Field required",
+                "type": "missing",
+            },
+        ],
+    }
 
 
 @pytest.mark.parametrize(
@@ -148,27 +123,16 @@ def test_optional_str_alias_schema(path: str):
     openapi = app.openapi()
     body_model_name = get_body_model_name(openapi, path)
 
-    assert app.openapi()["components"]["schemas"][body_model_name] == IsDict(
-        {
-            "properties": {
-                "p_alias": {
-                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                    "title": "P Alias",
-                },
+    assert app.openapi()["components"]["schemas"][body_model_name] == {
+        "properties": {
+            "p_alias": {
+                "anyOf": [{"type": "string"}, {"type": "null"}],
+                "title": "P Alias",
             },
-            "title": body_model_name,
-            "type": "object",
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "properties": {
-                "p_alias": {"type": "string", "title": "P Alias"},
-            },
-            "title": body_model_name,
-            "type": "object",
-        }
-    )
+        },
+        "title": body_model_name,
+        "type": "object",
+    }
 
 
 def test_optional_alias_missing():
@@ -182,29 +146,16 @@ def test_model_optional_alias_missing():
     client = TestClient(app)
     response = client.post("/model-optional-alias")
     assert response.status_code == 422, response.text
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "input": None,
-                    "loc": ["body"],
-                    "msg": "Field required",
-                    "type": "missing",
-                },
-            ],
-        }
-    ) | IsDict(
-        {
-            # TODO: remove when deprecating Pydantic v1
-            "detail": [
-                {
-                    "loc": ["body"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                },
-            ],
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "input": None,
+                "loc": ["body"],
+                "msg": "Field required",
+                "type": "missing",
+            },
+        ],
+    }
 
 
 @pytest.mark.parametrize(
@@ -274,27 +225,16 @@ def test_optional_validation_alias_schema(path: str):
     openapi = app.openapi()
     body_model_name = get_body_model_name(openapi, path)
 
-    assert app.openapi()["components"]["schemas"][body_model_name] == IsDict(
-        {
-            "properties": {
-                "p_val_alias": {
-                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                    "title": "P Val Alias",
-                },
+    assert app.openapi()["components"]["schemas"][body_model_name] == {
+        "properties": {
+            "p_val_alias": {
+                "anyOf": [{"type": "string"}, {"type": "null"}],
+                "title": "P Val Alias",
             },
-            "title": body_model_name,
-            "type": "object",
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "properties": {
-                "p_val_alias": {"type": "string", "title": "P Val Alias"},
-            },
-            "title": body_model_name,
-            "type": "object",
-        }
-    )
+        },
+        "title": body_model_name,
+        "type": "object",
+    }
 
 
 def test_optional_validation_alias_missing():
@@ -308,29 +248,16 @@ def test_model_optional_validation_alias_missing():
     client = TestClient(app)
     response = client.post("/model-optional-validation-alias")
     assert response.status_code == 422, response.text
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "input": None,
-                    "loc": ["body"],
-                    "msg": "Field required",
-                    "type": "missing",
-                },
-            ],
-        }
-    ) | IsDict(
-        {
-            # TODO: remove when deprecating Pydantic v1
-            "detail": [
-                {
-                    "loc": ["body"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                },
-            ],
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "input": None,
+                "loc": ["body"],
+                "msg": "Field required",
+                "type": "missing",
+            },
+        ],
+    }
 
 
 @pytest.mark.parametrize(
@@ -413,27 +340,16 @@ def test_optional_alias_and_validation_alias_schema(path: str):
     openapi = app.openapi()
     body_model_name = get_body_model_name(openapi, path)
 
-    assert app.openapi()["components"]["schemas"][body_model_name] == IsDict(
-        {
-            "properties": {
-                "p_val_alias": {
-                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                    "title": "P Val Alias",
-                },
+    assert app.openapi()["components"]["schemas"][body_model_name] == {
+        "properties": {
+            "p_val_alias": {
+                "anyOf": [{"type": "string"}, {"type": "null"}],
+                "title": "P Val Alias",
             },
-            "title": body_model_name,
-            "type": "object",
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "properties": {
-                "p_val_alias": {"type": "string", "title": "P Val Alias"},
-            },
-            "title": body_model_name,
-            "type": "object",
-        }
-    )
+        },
+        "title": body_model_name,
+        "type": "object",
+    }
 
 
 def test_optional_alias_and_validation_alias_missing():
@@ -447,29 +363,16 @@ def test_model_optional_alias_and_validation_alias_missing():
     client = TestClient(app)
     response = client.post("/model-optional-alias-and-validation-alias")
     assert response.status_code == 422, response.text
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "input": None,
-                    "loc": ["body"],
-                    "msg": "Field required",
-                    "type": "missing",
-                },
-            ],
-        }
-    ) | IsDict(
-        {
-            # TODO: remove when deprecating Pydantic v1
-            "detail": [
-                {
-                    "loc": ["body"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                },
-            ],
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "input": None,
+                "loc": ["body"],
+                "msg": "Field required",
+                "type": "missing",
+            },
+        ],
+    }
 
 
 @pytest.mark.parametrize(

tests/test_request_params/test_body/test_required_str.py

@@ -1,7 +1,7 @@
 from typing import Annotated, Any, Union
 
 import pytest
-from dirty_equals import IsDict, IsOneOf
+from dirty_equals import IsOneOf
 from fastapi import Body, FastAPI
 from fastapi.testclient import TestClient
 from pydantic import BaseModel, Field
@@ -55,29 +55,16 @@ def test_required_str_missing(path: str, json: Union[dict[str, Any], None]):
     client = TestClient(app)
     response = client.post(path, json=json)
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": IsOneOf(["body"], ["body", "p"]),
-                    "msg": "Field required",
-                    "input": IsOneOf(None, {}),
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": IsOneOf(["body"], ["body", "p"]),
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": IsOneOf(["body"], ["body", "p"]),
+                "msg": "Field required",
+                "input": IsOneOf(None, {}),
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(
@@ -141,29 +128,16 @@ def test_required_alias_missing(path: str, json: Union[dict[str, Any], None]):
     client = TestClient(app)
     response = client.post(path, json=json)
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": IsOneOf(["body", "p_alias"], ["body"]),
-                    "msg": "Field required",
-                    "input": IsOneOf(None, {}),
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": IsOneOf(["body", "p_alias"], ["body"]),
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": IsOneOf(["body", "p_alias"], ["body"]),
+                "msg": "Field required",
+                "input": IsOneOf(None, {}),
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(
@@ -174,29 +148,16 @@ def test_required_alias_by_name(path: str):
     client = TestClient(app)
     response = client.post(path, json={"p": "hello"})
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["body", "p_alias"],
-                    "msg": "Field required",
-                    "input": IsOneOf(None, {"p": "hello"}),
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": IsOneOf(["body", "p_alias"], ["body"]),
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["body", "p_alias"],
+                "msg": "Field required",
+                "input": IsOneOf(None, {"p": "hello"}),
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(

tests/test_request_params/test_cookie/test_optional_str.py

@@ -1,7 +1,6 @@
 from typing import Annotated, Optional
 
 import pytest
-from dirty_equals import IsDict
 from fastapi import Cookie, FastAPI
 from fastapi.testclient import TestClient
 from pydantic import BaseModel, Field
@@ -32,26 +31,15 @@ async def read_model_optional_str(p: Annotated[CookieModelOptionalStr, Cookie()]
 )
 def test_optional_str_schema(path: str):
     assert app.openapi()["paths"][path]["get"]["parameters"] == [
-        IsDict(
-            {
-                "required": False,
-                "schema": {
-                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                    "title": "P",
-                },
-                "name": "p",
-                "in": "cookie",
-            }
-        )
-        | IsDict(
-            # TODO: remove when deprecating Pydantic v1
-            {
-                "required": False,
-                "schema": {"title": "P", "type": "string"},
-                "name": "p",
-                "in": "cookie",
-            }
-        )
+        {
+            "required": False,
+            "schema": {
+                "anyOf": [{"type": "string"}, {"type": "null"}],
+                "title": "P",
+            },
+            "name": "p",
+            "in": "cookie",
+        }
     ]
 
 
@@ -104,26 +92,15 @@ async def read_model_optional_alias(p: Annotated[CookieModelOptionalAlias, Cooki
 )
 def test_optional_str_alias_schema(path: str):
     assert app.openapi()["paths"][path]["get"]["parameters"] == [
-        IsDict(
-            {
-                "required": False,
-                "schema": {
-                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                    "title": "P Alias",
-                },
-                "name": "p_alias",
-                "in": "cookie",
-            }
-        )
-        | IsDict(
-            # TODO: remove when deprecating Pydantic v1
-            {
-                "required": False,
-                "schema": {"title": "P Alias", "type": "string"},
-                "name": "p_alias",
-                "in": "cookie",
-            }
-        )
+        {
+            "required": False,
+            "schema": {
+                "anyOf": [{"type": "string"}, {"type": "null"}],
+                "title": "P Alias",
+            },
+            "name": "p_alias",
+            "in": "cookie",
+        }
     ]
 
 

tests/test_request_params/test_cookie/test_required_str.py

@@ -1,7 +1,7 @@
 from typing import Annotated
 
 import pytest
-from dirty_equals import IsDict, IsOneOf
+from dirty_equals import IsOneOf
 from fastapi import Cookie, FastAPI
 from fastapi.testclient import TestClient
 from pydantic import BaseModel, Field
@@ -49,29 +49,16 @@ def test_required_str_missing(path: str):
     client = TestClient(app)
     response = client.get(path)
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["cookie", "p"],
-                    "msg": "Field required",
-                    "input": IsOneOf(None, {}),
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["cookie", "p"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["cookie", "p"],
+                "msg": "Field required",
+                "input": IsOneOf(None, {}),
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(
@@ -127,29 +114,16 @@ def test_required_alias_missing(path: str):
     client = TestClient(app)
     response = client.get(path)
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["cookie", "p_alias"],
-                    "msg": "Field required",
-                    "input": IsOneOf(None, {}),
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["cookie", "p_alias"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["cookie", "p_alias"],
+                "msg": "Field required",
+                "input": IsOneOf(None, {}),
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(
@@ -164,32 +138,19 @@ def test_required_alias_by_name(path: str):
     client.cookies.set("p", "hello")
     response = client.get(path)
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["cookie", "p_alias"],
-                    "msg": "Field required",
-                    "input": IsOneOf(
-                        None,
-                        {"p": "hello"},
-                    ),
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["cookie", "p_alias"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["cookie", "p_alias"],
+                "msg": "Field required",
+                "input": IsOneOf(
+                    None,
+                    {"p": "hello"},
+                ),
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(

tests/test_request_params/test_file/test_list.py

@@ -1,7 +1,6 @@
 from typing import Annotated
 
 import pytest
-from dirty_equals import IsDict
 from fastapi import FastAPI, File, UploadFile
 from fastapi.testclient import TestClient
 
@@ -36,27 +35,11 @@ def test_list_schema(path: str):
 
     assert app.openapi()["components"]["schemas"][body_model_name] == {
         "properties": {
-            "p": (
-                IsDict(
-                    {
-                        "anyOf": [
-                            {
-                                "type": "array",
-                                "items": {"type": "string", "format": "binary"},
-                            },
-                            {"type": "null"},
-                        ],
-                        "title": "P",
-                    },
-                )
-                | IsDict(
-                    {
-                        "type": "array",
-                        "items": {"type": "string", "format": "binary"},
-                        "title": "P",
-                    },
-                )
-            )
+            "p": {
+                "type": "array",
+                "items": {"type": "string", "format": "binary"},
+                "title": "P",
+            },
         },
         "required": ["p"],
         "title": body_model_name,
@@ -75,29 +58,16 @@ def test_list_missing(path: str):
     client = TestClient(app)
     response = client.post(path)
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["body", "p"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["body", "p"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["body", "p"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(
@@ -143,27 +113,11 @@ def test_list_alias_schema(path: str):
 
     assert app.openapi()["components"]["schemas"][body_model_name] == {
         "properties": {
-            "p_alias": (
-                IsDict(
-                    {
-                        "anyOf": [
-                            {
-                                "type": "array",
-                                "items": {"type": "string", "format": "binary"},
-                            },
-                            {"type": "null"},
-                        ],
-                        "title": "P Alias",
-                    },
-                )
-                | IsDict(
-                    {
-                        "type": "array",
-                        "items": {"type": "string", "format": "binary"},
-                        "title": "P Alias",
-                    },
-                )
-            )
+            "p_alias": {
+                "type": "array",
+                "items": {"type": "string", "format": "binary"},
+                "title": "P Alias",
+            },
         },
         "required": ["p_alias"],
         "title": body_model_name,
@@ -182,29 +136,16 @@ def test_list_alias_missing(path: str):
     client = TestClient(app)
     response = client.post(path)
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["body", "p_alias"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["body", "p_alias"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["body", "p_alias"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(
@@ -218,29 +159,16 @@ def test_list_alias_by_name(path: str):
     client = TestClient(app)
     response = client.post(path, files=[("p", b"hello"), ("p", b"world")])
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["body", "p_alias"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["body", "p_alias"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["body", "p_alias"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(
@@ -291,27 +219,11 @@ def test_list_validation_alias_schema(path: str):
 
     assert app.openapi()["components"]["schemas"][body_model_name] == {
         "properties": {
-            "p_val_alias": (
-                IsDict(
-                    {
-                        "anyOf": [
-                            {
-                                "type": "array",
-                                "items": {"type": "string", "format": "binary"},
-                            },
-                            {"type": "null"},
-                        ],
-                        "title": "P Val Alias",
-                    },
-                )
-                | IsDict(
-                    {
-                        "type": "array",
-                        "items": {"type": "string", "format": "binary"},
-                        "title": "P Val Alias",
-                    },
-                )
-            )
+            "p_val_alias": {
+                "type": "array",
+                "items": {"type": "string", "format": "binary"},
+                "title": "P Val Alias",
+            },
         },
         "required": ["p_val_alias"],
         "title": body_model_name,
@@ -424,27 +336,11 @@ def test_list_alias_and_validation_alias_schema(path: str):
 
     assert app.openapi()["components"]["schemas"][body_model_name] == {
         "properties": {
-            "p_val_alias": (
-                IsDict(
-                    {
-                        "anyOf": [
-                            {
-                                "type": "array",
-                                "items": {"type": "string", "format": "binary"},
-                            },
-                            {"type": "null"},
-                        ],
-                        "title": "P Val Alias",
-                    },
-                )
-                | IsDict(
-                    {
-                        "type": "array",
-                        "items": {"type": "string", "format": "binary"},
-                        "title": "P Val Alias",
-                    },
-                )
-            )
+            "p_val_alias": {
+                "type": "array",
+                "items": {"type": "string", "format": "binary"},
+                "title": "P Val Alias",
+            },
         },
         "required": ["p_val_alias"],
         "title": body_model_name,

tests/test_request_params/test_file/test_optional.py

@@ -1,7 +1,6 @@
 from typing import Annotated, Optional
 
 import pytest
-from dirty_equals import IsDict
 from fastapi import FastAPI, File, UploadFile
 from fastapi.testclient import TestClient
 
@@ -36,21 +35,13 @@ def test_optional_schema(path: str):
 
     assert app.openapi()["components"]["schemas"][body_model_name] == {
         "properties": {
-            "p": (
-                IsDict(
-                    {
-                        "anyOf": [
-                            {"type": "string", "format": "binary"},
-                            {"type": "null"},
-                        ],
-                        "title": "P",
-                    }
-                )
-                | IsDict(
-                    # TODO: remove when deprecating Pydantic v1
-                    {"title": "P", "type": "string", "format": "binary"}
-                )
-            ),
+            "p": {
+                "anyOf": [
+                    {"type": "string", "format": "binary"},
+                    {"type": "null"},
+                ],
+                "title": "P",
+            }
         },
         "title": body_model_name,
         "type": "object",
@@ -116,21 +107,13 @@ def test_optional_alias_schema(path: str):
 
     assert app.openapi()["components"]["schemas"][body_model_name] == {
         "properties": {
-            "p_alias": (
-                IsDict(
-                    {
-                        "anyOf": [
-                            {"type": "string", "format": "binary"},
-                            {"type": "null"},
-                        ],
-                        "title": "P Alias",
-                    }
-                )
-                | IsDict(
-                    # TODO: remove when deprecating Pydantic v1
-                    {"title": "P Alias", "type": "string", "format": "binary"}
-                )
-            ),
+            "p_alias": {
+                "anyOf": [
+                    {"type": "string", "format": "binary"},
+                    {"type": "null"},
+                ],
+                "title": "P Alias",
+            }
         },
         "title": body_model_name,
         "type": "object",
@@ -215,21 +198,13 @@ def test_optional_validation_alias_schema(path: str):
 
     assert app.openapi()["components"]["schemas"][body_model_name] == {
         "properties": {
-            "p_val_alias": (
-                IsDict(
-                    {
-                        "anyOf": [
-                            {"type": "string", "format": "binary"},
-                            {"type": "null"},
-                        ],
-                        "title": "P Val Alias",
-                    }
-                )
-                | IsDict(
-                    # TODO: remove when deprecating Pydantic v1
-                    {"title": "P Val Alias", "type": "string", "format": "binary"}
-                )
-            ),
+            "p_val_alias": {
+                "anyOf": [
+                    {"type": "string", "format": "binary"},
+                    {"type": "null"},
+                ],
+                "title": "P Val Alias",
+            }
         },
         "title": body_model_name,
         "type": "object",
@@ -319,21 +294,13 @@ def test_optional_alias_and_validation_alias_schema(path: str):
 
     assert app.openapi()["components"]["schemas"][body_model_name] == {
         "properties": {
-            "p_val_alias": (
-                IsDict(
-                    {
-                        "anyOf": [
-                            {"type": "string", "format": "binary"},
-                            {"type": "null"},
-                        ],
-                        "title": "P Val Alias",
-                    }
-                )
-                | IsDict(
-                    # TODO: remove when deprecating Pydantic v1
-                    {"title": "P Val Alias", "type": "string", "format": "binary"}
-                )
-            ),
+            "p_val_alias": {
+                "anyOf": [
+                    {"type": "string", "format": "binary"},
+                    {"type": "null"},
+                ],
+                "title": "P Val Alias",
+            }
         },
         "title": body_model_name,
         "type": "object",

tests/test_request_params/test_file/test_optional_list.py

@@ -1,7 +1,6 @@
 from typing import Annotated, Optional
 
 import pytest
-from dirty_equals import IsDict
 from fastapi import FastAPI, File, UploadFile
 from fastapi.testclient import TestClient
 
@@ -38,28 +37,16 @@ def test_optional_list_schema(path: str):
 
     assert app.openapi()["components"]["schemas"][body_model_name] == {
         "properties": {
-            "p": (
-                IsDict(
+            "p": {
+                "anyOf": [
                     {
-                        "anyOf": [
-                            {
-                                "type": "array",
-                                "items": {"type": "string", "format": "binary"},
-                            },
-                            {"type": "null"},
-                        ],
-                        "title": "P",
-                    }
-                )
-                | IsDict(
-                    # TODO: remove when deprecating Pydantic v1
-                    {
-                        "title": "P",
                         "type": "array",
                         "items": {"type": "string", "format": "binary"},
                     },
-                )
-            ),
+                    {"type": "null"},
+                ],
+                "title": "P",
+            }
         },
         "title": body_model_name,
         "type": "object",
@@ -125,28 +112,16 @@ def test_optional_list_alias_schema(path: str):
 
     assert app.openapi()["components"]["schemas"][body_model_name] == {
         "properties": {
-            "p_alias": (
-                IsDict(
+            "p_alias": {
+                "anyOf": [
                     {
-                        "anyOf": [
-                            {
-                                "type": "array",
-                                "items": {"type": "string", "format": "binary"},
-                            },
-                            {"type": "null"},
-                        ],
-                        "title": "P Alias",
-                    }
-                )
-                | IsDict(
-                    # TODO: remove when deprecating Pydantic v1
-                    {
-                        "title": "P Alias",
                         "type": "array",
                         "items": {"type": "string", "format": "binary"},
-                    }
-                )
-            ),
+                    },
+                    {"type": "null"},
+                ],
+                "title": "P Alias",
+            }
         },
         "title": body_model_name,
         "type": "object",
@@ -228,28 +203,16 @@ def test_optional_validation_alias_schema(path: str):
 
     assert app.openapi()["components"]["schemas"][body_model_name] == {
         "properties": {
-            "p_val_alias": (
-                IsDict(
+            "p_val_alias": {
+                "anyOf": [
                     {
-                        "anyOf": [
-                            {
-                                "type": "array",
-                                "items": {"type": "string", "format": "binary"},
-                            },
-                            {"type": "null"},
-                        ],
-                        "title": "P Val Alias",
-                    }
-                )
-                | IsDict(
-                    # TODO: remove when deprecating Pydantic v1
-                    {
-                        "title": "P Val Alias",
                         "type": "array",
                         "items": {"type": "string", "format": "binary"},
-                    }
-                )
-            ),
+                    },
+                    {"type": "null"},
+                ],
+                "title": "P Val Alias",
+            }
         },
         "title": body_model_name,
         "type": "object",
@@ -336,28 +299,16 @@ def test_optional_list_alias_and_validation_alias_schema(path: str):
 
     assert app.openapi()["components"]["schemas"][body_model_name] == {
         "properties": {
-            "p_val_alias": (
-                IsDict(
+            "p_val_alias": {
+                "anyOf": [
                     {
-                        "anyOf": [
-                            {
-                                "type": "array",
-                                "items": {"type": "string", "format": "binary"},
-                            },
-                            {"type": "null"},
-                        ],
-                        "title": "P Val Alias",
-                    }
-                )
-                | IsDict(
-                    # TODO: remove when deprecating Pydantic v1
-                    {
-                        "title": "P Val Alias",
                         "type": "array",
                         "items": {"type": "string", "format": "binary"},
-                    }
-                )
-            ),
+                    },
+                    {"type": "null"},
+                ],
+                "title": "P Val Alias",
+            }
         },
         "title": body_model_name,
         "type": "object",

tests/test_request_params/test_file/test_required.py

@@ -1,7 +1,6 @@
 from typing import Annotated
 
 import pytest
-from dirty_equals import IsDict
 from fastapi import FastAPI, File, UploadFile
 from fastapi.testclient import TestClient
 
@@ -55,29 +54,16 @@ def test_required_missing(path: str):
     client = TestClient(app)
     response = client.post(path)
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["body", "p"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["body", "p"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["body", "p"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(
@@ -142,29 +128,16 @@ def test_required_alias_missing(path: str):
     client = TestClient(app)
     response = client.post(path)
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["body", "p_alias"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["body", "p_alias"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["body", "p_alias"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(
@@ -178,29 +151,16 @@ def test_required_alias_by_name(path: str):
     client = TestClient(app)
     response = client.post(path, files=[("p", b"hello")])
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["body", "p_alias"],
-                    "msg": "Field required",
-                    "input": None,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["body", "p_alias"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["body", "p_alias"],
+                "msg": "Field required",
+                "input": None,
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(

tests/test_request_params/test_form/test_list.py

@@ -1,7 +1,7 @@
 from typing import Annotated
 
 import pytest
-from dirty_equals import IsDict, IsOneOf, IsPartialDict
+from dirty_equals import IsOneOf, IsPartialDict
 from fastapi import FastAPI, Form
 from fastapi.testclient import TestClient
 from pydantic import BaseModel, Field
@@ -58,28 +58,16 @@ def test_required_list_str_missing(path: str):
     client = TestClient(app)
     response = client.post(path)
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["body", "p"],
-                    "msg": "Field required",
-                    "input": IsOneOf(None, {}),
-                }
-            ]
-        }
-    ) | IsDict(
-        {
-            "detail": [
-                {
-                    "loc": ["body", "p"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["body", "p"],
+                "msg": "Field required",
+                "input": IsOneOf(None, {}),
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(
@@ -146,29 +134,16 @@ def test_required_list_alias_missing(path: str):
     client = TestClient(app)
     response = client.post(path)
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["body", "p_alias"],
-                    "msg": "Field required",
-                    "input": IsOneOf(None, {}),
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["body", "p_alias"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["body", "p_alias"],
+                "msg": "Field required",
+                "input": IsOneOf(None, {}),
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(
@@ -182,29 +157,16 @@ def test_required_list_alias_by_name(path: str):
     client = TestClient(app)
     response = client.post(path, data={"p": ["hello", "world"]})
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["body", "p_alias"],
-                    "msg": "Field required",
-                    "input": IsOneOf(None, {"p": ["hello", "world"]}),
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["body", "p_alias"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["body", "p_alias"],
+                "msg": "Field required",
+                "input": IsOneOf(None, {"p": ["hello", "world"]}),
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(

tests/test_request_params/test_form/test_optional_list.py

@@ -1,7 +1,6 @@
 from typing import Annotated, Optional
 
 import pytest
-from dirty_equals import IsDict
 from fastapi import FastAPI, Form
 from fastapi.testclient import TestClient
 from pydantic import BaseModel, Field
@@ -38,30 +37,19 @@ def test_optional_list_str_schema(path: str):
     openapi = app.openapi()
     body_model_name = get_body_model_name(openapi, path)
 
-    assert app.openapi()["components"]["schemas"][body_model_name] == IsDict(
-        {
-            "properties": {
-                "p": {
-                    "anyOf": [
-                        {"items": {"type": "string"}, "type": "array"},
-                        {"type": "null"},
-                    ],
-                    "title": "P",
-                },
+    assert app.openapi()["components"]["schemas"][body_model_name] == {
+        "properties": {
+            "p": {
+                "anyOf": [
+                    {"items": {"type": "string"}, "type": "array"},
+                    {"type": "null"},
+                ],
+                "title": "P",
             },
-            "title": body_model_name,
-            "type": "object",
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "properties": {
-                "p": {"items": {"type": "string"}, "type": "array", "title": "P"},
-            },
-            "title": body_model_name,
-            "type": "object",
-        }
-    )
+        },
+        "title": body_model_name,
+        "type": "object",
+    }
 
 
 @pytest.mark.parametrize(
@@ -119,34 +107,19 @@ def test_optional_list_str_alias_schema(path: str):
     openapi = app.openapi()
     body_model_name = get_body_model_name(openapi, path)
 
-    assert app.openapi()["components"]["schemas"][body_model_name] == IsDict(
-        {
-            "properties": {
-                "p_alias": {
-                    "anyOf": [
-                        {"items": {"type": "string"}, "type": "array"},
-                        {"type": "null"},
-                    ],
-                    "title": "P Alias",
-                },
+    assert app.openapi()["components"]["schemas"][body_model_name] == {
+        "properties": {
+            "p_alias": {
+                "anyOf": [
+                    {"items": {"type": "string"}, "type": "array"},
+                    {"type": "null"},
+                ],
+                "title": "P Alias",
             },
-            "title": body_model_name,
-            "type": "object",
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "properties": {
-                "p_alias": {
-                    "items": {"type": "string"},
-                    "type": "array",
-                    "title": "P Alias",
-                },
-            },
-            "title": body_model_name,
-            "type": "object",
-        }
-    )
+        },
+        "title": body_model_name,
+        "type": "object",
+    }
 
 
 @pytest.mark.parametrize(
@@ -217,34 +190,19 @@ def test_optional_list_validation_alias_schema(path: str):
     openapi = app.openapi()
     body_model_name = get_body_model_name(openapi, path)
 
-    assert app.openapi()["components"]["schemas"][body_model_name] == IsDict(
-        {
-            "properties": {
-                "p_val_alias": {
-                    "anyOf": [
-                        {"items": {"type": "string"}, "type": "array"},
-                        {"type": "null"},
-                    ],
-                    "title": "P Val Alias",
-                },
+    assert app.openapi()["components"]["schemas"][body_model_name] == {
+        "properties": {
+            "p_val_alias": {
+                "anyOf": [
+                    {"items": {"type": "string"}, "type": "array"},
+                    {"type": "null"},
+                ],
+                "title": "P Val Alias",
             },
-            "title": body_model_name,
-            "type": "object",
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "properties": {
-                "p_val_alias": {
-                    "items": {"type": "string"},
-                    "type": "array",
-                    "title": "P Val Alias",
-                },
-            },
-            "title": body_model_name,
-            "type": "object",
-        }
-    )
+        },
+        "title": body_model_name,
+        "type": "object",
+    }
 
 
 @pytest.mark.parametrize(
@@ -326,34 +284,19 @@ def test_optional_list_alias_and_validation_alias_schema(path: str):
     openapi = app.openapi()
     body_model_name = get_body_model_name(openapi, path)
 
-    assert app.openapi()["components"]["schemas"][body_model_name] == IsDict(
-        {
-            "properties": {
-                "p_val_alias": {
-                    "anyOf": [
-                        {"items": {"type": "string"}, "type": "array"},
-                        {"type": "null"},
-                    ],
-                    "title": "P Val Alias",
-                },
+    assert app.openapi()["components"]["schemas"][body_model_name] == {
+        "properties": {
+            "p_val_alias": {
+                "anyOf": [
+                    {"items": {"type": "string"}, "type": "array"},
+                    {"type": "null"},
+                ],
+                "title": "P Val Alias",
             },
-            "title": body_model_name,
-            "type": "object",
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "properties": {
-                "p_val_alias": {
-                    "items": {"type": "string"},
-                    "type": "array",
-                    "title": "P Val Alias",
-                },
-            },
-            "title": body_model_name,
-            "type": "object",
-        }
-    )
+        },
+        "title": body_model_name,
+        "type": "object",
+    }
 
 
 @pytest.mark.parametrize(

tests/test_request_params/test_form/test_optional_str.py

@@ -1,7 +1,6 @@
 from typing import Annotated, Optional
 
 import pytest
-from dirty_equals import IsDict
 from fastapi import FastAPI, Form
 from fastapi.testclient import TestClient
 from pydantic import BaseModel, Field
@@ -36,27 +35,16 @@ def test_optional_str_schema(path: str):
     openapi = app.openapi()
     body_model_name = get_body_model_name(openapi, path)
 
-    assert app.openapi()["components"]["schemas"][body_model_name] == IsDict(
-        {
-            "properties": {
-                "p": {
-                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                    "title": "P",
-                },
+    assert app.openapi()["components"]["schemas"][body_model_name] == {
+        "properties": {
+            "p": {
+                "anyOf": [{"type": "string"}, {"type": "null"}],
+                "title": "P",
             },
-            "title": body_model_name,
-            "type": "object",
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "properties": {
-                "p": {"type": "string", "title": "P"},
-            },
-            "title": body_model_name,
-            "type": "object",
-        }
-    )
+        },
+        "title": body_model_name,
+        "type": "object",
+    }
 
 
 @pytest.mark.parametrize(
@@ -112,27 +100,16 @@ def test_optional_str_alias_schema(path: str):
     openapi = app.openapi()
     body_model_name = get_body_model_name(openapi, path)
 
-    assert app.openapi()["components"]["schemas"][body_model_name] == IsDict(
-        {
-            "properties": {
-                "p_alias": {
-                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                    "title": "P Alias",
-                },
+    assert app.openapi()["components"]["schemas"][body_model_name] == {
+        "properties": {
+            "p_alias": {
+                "anyOf": [{"type": "string"}, {"type": "null"}],
+                "title": "P Alias",
             },
-            "title": body_model_name,
-            "type": "object",
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "properties": {
-                "p_alias": {"type": "string", "title": "P Alias"},
-            },
-            "title": body_model_name,
-            "type": "object",
-        }
-    )
+        },
+        "title": body_model_name,
+        "type": "object",
+    }
 
 
 @pytest.mark.parametrize(
@@ -200,27 +177,16 @@ def test_optional_validation_alias_schema(path: str):
     openapi = app.openapi()
     body_model_name = get_body_model_name(openapi, path)
 
-    assert app.openapi()["components"]["schemas"][body_model_name] == IsDict(
-        {
-            "properties": {
-                "p_val_alias": {
-                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                    "title": "P Val Alias",
-                },
+    assert app.openapi()["components"]["schemas"][body_model_name] == {
+        "properties": {
+            "p_val_alias": {
+                "anyOf": [{"type": "string"}, {"type": "null"}],
+                "title": "P Val Alias",
             },
-            "title": body_model_name,
-            "type": "object",
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "properties": {
-                "p_val_alias": {"type": "string", "title": "P Val Alias"},
-            },
-            "title": body_model_name,
-            "type": "object",
-        }
-    )
+        },
+        "title": body_model_name,
+        "type": "object",
+    }
 
 
 @pytest.mark.parametrize(
@@ -303,27 +269,16 @@ def test_optional_alias_and_validation_alias_schema(path: str):
     openapi = app.openapi()
     body_model_name = get_body_model_name(openapi, path)
 
-    assert app.openapi()["components"]["schemas"][body_model_name] == IsDict(
-        {
-            "properties": {
-                "p_val_alias": {
-                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                    "title": "P Val Alias",
-                },
+    assert app.openapi()["components"]["schemas"][body_model_name] == {
+        "properties": {
+            "p_val_alias": {
+                "anyOf": [{"type": "string"}, {"type": "null"}],
+                "title": "P Val Alias",
             },
-            "title": body_model_name,
-            "type": "object",
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "properties": {
-                "p_val_alias": {"type": "string", "title": "P Val Alias"},
-            },
-            "title": body_model_name,
-            "type": "object",
-        }
-    )
+        },
+        "title": body_model_name,
+        "type": "object",
+    }
 
 
 @pytest.mark.parametrize(

tests/test_request_params/test_form/test_required_str.py

@@ -1,7 +1,7 @@
 from typing import Annotated
 
 import pytest
-from dirty_equals import IsDict, IsOneOf
+from dirty_equals import IsOneOf
 from fastapi import FastAPI, Form
 from fastapi.testclient import TestClient
 from pydantic import BaseModel, Field
@@ -54,29 +54,16 @@ def test_required_str_missing(path: str):
     client = TestClient(app)
     response = client.post(path)
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["body", "p"],
-                    "msg": "Field required",
-                    "input": IsOneOf(None, {}),
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["body", "p"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["body", "p"],
+                "msg": "Field required",
+                "input": IsOneOf(None, {}),
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(
@@ -137,29 +124,16 @@ def test_required_alias_missing(path: str):
     client = TestClient(app)
     response = client.post(path)
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["body", "p_alias"],
-                    "msg": "Field required",
-                    "input": IsOneOf(None, {}),
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["body", "p_alias"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["body", "p_alias"],
+                "msg": "Field required",
+                "input": IsOneOf(None, {}),
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(
@@ -170,29 +144,16 @@ def test_required_alias_by_name(path: str):
     client = TestClient(app)
     response = client.post(path, data={"p": "hello"})
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["body", "p_alias"],
-                    "msg": "Field required",
-                    "input": IsOneOf(None, {"p": "hello"}),
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["body", "p_alias"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["body", "p_alias"],
+                "msg": "Field required",
+                "input": IsOneOf(None, {"p": "hello"}),
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(

tests/test_request_params/test_header/test_list.py

@@ -1,7 +1,7 @@
 from typing import Annotated
 
 import pytest
-from dirty_equals import AnyThing, IsDict, IsOneOf, IsPartialDict
+from dirty_equals import AnyThing, IsOneOf, IsPartialDict
 from fastapi import FastAPI, Header
 from fastapi.testclient import TestClient
 from pydantic import BaseModel, Field
@@ -53,28 +53,16 @@ def test_required_list_str_missing(path: str):
     client = TestClient(app)
     response = client.get(path)
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["header", "p"],
-                    "msg": "Field required",
-                    "input": AnyThing,
-                }
-            ]
-        }
-    ) | IsDict(
-        {
-            "detail": [
-                {
-                    "loc": ["header", "p"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["header", "p"],
+                "msg": "Field required",
+                "input": AnyThing,
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(
@@ -135,29 +123,16 @@ def test_required_list_alias_missing(path: str):
     client = TestClient(app)
     response = client.get(path)
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["header", "p_alias"],
-                    "msg": "Field required",
-                    "input": AnyThing,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["header", "p_alias"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["header", "p_alias"],
+                "msg": "Field required",
+                "input": AnyThing,
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(
@@ -171,29 +146,16 @@ def test_required_list_alias_by_name(path: str):
     client = TestClient(app)
     response = client.get(path, headers=[("p", "hello"), ("p", "world")])
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["header", "p_alias"],
-                    "msg": "Field required",
-                    "input": IsOneOf(None, IsPartialDict({"p": ["hello", "world"]})),
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["header", "p_alias"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["header", "p_alias"],
+                "msg": "Field required",
+                "input": IsOneOf(None, IsPartialDict({"p": ["hello", "world"]})),
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(

tests/test_request_params/test_header/test_optional_list.py

@@ -1,7 +1,6 @@
 from typing import Annotated, Optional
 
 import pytest
-from dirty_equals import IsDict
 from fastapi import FastAPI, Header
 from fastapi.testclient import TestClient
 from pydantic import BaseModel, Field
@@ -36,29 +35,18 @@ async def read_model_optional_list_str(
 )
 def test_optional_list_str_schema(path: str):
     assert app.openapi()["paths"][path]["get"]["parameters"] == [
-        IsDict(
-            {
-                "required": False,
-                "schema": {
-                    "anyOf": [
-                        {"items": {"type": "string"}, "type": "array"},
-                        {"type": "null"},
-                    ],
-                    "title": "P",
-                },
-                "name": "p",
-                "in": "header",
-            }
-        )
-        | IsDict(
-            # TODO: remove when deprecating Pydantic v1
-            {
-                "required": False,
-                "schema": {"items": {"type": "string"}, "type": "array", "title": "P"},
-                "name": "p",
-                "in": "header",
-            }
-        )
+        {
+            "required": False,
+            "schema": {
+                "anyOf": [
+                    {"items": {"type": "string"}, "type": "array"},
+                    {"type": "null"},
+                ],
+                "title": "P",
+            },
+            "name": "p",
+            "in": "header",
+        }
     ]
 
 
@@ -112,33 +100,18 @@ async def read_model_optional_list_alias(
 )
 def test_optional_list_str_alias_schema(path: str):
     assert app.openapi()["paths"][path]["get"]["parameters"] == [
-        IsDict(
-            {
-                "required": False,
-                "schema": {
-                    "anyOf": [
-                        {"items": {"type": "string"}, "type": "array"},
-                        {"type": "null"},
-                    ],
-                    "title": "P Alias",
-                },
-                "name": "p_alias",
-                "in": "header",
-            }
-        )
-        | IsDict(
-            # TODO: remove when deprecating Pydantic v1
-            {
-                "required": False,
-                "schema": {
-                    "items": {"type": "string"},
-                    "type": "array",
-                    "title": "P Alias",
-                },
-                "name": "p_alias",
-                "in": "header",
-            }
-        )
+        {
+            "required": False,
+            "schema": {
+                "anyOf": [
+                    {"items": {"type": "string"}, "type": "array"},
+                    {"type": "null"},
+                ],
+                "title": "P Alias",
+            },
+            "name": "p_alias",
+            "in": "header",
+        }
     ]
 
 

tests/test_request_params/test_header/test_optional_str.py

@@ -1,7 +1,6 @@
 from typing import Annotated, Optional
 
 import pytest
-from dirty_equals import IsDict
 from fastapi import FastAPI, Header
 from fastapi.testclient import TestClient
 from pydantic import BaseModel, Field
@@ -32,26 +31,15 @@ async def read_model_optional_str(p: Annotated[HeaderModelOptionalStr, Header()]
 )
 def test_optional_str_schema(path: str):
     assert app.openapi()["paths"][path]["get"]["parameters"] == [
-        IsDict(
-            {
-                "required": False,
-                "schema": {
-                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                    "title": "P",
-                },
-                "name": "p",
-                "in": "header",
-            }
-        )
-        | IsDict(
-            # TODO: remove when deprecating Pydantic v1
-            {
-                "required": False,
-                "schema": {"title": "P", "type": "string"},
-                "name": "p",
-                "in": "header",
-            }
-        )
+        {
+            "required": False,
+            "schema": {
+                "anyOf": [{"type": "string"}, {"type": "null"}],
+                "title": "P",
+            },
+            "name": "p",
+            "in": "header",
+        }
     ]
 
 
@@ -103,26 +91,15 @@ async def read_model_optional_alias(p: Annotated[HeaderModelOptionalAlias, Heade
 )
 def test_optional_str_alias_schema(path: str):
     assert app.openapi()["paths"][path]["get"]["parameters"] == [
-        IsDict(
-            {
-                "required": False,
-                "schema": {
-                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                    "title": "P Alias",
-                },
-                "name": "p_alias",
-                "in": "header",
-            }
-        )
-        | IsDict(
-            # TODO: remove when deprecating Pydantic v1
-            {
-                "required": False,
-                "schema": {"title": "P Alias", "type": "string"},
-                "name": "p_alias",
-                "in": "header",
-            }
-        )
+        {
+            "required": False,
+            "schema": {
+                "anyOf": [{"type": "string"}, {"type": "null"}],
+                "title": "P Alias",
+            },
+            "name": "p_alias",
+            "in": "header",
+        }
     ]
 
 

tests/test_request_params/test_header/test_required_str.py

@@ -1,7 +1,7 @@
 from typing import Annotated
 
 import pytest
-from dirty_equals import AnyThing, IsDict, IsOneOf, IsPartialDict
+from dirty_equals import AnyThing, IsOneOf, IsPartialDict
 from fastapi import FastAPI, Header
 from fastapi.testclient import TestClient
 from pydantic import BaseModel, Field
@@ -49,29 +49,16 @@ def test_required_str_missing(path: str):
     client = TestClient(app)
     response = client.get(path)
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["header", "p"],
-                    "msg": "Field required",
-                    "input": AnyThing,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["header", "p"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["header", "p"],
+                "msg": "Field required",
+                "input": AnyThing,
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(
@@ -126,29 +113,16 @@ def test_required_alias_missing(path: str):
     client = TestClient(app)
     response = client.get(path)
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["header", "p_alias"],
-                    "msg": "Field required",
-                    "input": AnyThing,
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["header", "p_alias"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["header", "p_alias"],
+                "msg": "Field required",
+                "input": AnyThing,
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(
@@ -162,29 +136,16 @@ def test_required_alias_by_name(path: str):
     client = TestClient(app)
     response = client.get(path, headers={"p": "hello"})
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["header", "p_alias"],
-                    "msg": "Field required",
-                    "input": IsOneOf(None, IsPartialDict({"p": "hello"})),
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["header", "p_alias"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["header", "p_alias"],
+                "msg": "Field required",
+                "input": IsOneOf(None, IsPartialDict({"p": "hello"})),
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(

tests/test_request_params/test_query/test_list.py

@@ -1,7 +1,7 @@
 from typing import Annotated
 
 import pytest
-from dirty_equals import IsDict, IsOneOf
+from dirty_equals import IsOneOf
 from fastapi import FastAPI, Query
 from fastapi.testclient import TestClient
 from pydantic import BaseModel, Field
@@ -53,28 +53,16 @@ def test_required_list_str_missing(path: str):
     client = TestClient(app)
     response = client.get(path)
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["query", "p"],
-                    "msg": "Field required",
-                    "input": IsOneOf(None, {}),
-                }
-            ]
-        }
-    ) | IsDict(
-        {
-            "detail": [
-                {
-                    "loc": ["query", "p"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["query", "p"],
+                "msg": "Field required",
+                "input": IsOneOf(None, {}),
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(
@@ -135,29 +123,16 @@ def test_required_list_alias_missing(path: str):
     client = TestClient(app)
     response = client.get(path)
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["query", "p_alias"],
-                    "msg": "Field required",
-                    "input": IsOneOf(None, {}),
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "p_alias"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["query", "p_alias"],
+                "msg": "Field required",
+                "input": IsOneOf(None, {}),
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(
@@ -171,29 +146,16 @@ def test_required_list_alias_by_name(path: str):
     client = TestClient(app)
     response = client.get(f"{path}?p=hello&p=world")
     assert response.status_code == 422
-    assert response.json() == IsDict(
-        {
-            "detail": [
-                {
-                    "type": "missing",
-                    "loc": ["query", "p_alias"],
-                    "msg": "Field required",
-                    "input": IsOneOf(None, {"p": ["hello", "world"]}),
-                }
-            ]
-        }
-    ) | IsDict(
-        # TODO: remove when deprecating Pydantic v1
-        {
-            "detail": [
-                {
-                    "loc": ["query", "p_alias"],
-                    "msg": "field required",
-                    "type": "value_error.missing",
-                }
-            ]
-        }
-    )
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "missing",
+                "loc": ["query", "p_alias"],
+                "msg": "Field required",
+                "input": IsOneOf(None, {"p": ["hello", "world"]}),
+            }
+        ]
+    }
 
 
 @pytest.mark.parametrize(

tests/test_request_params/test_query/test_optional_list.py

@@ -1,7 +1,6 @@
 from typing import Annotated, Optional
 
 import pytest
-from dirty_equals import IsDict
 from fastapi import FastAPI, Query
 from fastapi.testclient import TestClient
 from pydantic import BaseModel, Field
@@ -36,29 +35,18 @@ async def read_model_optional_list_str(
 )
 def test_optional_list_str_schema(path: str):
     assert app.openapi()["paths"][path]["get"]["parameters"] == [
-        IsDict(
-            {
-                "required": False,
-                "schema": {
-                    "anyOf": [
-                        {"items": {"type": "string"}, "type": "array"},
-                        {"type": "null"},
-                    ],
-                    "title": "P",
-                },
-                "name": "p",
-                "in": "query",
-            }
-        )
-        | IsDict(
-            # TODO: remove when deprecating Pydantic v1
-            {
-                "required": False,
-                "schema": {"items": {"type": "string"}, "type": "array", "title": "P"},
-                "name": "p",
-                "in": "query",
-            }
-        )
+        {
+            "required": False,
+            "schema": {
+                "anyOf": [
+                    {"items": {"type": "string"}, "type": "array"},
+                    {"type": "null"},
+                ],
+                "title": "P",
+            },
+            "name": "p",
+            "in": "query",
+        }
     ]
 
 
@@ -112,33 +100,18 @@ async def read_model_optional_list_alias(
 )
 def test_optional_list_str_alias_schema(path: str):
     assert app.openapi()["paths"][path]["get"]["parameters"] == [
-        IsDict(
-            {
-                "required": False,
-                "schema": {
-                    "anyOf": [
-                        {"items": {"type": "string"}, "type": "array"},
-                        {"type": "null"},
-                    ],
-                    "title": "P Alias",
-                },
-                "name": "p_alias",
-                "in": "query",
-            }
-        )
-        | IsDict(
-            # TODO: remove when deprecating Pydantic v1
-            {
-                "required": False,
-                "schema": {
-                    "items": {"type": "string"},
-                    "type": "array",
-                    "title": "P Alias",
-                },
-                "name": "p_alias",
-                "in": "query",
-            }
-        )
+        {
+            "required": False,
+            "schema": {
+                "anyOf": [
+                    {"items": {"type": "string"}, "type": "array"},
+                    {"type": "null"},
+                ],
+                "title": "P Alias",
+            },
+            "name": "p_alias",
+            "in": "query",
+        }
     ]