Compare commits

..

1 Commits

Author SHA1 Message Date
Yurii Motov
c5e31ae863 Fix doctrings for max_digits and decimal_places 2026-02-19 14:15:01 +01:00
25 changed files with 46 additions and 493 deletions

View File

@@ -45,7 +45,7 @@ jobs:
test:
needs:
- changes
if: needs.changes.outputs.src == 'true' || github.ref == 'refs/heads/master'
if: needs.changes.outputs.src == 'true'
strategy:
matrix:
os: [ windows-latest, macos-latest ]

View File

@@ -1,63 +0,0 @@
# JSON with Bytes as Base64 { #json-with-bytes-as-base64 }
If your app needs to receive and send JSON data, but you need to include binary data in it, you can encode it as base64.
## Base64 vs Files { #base64-vs-files }
Consider first if you can use [Request Files](../tutorial/request-files.md){.internal-link target=_blank} for uploading binary data and [Custom Response - FileResponse](./custom-response.md#fileresponse--fileresponse-){.internal-link target=_blank} for sending binary data, instead of encoding it in JSON.
JSON can only contain UTF-8 encoded strings, so it can't contain raw bytes.
Base64 can encode binary data in strings, but to do it, it needs to use more characters than the original binary data, so it would normally be less efficient than regular files.
Use base64 only if you definitely need to include binary data in JSON, and you can't use files for that.
## Pydantic `bytes` { #pydantic-bytes }
You can declare a Pydantic model with `bytes` fields, and then use `val_json_bytes` in the model config to tell it to use base64 to *validate* input JSON data, as part of that validation it will decode the base64 string into bytes.
{* ../../docs_src/json_base64_bytes/tutorial001_py310.py ln[1:9,29:35] hl[9] *}
If you check the `/docs`, they will show that the field `data` expects base64 encoded bytes:
<div class="screenshot">
<img src="/img/tutorial/json-base64-bytes/image01.png">
</div>
You could send a request like:
```json
{
"description": "Some data",
"data": "aGVsbG8="
}
```
/// tip
`aGVsbG8=` is the base64 encoding of `hello`.
///
And then Pydantic will decode the base64 string and give you the original bytes in the `data` field of the model.
You will receive a response like:
```json
{
"description": "Some data",
"content": "hello"
}
```
## Pydantic `bytes` for Output Data { #pydantic-bytes-for-output-data }
You can also use `bytes` fields with `ser_json_bytes` in the model config for output data, and Pydantic will *serialize* the bytes as base64 when generating the JSON response.
{* ../../docs_src/json_base64_bytes/tutorial001_py310.py ln[1:2,12:16,29,38:41] hl[16] *}
## Pydantic `bytes` for Input and Output Data { #pydantic-bytes-for-input-and-output-data }
And of course, you can use the same model configured to use base64 to handle both input (*validate*) with `val_json_bytes` and output (*serialize*) with `ser_json_bytes` when receiving and sending JSON data.
{* ../../docs_src/json_base64_bytes/tutorial001_py310.py ln[1:2,19:26,29,44:46] hl[23:26] *}

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 71 KiB

View File

@@ -7,12 +7,6 @@ hide:
## Latest Changes
## 0.129.1
### Fixes
* ♻️ Fix JSON Schema for bytes, use `"contentMediaType": "application/octet-stream"` instead of `"format": "binary"`. PR [#14953](https://github.com/fastapi/fastapi/pull/14953) by [@tiangolo](https://github.com/tiangolo).
### Docs
* 🔨 Add Kapa.ai widget (AI chatbot). PR [#14938](https://github.com/fastapi/fastapi/pull/14938) by [@tiangolo](https://github.com/tiangolo).
@@ -37,7 +31,6 @@ hide:
### Internal
* 👷 Always run tests on push to `master` branch and when run by scheduler. PR [#14940](https://github.com/fastapi/fastapi/pull/14940) by [@YuriiMotov](https://github.com/YuriiMotov).
* 🎨 Upgrade typing syntax for Python 3.10. PR [#14932](https://github.com/fastapi/fastapi/pull/14932) by [@tiangolo](https://github.com/tiangolo).
* ⬆ Bump cryptography from 46.0.4 to 46.0.5. PR [#14892](https://github.com/fastapi/fastapi/pull/14892) by [@dependabot[bot]](https://github.com/apps/dependabot).
* ⬆ Bump pillow from 12.1.0 to 12.1.1. PR [#14899](https://github.com/fastapi/fastapi/pull/14899) by [@dependabot[bot]](https://github.com/apps/dependabot).

View File

@@ -192,7 +192,6 @@ nav:
- advanced/wsgi.md
- advanced/generate-clients.md
- advanced/advanced-python-types.md
- advanced/json-base64-bytes.md
- fastapi-cli.md
- Deployment:
- deployment/index.md

View File

View File

@@ -1,46 +0,0 @@
from fastapi import FastAPI
from pydantic import BaseModel
class DataInput(BaseModel):
description: str
data: bytes
model_config = {"val_json_bytes": "base64"}
class DataOutput(BaseModel):
description: str
data: bytes
model_config = {"ser_json_bytes": "base64"}
class DataInputOutput(BaseModel):
description: str
data: bytes
model_config = {
"val_json_bytes": "base64",
"ser_json_bytes": "base64",
}
app = FastAPI()
@app.post("/data")
def post_data(body: DataInput):
content = body.data.decode("utf-8")
return {"description": body.description, "content": content}
@app.get("/data")
def get_data() -> DataOutput:
data = "hello".encode("utf-8")
return DataOutput(description="A plumbus", data=data)
@app.post("/data-in-out")
def post_data_in_out(body: DataInputOutput) -> DataInputOutput:
return body

View File

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

View File

@@ -27,7 +27,7 @@ from pydantic._internal._schema_generation_shared import ( # type: ignore[attr-
)
from pydantic._internal._typing_extra import eval_type_lenient
from pydantic.fields import FieldInfo as FieldInfo
from pydantic.json_schema import GenerateJsonSchema as _GenerateJsonSchema
from pydantic.json_schema import GenerateJsonSchema as GenerateJsonSchema
from pydantic.json_schema import JsonSchemaValue as JsonSchemaValue
from pydantic_core import CoreSchema as CoreSchema
from pydantic_core import PydanticUndefined
@@ -40,23 +40,6 @@ RequiredParam = PydanticUndefined
Undefined = PydanticUndefined
evaluate_forwardref = eval_type_lenient
class GenerateJsonSchema(_GenerateJsonSchema):
# TODO: remove when this is merged (or equivalent): https://github.com/pydantic/pydantic/pull/12841
# and dropping support for any version of Pydantic before that one (so, in a very long time)
def bytes_schema(self, schema: CoreSchema) -> JsonSchemaValue:
json_schema = {"type": "string", "contentMediaType": "application/octet-stream"}
bytes_mode = (
self._config.ser_json_bytes
if self.mode == "serialization"
else self._config.val_json_bytes
)
if bytes_mode == "base64":
json_schema["contentEncoding"] = "base64"
self.update_with_validations(json_schema, schema, self.ValidationsMapping.bytes)
return json_schema
# TODO: remove when dropping support for Pydantic < v2.12.3
_Attrs = {
"default": ...,

View File

@@ -139,7 +139,7 @@ class UploadFile(StarletteUploadFile):
def __get_pydantic_json_schema__(
cls, core_schema: Mapping[str, Any], handler: GetJsonSchemaHandler
) -> dict[str, Any]:
return {"type": "string", "contentMediaType": "application/octet-stream"}
return {"type": "string", "format": "binary"}
@classmethod
def __get_pydantic_core_schema__(

View File

@@ -211,7 +211,7 @@ def Path( # noqa: N802
int | None,
Doc(
"""
Maximum number of allow digits for strings.
Maximum number of digits allowed for decimal values.
"""
),
] = _Unset,
@@ -219,7 +219,7 @@ def Path( # noqa: N802
int | None,
Doc(
"""
Maximum number of decimal places allowed for numbers.
Maximum number of decimal places allowed for decimal values.
"""
),
] = _Unset,
@@ -570,7 +570,7 @@ def Query( # noqa: N802
int | None,
Doc(
"""
Maximum number of allow digits for strings.
Maximum number of digits allowed for decimal values.
"""
),
] = _Unset,
@@ -578,7 +578,7 @@ def Query( # noqa: N802
int | None,
Doc(
"""
Maximum number of decimal places allowed for numbers.
Maximum number of decimal places allowed for decimal values.
"""
),
] = _Unset,
@@ -892,7 +892,7 @@ def Header( # noqa: N802
int | None,
Doc(
"""
Maximum number of allow digits for strings.
Maximum number of digits allowed for decimal values.
"""
),
] = _Unset,
@@ -900,7 +900,7 @@ def Header( # noqa: N802
int | None,
Doc(
"""
Maximum number of decimal places allowed for numbers.
Maximum number of decimal places allowed for decimal values.
"""
),
] = _Unset,
@@ -1198,7 +1198,7 @@ def Cookie( # noqa: N802
int | None,
Doc(
"""
Maximum number of allow digits for strings.
Maximum number of digits allowed for decimal values.
"""
),
] = _Unset,
@@ -1206,7 +1206,7 @@ def Cookie( # noqa: N802
int | None,
Doc(
"""
Maximum number of decimal places allowed for numbers.
Maximum number of decimal places allowed for decimal values.
"""
),
] = _Unset,
@@ -1526,7 +1526,7 @@ def Body( # noqa: N802
int | None,
Doc(
"""
Maximum number of allow digits for strings.
Maximum number of digits allowed for decimal values.
"""
),
] = _Unset,
@@ -1534,7 +1534,7 @@ def Body( # noqa: N802
int | None,
Doc(
"""
Maximum number of decimal places allowed for numbers.
Maximum number of decimal places allowed for decimal values.
"""
),
] = _Unset,
@@ -1842,7 +1842,7 @@ def Form( # noqa: N802
int | None,
Doc(
"""
Maximum number of allow digits for strings.
Maximum number of digits allowed for decimal values.
"""
),
] = _Unset,
@@ -1850,7 +1850,7 @@ def Form( # noqa: N802
int | None,
Doc(
"""
Maximum number of decimal places allowed for numbers.
Maximum number of decimal places allowed for decimal values.
"""
),
] = _Unset,
@@ -2157,7 +2157,7 @@ def File( # noqa: N802
int | None,
Doc(
"""
Maximum number of allow digits for strings.
Maximum number of digits allowed for decimal values.
"""
),
] = _Unset,
@@ -2165,7 +2165,7 @@ def File( # noqa: N802
int | None,
Doc(
"""
Maximum number of decimal places allowed for numbers.
Maximum number of decimal places allowed for decimal values.
"""
),
] = _Unset,

View File

@@ -548,7 +548,6 @@ ignore = [
"docs_src/security/tutorial005_an_py39.py" = ["B904"]
"docs_src/security/tutorial005_py310.py" = ["B904"]
"docs_src/security/tutorial005_py39.py" = ["B904"]
"docs_src/json_base64_bytes/tutorial001_py310.py" = ["UP012"]
[tool.ruff.lint.isort]
known-third-party = ["fastapi", "pydantic", "starlette"]

View File

@@ -1,37 +0,0 @@
import subprocess
import time
import httpx
from playwright.sync_api import Playwright, sync_playwright
# Run playwright codegen to generate the code below, copy paste the sections in run()
def run(playwright: Playwright) -> None:
browser = playwright.chromium.launch(headless=False)
# Update the viewport manually
context = browser.new_context(viewport={"width": 960, "height": 1080})
page = context.new_page()
page.goto("http://localhost:8000/docs")
page.get_by_role("button", name="POST /data Post Data").click()
# Manually add the screenshot
page.screenshot(path="docs/en/docs/img/tutorial/json-base64-bytes/image01.png")
# ---------------------
context.close()
browser.close()
process = subprocess.Popen(
["fastapi", "run", "docs_src/json_base64_bytes/tutorial001_py310.py"]
)
try:
for _ in range(3):
try:
response = httpx.get("http://localhost:8000/docs")
except httpx.ConnectError:
time.sleep(1)
break
with sync_playwright() as playwright:
run(playwright)
finally:
process.terminate()

View File

@@ -37,10 +37,7 @@ def test_list_schema(path: str):
"properties": {
"p": {
"type": "array",
"items": {
"type": "string",
"contentMediaType": "application/octet-stream",
},
"items": {"type": "string", "format": "binary"},
"title": "P",
},
},
@@ -118,10 +115,7 @@ def test_list_alias_schema(path: str):
"properties": {
"p_alias": {
"type": "array",
"items": {
"type": "string",
"contentMediaType": "application/octet-stream",
},
"items": {"type": "string", "format": "binary"},
"title": "P Alias",
},
},
@@ -227,10 +221,7 @@ def test_list_validation_alias_schema(path: str):
"properties": {
"p_val_alias": {
"type": "array",
"items": {
"type": "string",
"contentMediaType": "application/octet-stream",
},
"items": {"type": "string", "format": "binary"},
"title": "P Val Alias",
},
},
@@ -347,10 +338,7 @@ def test_list_alias_and_validation_alias_schema(path: str):
"properties": {
"p_val_alias": {
"type": "array",
"items": {
"type": "string",
"contentMediaType": "application/octet-stream",
},
"items": {"type": "string", "format": "binary"},
"title": "P Val Alias",
},
},

View File

@@ -37,7 +37,7 @@ def test_optional_schema(path: str):
"properties": {
"p": {
"anyOf": [
{"type": "string", "contentMediaType": "application/octet-stream"},
{"type": "string", "format": "binary"},
{"type": "null"},
],
"title": "P",
@@ -109,7 +109,7 @@ def test_optional_alias_schema(path: str):
"properties": {
"p_alias": {
"anyOf": [
{"type": "string", "contentMediaType": "application/octet-stream"},
{"type": "string", "format": "binary"},
{"type": "null"},
],
"title": "P Alias",
@@ -200,7 +200,7 @@ def test_optional_validation_alias_schema(path: str):
"properties": {
"p_val_alias": {
"anyOf": [
{"type": "string", "contentMediaType": "application/octet-stream"},
{"type": "string", "format": "binary"},
{"type": "null"},
],
"title": "P Val Alias",
@@ -296,7 +296,7 @@ def test_optional_alias_and_validation_alias_schema(path: str):
"properties": {
"p_val_alias": {
"anyOf": [
{"type": "string", "contentMediaType": "application/octet-stream"},
{"type": "string", "format": "binary"},
{"type": "null"},
],
"title": "P Val Alias",

View File

@@ -41,10 +41,7 @@ def test_optional_list_schema(path: str):
"anyOf": [
{
"type": "array",
"items": {
"type": "string",
"contentMediaType": "application/octet-stream",
},
"items": {"type": "string", "format": "binary"},
},
{"type": "null"},
],
@@ -119,10 +116,7 @@ def test_optional_list_alias_schema(path: str):
"anyOf": [
{
"type": "array",
"items": {
"type": "string",
"contentMediaType": "application/octet-stream",
},
"items": {"type": "string", "format": "binary"},
},
{"type": "null"},
],
@@ -211,10 +205,7 @@ def test_optional_validation_alias_schema(path: str):
"anyOf": [
{
"type": "array",
"items": {
"type": "string",
"contentMediaType": "application/octet-stream",
},
"items": {"type": "string", "format": "binary"},
},
{"type": "null"},
],
@@ -310,10 +301,7 @@ def test_optional_list_alias_and_validation_alias_schema(path: str):
"anyOf": [
{
"type": "array",
"items": {
"type": "string",
"contentMediaType": "application/octet-stream",
},
"items": {"type": "string", "format": "binary"},
},
{"type": "null"},
],

View File

@@ -35,11 +35,7 @@ def test_required_schema(path: str):
assert app.openapi()["components"]["schemas"][body_model_name] == {
"properties": {
"p": {
"title": "P",
"type": "string",
"contentMediaType": "application/octet-stream",
},
"p": {"title": "P", "type": "string", "format": "binary"},
},
"required": ["p"],
"title": body_model_name,
@@ -113,11 +109,7 @@ def test_required_alias_schema(path: str):
assert app.openapi()["components"]["schemas"][body_model_name] == {
"properties": {
"p_alias": {
"title": "P Alias",
"type": "string",
"contentMediaType": "application/octet-stream",
},
"p_alias": {"title": "P Alias", "type": "string", "format": "binary"},
},
"required": ["p_alias"],
"title": body_model_name,
@@ -224,7 +216,7 @@ def test_required_validation_alias_schema(path: str):
"p_val_alias": {
"title": "P Val Alias",
"type": "string",
"contentMediaType": "application/octet-stream",
"format": "binary",
},
},
"required": ["p_val_alias"],
@@ -337,7 +329,7 @@ def test_required_alias_and_validation_alias_schema(path: str):
"p_val_alias": {
"title": "P Val Alias",
"type": "string",
"contentMediaType": "application/octet-stream",
"format": "binary",
},
},
"required": ["p_val_alias"],

View File

@@ -1,225 +0,0 @@
import importlib
import pytest
from fastapi.testclient import TestClient
from inline_snapshot import snapshot
from tests.utils import needs_py310
@pytest.fixture(
name="client",
params=[pytest.param("tutorial001_py310", marks=needs_py310)],
)
def get_client(request: pytest.FixtureRequest):
mod = importlib.import_module(f"docs_src.json_base64_bytes.{request.param}")
client = TestClient(mod.app)
return client
def test_post_data(client: TestClient):
response = client.post(
"/data",
json={
"description": "A file",
"data": "SGVsbG8sIFdvcmxkIQ==",
},
)
assert response.status_code == 200, response.text
assert response.json() == {"description": "A file", "content": "Hello, World!"}
def test_get_data(client: TestClient):
response = client.get("/data")
assert response.status_code == 200, response.text
assert response.json() == {"description": "A plumbus", "data": "aGVsbG8="}
def test_post_data_in_out(client: TestClient):
response = client.post(
"/data-in-out",
json={
"description": "A plumbus",
"data": "SGVsbG8sIFdvcmxkIQ==",
},
)
assert response.status_code == 200, response.text
assert response.json() == {
"description": "A plumbus",
"data": "SGVsbG8sIFdvcmxkIQ==",
}
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": {
"/data": {
"get": {
"summary": "Get Data",
"operationId": "get_data_data_get",
"responses": {
"200": {
"description": "Successful Response",
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/DataOutput"
}
}
},
}
},
},
"post": {
"summary": "Post Data",
"operationId": "post_data_data_post",
"requestBody": {
"content": {
"application/json": {
"schema": {"$ref": "#/components/schemas/DataInput"}
}
},
"required": True,
},
"responses": {
"200": {
"description": "Successful Response",
"content": {"application/json": {"schema": {}}},
},
"422": {
"description": "Validation Error",
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/HTTPValidationError"
}
}
},
},
},
},
},
"/data-in-out": {
"post": {
"summary": "Post Data In Out",
"operationId": "post_data_in_out_data_in_out_post",
"requestBody": {
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/DataInputOutput"
}
}
},
"required": True,
},
"responses": {
"200": {
"description": "Successful Response",
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/DataInputOutput"
}
}
},
},
"422": {
"description": "Validation Error",
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/HTTPValidationError"
}
}
},
},
},
}
},
},
"components": {
"schemas": {
"DataInput": {
"properties": {
"description": {"type": "string", "title": "Description"},
"data": {
"type": "string",
"contentEncoding": "base64",
"contentMediaType": "application/octet-stream",
"title": "Data",
},
},
"type": "object",
"required": ["description", "data"],
"title": "DataInput",
},
"DataInputOutput": {
"properties": {
"description": {"type": "string", "title": "Description"},
"data": {
"type": "string",
"contentEncoding": "base64",
"contentMediaType": "application/octet-stream",
"title": "Data",
},
},
"type": "object",
"required": ["description", "data"],
"title": "DataInputOutput",
},
"DataOutput": {
"properties": {
"description": {"type": "string", "title": "Description"},
"data": {
"type": "string",
"contentEncoding": "base64",
"contentMediaType": "application/octet-stream",
"title": "Data",
},
},
"type": "object",
"required": ["description", "data"],
"title": "DataOutput",
},
"HTTPValidationError": {
"properties": {
"detail": {
"items": {
"$ref": "#/components/schemas/ValidationError"
},
"type": "array",
"title": "Detail",
}
},
"type": "object",
"title": "HTTPValidationError",
},
"ValidationError": {
"properties": {
"ctx": {"title": "Context", "type": "object"},
"input": {"title": "Input"},
"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",
},
}
},
}
)

View File

@@ -162,8 +162,8 @@ def test_openapi_schema(client: TestClient):
"properties": {
"file": {
"title": "File",
"contentMediaType": "application/octet-stream",
"type": "string",
"format": "binary",
}
},
},
@@ -175,7 +175,7 @@ def test_openapi_schema(client: TestClient):
"file": {
"title": "File",
"type": "string",
"contentMediaType": "application/octet-stream",
"format": "binary",
}
},
},

View File

@@ -134,10 +134,7 @@ def test_openapi_schema(client: TestClient):
"file": {
"title": "File",
"anyOf": [
{
"type": "string",
"contentMediaType": "application/octet-stream",
},
{"type": "string", "format": "binary"},
{"type": "null"},
],
}
@@ -150,10 +147,7 @@ def test_openapi_schema(client: TestClient):
"file": {
"title": "File",
"anyOf": [
{
"type": "string",
"contentMediaType": "application/octet-stream",
},
{"type": "string", "format": "binary"},
{"type": "null"},
],
}

View File

@@ -123,7 +123,7 @@ def test_openapi_schema(client: TestClient):
"title": "File",
"type": "string",
"description": "A file read as bytes",
"contentMediaType": "application/octet-stream",
"format": "binary",
}
},
},
@@ -134,9 +134,9 @@ def test_openapi_schema(client: TestClient):
"properties": {
"file": {
"title": "File",
"contentMediaType": "application/octet-stream",
"type": "string",
"description": "A file read as UploadFile",
"format": "binary",
}
},
},

View File

@@ -195,10 +195,7 @@ def test_openapi_schema(client: TestClient):
"files": {
"title": "Files",
"type": "array",
"items": {
"type": "string",
"contentMediaType": "application/octet-stream",
},
"items": {"type": "string", "format": "binary"},
}
},
},
@@ -210,10 +207,7 @@ def test_openapi_schema(client: TestClient):
"files": {
"title": "Files",
"type": "array",
"items": {
"type": "string",
"contentMediaType": "application/octet-stream",
},
"items": {"type": "string", "format": "binary"},
}
},
},

View File

@@ -165,10 +165,7 @@ def test_openapi_schema(client: TestClient):
"files": {
"title": "Files",
"type": "array",
"items": {
"type": "string",
"contentMediaType": "application/octet-stream",
},
"items": {"type": "string", "format": "binary"},
"description": "Multiple files as bytes",
}
},
@@ -181,10 +178,7 @@ def test_openapi_schema(client: TestClient):
"files": {
"title": "Files",
"type": "array",
"items": {
"type": "string",
"contentMediaType": "application/octet-stream",
},
"items": {"type": "string", "format": "binary"},
"description": "Multiple files as UploadFile",
}
},

View File

@@ -198,12 +198,12 @@ def test_openapi_schema(client: TestClient):
"file": {
"title": "File",
"type": "string",
"contentMediaType": "application/octet-stream",
"format": "binary",
},
"fileb": {
"title": "Fileb",
"contentMediaType": "application/octet-stream",
"type": "string",
"format": "binary",
},
"token": {"title": "Token", "type": "string"},
},