Skip to content

Commit 915d7c3

Browse files
forest-benchlingforest-benchling
committed
Check type
1 parent 8e88fa4 commit 915d7c3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+138
-114
lines changed

‎end_to_end_tests/golden-record-custom/custom_e2e/api/tests/defaults_tests_defaults_post.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ def _parse_response(*, response: httpx.Response) -> Optional[Union[None, HTTPVal
2323

2424
return response_200
2525
if response.status_code == 422:
26-
if not isinstance(response.json(), dict):
27-
raise ValueError("Cannot construct model from value " + str(response.json()))
2826
response_422 = HTTPValidationError.from_dict(response.json())
2927

3028
return response_422

‎end_to_end_tests/golden-record-custom/custom_e2e/api/tests/get_user_list.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,12 @@ def _parse_response(*, response: httpx.Response) -> Optional[Union[List[AModel],
1919
response_200 = []
2020
_response_200 = response.json()
2121
for response_200_item_data in _response_200:
22-
if not isinstance(response_200_item_data, dict):
23-
raise ValueError("Cannot construct model from value " + str(response_200_item_data))
2422
response_200_item = AModel.from_dict(response_200_item_data)
2523

2624
response_200.append(response_200_item)
2725

2826
return response_200
2927
if response.status_code == 422:
30-
if not isinstance(response.json(), dict):
31-
raise ValueError("Cannot construct model from value " + str(response.json()))
3228
response_422 = HTTPValidationError.from_dict(response.json())
3329

3430
return response_422

‎end_to_end_tests/golden-record-custom/custom_e2e/api/tests/int_enum_tests_int_enum_post.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ def _parse_response(*, response: httpx.Response) -> Optional[Union[None, HTTPVal
1818

1919
return response_200
2020
if response.status_code == 422:
21-
if not isinstance(response.json(), dict):
22-
raise ValueError("Cannot construct model from value " + str(response.json()))
2321
response_422 = HTTPValidationError.from_dict(response.json())
2422

2523
return response_422

‎end_to_end_tests/golden-record-custom/custom_e2e/api/tests/json_body_tests_json_body_post.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ def _parse_response(*, response: httpx.Response) -> Optional[Union[None, HTTPVal
1616

1717
return response_200
1818
if response.status_code == 422:
19-
if not isinstance(response.json(), dict):
20-
raise ValueError("Cannot construct model from value " + str(response.json()))
2119
response_422 = HTTPValidationError.from_dict(response.json())
2220

2321
return response_422

‎end_to_end_tests/golden-record-custom/custom_e2e/api/tests/optional_value_tests_optional_query_param.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ def _parse_response(*, response: httpx.Response) -> Optional[Union[None, HTTPVal
1818

1919
return response_200
2020
if response.status_code == 422:
21-
if not isinstance(response.json(), dict):
22-
raise ValueError("Cannot construct model from value " + str(response.json()))
2321
response_422 = HTTPValidationError.from_dict(response.json())
2422

2523
return response_422

‎end_to_end_tests/golden-record-custom/custom_e2e/api/tests/test_inline_objects.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212

1313
def _parse_response(*, response: httpx.Response) -> Optional[TestInlineObjectsResponse_200]:
1414
if response.status_code == 200:
15-
if not isinstance(response.json(), dict):
16-
raise ValueError("Cannot construct model from value " + str(response.json()))
1715
response_200 = TestInlineObjectsResponse_200.from_dict(response.json())
1816

1917
return response_200

‎end_to_end_tests/golden-record-custom/custom_e2e/api/tests/upload_file_tests_upload_post.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ def _parse_response(*, response: httpx.Response) -> Optional[Union[
2222

2323
return response_200
2424
if response.status_code == 422:
25-
if not isinstance(response.json(), dict):
26-
raise ValueError("Cannot construct model from value " + str(response.json()))
2725
response_422 = HTTPValidationError.from_dict(response.json())
2826

2927
return response_422

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

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class AModel:
3636
not_required_model: Union[Unset, AModelNotRequiredModel] = UNSET
3737
not_required_nullable_model: Union[Unset, None, AModelNotRequiredNullableModel] = UNSET
3838
not_required_one_of_models: Union[Unset, FreeFormModel, ModelWithUnionProperty] = UNSET
39-
not_required_nullable_one_of_models: Union[Unset, None, FreeFormModel, ModelWithUnionProperty] = UNSET
39+
not_required_nullable_one_of_models: Union[Unset, None, FreeFormModel, ModelWithUnionProperty, str] = UNSET
4040

4141
def to_dict(self) -> Dict[str, Any]:
4242
an_enum_value = self.an_enum_value.value
@@ -110,7 +110,7 @@ def to_dict(self) -> Dict[str, Any]:
110110
if not isinstance(self.not_required_one_of_models, Unset):
111111
not_required_one_of_models = self.not_required_one_of_models.to_dict()
112112

113-
not_required_nullable_one_of_models: Union[Unset, None, Dict[str, Any]]
113+
not_required_nullable_one_of_models: Union[Unset, None, Dict[str, Any], str]
114114
if isinstance(self.not_required_nullable_one_of_models, Unset):
115115
not_required_nullable_one_of_models = UNSET
116116
elif self.not_required_nullable_one_of_models is None:
@@ -120,11 +120,14 @@ def to_dict(self) -> Dict[str, Any]:
120120
if not isinstance(self.not_required_nullable_one_of_models, Unset):
121121
not_required_nullable_one_of_models = self.not_required_nullable_one_of_models.to_dict()
122122

123-
else:
123+
elif isinstance(self.not_required_nullable_one_of_models, ModelWithUnionProperty):
124124
not_required_nullable_one_of_models = UNSET
125125
if not isinstance(self.not_required_nullable_one_of_models, Unset):
126126
not_required_nullable_one_of_models = self.not_required_nullable_one_of_models.to_dict()
127127

128+
else:
129+
not_required_nullable_one_of_models = self.not_required_nullable_one_of_models
130+
128131
field_dict: Dict[str, Any] = {}
129132
field_dict.update(
130133
{
@@ -167,11 +170,15 @@ def from_dict(src_dict: Dict[str, Any]) -> "AModel":
167170
def _parse_a_camel_date_time(data: Union[str]) -> Union[datetime.datetime, datetime.date]:
168171
a_camel_date_time: Union[datetime.datetime, datetime.date]
169172
try:
173+
if not isinstance(data, str):
174+
raise TypeError()
170175
a_camel_date_time = isoparse(data)
171176

172177
return a_camel_date_time
173178
except: # noqa: E722
174179
pass
180+
if not isinstance(data, str):
181+
raise TypeError()
175182
a_camel_date_time = isoparse(data).date()
176183

177184
return a_camel_date_time
@@ -182,22 +189,20 @@ def _parse_a_camel_date_time(data: Union[str]) -> Union[datetime.datetime, datet
182189

183190
required_not_nullable = d.pop("required_not_nullable")
184191

185-
if not isinstance(d.pop("model"), dict):
186-
raise ValueError("Cannot construct model from value " + str(d.pop("model")))
187192
model = AModelModel.from_dict(d.pop("model"))
188193

189194
def _parse_one_of_models(data: Union[Dict[str, Any]]) -> Union[FreeFormModel, ModelWithUnionProperty]:
190195
one_of_models: Union[FreeFormModel, ModelWithUnionProperty]
191196
try:
192197
if not isinstance(data, dict):
193-
raise ValueError("Cannot construct model from value " + str(data))
198+
raise TypeError()
194199
one_of_models = FreeFormModel.from_dict(data)
195200

196201
return one_of_models
197202
except: # noqa: E722
198203
pass
199204
if not isinstance(data, dict):
200-
raise ValueError("Cannot construct model from value " + str(data))
205+
raise TypeError()
201206
one_of_models = ModelWithUnionProperty.from_dict(data)
202207

203208
return one_of_models
@@ -231,24 +236,16 @@ def _parse_one_of_models(data: Union[Dict[str, Any]]) -> Union[FreeFormModel, Mo
231236

232237
nullable_model = None
233238
if d.pop("nullable_model") is not None and not isinstance(d.pop("nullable_model"), Unset):
234-
if not isinstance(d.pop("nullable_model"), dict):
235-
raise ValueError("Cannot construct model from value " + str(d.pop("nullable_model")))
236239
nullable_model = AModelNullableModel.from_dict(d.pop("nullable_model"))
237240

238241
not_required_model: Union[Unset, AModelNotRequiredModel] = UNSET
239242
if d.pop("not_required_model", UNSET) is not None and not isinstance(d.pop("not_required_model", UNSET), Unset):
240-
if not isinstance(d.pop("not_required_model", UNSET), dict):
241-
raise ValueError("Cannot construct model from value " + str(d.pop("not_required_model", UNSET)))
242243
not_required_model = AModelNotRequiredModel.from_dict(d.pop("not_required_model", UNSET))
243244

244245
not_required_nullable_model = None
245246
if d.pop("not_required_nullable_model", UNSET) is not None and not isinstance(
246247
d.pop("not_required_nullable_model", UNSET), Unset
247248
):
248-
if not isinstance(d.pop("not_required_nullable_model", UNSET), dict):
249-
raise ValueError(
250-
"Cannot construct model from value " + str(d.pop("not_required_nullable_model", UNSET))
251-
)
252249
not_required_nullable_model = AModelNotRequiredNullableModel.from_dict(
253250
d.pop("not_required_nullable_model", UNSET)
254251
)
@@ -261,14 +258,14 @@ def _parse_nullable_one_of_models(
261258
return data
262259
try:
263260
if not isinstance(data, dict):
264-
raise ValueError("Cannot construct model from value " + str(data))
261+
raise TypeError()
265262
nullable_one_of_models = FreeFormModel.from_dict(data)
266263

267264
return nullable_one_of_models
268265
except: # noqa: E722
269266
pass
270267
if not isinstance(data, dict):
271-
raise ValueError("Cannot construct model from value " + str(data))
268+
raise TypeError()
272269
nullable_one_of_models = ModelWithUnionProperty.from_dict(data)
273270

274271
return nullable_one_of_models
@@ -282,50 +279,54 @@ def _parse_not_required_one_of_models(
282279
if isinstance(data, Unset):
283280
return data
284281
try:
282+
if not isinstance(data, dict):
283+
raise TypeError()
285284
not_required_one_of_models = UNSET
286285
if data is not None and not isinstance(data, Unset):
287-
if not isinstance(data, dict):
288-
raise ValueError("Cannot construct model from value " + str(data))
289286
not_required_one_of_models = FreeFormModel.from_dict(data)
290287

291288
return not_required_one_of_models
292289
except: # noqa: E722
293290
pass
291+
if not isinstance(data, dict):
292+
raise TypeError()
294293
not_required_one_of_models = UNSET
295294
if data is not None and not isinstance(data, Unset):
296-
if not isinstance(data, dict):
297-
raise ValueError("Cannot construct model from value " + str(data))
298295
not_required_one_of_models = ModelWithUnionProperty.from_dict(data)
299296

300297
return not_required_one_of_models
301298

302299
not_required_one_of_models = _parse_not_required_one_of_models(d.pop("not_required_one_of_models", UNSET))
303300

304301
def _parse_not_required_nullable_one_of_models(
305-
data: Union[Unset, None, Dict[str, Any]]
306-
) -> Union[Unset, None, FreeFormModel, ModelWithUnionProperty]:
307-
not_required_nullable_one_of_models: Union[Unset, None, FreeFormModel, ModelWithUnionProperty]
302+
data: Union[Unset, None, Dict[str, Any], str]
303+
) -> Union[Unset, None, FreeFormModel, ModelWithUnionProperty, str]:
304+
not_required_nullable_one_of_models: Union[Unset, None, FreeFormModel, ModelWithUnionProperty, str]
308305
if data is None:
309306
return data
310307
if isinstance(data, Unset):
311308
return data
312309
try:
310+
if not isinstance(data, dict):
311+
raise TypeError()
313312
not_required_nullable_one_of_models = UNSET
314313
if data is not None and not isinstance(data, Unset):
315-
if not isinstance(data, dict):
316-
raise ValueError("Cannot construct model from value " + str(data))
317314
not_required_nullable_one_of_models = FreeFormModel.from_dict(data)
318315

319316
return not_required_nullable_one_of_models
320317
except: # noqa: E722
321318
pass
322-
not_required_nullable_one_of_models = UNSET
323-
if data is not None and not isinstance(data, Unset):
319+
try:
324320
if not isinstance(data, dict):
325-
raise ValueError("Cannot construct model from value " + str(data))
326-
not_required_nullable_one_of_models = ModelWithUnionProperty.from_dict(data)
321+
raise TypeError()
322+
not_required_nullable_one_of_models = UNSET
323+
if data is not None and not isinstance(data, Unset):
324+
not_required_nullable_one_of_models = ModelWithUnionProperty.from_dict(data)
327325

328-
return not_required_nullable_one_of_models
326+
return not_required_nullable_one_of_models
327+
except: # noqa: E722
328+
pass
329+
return cast(Union[Unset, None, FreeFormModel, ModelWithUnionProperty, str], data)
329330

330331
not_required_nullable_one_of_models = _parse_not_required_nullable_one_of_models(
331332
d.pop("not_required_nullable_one_of_models", UNSET)

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ def _parse_a_property(data: Union[Unset, int]) -> Union[Unset, AnEnum, AnIntEnum
4545
if isinstance(data, Unset):
4646
return data
4747
try:
48+
if not isinstance(data, int):
49+
raise TypeError()
4850
a_property = UNSET
4951
_a_property = data
5052
if _a_property is not None and not isinstance(_a_property, Unset):
@@ -53,6 +55,8 @@ def _parse_a_property(data: Union[Unset, int]) -> Union[Unset, AnEnum, AnIntEnum
5355
return a_property
5456
except: # noqa: E722
5557
pass
58+
if not isinstance(data, int):
59+
raise TypeError()
5660
a_property = UNSET
5761
_a_property = data
5862
if _a_property is not None and not isinstance(_a_property, Unset):

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ def _parse_a_property(data: Union[Unset, int]) -> Union[Unset, AnEnum, AnIntEnum
4545
if isinstance(data, Unset):
4646
return data
4747
try:
48+
if not isinstance(data, int):
49+
raise TypeError()
4850
a_property = UNSET
4951
_a_property = data
5052
if _a_property is not None and not isinstance(_a_property, Unset):
@@ -53,6 +55,8 @@ def _parse_a_property(data: Union[Unset, int]) -> Union[Unset, AnEnum, AnIntEnum
5355
return a_property
5456
except: # noqa: E722
5557
pass
58+
if not isinstance(data, int):
59+
raise TypeError()
5660
a_property = UNSET
5761
_a_property = data
5862
if _a_property is not None and not isinstance(_a_property, Unset):

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ def _parse_a_property(data: Union[Unset, int]) -> Union[Unset, AnEnum, AnIntEnum
4545
if isinstance(data, Unset):
4646
return data
4747
try:
48+
if not isinstance(data, int):
49+
raise TypeError()
4850
a_property = UNSET
4951
_a_property = data
5052
if _a_property is not None and not isinstance(_a_property, Unset):
@@ -53,6 +55,8 @@ def _parse_a_property(data: Union[Unset, int]) -> Union[Unset, AnEnum, AnIntEnum
5355
return a_property
5456
except: # noqa: E722
5557
pass
58+
if not isinstance(data, int):
59+
raise TypeError()
5660
a_property = UNSET
5761
_a_property = data
5862
if _a_property is not None and not isinstance(_a_property, Unset):

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ def _parse_a_property(data: Union[Unset, int]) -> Union[Unset, AnEnum, AnIntEnum
4545
if isinstance(data, Unset):
4646
return data
4747
try:
48+
if not isinstance(data, int):
49+
raise TypeError()
4850
a_property = UNSET
4951
_a_property = data
5052
if _a_property is not None and not isinstance(_a_property, Unset):
@@ -53,6 +55,8 @@ def _parse_a_property(data: Union[Unset, int]) -> Union[Unset, AnEnum, AnIntEnum
5355
return a_property
5456
except: # noqa: E722
5557
pass
58+
if not isinstance(data, int):
59+
raise TypeError()
5660
a_property = UNSET
5761
_a_property = data
5862
if _a_property is not None and not isinstance(_a_property, Unset):

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ def from_dict(src_dict: Dict[str, Any]) -> "HTTPValidationError":
3434
detail = []
3535
_detail = d.pop("detail", UNSET)
3636
for detail_item_data in _detail or []:
37-
if not isinstance(detail_item_data, dict):
38-
raise ValueError("Cannot construct model from value " + str(detail_item_data))
3937
detail_item = ValidationError.from_dict(detail_item_data)
4038

4139
detail.append(detail_item)

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ def from_dict(src_dict: Dict[str, Any]) -> "ModelWithAdditionalPropertiesInlined
4141

4242
additional_properties = {}
4343
for prop_name, prop_dict in d.items():
44-
if not isinstance(prop_dict, dict):
45-
raise ValueError("Cannot construct model from value " + str(prop_dict))
4644
additional_property = ModelWithAdditionalPropertiesInlinedAdditionalProperty.from_dict(prop_dict)
4745

4846
additional_properties[prop_name] = additional_property

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,15 @@ def _parse_additional_property(
4646
]
4747
try:
4848
if not isinstance(data, dict):
49-
raise ValueError("Cannot construct model from value " + str(data))
49+
raise TypeError()
5050
additional_property = ModelWithAnyJsonPropertiesAdditionalProperty.from_dict(data)
5151

5252
return additional_property
5353
except: # noqa: E722
5454
pass
5555
try:
56+
if not isinstance(data, list):
57+
raise TypeError()
5658
additional_property = cast(List[str], data)
5759

5860
return additional_property

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ def from_dict(src_dict: Dict[str, Any]) -> "ModelWithPrimitiveAdditionalProperti
3333
d = src_dict.copy()
3434
a_date_holder: Union[Unset, ModelWithPrimitiveAdditionalPropertiesADateHolder] = UNSET
3535
if d.pop("a_date_holder", UNSET) is not None and not isinstance(d.pop("a_date_holder", UNSET), Unset):
36-
if not isinstance(d.pop("a_date_holder", UNSET), dict):
37-
raise ValueError("Cannot construct model from value " + str(d.pop("a_date_holder", UNSET)))
3836
a_date_holder = ModelWithPrimitiveAdditionalPropertiesADateHolder.from_dict(d.pop("a_date_holder", UNSET))
3937

4038
model_with_primitive_additional_properties = ModelWithPrimitiveAdditionalProperties(

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ def _parse_a_property(data: Union[Unset, int]) -> Union[Unset, AnEnum, AnIntEnum
4343
if isinstance(data, Unset):
4444
return data
4545
try:
46+
if not isinstance(data, int):
47+
raise TypeError()
4648
a_property = UNSET
4749
_a_property = data
4850
if _a_property is not None and not isinstance(_a_property, Unset):
@@ -51,6 +53,8 @@ def _parse_a_property(data: Union[Unset, int]) -> Union[Unset, AnEnum, AnIntEnum
5153
return a_property
5254
except: # noqa: E722
5355
pass
56+
if not isinstance(data, int):
57+
raise TypeError()
5458
a_property = UNSET
5559
_a_property = data
5660
if _a_property is not None and not isinstance(_a_property, Unset):

‎end_to_end_tests/golden-record/my_test_api_client/api/tests/defaults_tests_defaults_post.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,6 @@ def _parse_response(*, response: httpx.Response) -> Optional[Union[None, HTTPVal
146146

147147
return response_200
148148
if response.status_code == 422:
149-
if not isinstance(response.json(), dict):
150-
raise ValueError("Cannot construct model from value " + str(response.json()))
151149
response_422 = HTTPValidationError.from_dict(response.json())
152150

153151
return response_422

0 commit comments

Comments
 (0)