happyz
/
fastapi
mirror of https://github.com/tiangolo/fastapi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

♻️ Tweak type annotations and Pydantic version range (#9801)

This commit is contained in:
Sebastián Ramírez 2023-07-05 19:21:33 +02:00 committed by GitHub
parent d4e3dcfa3a
commit 7ea3d642c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fastapi/_compat.py
View File

@ -201,11 +201,18 @@ if PYDANTIC_V2:
fields: List[ModelField], fields: List[ModelField],
schema_generator: GenerateJsonSchema, schema_generator: GenerateJsonSchema,
model_name_map: ModelNameMap, model_name_map: ModelNameMap,
) -> Tuple[Dict[str, Any], Dict[str, Dict[str, Any]]]: ) -> Tuple[
Dict[
Tuple[ModelField, Literal["validation", "serialization"]], JsonSchemaValue
],
Dict[str, Dict[str, Any]],
]:
inputs = [ inputs = [
(field, field.mode, field._type_adapter.core_schema) for field in fields (field, field.mode, field._type_adapter.core_schema) for field in fields
] ]
field_mapping, definitions = schema_generator.generate_definitions(inputs=inputs) # type: ignore[arg-type] field_mapping, definitions = schema_generator.generate_definitions(
inputs=inputs
)
return field_mapping, definitions # type: ignore[return-value] return field_mapping, definitions # type: ignore[return-value]
def is_scalar_field(field: ModelField) -> bool: def is_scalar_field(field: ModelField) -> bool:
@ -441,7 +448,12 @@ else:
fields: List[ModelField], fields: List[ModelField],
schema_generator: GenerateJsonSchema, schema_generator: GenerateJsonSchema,
model_name_map: ModelNameMap, model_name_map: ModelNameMap,
) -> Tuple[Dict[str, Any], Dict[str, Dict[str, Any]]]: ) -> Tuple[
Dict[
Tuple[ModelField, Literal["validation", "serialization"]], JsonSchemaValue
],
Dict[str, Dict[str, Any]],
]:
models = get_flat_models_from_fields(fields, known_models=set()) models = get_flat_models_from_fields(fields, known_models=set())
return {}, get_model_definitions( return {}, get_model_definitions(
flat_models=models, model_name_map=model_name_map flat_models=models, model_name_map=model_name_map

2
pyproject.toml
View File

@ -43,7 +43,7 @@ classifiers = [
dependencies = [ dependencies = [
"starlette>=0.27.0,<0.28.0", "starlette>=0.27.0,<0.28.0",
# TODO (pv2): re-enable this # TODO (pv2): re-enable this
# "pydantic>=1.7.4,!=1.8,!=1.8.1,<3.0.0", # "pydantic>=1.7.4,!=1.8,!=1.8.1,!=2.0.0,!=2.0.1,<3.0.0",
"typing-extensions>=4.5.0", "typing-extensions>=4.5.0",
] ]
dynamic = ["version"] dynamic = ["version"]