From 7c54fd0ff80e1a855b5f234bf884e721182040a8 Mon Sep 17 00:00:00 2001 From: svd0 Date: Wed, 29 Jun 2022 11:25:52 -0300 Subject: [PATCH] Fix formats in fastapi/utils, fastapi/dependencies/utils --- fastapi/dependencies/utils.py | 2 +- fastapi/utils.py | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/fastapi/dependencies/utils.py b/fastapi/dependencies/utils.py index f397e333c..96d28f6cf 100644 --- a/fastapi/dependencies/utils.py +++ b/fastapi/dependencies/utils.py @@ -721,7 +721,7 @@ def get_body_field(*, dependant: Dependant, name: str) -> Optional[ModelField]: # That is combined (embedded) with other body fields for param in flat_dependant.body_params: setattr(param.field_info, "embed", True) - model_name = "Body_" + name + model_name = f"Body_{name}" BodyModel: Type[BaseModel] = create_model(model_name) for f in flat_dependant.body_params: BodyModel.__fields__[f.name] = f diff --git a/fastapi/utils.py b/fastapi/utils.py index dcd523b22..f6476933d 100644 --- a/fastapi/utils.py +++ b/fastapi/utils.py @@ -74,11 +74,11 @@ def create_response_field( def create_cloned_field( field: ModelField, *, - cloned_types: Optional[Dict[Type[BaseModel], Type[BaseModel]]] = None, + cloned_types: Optional[Dict[Type[BaseModel], Type[BaseModel]]] = {}, ) -> ModelField: - # _cloned_types has already cloned types, to support recursive models - if cloned_types is None: - cloned_types = dict() + """ + _cloned_types has already cloned types, to support recursive models + """ original_type = field.type_ if is_dataclass(original_type) and hasattr(original_type, "__pydantic_model__"): original_type = original_type.__pydantic_model__ @@ -167,7 +167,8 @@ def get_value_or_default( Otherwise, the first item (a `DefaultPlaceholder`) will be returned. """ - for item in (first_item,) + extra_items: + items = (first_item,) + extra_items + for item in (first_item,) + items: if not isinstance(item, DefaultPlaceholder): return item return first_item