Skip to content

Fix additionalProperty Union spacing and construction (#266) #273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Dec 21, 2020
Merged

Fix additionalProperty Union spacing and construction (#266) #273

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ca2a18b
Fix indentation of union-ed addtionalProperties
packyg Dec 15, 2020
ab6622d
Typing fixes
packyg Dec 15, 2020
45d1801
Add ModelWithAnyJsonProperties to e2e tests
packyg Dec 15, 2020
85fc685
Regen golden record
packyg Dec 15, 2020
bd59aa6
Add return type for get_instance_type_string
packyg Dec 15, 2020
c5f21b5
Union Property - use `data` from inner function when returning primit…
packyg Dec 16, 2020
0521e36
Update golden record
packyg Dec 16, 2020
9a679af
Update union properties handling of props with and without template
packyg Dec 19, 2020
bfab9d4
Update golden record
packyg Dec 19, 2020
a365384
Perf improvements to #268 (additionalProperties Union Fix):
dbanty Dec 20, 2020
d7e4b34
Merge branch 'main' into issue-266
dbanty Dec 20, 2020
8a1bef3
Run isort, fix unit test
dbanty Dec 20, 2020
397d655
Merge branch 'main' into issue-266
dbanty Dec 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update golden record
  • Loading branch information
@packyg
packyg committed Dec 19, 2020
commit bfab9d4312a4717324eb9fc5f6214c62ec2b904b
9 changes: 4 additions & 5 deletions end_to_end_tests/golden-record-custom/custom_e2e/api/tests/defaults_tests_defaults_post.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,21 +71,20 @@ def httpx_request(
json_union_prop: Union[Unset, float, str]
if isinstance(union_prop, Unset):
json_union_prop = UNSET
elif isinstance(union_prop, float):
json_union_prop = union_prop
else:
json_union_prop = union_prop

json_union_prop_with_ref: Union[Unset, float, AnEnum]
if isinstance(union_prop_with_ref, Unset):
json_union_prop_with_ref = UNSET
elif isinstance(union_prop_with_ref, float):
json_union_prop_with_ref = union_prop_with_ref
else:
elif isinstance(union_prop_with_ref, AnEnum):
json_union_prop_with_ref = UNSET
if not isinstance(union_prop_with_ref, Unset):
json_union_prop_with_ref = union_prop_with_ref

else:
json_union_prop_with_ref = union_prop_with_ref

json_enum_prop: Union[Unset, AnEnum] = UNSET
if not isinstance(enum_prop, Unset):
json_enum_prop = enum_prop
Expand Down
9 changes: 0 additions & 9 deletions end_to_end_tests/golden-record-custom/custom_e2e/models/model_with_any_json_properties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@ def to_dict(self) -> Dict[str, Any]:
elif isinstance(prop, list):
field_dict[prop_name] = prop

elif isinstance(prop, str):
field_dict[prop_name] = prop
elif isinstance(prop, float):
field_dict[prop_name] = prop
elif isinstance(prop, int):
field_dict[prop_name] = prop
else:
field_dict[prop_name] = prop

Expand Down Expand Up @@ -65,9 +59,6 @@ def _parse_additional_property(
except: # noqa: E722
pass
return cast(str, data)
return cast(float, data)
return cast(int, data)
return cast(bool, data)

additional_property = _parse_additional_property(prop_dict)

Expand Down
9 changes: 4 additions & 5 deletions end_to_end_tests/golden-record/my_test_api_client/api/tests/defaults_tests_defaults_post.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,21 +47,20 @@ def _get_kwargs(
json_union_prop: Union[Unset, float, str]
if isinstance(union_prop, Unset):
json_union_prop = UNSET
elif isinstance(union_prop, float):
json_union_prop = union_prop
else:
json_union_prop = union_prop

json_union_prop_with_ref: Union[Unset, float, AnEnum]
if isinstance(union_prop_with_ref, Unset):
json_union_prop_with_ref = UNSET
elif isinstance(union_prop_with_ref, float):
json_union_prop_with_ref = union_prop_with_ref
else:
elif isinstance(union_prop_with_ref, AnEnum):
json_union_prop_with_ref = UNSET
if not isinstance(union_prop_with_ref, Unset):
json_union_prop_with_ref = union_prop_with_ref

else:
json_union_prop_with_ref = union_prop_with_ref

json_enum_prop: Union[Unset, AnEnum] = UNSET
if not isinstance(enum_prop, Unset):
json_enum_prop = enum_prop
Expand Down
9 changes: 0 additions & 9 deletions end_to_end_tests/golden-record/my_test_api_client/models/model_with_any_json_properties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@ def to_dict(self) -> Dict[str, Any]:
elif isinstance(prop, list):
field_dict[prop_name] = prop

elif isinstance(prop, str):
field_dict[prop_name] = prop
elif isinstance(prop, float):
field_dict[prop_name] = prop
elif isinstance(prop, int):
field_dict[prop_name] = prop
else:
field_dict[prop_name] = prop

Expand Down Expand Up @@ -65,9 +59,6 @@ def _parse_additional_property(
except: # noqa: E722
pass
return cast(str, data)
return cast(float, data)
return cast(int, data)
return cast(bool, data)

additional_property = _parse_additional_property(prop_dict)

Expand Down