mirror/fastapi
1
0
Fork 0
mirror of https://github.com/fastapi/fastapi.git synced 2026-02-11 14:51:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Yurii Motov
2026-02-09 12:04:36 +01:00
parent cd31576d57
commit cda2003ff5
2 changed files with 144 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fastapi/_compat/shared.py
View File

@@ -65,6 +65,10 @@ def _annotation_is_sequence(annotation: Union[type[Any], None]) -> bool:
def field_annotation_is_sequence(annotation: Union[type[Any], None]) -> bool:
origin = get_origin(annotation)
if origin is Annotated:
return field_annotation_is_sequence(get_args(annotation)[0])
if origin is Union or origin is UnionType:
for arg in get_args(annotation):
if field_annotation_is_sequence(arg):
@@ -110,6 +114,10 @@ def field_annotation_is_scalar(annotation: Any) -> bool:
def field_annotation_is_scalar_sequence(annotation: Union[type[Any], None]) -> bool:
origin = get_origin(annotation)
if origin is Annotated:
return field_annotation_is_scalar_sequence(get_args(annotation)[0])
if origin is Union or origin is UnionType:
at_least_one_scalar_sequence = False
for arg in get_args(annotation):

136
tests/test_nested_annotated_in_sequence.py Normal file
View File

@@ -0,0 +1,136 @@
from typing import Annotated, Union
from dirty_equals import IsList
from fastapi import FastAPI, Query
from fastapi.testclient import TestClient
from pydantic import Field
MaxSizedSet = Annotated[set[str], Field(max_length=3)]
app = FastAPI()
@app.get("/")
def read_root(foo: Annotated[Union[MaxSizedSet, None], Query()] = None):
return {"foo": foo}
client = TestClient(app)
def test_endpoint_none():
response = client.get("/")
assert response.status_code == 200
assert response.json() == {"foo": None}
def test_endpoint_valid():
response = client.get("/", params={"foo": ["a", "b"]})
assert response.status_code == 200
assert response.json() == {"foo": IsList("a", "b", check_order=False)}
def test_endpoint_too_long():
response = client.get("/", params={"foo": ["a", "b", "c", "d"]})
assert response.status_code == 422
assert response.json() == {
"detail": [
{
"type": "too_long",
"loc": ["query", "foo"],
"msg": "Set should have at most 3 items after validation, not more",
"input": IsList("a", "b", "c", "d", check_order=False),
"ctx": {
"actual_length": None,
"field_type": "Set",
"max_length": 3,
},
}
]
}
def test_openapi():
assert app.openapi() == {
"components": {
"schemas": {
"HTTPValidationError": {
"properties": {
"detail": {
"items": {"$ref": "#/components/schemas/ValidationError"},
"title": "Detail",
"type": "array",
},
},
"title": "HTTPValidationError",
"type": "object",
},
"ValidationError": {
"properties": {
"ctx": {"title": "Context", "type": "object"},
"input": {"title": "Input"},
"loc": {
"items": {
"anyOf": [{"type": "string"}, {"type": "integer"}],
},
"title": "Location",
"type": "array",
},
"msg": {"title": "Message", "type": "string"},
"type": {"title": "Error Type", "type": "string"},
},
"required": ["loc", "msg", "type"],
"title": "ValidationError",
"type": "object",
},
},
},
"info": {
"title": "FastAPI",
"version": "0.1.0",
},
"openapi": "3.1.0",
"paths": {
"/": {
"get": {
"operationId": "read_root__get",
"parameters": [
{
"in": "query",
"name": "foo",
"required": False,
"schema": {
"anyOf": [
{
"items": {"type": "string"},
"maxItems": 3,
"type": "array",
"uniqueItems": True,
},
{"type": "null"},
],
"title": "Foo",
},
},
],
"responses": {
"200": {
"content": {"application/json": {"schema": {}}},
"description": "Successful Response",
},
"422": {
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/HTTPValidationError",
},
},
},
"description": "Validation Error",
},
},
"summary": "Read Root",
},
},
},
}