Skip to content

Commit 8a72732

Browse files
forest-benchlingforest-benchling
committed
Change parse annotation to object
1 parent 3c536f7 commit 8a72732

File tree

7 files changed

+15
-23
lines changed

7 files changed

+15
-23
lines changed

‎end_to_end_tests/golden-record-custom/custom_e2e/models/a_model.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
174174
d = src_dict.copy()
175175
an_enum_value = AnEnum(d.pop("an_enum_value"))
176176

177-
def _parse_a_camel_date_time(data: str) -> Union[datetime.datetime, datetime.date]:
177+
def _parse_a_camel_date_time(data: object) -> Union[datetime.datetime, datetime.date]:
178178
a_camel_date_time: Union[datetime.datetime, datetime.date]
179179
try:
180180
if not isinstance(data, str):
@@ -196,7 +196,7 @@ def _parse_a_camel_date_time(data: str) -> Union[datetime.datetime, datetime.dat
196196

197197
required_not_nullable = d.pop("required_not_nullable")
198198

199-
def _parse_one_of_models(data: Dict[str, Any]) -> Union[FreeFormModel, ModelWithUnionProperty]:
199+
def _parse_one_of_models(data: object) -> Union[FreeFormModel, ModelWithUnionProperty]:
200200
one_of_models: Union[FreeFormModel, ModelWithUnionProperty]
201201
try:
202202
if not isinstance(data, dict):
@@ -246,9 +246,7 @@ def _parse_one_of_models(data: Dict[str, Any]) -> Union[FreeFormModel, ModelWith
246246

247247
not_required_not_nullable = d.pop("not_required_not_nullable", UNSET)
248248

249-
def _parse_nullable_one_of_models(
250-
data: Union[None, Dict[str, Any]]
251-
) -> Union[None, FreeFormModel, ModelWithUnionProperty]:
249+
def _parse_nullable_one_of_models(data: object) -> Union[None, FreeFormModel, ModelWithUnionProperty]:
252250
nullable_one_of_models: Union[None, FreeFormModel, ModelWithUnionProperty]
253251
if data is None:
254252
return data
@@ -268,9 +266,7 @@ def _parse_nullable_one_of_models(
268266

269267
nullable_one_of_models = _parse_nullable_one_of_models(d.pop("nullable_one_of_models"))
270268

271-
def _parse_not_required_one_of_models(
272-
data: Union[Unset, Dict[str, Any]]
273-
) -> Union[Unset, FreeFormModel, ModelWithUnionProperty]:
269+
def _parse_not_required_one_of_models(data: object) -> Union[Unset, FreeFormModel, ModelWithUnionProperty]:
274270
not_required_one_of_models: Union[Unset, FreeFormModel, ModelWithUnionProperty]
275271
if isinstance(data, Unset):
276272
return data
@@ -297,7 +293,7 @@ def _parse_not_required_one_of_models(
297293
not_required_one_of_models = _parse_not_required_one_of_models(d.pop("not_required_one_of_models", UNSET))
298294

299295
def _parse_not_required_nullable_one_of_models(
300-
data: Union[Unset, None, Dict[str, Any], str]
296+
data: object,
301297
) -> Union[Unset, None, FreeFormModel, ModelWithUnionProperty, str]:
302298
not_required_nullable_one_of_models: Union[Unset, None, FreeFormModel, ModelWithUnionProperty, str]
303299
if data is None:

‎end_to_end_tests/golden-record-custom/custom_e2e/models/model_with_any_json_properties.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
4141
for prop_name, prop_dict in d.items():
4242

4343
def _parse_additional_property(
44-
data: Union[Dict[str, Any], List[Any], str, float, int, bool]
44+
data: object,
4545
) -> Union[ModelWithAnyJsonPropertiesAdditionalProperty, List[str], str, float, int, bool]:
4646
additional_property: Union[
4747
ModelWithAnyJsonPropertiesAdditionalProperty, List[str], str, float, int, bool

‎end_to_end_tests/golden-record-custom/custom_e2e/models/model_with_union_property.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def to_dict(self) -> Dict[str, Any]:
4040
def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
4141
d = src_dict.copy()
4242

43-
def _parse_a_property(data: Union[Unset, str, int]) -> Union[Unset, AnEnum, AnIntEnum]:
43+
def _parse_a_property(data: object) -> Union[Unset, AnEnum, AnIntEnum]:
4444
a_property: Union[Unset, AnEnum, AnIntEnum]
4545
if isinstance(data, Unset):
4646
return data

‎end_to_end_tests/golden-record/my_test_api_client/models/a_model.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
174174
d = src_dict.copy()
175175
an_enum_value = AnEnum(d.pop("an_enum_value"))
176176

177-
def _parse_a_camel_date_time(data: str) -> Union[datetime.datetime, datetime.date]:
177+
def _parse_a_camel_date_time(data: object) -> Union[datetime.datetime, datetime.date]:
178178
a_camel_date_time: Union[datetime.datetime, datetime.date]
179179
try:
180180
if not isinstance(data, str):
@@ -196,7 +196,7 @@ def _parse_a_camel_date_time(data: str) -> Union[datetime.datetime, datetime.dat
196196

197197
required_not_nullable = d.pop("required_not_nullable")
198198

199-
def _parse_one_of_models(data: Dict[str, Any]) -> Union[FreeFormModel, ModelWithUnionProperty]:
199+
def _parse_one_of_models(data: object) -> Union[FreeFormModel, ModelWithUnionProperty]:
200200
one_of_models: Union[FreeFormModel, ModelWithUnionProperty]
201201
try:
202202
if not isinstance(data, dict):
@@ -246,9 +246,7 @@ def _parse_one_of_models(data: Dict[str, Any]) -> Union[FreeFormModel, ModelWith
246246

247247
not_required_not_nullable = d.pop("not_required_not_nullable", UNSET)
248248

249-
def _parse_nullable_one_of_models(
250-
data: Union[None, Dict[str, Any]]
251-
) -> Union[None, FreeFormModel, ModelWithUnionProperty]:
249+
def _parse_nullable_one_of_models(data: object) -> Union[None, FreeFormModel, ModelWithUnionProperty]:
252250
nullable_one_of_models: Union[None, FreeFormModel, ModelWithUnionProperty]
253251
if data is None:
254252
return data
@@ -268,9 +266,7 @@ def _parse_nullable_one_of_models(
268266

269267
nullable_one_of_models = _parse_nullable_one_of_models(d.pop("nullable_one_of_models"))
270268

271-
def _parse_not_required_one_of_models(
272-
data: Union[Unset, Dict[str, Any]]
273-
) -> Union[Unset, FreeFormModel, ModelWithUnionProperty]:
269+
def _parse_not_required_one_of_models(data: object) -> Union[Unset, FreeFormModel, ModelWithUnionProperty]:
274270
not_required_one_of_models: Union[Unset, FreeFormModel, ModelWithUnionProperty]
275271
if isinstance(data, Unset):
276272
return data
@@ -297,7 +293,7 @@ def _parse_not_required_one_of_models(
297293
not_required_one_of_models = _parse_not_required_one_of_models(d.pop("not_required_one_of_models", UNSET))
298294

299295
def _parse_not_required_nullable_one_of_models(
300-
data: Union[Unset, None, Dict[str, Any], str]
296+
data: object,
301297
) -> Union[Unset, None, FreeFormModel, ModelWithUnionProperty, str]:
302298
not_required_nullable_one_of_models: Union[Unset, None, FreeFormModel, ModelWithUnionProperty, str]
303299
if data is None:

‎end_to_end_tests/golden-record/my_test_api_client/models/model_with_any_json_properties.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
4141
for prop_name, prop_dict in d.items():
4242

4343
def _parse_additional_property(
44-
data: Union[Dict[str, Any], List[Any], str, float, int, bool]
44+
data: object,
4545
) -> Union[ModelWithAnyJsonPropertiesAdditionalProperty, List[str], str, float, int, bool]:
4646
additional_property: Union[
4747
ModelWithAnyJsonPropertiesAdditionalProperty, List[str], str, float, int, bool

‎end_to_end_tests/golden-record/my_test_api_client/models/model_with_union_property.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def to_dict(self) -> Dict[str, Any]:
4040
def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
4141
d = src_dict.copy()
4242

43-
def _parse_a_property(data: Union[Unset, str, int]) -> Union[Unset, AnEnum, AnIntEnum]:
43+
def _parse_a_property(data: object) -> Union[Unset, AnEnum, AnIntEnum]:
4444
a_property: Union[Unset, AnEnum, AnIntEnum]
4545
if isinstance(data, Unset):
4646
return data

‎openapi_python_client/templates/property_templates/union_property.py.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% macro construct(property, source, initial_value=None) %}
2-
def _parse_{{ property.python_name }}(data: {{ property.get_type_string(json=True) }}) -> {{ property.get_type_string() }}:
2+
def _parse_{{ property.python_name }}(data: object) -> {{ property.get_type_string() }}:
33
{{ property.python_name }}: {{ property.get_type_string() }}
44
{% if "None" in property.get_type_strings_in_union(json=True) %}
55
if data is None:

0 commit comments

Comments
 (0)