This commit is contained in:
JONEMI19 2023-07-07 21:10:51 +00:00
parent 13cd1af00b
commit cd34cdc02c
2 changed files with 8 additions and 8 deletions

View File

@ -421,24 +421,24 @@ else:
return False
def is_pv1_scalar_mapping_field(field: ModelField) -> bool:
if (field.shape in mapping_shapes) and not lenient_issubclass(
if (field.shape in mapping_shapes) and not lenient_issubclass( # type: ignore[attr-defined]
field.type_, BaseModel
):
if field.sub_fields is None:
if field.sub_fields is None: # type: ignore[attr-defined]
return False
for sub_field in field.sub_fields:
for sub_field in field.sub_fields: # type: ignore[attr-defined]
if not is_scalar_field(sub_field):
return False
return True
return False
def is_pv1_scalar_sequence_mapping_field(field: ModelField) -> bool:
if (field.shape in mapping_shapes) and not lenient_issubclass(
if (field.shape in mapping_shapes) and not lenient_issubclass( # type: ignore[attr-defined]
field.type_, BaseModel
):
if field.sub_fields is None:
if field.sub_fields is None: # type: ignore[attr-defined]
return False
for sub_field in field.sub_fields:
for sub_field in field.sub_fields: # type: ignore[attr-defined]
if not is_scalar_sequence_field(sub_field):
return False
return True

View File

@ -653,11 +653,11 @@ def request_params_to_args(
):
value = received_params.getlist(field.alias) or field.default
elif is_scalar_mapping_field(field) and isinstance(
received_params, (QueryParams, Headers)
received_params, (QueryParams)
):
value = dict(received_params.multi_items()) or field.default
elif is_scalar_sequence_mapping_field(field) and isinstance(
received_params, (QueryParams, Headers)
received_params, (QueryParams)
):
if not len(received_params.multi_items()):
value = field.default