Skip to content

Commit 682c5ab

Browse files
forest-benchlingforest-benchling
committed
2 parents caea77a + da1d970 commit 682c5ab

19 files changed

+567
-143
lines changed

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@
1717
)
1818
from .model_with_additional_properties_refed import ModelWithAdditionalPropertiesRefed
1919
from .model_with_any_json_properties import ModelWithAnyJsonProperties
20-
from .model_with_any_json_properties_additional_property import ModelWithAnyJsonPropertiesAdditionalProperty
20+
from .model_with_any_json_properties_additional_property_item0 import ModelWithAnyJsonPropertiesAdditionalPropertyItem0
2121
from .model_with_primitive_additional_properties import ModelWithPrimitiveAdditionalProperties
2222
from .model_with_primitive_additional_properties_a_date_holder import ModelWithPrimitiveAdditionalPropertiesADateHolder
2323
from .model_with_union_property import ModelWithUnionProperty
24+
from .model_with_union_property_inlined import ModelWithUnionPropertyInlined
25+
from .model_with_union_property_inlined_fruit_item0 import ModelWithUnionPropertyInlinedFruitItem0
26+
from .model_with_union_property_inlined_fruit_item1 import ModelWithUnionPropertyInlinedFruitItem1
2427
from .test_inline_objects_json_body import TestInlineObjectsJsonBody
2528
from .test_inline_objects_response_200 import TestInlineObjectsResponse_200
2629
from .validation_error import ValidationError

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

+45-38
Original file line numberDiff line numberDiff line change
@@ -175,20 +175,21 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
175175
an_enum_value = AnEnum(d.pop("an_enum_value"))
176176

177177
def _parse_a_camel_date_time(data: object) -> Union[datetime.date, datetime.datetime]:
178-
a_camel_date_time: Union[datetime.date, datetime.datetime]
179178
try:
179+
a_camel_date_time_item0: datetime.datetime
180180
if not isinstance(data, str):
181181
raise TypeError()
182-
a_camel_date_time = isoparse(data)
182+
a_camel_date_time_item0 = isoparse(data)
183183

184-
return a_camel_date_time
184+
return a_camel_date_time_item0
185185
except: # noqa: E722
186186
pass
187187
if not isinstance(data, str):
188188
raise TypeError()
189-
a_camel_date_time = isoparse(data).date()
189+
a_camel_date_time_item1: datetime.date
190+
a_camel_date_time_item1 = isoparse(data).date()
190191

191-
return a_camel_date_time
192+
return a_camel_date_time_item1
192193

193194
a_camel_date_time = _parse_a_camel_date_time(d.pop("aCamelDateTime"))
194195

@@ -197,20 +198,21 @@ def _parse_a_camel_date_time(data: object) -> Union[datetime.date, datetime.date
197198
required_not_nullable = d.pop("required_not_nullable")
198199

199200
def _parse_one_of_models(data: object) -> Union[FreeFormModel, ModelWithUnionProperty]:
200-
one_of_models: Union[FreeFormModel, ModelWithUnionProperty]
201201
try:
202+
one_of_models_item0: FreeFormModel
202203
if not isinstance(data, dict):
203204
raise TypeError()
204-
one_of_models = FreeFormModel.from_dict(data)
205+
one_of_models_item0 = FreeFormModel.from_dict(data)
205206

206-
return one_of_models
207+
return one_of_models_item0
207208
except: # noqa: E722
208209
pass
209210
if not isinstance(data, dict):
210211
raise TypeError()
211-
one_of_models = ModelWithUnionProperty.from_dict(data)
212+
one_of_models_item1: ModelWithUnionProperty
213+
one_of_models_item1 = ModelWithUnionProperty.from_dict(data)
212214

213-
return one_of_models
215+
return one_of_models_item1
214216

215217
one_of_models = _parse_one_of_models(d.pop("one_of_models"))
216218

@@ -247,81 +249,86 @@ def _parse_one_of_models(data: object) -> Union[FreeFormModel, ModelWithUnionPro
247249
not_required_not_nullable = d.pop("not_required_not_nullable", UNSET)
248250

249251
def _parse_nullable_one_of_models(data: object) -> Union[FreeFormModel, ModelWithUnionProperty, None]:
250-
nullable_one_of_models: Union[FreeFormModel, ModelWithUnionProperty, None]
251252
if data is None:
252253
return data
253254
try:
255+
nullable_one_of_models_item0: FreeFormModel
254256
if not isinstance(data, dict):
255257
raise TypeError()
256-
nullable_one_of_models = FreeFormModel.from_dict(data)
258+
nullable_one_of_models_item0 = FreeFormModel.from_dict(data)
257259

258-
return nullable_one_of_models
260+
return nullable_one_of_models_item0
259261
except: # noqa: E722
260262
pass
261263
if not isinstance(data, dict):
262264
raise TypeError()
263-
nullable_one_of_models = ModelWithUnionProperty.from_dict(data)
265+
nullable_one_of_models_item1: ModelWithUnionProperty
266+
nullable_one_of_models_item1 = ModelWithUnionProperty.from_dict(data)
264267

265-
return nullable_one_of_models
268+
return nullable_one_of_models_item1
266269

267270
nullable_one_of_models = _parse_nullable_one_of_models(d.pop("nullable_one_of_models"))
268271

269272
def _parse_not_required_one_of_models(data: object) -> Union[FreeFormModel, ModelWithUnionProperty, Unset]:
270-
not_required_one_of_models: Union[FreeFormModel, ModelWithUnionProperty, Unset]
271273
if isinstance(data, Unset):
272274
return data
273275
try:
276+
not_required_one_of_models_item0: Union[Unset, FreeFormModel]
274277
if not isinstance(data, dict):
275278
raise TypeError()
276-
not_required_one_of_models = UNSET
277-
_not_required_one_of_models = data
278-
if not isinstance(_not_required_one_of_models, Unset):
279-
not_required_one_of_models = FreeFormModel.from_dict(_not_required_one_of_models)
279+
not_required_one_of_models_item0 = UNSET
280+
_not_required_one_of_models_item0 = data
281+
if not isinstance(_not_required_one_of_models_item0, Unset):
282+
not_required_one_of_models_item0 = FreeFormModel.from_dict(_not_required_one_of_models_item0)
280283

281-
return not_required_one_of_models
284+
return not_required_one_of_models_item0
282285
except: # noqa: E722
283286
pass
284287
if not isinstance(data, dict):
285288
raise TypeError()
286-
not_required_one_of_models = UNSET
287-
_not_required_one_of_models = data
288-
if not isinstance(_not_required_one_of_models, Unset):
289-
not_required_one_of_models = ModelWithUnionProperty.from_dict(_not_required_one_of_models)
289+
not_required_one_of_models_item1: Union[Unset, ModelWithUnionProperty]
290+
not_required_one_of_models_item1 = UNSET
291+
_not_required_one_of_models_item1 = data
292+
if not isinstance(_not_required_one_of_models_item1, Unset):
293+
not_required_one_of_models_item1 = ModelWithUnionProperty.from_dict(_not_required_one_of_models_item1)
290294

291-
return not_required_one_of_models
295+
return not_required_one_of_models_item1
292296

293297
not_required_one_of_models = _parse_not_required_one_of_models(d.pop("not_required_one_of_models", UNSET))
294298

295299
def _parse_not_required_nullable_one_of_models(
296300
data: object,
297301
) -> Union[FreeFormModel, ModelWithUnionProperty, None, Unset, str]:
298-
not_required_nullable_one_of_models: Union[FreeFormModel, ModelWithUnionProperty, None, Unset, str]
299302
if data is None:
300303
return data
301304
if isinstance(data, Unset):
302305
return data
303306
try:
307+
not_required_nullable_one_of_models_item0: Union[Unset, FreeFormModel]
304308
if not isinstance(data, dict):
305309
raise TypeError()
306-
not_required_nullable_one_of_models = UNSET
307-
_not_required_nullable_one_of_models = data
308-
if not isinstance(_not_required_nullable_one_of_models, Unset):
309-
not_required_nullable_one_of_models = FreeFormModel.from_dict(_not_required_nullable_one_of_models)
310+
not_required_nullable_one_of_models_item0 = UNSET
311+
_not_required_nullable_one_of_models_item0 = data
312+
if not isinstance(_not_required_nullable_one_of_models_item0, Unset):
313+
not_required_nullable_one_of_models_item0 = FreeFormModel.from_dict(
314+
_not_required_nullable_one_of_models_item0
315+
)
310316

311-
return not_required_nullable_one_of_models
317+
return not_required_nullable_one_of_models_item0
312318
except: # noqa: E722
313319
pass
314320
try:
321+
not_required_nullable_one_of_models_item1: Union[Unset, ModelWithUnionProperty]
315322
if not isinstance(data, dict):
316323
raise TypeError()
317-
not_required_nullable_one_of_models = UNSET
318-
_not_required_nullable_one_of_models = data
319-
if not isinstance(_not_required_nullable_one_of_models, Unset):
320-
not_required_nullable_one_of_models = ModelWithUnionProperty.from_dict(
321-
_not_required_nullable_one_of_models
324+
not_required_nullable_one_of_models_item1 = UNSET
325+
_not_required_nullable_one_of_models_item1 = data
326+
if not isinstance(_not_required_nullable_one_of_models_item1, Unset):
327+
not_required_nullable_one_of_models_item1 = ModelWithUnionProperty.from_dict(
328+
_not_required_nullable_one_of_models_item1
322329
)
323330

324-
return not_required_nullable_one_of_models
331+
return not_required_nullable_one_of_models_item1
325332
except: # noqa: E722
326333
pass
327334
return cast(Union[FreeFormModel, ModelWithUnionProperty, None, Unset, str], data)

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

+19-14
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import attr
44

5-
from ..models.model_with_any_json_properties_additional_property import ModelWithAnyJsonPropertiesAdditionalProperty
5+
from ..models.model_with_any_json_properties_additional_property_item0 import (
6+
ModelWithAnyJsonPropertiesAdditionalPropertyItem0,
7+
)
68

79
T = TypeVar("T", bound="ModelWithAnyJsonProperties")
810

@@ -12,14 +14,14 @@ class ModelWithAnyJsonProperties:
1214
""" """
1315

1416
additional_properties: Dict[
15-
str, Union[List[str], ModelWithAnyJsonPropertiesAdditionalProperty, bool, float, int, str]
17+
str, Union[List[str], ModelWithAnyJsonPropertiesAdditionalPropertyItem0, bool, float, int, str]
1618
] = attr.ib(init=False, factory=dict)
1719

1820
def to_dict(self) -> Dict[str, Any]:
1921

2022
field_dict: Dict[str, Any] = {}
2123
for prop_name, prop in self.additional_properties.items():
22-
if isinstance(prop, ModelWithAnyJsonPropertiesAdditionalProperty):
24+
if isinstance(prop, ModelWithAnyJsonPropertiesAdditionalPropertyItem0):
2325
field_dict[prop_name] = prop.to_dict()
2426

2527
elif isinstance(prop, list):
@@ -42,27 +44,28 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
4244

4345
def _parse_additional_property(
4446
data: object,
45-
) -> Union[List[str], ModelWithAnyJsonPropertiesAdditionalProperty, bool, float, int, str]:
46-
additional_property: Union[
47-
List[str], ModelWithAnyJsonPropertiesAdditionalProperty, bool, float, int, str
48-
]
47+
) -> Union[List[str], ModelWithAnyJsonPropertiesAdditionalPropertyItem0, bool, float, int, str]:
4948
try:
49+
additional_property_item0: ModelWithAnyJsonPropertiesAdditionalPropertyItem0
5050
if not isinstance(data, dict):
5151
raise TypeError()
52-
additional_property = ModelWithAnyJsonPropertiesAdditionalProperty.from_dict(data)
52+
additional_property_item0 = ModelWithAnyJsonPropertiesAdditionalPropertyItem0.from_dict(data)
5353

54-
return additional_property
54+
return additional_property_item0
5555
except: # noqa: E722
5656
pass
5757
try:
58+
additional_property_item1: List[str]
5859
if not isinstance(data, list):
5960
raise TypeError()
60-
additional_property = cast(List[str], data)
61+
additional_property_item1 = cast(List[str], data)
6162

62-
return additional_property
63+
return additional_property_item1
6364
except: # noqa: E722
6465
pass
65-
return cast(Union[List[str], ModelWithAnyJsonPropertiesAdditionalProperty, bool, float, int, str], data)
66+
return cast(
67+
Union[List[str], ModelWithAnyJsonPropertiesAdditionalPropertyItem0, bool, float, int, str], data
68+
)
6669

6770
additional_property = _parse_additional_property(prop_dict)
6871

@@ -77,11 +80,13 @@ def additional_keys(self) -> List[str]:
7780

7881
def __getitem__(
7982
self, key: str
80-
) -> Union[List[str], ModelWithAnyJsonPropertiesAdditionalProperty, bool, float, int, str]:
83+
) -> Union[List[str], ModelWithAnyJsonPropertiesAdditionalPropertyItem0, bool, float, int, str]:
8184
return self.additional_properties[key]
8285

8386
def __setitem__(
84-
self, key: str, value: Union[List[str], ModelWithAnyJsonPropertiesAdditionalProperty, bool, float, int, str]
87+
self,
88+
key: str,
89+
value: Union[List[str], ModelWithAnyJsonPropertiesAdditionalPropertyItem0, bool, float, int, str],
8590
) -> None:
8691
self.additional_properties[key] = value
8792

‎end_to_end_tests/golden-record-custom/custom_e2e/models/model_with_any_json_properties_additional_property.py renamed to ‎end_to_end_tests/golden-record-custom/custom_e2e/models/model_with_any_json_properties_additional_property_item0.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
import attr
44

5-
T = TypeVar("T", bound="ModelWithAnyJsonPropertiesAdditionalProperty")
5+
T = TypeVar("T", bound="ModelWithAnyJsonPropertiesAdditionalPropertyItem0")
66

77

88
@attr.s(auto_attribs=True)
9-
class ModelWithAnyJsonPropertiesAdditionalProperty:
9+
class ModelWithAnyJsonPropertiesAdditionalPropertyItem0:
1010
""" """
1111

1212
additional_properties: Dict[str, str] = attr.ib(init=False, factory=dict)
@@ -22,10 +22,10 @@ def to_dict(self) -> Dict[str, Any]:
2222
@classmethod
2323
def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
2424
d = src_dict.copy()
25-
model_with_any_json_properties_additional_property = cls()
25+
model_with_any_json_properties_additional_property_item0 = cls()
2626

27-
model_with_any_json_properties_additional_property.additional_properties = d
28-
return model_with_any_json_properties_additional_property
27+
model_with_any_json_properties_additional_property_item0.additional_properties = d
28+
return model_with_any_json_properties_additional_property_item0
2929

3030
@property
3131
def additional_keys(self) -> List[str]:

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

+12-11
Original file line numberDiff line numberDiff line change
@@ -41,28 +41,29 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
4141
d = src_dict.copy()
4242

4343
def _parse_a_property(data: object) -> Union[AnEnum, AnIntEnum, Unset]:
44-
a_property: Union[AnEnum, AnIntEnum, Unset]
4544
if isinstance(data, Unset):
4645
return data
4746
try:
47+
a_property_item0: Union[Unset, AnEnum]
4848
if not isinstance(data, str):
4949
raise TypeError()
50-
a_property = UNSET
51-
_a_property = data
52-
if not isinstance(_a_property, Unset):
53-
a_property = AnEnum(_a_property)
50+
a_property_item0 = UNSET
51+
_a_property_item0 = data
52+
if not isinstance(_a_property_item0, Unset):
53+
a_property_item0 = AnEnum(_a_property_item0)
5454

55-
return a_property
55+
return a_property_item0
5656
except: # noqa: E722
5757
pass
5858
if not isinstance(data, int):
5959
raise TypeError()
60-
a_property = UNSET
61-
_a_property = data
62-
if not isinstance(_a_property, Unset):
63-
a_property = AnIntEnum(_a_property)
60+
a_property_item1: Union[Unset, AnIntEnum]
61+
a_property_item1 = UNSET
62+
_a_property_item1 = data
63+
if not isinstance(_a_property_item1, Unset):
64+
a_property_item1 = AnIntEnum(_a_property_item1)
6465

65-
return a_property
66+
return a_property_item1
6667

6768
a_property = _parse_a_property(d.pop("a_property", UNSET))
6869

0 commit comments

Comments
 (0)