Skip to content

Commit cd9fcda

Browse files
Regen tests
1 parent 7bc3735 commit cd9fcda

File tree

13 files changed

+436
-150
lines changed

13 files changed

+436
-150
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
""" Contains all the data models used in inputs/outputs """
22

33
from .a_model import AModel
4+
from .a_model_model import AModelModel
5+
from .a_model_not_required_model import AModelNotRequiredModel
6+
from .a_model_not_required_nullable_model import AModelNotRequiredNullableModel
7+
from .a_model_nullable_model import AModelNullableModel
48
from .an_enum import AnEnum
59
from .an_int_enum import AnIntEnum
610
from .body_upload_file_tests_upload_post import BodyUploadFileTestsUploadPost

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

Lines changed: 36 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44
import attr
55
from dateutil.parser import isoparse
66

7+
from ..models.a_model_model import AModelModel
8+
from ..models.a_model_not_required_model import AModelNotRequiredModel
9+
from ..models.a_model_not_required_nullable_model import AModelNotRequiredNullableModel
10+
from ..models.a_model_nullable_model import AModelNullableModel
711
from ..models.an_enum import AnEnum
812
from ..models.different_enum import DifferentEnum
9-
from ..models.model_with_union_property import ModelWithUnionProperty
1013
from ..types import UNSET, Unset
1114

1215
T = TypeVar("T", bound="AModel")
@@ -20,16 +23,16 @@ class AModel:
2023
a_camel_date_time: Union[datetime.datetime, datetime.date]
2124
a_date: datetime.date
2225
required_not_nullable: str
23-
model: Union[ModelWithUnionProperty]
26+
model: AModelModel
2427
a_nullable_date: Optional[datetime.date]
2528
required_nullable: Optional[str]
26-
nullable_model: Union[None, ModelWithUnionProperty]
29+
nullable_model: Optional[AModelNullableModel]
2730
nested_list_of_enums: Union[Unset, List[List[DifferentEnum]]] = UNSET
2831
attr_1_leading_digit: Union[Unset, str] = UNSET
2932
not_required_nullable: Union[Unset, None, str] = UNSET
3033
not_required_not_nullable: Union[Unset, str] = UNSET
31-
not_required_model: Union[Unset, ModelWithUnionProperty] = UNSET
32-
not_required_nullable_model: Union[Unset, None, ModelWithUnionProperty] = UNSET
34+
not_required_model: Union[Unset, AModelNotRequiredModel] = UNSET
35+
not_required_nullable_model: Union[Unset, None, AModelNotRequiredNullableModel] = UNSET
3336

3437
def to_dict(self) -> Dict[str, Any]:
3538
an_enum_value = self.an_enum_value.value
@@ -42,8 +45,7 @@ def to_dict(self) -> Dict[str, Any]:
4245

4346
a_date = self.a_date.isoformat()
4447
required_not_nullable = self.required_not_nullable
45-
if isinstance(self.model, ModelWithUnionProperty):
46-
model = self.model.to_dict()
48+
model = self.model.to_dict()
4749

4850
nested_list_of_enums: Union[Unset, List[Any]] = UNSET
4951
if not isinstance(self.nested_list_of_enums, Unset):
@@ -62,31 +64,17 @@ def to_dict(self) -> Dict[str, Any]:
6264
required_nullable = self.required_nullable
6365
not_required_nullable = self.not_required_nullable
6466
not_required_not_nullable = self.not_required_not_nullable
65-
nullable_model: Union[None, Dict[str, Any]]
66-
if isinstance(self.nullable_model, Unset):
67-
nullable_model = UNSET
68-
if self.nullable_model is None:
69-
nullable_model = None
70-
else:
71-
nullable_model = self.nullable_model.to_dict()
67+
nullable_model = self.nullable_model.to_dict() if self.nullable_model else None
7268

73-
not_required_model: Union[Unset, Dict[str, Any]]
74-
if isinstance(self.not_required_model, Unset):
75-
not_required_model = UNSET
76-
else:
77-
not_required_model = UNSET
78-
if not isinstance(self.not_required_model, Unset):
79-
not_required_model = self.not_required_model.to_dict()
80-
81-
not_required_nullable_model: Union[Unset, None, Dict[str, Any]]
82-
if isinstance(self.not_required_nullable_model, Unset):
83-
not_required_nullable_model = UNSET
84-
elif self.not_required_nullable_model is None:
85-
not_required_nullable_model = None
86-
else:
87-
not_required_nullable_model = UNSET
88-
if not isinstance(self.not_required_nullable_model, Unset):
89-
not_required_nullable_model = self.not_required_nullable_model.to_dict()
69+
not_required_model: Union[Unset, Dict[str, Any]] = UNSET
70+
if not isinstance(self.not_required_model, Unset):
71+
not_required_model = self.not_required_model.to_dict()
72+
73+
not_required_nullable_model: Union[Unset, None, Dict[str, Any]] = UNSET
74+
if not isinstance(self.not_required_nullable_model, Unset):
75+
not_required_nullable_model = (
76+
self.not_required_nullable_model.to_dict() if self.not_required_nullable_model else None
77+
)
9078

9179
field_dict: Dict[str, Any] = {}
9280
field_dict.update(
@@ -140,14 +128,7 @@ def _parse_a_camel_date_time(data: Any) -> Union[datetime.datetime, datetime.dat
140128

141129
required_not_nullable = d.pop("required_not_nullable")
142130

143-
def _parse_model(data: Any) -> Union[ModelWithUnionProperty]:
144-
data = None if isinstance(data, Unset) else data
145-
model: Union[ModelWithUnionProperty]
146-
model = ModelWithUnionProperty.from_dict(data)
147-
148-
return model
149-
150-
model = _parse_model(d.pop("model"))
131+
model = AModelModel.from_dict(d.pop("model"))
151132

152133
nested_list_of_enums = []
153134
_nested_list_of_enums = d.pop("nested_list_of_enums", UNSET)
@@ -174,40 +155,22 @@ def _parse_model(data: Any) -> Union[ModelWithUnionProperty]:
174155

175156
not_required_not_nullable = d.pop("not_required_not_nullable", UNSET)
176157

177-
def _parse_nullable_model(data: Any) -> Union[None, ModelWithUnionProperty]:
178-
data = None if isinstance(data, Unset) else data
179-
nullable_model: Union[None, ModelWithUnionProperty]
180-
nullable_model = ModelWithUnionProperty.from_dict(data)
181-
182-
return nullable_model
183-
184-
nullable_model = _parse_nullable_model(d.pop("nullable_model"))
185-
186-
def _parse_not_required_model(data: Any) -> Union[Unset, ModelWithUnionProperty]:
187-
data = None if isinstance(data, Unset) else data
188-
not_required_model: Union[Unset, ModelWithUnionProperty]
189-
not_required_model = UNSET
190-
_not_required_model = data
191-
if not isinstance(_not_required_model, Unset):
192-
not_required_model = ModelWithUnionProperty.from_dict(cast(Dict[str, Any], _not_required_model))
193-
194-
return not_required_model
195-
196-
not_required_model = _parse_not_required_model(d.pop("not_required_model", UNSET))
197-
198-
def _parse_not_required_nullable_model(data: Any) -> Union[Unset, None, ModelWithUnionProperty]:
199-
data = None if isinstance(data, Unset) else data
200-
not_required_nullable_model: Union[Unset, None, ModelWithUnionProperty]
201-
not_required_nullable_model = UNSET
202-
_not_required_nullable_model = data
203-
if not isinstance(_not_required_nullable_model, Unset):
204-
not_required_nullable_model = ModelWithUnionProperty.from_dict(
205-
cast(Dict[str, Any], _not_required_nullable_model)
206-
)
207-
208-
return not_required_nullable_model
209-
210-
not_required_nullable_model = _parse_not_required_nullable_model(d.pop("not_required_nullable_model", UNSET))
158+
nullable_model = None
159+
_nullable_model = d.pop("nullable_model")
160+
if _nullable_model is not None:
161+
nullable_model = AModelNullableModel.from_dict(cast(Dict[str, Any], _nullable_model))
162+
163+
not_required_model: Union[Unset, AModelNotRequiredModel] = UNSET
164+
_not_required_model = d.pop("not_required_model", UNSET)
165+
if not isinstance(_not_required_model, Unset):
166+
not_required_model = AModelNotRequiredModel.from_dict(cast(Dict[str, Any], _not_required_model))
167+
168+
not_required_nullable_model = None
169+
_not_required_nullable_model = d.pop("not_required_nullable_model", UNSET)
170+
if _not_required_nullable_model is not None and not isinstance(_not_required_nullable_model, Unset):
171+
not_required_nullable_model = AModelNotRequiredNullableModel.from_dict(
172+
cast(Dict[str, Any], _not_required_nullable_model)
173+
)
211174

212175
a_model = cls(
213176
an_enum_value=an_enum_value,
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
from typing import Any, Dict, List, Type, TypeVar
2+
3+
import attr
4+
5+
T = TypeVar("T", bound="AModelModel")
6+
7+
8+
@attr.s(auto_attribs=True)
9+
class AModelModel:
10+
""" """
11+
12+
additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
13+
14+
def to_dict(self) -> Dict[str, Any]:
15+
16+
field_dict: Dict[str, Any] = {}
17+
field_dict.update(self.additional_properties)
18+
field_dict.update({})
19+
20+
return field_dict
21+
22+
@classmethod
23+
def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
24+
d = src_dict.copy()
25+
a_model_model = cls()
26+
27+
a_model_model.additional_properties = d
28+
return a_model_model
29+
30+
@property
31+
def additional_keys(self) -> List[str]:
32+
return list(self.additional_properties.keys())
33+
34+
def __getitem__(self, key: str) -> Any:
35+
return self.additional_properties[key]
36+
37+
def __setitem__(self, key: str, value: Any) -> None:
38+
self.additional_properties[key] = value
39+
40+
def __delitem__(self, key: str) -> None:
41+
del self.additional_properties[key]
42+
43+
def __contains__(self, key: str) -> bool:
44+
return key in self.additional_properties
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
from typing import Any, Dict, List, Type, TypeVar
2+
3+
import attr
4+
5+
T = TypeVar("T", bound="AModelNotRequiredModel")
6+
7+
8+
@attr.s(auto_attribs=True)
9+
class AModelNotRequiredModel:
10+
""" """
11+
12+
additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
13+
14+
def to_dict(self) -> Dict[str, Any]:
15+
16+
field_dict: Dict[str, Any] = {}
17+
field_dict.update(self.additional_properties)
18+
field_dict.update({})
19+
20+
return field_dict
21+
22+
@classmethod
23+
def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
24+
d = src_dict.copy()
25+
a_model_not_required_model = cls()
26+
27+
a_model_not_required_model.additional_properties = d
28+
return a_model_not_required_model
29+
30+
@property
31+
def additional_keys(self) -> List[str]:
32+
return list(self.additional_properties.keys())
33+
34+
def __getitem__(self, key: str) -> Any:
35+
return self.additional_properties[key]
36+
37+
def __setitem__(self, key: str, value: Any) -> None:
38+
self.additional_properties[key] = value
39+
40+
def __delitem__(self, key: str) -> None:
41+
del self.additional_properties[key]
42+
43+
def __contains__(self, key: str) -> bool:
44+
return key in self.additional_properties
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
from typing import Any, Dict, List, Type, TypeVar
2+
3+
import attr
4+
5+
T = TypeVar("T", bound="AModelNotRequiredNullableModel")
6+
7+
8+
@attr.s(auto_attribs=True)
9+
class AModelNotRequiredNullableModel:
10+
""" """
11+
12+
additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
13+
14+
def to_dict(self) -> Dict[str, Any]:
15+
16+
field_dict: Dict[str, Any] = {}
17+
field_dict.update(self.additional_properties)
18+
field_dict.update({})
19+
20+
return field_dict
21+
22+
@classmethod
23+
def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
24+
d = src_dict.copy()
25+
a_model_not_required_nullable_model = cls()
26+
27+
a_model_not_required_nullable_model.additional_properties = d
28+
return a_model_not_required_nullable_model
29+
30+
@property
31+
def additional_keys(self) -> List[str]:
32+
return list(self.additional_properties.keys())
33+
34+
def __getitem__(self, key: str) -> Any:
35+
return self.additional_properties[key]
36+
37+
def __setitem__(self, key: str, value: Any) -> None:
38+
self.additional_properties[key] = value
39+
40+
def __delitem__(self, key: str) -> None:
41+
del self.additional_properties[key]
42+
43+
def __contains__(self, key: str) -> bool:
44+
return key in self.additional_properties
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
from typing import Any, Dict, List, Type, TypeVar
2+
3+
import attr
4+
5+
T = TypeVar("T", bound="AModelNullableModel")
6+
7+
8+
@attr.s(auto_attribs=True)
9+
class AModelNullableModel:
10+
""" """
11+
12+
additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
13+
14+
def to_dict(self) -> Dict[str, Any]:
15+
16+
field_dict: Dict[str, Any] = {}
17+
field_dict.update(self.additional_properties)
18+
field_dict.update({})
19+
20+
return field_dict
21+
22+
@classmethod
23+
def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
24+
d = src_dict.copy()
25+
a_model_nullable_model = cls()
26+
27+
a_model_nullable_model.additional_properties = d
28+
return a_model_nullable_model
29+
30+
@property
31+
def additional_keys(self) -> List[str]:
32+
return list(self.additional_properties.keys())
33+
34+
def __getitem__(self, key: str) -> Any:
35+
return self.additional_properties[key]
36+
37+
def __setitem__(self, key: str, value: Any) -> None:
38+
self.additional_properties[key] = value
39+
40+
def __delitem__(self, key: str) -> None:
41+
del self.additional_properties[key]
42+
43+
def __contains__(self, key: str) -> bool:
44+
return key in self.additional_properties

end_to_end_tests/golden-record/my_test_api_client/models/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
""" Contains all the data models used in inputs/outputs """
22

33
from .a_model import AModel
4+
from .a_model_model import AModelModel
5+
from .a_model_not_required_model import AModelNotRequiredModel
6+
from .a_model_not_required_nullable_model import AModelNotRequiredNullableModel
7+
from .a_model_nullable_model import AModelNullableModel
48
from .an_enum import AnEnum
59
from .an_int_enum import AnIntEnum
610
from .body_upload_file_tests_upload_post import BodyUploadFileTestsUploadPost

0 commit comments

Comments
 (0)