Skip to content

Commit 1ddd486

Browse files
forest-benchlingforest-benchling
committed
Change item to type
1 parent 55496e5 commit 1ddd486

17 files changed

+211
-211
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,13 +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_item0 import ModelWithAnyJsonPropertiesAdditionalPropertyItem0
20+
from .model_with_any_json_properties_additional_property_type0 import ModelWithAnyJsonPropertiesAdditionalPropertyType0
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
2424
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
25+
from .model_with_union_property_inlined_fruit_type0 import ModelWithUnionPropertyInlinedFruitType0
26+
from .model_with_union_property_inlined_fruit_type1 import ModelWithUnionPropertyInlinedFruitType1
2727
from .test_inline_objects_json_body import TestInlineObjectsJsonBody
2828
from .test_inline_objects_response_200 import TestInlineObjectsResponse_200
2929
from .validation_error import ValidationError

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

+44-44
Original file line numberDiff line numberDiff line change
@@ -176,20 +176,20 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
176176

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

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

192-
return a_camel_date_time_item1
192+
return a_camel_date_time_type1
193193

194194
a_camel_date_time = _parse_a_camel_date_time(d.pop("aCamelDateTime"))
195195

@@ -199,20 +199,20 @@ def _parse_a_camel_date_time(data: object) -> Union[datetime.date, datetime.date
199199

200200
def _parse_one_of_models(data: object) -> Union[FreeFormModel, ModelWithUnionProperty]:
201201
try:
202-
one_of_models_item0: FreeFormModel
202+
one_of_models_type0: FreeFormModel
203203
if not isinstance(data, dict):
204204
raise TypeError()
205-
one_of_models_item0 = FreeFormModel.from_dict(data)
205+
one_of_models_type0 = FreeFormModel.from_dict(data)
206206

207-
return one_of_models_item0
207+
return one_of_models_type0
208208
except: # noqa: E722
209209
pass
210210
if not isinstance(data, dict):
211211
raise TypeError()
212-
one_of_models_item1: ModelWithUnionProperty
213-
one_of_models_item1 = ModelWithUnionProperty.from_dict(data)
212+
one_of_models_type1: ModelWithUnionProperty
213+
one_of_models_type1 = ModelWithUnionProperty.from_dict(data)
214214

215-
return one_of_models_item1
215+
return one_of_models_type1
216216

217217
one_of_models = _parse_one_of_models(d.pop("one_of_models"))
218218

@@ -252,47 +252,47 @@ def _parse_nullable_one_of_models(data: object) -> Union[FreeFormModel, ModelWit
252252
if data is None:
253253
return data
254254
try:
255-
nullable_one_of_models_item0: FreeFormModel
255+
nullable_one_of_models_type0: FreeFormModel
256256
if not isinstance(data, dict):
257257
raise TypeError()
258-
nullable_one_of_models_item0 = FreeFormModel.from_dict(data)
258+
nullable_one_of_models_type0 = FreeFormModel.from_dict(data)
259259

260-
return nullable_one_of_models_item0
260+
return nullable_one_of_models_type0
261261
except: # noqa: E722
262262
pass
263263
if not isinstance(data, dict):
264264
raise TypeError()
265-
nullable_one_of_models_item1: ModelWithUnionProperty
266-
nullable_one_of_models_item1 = ModelWithUnionProperty.from_dict(data)
265+
nullable_one_of_models_type1: ModelWithUnionProperty
266+
nullable_one_of_models_type1 = ModelWithUnionProperty.from_dict(data)
267267

268-
return nullable_one_of_models_item1
268+
return nullable_one_of_models_type1
269269

270270
nullable_one_of_models = _parse_nullable_one_of_models(d.pop("nullable_one_of_models"))
271271

272272
def _parse_not_required_one_of_models(data: object) -> Union[FreeFormModel, ModelWithUnionProperty, Unset]:
273273
if isinstance(data, Unset):
274274
return data
275275
try:
276-
not_required_one_of_models_item0: Union[Unset, FreeFormModel]
276+
not_required_one_of_models_type0: Union[Unset, FreeFormModel]
277277
if not isinstance(data, dict):
278278
raise TypeError()
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)
279+
not_required_one_of_models_type0 = UNSET
280+
_not_required_one_of_models_type0 = data
281+
if not isinstance(_not_required_one_of_models_type0, Unset):
282+
not_required_one_of_models_type0 = FreeFormModel.from_dict(_not_required_one_of_models_type0)
283283

284-
return not_required_one_of_models_item0
284+
return not_required_one_of_models_type0
285285
except: # noqa: E722
286286
pass
287287
if not isinstance(data, dict):
288288
raise TypeError()
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)
289+
not_required_one_of_models_type1: Union[Unset, ModelWithUnionProperty]
290+
not_required_one_of_models_type1 = UNSET
291+
_not_required_one_of_models_type1 = data
292+
if not isinstance(_not_required_one_of_models_type1, Unset):
293+
not_required_one_of_models_type1 = ModelWithUnionProperty.from_dict(_not_required_one_of_models_type1)
294294

295-
return not_required_one_of_models_item1
295+
return not_required_one_of_models_type1
296296

297297
not_required_one_of_models = _parse_not_required_one_of_models(d.pop("not_required_one_of_models", UNSET))
298298

@@ -304,31 +304,31 @@ def _parse_not_required_nullable_one_of_models(
304304
if isinstance(data, Unset):
305305
return data
306306
try:
307-
not_required_nullable_one_of_models_item0: Union[Unset, FreeFormModel]
307+
not_required_nullable_one_of_models_type0: Union[Unset, FreeFormModel]
308308
if not isinstance(data, dict):
309309
raise TypeError()
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
310+
not_required_nullable_one_of_models_type0 = UNSET
311+
_not_required_nullable_one_of_models_type0 = data
312+
if not isinstance(_not_required_nullable_one_of_models_type0, Unset):
313+
not_required_nullable_one_of_models_type0 = FreeFormModel.from_dict(
314+
_not_required_nullable_one_of_models_type0
315315
)
316316

317-
return not_required_nullable_one_of_models_item0
317+
return not_required_nullable_one_of_models_type0
318318
except: # noqa: E722
319319
pass
320320
try:
321-
not_required_nullable_one_of_models_item1: Union[Unset, ModelWithUnionProperty]
321+
not_required_nullable_one_of_models_type1: Union[Unset, ModelWithUnionProperty]
322322
if not isinstance(data, dict):
323323
raise TypeError()
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
324+
not_required_nullable_one_of_models_type1 = UNSET
325+
_not_required_nullable_one_of_models_type1 = data
326+
if not isinstance(_not_required_nullable_one_of_models_type1, Unset):
327+
not_required_nullable_one_of_models_type1 = ModelWithUnionProperty.from_dict(
328+
_not_required_nullable_one_of_models_type1
329329
)
330330

331-
return not_required_nullable_one_of_models_item1
331+
return not_required_nullable_one_of_models_type1
332332
except: # noqa: E722
333333
pass
334334
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

+14-14
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import attr
44

5-
from ..models.model_with_any_json_properties_additional_property_item0 import (
6-
ModelWithAnyJsonPropertiesAdditionalPropertyItem0,
5+
from ..models.model_with_any_json_properties_additional_property_type0 import (
6+
ModelWithAnyJsonPropertiesAdditionalPropertyType0,
77
)
88

99
T = TypeVar("T", bound="ModelWithAnyJsonProperties")
@@ -14,14 +14,14 @@ class ModelWithAnyJsonProperties:
1414
""" """
1515

1616
additional_properties: Dict[
17-
str, Union[List[str], ModelWithAnyJsonPropertiesAdditionalPropertyItem0, bool, float, int, str]
17+
str, Union[List[str], ModelWithAnyJsonPropertiesAdditionalPropertyType0, bool, float, int, str]
1818
] = attr.ib(init=False, factory=dict)
1919

2020
def to_dict(self) -> Dict[str, Any]:
2121

2222
field_dict: Dict[str, Any] = {}
2323
for prop_name, prop in self.additional_properties.items():
24-
if isinstance(prop, ModelWithAnyJsonPropertiesAdditionalPropertyItem0):
24+
if isinstance(prop, ModelWithAnyJsonPropertiesAdditionalPropertyType0):
2525
field_dict[prop_name] = prop.to_dict()
2626

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

4545
def _parse_additional_property(
4646
data: object,
47-
) -> Union[List[str], ModelWithAnyJsonPropertiesAdditionalPropertyItem0, bool, float, int, str]:
47+
) -> Union[List[str], ModelWithAnyJsonPropertiesAdditionalPropertyType0, bool, float, int, str]:
4848
try:
49-
additional_property_item0: ModelWithAnyJsonPropertiesAdditionalPropertyItem0
49+
additional_property_type0: ModelWithAnyJsonPropertiesAdditionalPropertyType0
5050
if not isinstance(data, dict):
5151
raise TypeError()
52-
additional_property_item0 = ModelWithAnyJsonPropertiesAdditionalPropertyItem0.from_dict(data)
52+
additional_property_type0 = ModelWithAnyJsonPropertiesAdditionalPropertyType0.from_dict(data)
5353

54-
return additional_property_item0
54+
return additional_property_type0
5555
except: # noqa: E722
5656
pass
5757
try:
58-
additional_property_item1: List[str]
58+
additional_property_type1: List[str]
5959
if not isinstance(data, list):
6060
raise TypeError()
61-
additional_property_item1 = cast(List[str], data)
61+
additional_property_type1 = cast(List[str], data)
6262

63-
return additional_property_item1
63+
return additional_property_type1
6464
except: # noqa: E722
6565
pass
6666
return cast(
67-
Union[List[str], ModelWithAnyJsonPropertiesAdditionalPropertyItem0, bool, float, int, str], data
67+
Union[List[str], ModelWithAnyJsonPropertiesAdditionalPropertyType0, bool, float, int, str], data
6868
)
6969

7070
additional_property = _parse_additional_property(prop_dict)
@@ -80,13 +80,13 @@ def additional_keys(self) -> List[str]:
8080

8181
def __getitem__(
8282
self, key: str
83-
) -> Union[List[str], ModelWithAnyJsonPropertiesAdditionalPropertyItem0, bool, float, int, str]:
83+
) -> Union[List[str], ModelWithAnyJsonPropertiesAdditionalPropertyType0, bool, float, int, str]:
8484
return self.additional_properties[key]
8585

8686
def __setitem__(
8787
self,
8888
key: str,
89-
value: Union[List[str], ModelWithAnyJsonPropertiesAdditionalPropertyItem0, bool, float, int, str],
89+
value: Union[List[str], ModelWithAnyJsonPropertiesAdditionalPropertyType0, bool, float, int, str],
9090
) -> None:
9191
self.additional_properties[key] = value
9292

‎end_to_end_tests/golden-record-custom/custom_e2e/models/model_with_any_json_properties_additional_property_item0.py renamed to ‎end_to_end_tests/golden-record-custom/custom_e2e/models/model_with_any_json_properties_additional_property_type0.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="ModelWithAnyJsonPropertiesAdditionalPropertyItem0")
5+
T = TypeVar("T", bound="ModelWithAnyJsonPropertiesAdditionalPropertyType0")
66

77

88
@attr.s(auto_attribs=True)
9-
class ModelWithAnyJsonPropertiesAdditionalPropertyItem0:
9+
class ModelWithAnyJsonPropertiesAdditionalPropertyType0:
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_item0 = cls()
25+
model_with_any_json_properties_additional_property_type0 = cls()
2626

27-
model_with_any_json_properties_additional_property_item0.additional_properties = d
28-
return model_with_any_json_properties_additional_property_item0
27+
model_with_any_json_properties_additional_property_type0.additional_properties = d
28+
return model_with_any_json_properties_additional_property_type0
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-12
Original file line numberDiff line numberDiff line change
@@ -44,26 +44,26 @@ def _parse_a_property(data: object) -> Union[AnEnum, AnIntEnum, Unset]:
4444
if isinstance(data, Unset):
4545
return data
4646
try:
47-
a_property_item0: Union[Unset, AnEnum]
47+
a_property_type0: Union[Unset, AnEnum]
4848
if not isinstance(data, str):
4949
raise TypeError()
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)
50+
a_property_type0 = UNSET
51+
_a_property_type0 = data
52+
if not isinstance(_a_property_type0, Unset):
53+
a_property_type0 = AnEnum(_a_property_type0)
5454

55-
return a_property_item0
55+
return a_property_type0
5656
except: # noqa: E722
5757
pass
5858
if not isinstance(data, int):
5959
raise TypeError()
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)
60+
a_property_type1: Union[Unset, AnIntEnum]
61+
a_property_type1 = UNSET
62+
_a_property_type1 = data
63+
if not isinstance(_a_property_type1, Unset):
64+
a_property_type1 = AnIntEnum(_a_property_type1)
6565

66-
return a_property_item1
66+
return a_property_type1
6767

6868
a_property = _parse_a_property(d.pop("a_property", UNSET))
6969

0 commit comments

Comments
 (0)