Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def _parse_response_200(
response_200_type_0 = GetModelsOneofWithRequiredConstResponse200Type0.from_dict(data)

return response_200_type_0
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
if not isinstance(data, dict):
raise TypeError()
Expand Down
24 changes: 12 additions & 12 deletions end_to_end_tests/golden-record/my_test_api_client/models/a_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ def _parse_a_camel_date_time(data: object) -> datetime.date | datetime.datetime:
a_camel_date_time_type_0 = isoparse(data)

return a_camel_date_time_type_0
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
if not isinstance(data, str):
raise TypeError()
Expand All @@ -293,7 +293,7 @@ def _parse_a_nullable_date(data: object) -> datetime.date | None:
a_nullable_date_type_0 = isoparse(data).date()

return a_nullable_date_type_0
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
return cast(datetime.date | None, data)

Expand All @@ -310,7 +310,7 @@ def _parse_a_nullable_uuid(data: object) -> None | UUID:
a_nullable_uuid_type_0 = UUID(data)

return a_nullable_uuid_type_0
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
return cast(None | UUID, data)

Expand All @@ -332,15 +332,15 @@ def _parse_one_of_models(data: object) -> Any | FreeFormModel | ModelWithUnionPr
one_of_models_type_0 = FreeFormModel.from_dict(data)

return one_of_models_type_0
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
try:
if not isinstance(data, dict):
raise TypeError()
one_of_models_type_1 = ModelWithUnionProperty.from_dict(data)

return one_of_models_type_1
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
return cast(Any | FreeFormModel | ModelWithUnionProperty, data)

Expand All @@ -355,15 +355,15 @@ def _parse_nullable_one_of_models(data: object) -> FreeFormModel | ModelWithUnio
nullable_one_of_models_type_0 = FreeFormModel.from_dict(data)

return nullable_one_of_models_type_0
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
try:
if not isinstance(data, dict):
raise TypeError()
nullable_one_of_models_type_1 = ModelWithUnionProperty.from_dict(data)

return nullable_one_of_models_type_1
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
return cast(FreeFormModel | ModelWithUnionProperty | None, data)

Expand All @@ -380,7 +380,7 @@ def _parse_nullable_model(data: object) -> ModelWithUnionProperty | None:
nullable_model_type_1 = ModelWithUnionProperty.from_dict(data)

return nullable_model_type_1
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
return cast(ModelWithUnionProperty | None, data)

Expand Down Expand Up @@ -447,7 +447,7 @@ def _parse_not_required_one_of_models(data: object) -> FreeFormModel | ModelWith
not_required_one_of_models_type_0 = FreeFormModel.from_dict(data)

return not_required_one_of_models_type_0
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
if not isinstance(data, dict):
raise TypeError()
Expand All @@ -470,15 +470,15 @@ def _parse_not_required_nullable_one_of_models(
not_required_nullable_one_of_models_type_0 = FreeFormModel.from_dict(data)

return not_required_nullable_one_of_models_type_0
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
try:
if not isinstance(data, dict):
raise TypeError()
not_required_nullable_one_of_models_type_1 = ModelWithUnionProperty.from_dict(data)

return not_required_nullable_one_of_models_type_1
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
return cast(FreeFormModel | ModelWithUnionProperty | None | str | Unset, data)

Expand All @@ -504,7 +504,7 @@ def _parse_not_required_nullable_model(data: object) -> ModelWithUnionProperty |
not_required_nullable_model_type_1 = ModelWithUnionProperty.from_dict(data)

return not_required_nullable_model_type_1
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
return cast(ModelWithUnionProperty | None | Unset, data)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ def _parse_some_nullable_object(data: object) -> BodyUploadFileTestsUploadPostSo
some_nullable_object_type_0 = BodyUploadFileTestsUploadPostSomeNullableObject.from_dict(data)

return some_nullable_object_type_0
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
return cast(BodyUploadFileTestsUploadPostSomeNullableObject | None, data)

Expand Down Expand Up @@ -347,7 +347,7 @@ def _parse_some_array(data: object) -> list[AFormData] | None | Unset:
some_array_type_0.append(some_array_type_0_item)

return some_array_type_0
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
return cast(list[AFormData] | None | Unset, data)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ def _parse_a_camel_date_time(data: object) -> datetime.date | datetime.datetime:
a_camel_date_time_type_0 = isoparse(data)

return a_camel_date_time_type_0
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
if not isinstance(data, str):
raise TypeError()
Expand All @@ -300,7 +300,7 @@ def _parse_a_nullable_date(data: object) -> datetime.date | None:
a_nullable_date_type_0 = isoparse(data).date()

return a_nullable_date_type_0
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
return cast(datetime.date | None, data)

Expand All @@ -317,7 +317,7 @@ def _parse_a_nullable_uuid(data: object) -> None | UUID:
a_nullable_uuid_type_0 = UUID(data)

return a_nullable_uuid_type_0
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
return cast(None | UUID, data)

Expand All @@ -339,15 +339,15 @@ def _parse_one_of_models(data: object) -> Any | FreeFormModel | ModelWithUnionPr
one_of_models_type_0 = FreeFormModel.from_dict(data)

return one_of_models_type_0
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
try:
if not isinstance(data, dict):
raise TypeError()
one_of_models_type_1 = ModelWithUnionProperty.from_dict(data)

return one_of_models_type_1
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
return cast(Any | FreeFormModel | ModelWithUnionProperty, data)

Expand All @@ -362,15 +362,15 @@ def _parse_nullable_one_of_models(data: object) -> FreeFormModel | ModelWithUnio
nullable_one_of_models_type_0 = FreeFormModel.from_dict(data)

return nullable_one_of_models_type_0
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
try:
if not isinstance(data, dict):
raise TypeError()
nullable_one_of_models_type_1 = ModelWithUnionProperty.from_dict(data)

return nullable_one_of_models_type_1
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
return cast(FreeFormModel | ModelWithUnionProperty | None, data)

Expand All @@ -387,7 +387,7 @@ def _parse_nullable_model(data: object) -> ModelWithUnionProperty | None:
nullable_model_type_1 = ModelWithUnionProperty.from_dict(data)

return nullable_model_type_1
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
return cast(ModelWithUnionProperty | None, data)

Expand Down Expand Up @@ -454,7 +454,7 @@ def _parse_not_required_one_of_models(data: object) -> FreeFormModel | ModelWith
not_required_one_of_models_type_0 = FreeFormModel.from_dict(data)

return not_required_one_of_models_type_0
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
if not isinstance(data, dict):
raise TypeError()
Expand All @@ -477,15 +477,15 @@ def _parse_not_required_nullable_one_of_models(
not_required_nullable_one_of_models_type_0 = FreeFormModel.from_dict(data)

return not_required_nullable_one_of_models_type_0
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
try:
if not isinstance(data, dict):
raise TypeError()
not_required_nullable_one_of_models_type_1 = ModelWithUnionProperty.from_dict(data)

return not_required_nullable_one_of_models_type_1
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
return cast(FreeFormModel | ModelWithUnionProperty | None | str | Unset, data)

Expand All @@ -511,7 +511,7 @@ def _parse_not_required_nullable_model(data: object) -> ModelWithUnionProperty |
not_required_nullable_model_type_1 = ModelWithUnionProperty.from_dict(data)

return not_required_nullable_model_type_1
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
return cast(ModelWithUnionProperty | None | Unset, data)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ def _parse_additional_property(
additional_property_type_0 = ModelWithAnyJsonPropertiesAdditionalPropertyType0.from_dict(data)

return additional_property_type_0
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
try:
if not isinstance(data, list):
raise TypeError()
additional_property_type_1 = cast(list[str], data)

return additional_property_type_1
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
return cast(
bool | float | int | list[str] | ModelWithAnyJsonPropertiesAdditionalPropertyType0 | str, data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,15 @@ def _parse_discriminated_union(
componentsschemas_a_discriminated_union_type_0 = ADiscriminatedUnionType1.from_dict(data)

return componentsschemas_a_discriminated_union_type_0
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
try:
if not isinstance(data, dict):
raise TypeError()
componentsschemas_a_discriminated_union_type_1 = ADiscriminatedUnionType2.from_dict(data)

return componentsschemas_a_discriminated_union_type_1
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
return cast(ADiscriminatedUnionType1 | ADiscriminatedUnionType2 | None | Unset, data)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def _parse_a_property(data: object) -> AnEnum | AnIntEnum | Unset:
a_property_type_0 = AnEnum(data)

return a_property_type_0
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
if not isinstance(data, int):
raise TypeError()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def _parse_fruit(
fruit_apples = ModelWithUnionPropertyInlinedApples.from_dict(data)

return fruit_apples
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
if not isinstance(data, dict):
raise TypeError()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def _parse_a(data: object) -> PostResponsesUnionsSimpleBeforeComplexResponse200A
a_type_1 = PostResponsesUnionsSimpleBeforeComplexResponse200AType1.from_dict(data)

return a_type_1
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
return cast(PostResponsesUnionsSimpleBeforeComplexResponse200AType1 | str, data)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ def _parse_an_enum_value_with_null_item(data: object) -> AnEnumWithNull | None:
componentsschemas_an_enum_with_null_type_1 = check_an_enum_with_null(data)

return componentsschemas_an_enum_with_null_type_1
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
return cast(AnEnumWithNull | None, data)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def _parse_{{ property.python_name }}(data: object) -> {{ property.get_type_stri
raise TypeError()
{{ inner_template.construct(inner_property, "data") | indent(8) }}
return {{ inner_property.python_name }}
except: # noqa: E722
except (TypeError, ValueError, AttributeError, KeyError):
pass
{% else %}{# Don't do try/except for the last one nor any properties with no type checking #}
{% if inner_template.check_type_for_construct %}
Expand Down