Skip to content

feat: Change optional Open API query parameters to allow None BNCH-20153 #27

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

Closed
wants to merge 7 commits into from
Closed

feat: Change optional Open API query parameters to allow None BNCH-20153 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
46974cc
Change endpoint macros
forest-benchling Jan 11, 2021
c4ec480
Change type string
forest-benchling Jan 12, 2021
435a189
Regenerate tests
forest-benchling Jan 12, 2021
447bfa4
Save WIP
forest-benchling Jan 12, 2021
d61d7ff
Fix type errors
forest-benchling Jan 12, 2021
669e7bb
Only use in query parameters
forest-benchling Jan 12, 2021
89978b0
Fix docstring
forest-benchling Jan 12, 2021
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
52 changes: 26 additions & 26 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 @@ -40,42 +40,42 @@ def _build_response(*, response: httpx.Response) -> Response[Union[None, HTTPVal
def httpx_request(
*,
client: Client,
string_prop: Union[Unset, str] = "the default string",
datetime_prop: Union[Unset, datetime.datetime] = isoparse("1010-10-10T00:00:00"),
date_prop: Union[Unset, datetime.date] = isoparse("1010-10-10").date(),
float_prop: Union[Unset, float] = 3.14,
int_prop: Union[Unset, int] = 7,
boolean_prop: Union[Unset, bool] = False,
list_prop: Union[Unset, List[AnEnum]] = UNSET,
union_prop: Union[Unset, float, str] = "not a float",
union_prop_with_ref: Union[Unset, float, AnEnum] = 0.6,
enum_prop: Union[Unset, AnEnum] = UNSET,
string_prop: Union[Unset, None, str] = "the default string",
datetime_prop: Union[Unset, None, datetime.datetime] = isoparse("1010-10-10T00:00:00"),
date_prop: Union[Unset, None, datetime.date] = isoparse("1010-10-10").date(),
float_prop: Union[Unset, None, float] = 3.14,
int_prop: Union[Unset, None, int] = 7,
boolean_prop: Union[Unset, None, bool] = False,
list_prop: Union[Unset, None, List[AnEnum]] = None,
union_prop: Union[Unset, None, float, str] = "not a float",
union_prop_with_ref: Union[Unset, None, float, AnEnum] = 0.6,
enum_prop: Union[Unset, None, AnEnum] = None,
) -> Response[Union[None, HTTPValidationError]]:

json_datetime_prop: Union[Unset, str] = UNSET
if not isinstance(datetime_prop, Unset):
if not isinstance(datetime_prop, Unset) and datetime_prop is not None:
json_datetime_prop = datetime_prop.isoformat()

json_date_prop: Union[Unset, str] = UNSET
if not isinstance(date_prop, Unset):
if not isinstance(date_prop, Unset) and date_prop is not None:
json_date_prop = date_prop.isoformat()

json_list_prop: Union[Unset, List[Any]] = UNSET
if not isinstance(list_prop, Unset):
if not isinstance(list_prop, Unset) and list_prop is not None:
json_list_prop = []
for list_prop_item_data in list_prop:
list_prop_item = list_prop_item_data.value

json_list_prop.append(list_prop_item)

json_union_prop: Union[Unset, float, str]
if isinstance(union_prop, Unset):
if isinstance(union_prop, Unset) or union_prop is None:
json_union_prop = UNSET
else:
json_union_prop = union_prop

json_union_prop_with_ref: Union[Unset, float, AnEnum]
if isinstance(union_prop_with_ref, Unset):
if isinstance(union_prop_with_ref, Unset) or union_prop_with_ref is None:
json_union_prop_with_ref = UNSET
elif isinstance(union_prop_with_ref, AnEnum):
json_union_prop_with_ref = UNSET
Expand All @@ -86,29 +86,29 @@ def httpx_request(
json_union_prop_with_ref = union_prop_with_ref

json_enum_prop: Union[Unset, AnEnum] = UNSET
if not isinstance(enum_prop, Unset):
if not isinstance(enum_prop, Unset) and enum_prop is not None:
json_enum_prop = enum_prop

params: Dict[str, Any] = {}
if string_prop is not UNSET:
if string_prop is not UNSET and string_prop is not None:
params["string_prop"] = string_prop
if datetime_prop is not UNSET:
if datetime_prop is not UNSET and datetime_prop is not None:
params["datetime_prop"] = json_datetime_prop
if date_prop is not UNSET:
if date_prop is not UNSET and date_prop is not None:
params["date_prop"] = json_date_prop
if float_prop is not UNSET:
if float_prop is not UNSET and float_prop is not None:
params["float_prop"] = float_prop
if int_prop is not UNSET:
if int_prop is not UNSET and int_prop is not None:
params["int_prop"] = int_prop
if boolean_prop is not UNSET:
if boolean_prop is not UNSET and boolean_prop is not None:
params["boolean_prop"] = boolean_prop
if list_prop is not UNSET:
if list_prop is not UNSET and list_prop is not None:
params["list_prop"] = json_list_prop
if union_prop is not UNSET:
if union_prop is not UNSET and union_prop is not None:
params["union_prop"] = json_union_prop
if union_prop_with_ref is not UNSET:
if union_prop_with_ref is not UNSET and union_prop_with_ref is not None:
params["union_prop_with_ref"] = json_union_prop_with_ref
if enum_prop is not UNSET:
if enum_prop is not UNSET and enum_prop is not None:
params["enum_prop"] = json_enum_prop

response = client.request(
Expand Down
6 changes: 3 additions & 3 deletions ...ts/golden-record-custom/custom_e2e/api/tests/optional_value_tests_optional_query_param.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ def _build_response(*, response: httpx.Response) -> Response[Union[None, HTTPVal
def httpx_request(
*,
client: Client,
query_param: Union[Unset, List[str]] = UNSET,
query_param: Union[Unset, None, List[str]] = None,
) -> Response[Union[None, HTTPValidationError]]:

json_query_param: Union[Unset, List[Any]] = UNSET
if not isinstance(query_param, Unset):
if not isinstance(query_param, Unset) and query_param is not None:
json_query_param = query_param

params: Dict[str, Any] = {}
if query_param is not UNSET:
if query_param is not UNSET and query_param is not None:
params["query_param"] = json_query_param

response = client.request(
Expand Down
4 changes: 2 additions & 2 deletions ...ests/golden-record-custom/custom_e2e/models/model_with_primitive_additional_properties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
class ModelWithPrimitiveAdditionalProperties:
""" """

a_date_holder: Union[ModelWithPrimitiveAdditionalPropertiesADateHolder, Unset] = UNSET
a_date_holder: Union[Unset, ModelWithPrimitiveAdditionalPropertiesADateHolder] = UNSET
additional_properties: Dict[str, str] = attr.ib(init=False, factory=dict)

def to_dict(self) -> Dict[str, Any]:
Expand All @@ -31,7 +31,7 @@ def to_dict(self) -> Dict[str, Any]:
@staticmethod
def from_dict(src_dict: Dict[str, Any]) -> "ModelWithPrimitiveAdditionalProperties":
d = src_dict.copy()
a_date_holder: Union[ModelWithPrimitiveAdditionalPropertiesADateHolder, Unset] = UNSET
a_date_holder: Union[Unset, ModelWithPrimitiveAdditionalPropertiesADateHolder] = UNSET
_a_date_holder = d.pop("a_date_holder", UNSET)
if _a_date_holder is not None and not isinstance(_a_date_holder, Unset):
a_date_holder = ModelWithPrimitiveAdditionalPropertiesADateHolder.from_dict(
Expand Down
132 changes: 66 additions & 66 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 @@ -13,45 +13,45 @@
def _get_kwargs(
*,
client: Client,
string_prop: Union[Unset, str] = "the default string",
datetime_prop: Union[Unset, datetime.datetime] = isoparse("1010-10-10T00:00:00"),
date_prop: Union[Unset, datetime.date] = isoparse("1010-10-10").date(),
float_prop: Union[Unset, float] = 3.14,
int_prop: Union[Unset, int] = 7,
boolean_prop: Union[Unset, bool] = False,
list_prop: Union[Unset, List[AnEnum]] = UNSET,
union_prop: Union[Unset, float, str] = "not a float",
union_prop_with_ref: Union[Unset, float, AnEnum] = 0.6,
enum_prop: Union[Unset, AnEnum] = UNSET,
string_prop: Union[Unset, None, str] = "the default string",
datetime_prop: Union[Unset, None, datetime.datetime] = isoparse("1010-10-10T00:00:00"),
date_prop: Union[Unset, None, datetime.date] = isoparse("1010-10-10").date(),
float_prop: Union[Unset, None, float] = 3.14,
int_prop: Union[Unset, None, int] = 7,
boolean_prop: Union[Unset, None, bool] = False,
list_prop: Union[Unset, None, List[AnEnum]] = None,
union_prop: Union[Unset, None, float, str] = "not a float",
union_prop_with_ref: Union[Unset, None, float, AnEnum] = 0.6,
enum_prop: Union[Unset, None, AnEnum] = None,
) -> Dict[str, Any]:
url = "{}/tests/defaults".format(client.base_url)

headers: Dict[str, Any] = client.get_headers()

json_datetime_prop: Union[Unset, str] = UNSET
if not isinstance(datetime_prop, Unset):
if not isinstance(datetime_prop, Unset) and datetime_prop is not None:
json_datetime_prop = datetime_prop.isoformat()

json_date_prop: Union[Unset, str] = UNSET
if not isinstance(date_prop, Unset):
if not isinstance(date_prop, Unset) and date_prop is not None:
json_date_prop = date_prop.isoformat()

json_list_prop: Union[Unset, List[Any]] = UNSET
if not isinstance(list_prop, Unset):
if not isinstance(list_prop, Unset) and list_prop is not None:
json_list_prop = []
for list_prop_item_data in list_prop:
list_prop_item = list_prop_item_data.value

json_list_prop.append(list_prop_item)

json_union_prop: Union[Unset, float, str]
if isinstance(union_prop, Unset):
if isinstance(union_prop, Unset) or union_prop is None:
json_union_prop = UNSET
else:
json_union_prop = union_prop

json_union_prop_with_ref: Union[Unset, float, AnEnum]
if isinstance(union_prop_with_ref, Unset):
if isinstance(union_prop_with_ref, Unset) or union_prop_with_ref is None:
json_union_prop_with_ref = UNSET
elif isinstance(union_prop_with_ref, AnEnum):
json_union_prop_with_ref = UNSET
Expand All @@ -62,29 +62,29 @@ def _get_kwargs(
json_union_prop_with_ref = union_prop_with_ref

json_enum_prop: Union[Unset, AnEnum] = UNSET
if not isinstance(enum_prop, Unset):
if not isinstance(enum_prop, Unset) and enum_prop is not None:
json_enum_prop = enum_prop

params: Dict[str, Any] = {}
if string_prop is not UNSET:
if string_prop is not UNSET and string_prop is not None:
params["string_prop"] = string_prop
if datetime_prop is not UNSET:
if datetime_prop is not UNSET and datetime_prop is not None:
params["datetime_prop"] = json_datetime_prop
if date_prop is not UNSET:
if date_prop is not UNSET and date_prop is not None:
params["date_prop"] = json_date_prop
if float_prop is not UNSET:
if float_prop is not UNSET and float_prop is not None:
params["float_prop"] = float_prop
if int_prop is not UNSET:
if int_prop is not UNSET and int_prop is not None:
params["int_prop"] = int_prop
if boolean_prop is not UNSET:
if boolean_prop is not UNSET and boolean_prop is not None:
params["boolean_prop"] = boolean_prop
if list_prop is not UNSET:
if list_prop is not UNSET and list_prop is not None:
params["list_prop"] = json_list_prop
if union_prop is not UNSET:
if union_prop is not UNSET and union_prop is not None:
params["union_prop"] = json_union_prop
if union_prop_with_ref is not UNSET:
if union_prop_with_ref is not UNSET and union_prop_with_ref is not None:
params["union_prop_with_ref"] = json_union_prop_with_ref
if enum_prop is not UNSET:
if enum_prop is not UNSET and enum_prop is not None:
params["enum_prop"] = json_enum_prop

return {
Expand Down Expand Up @@ -120,16 +120,16 @@ def _build_response(*, response: httpx.Response) -> Response[Union[None, HTTPVal
def sync_detailed(
*,
client: Client,
string_prop: Union[Unset, str] = "the default string",
datetime_prop: Union[Unset, datetime.datetime] = isoparse("1010-10-10T00:00:00"),
date_prop: Union[Unset, datetime.date] = isoparse("1010-10-10").date(),
float_prop: Union[Unset, float] = 3.14,
int_prop: Union[Unset, int] = 7,
boolean_prop: Union[Unset, bool] = False,
list_prop: Union[Unset, List[AnEnum]] = UNSET,
union_prop: Union[Unset, float, str] = "not a float",
union_prop_with_ref: Union[Unset, float, AnEnum] = 0.6,
enum_prop: Union[Unset, AnEnum] = UNSET,
string_prop: Union[Unset, None, str] = "the default string",
datetime_prop: Union[Unset, None, datetime.datetime] = isoparse("1010-10-10T00:00:00"),
date_prop: Union[Unset, None, datetime.date] = isoparse("1010-10-10").date(),
float_prop: Union[Unset, None, float] = 3.14,
int_prop: Union[Unset, None, int] = 7,
boolean_prop: Union[Unset, None, bool] = False,
list_prop: Union[Unset, None, List[AnEnum]] = None,
union_prop: Union[Unset, None, float, str] = "not a float",
union_prop_with_ref: Union[Unset, None, float, AnEnum] = 0.6,
enum_prop: Union[Unset, None, AnEnum] = None,
) -> Response[Union[None, HTTPValidationError]]:
kwargs = _get_kwargs(
client=client,
Expand All @@ -155,16 +155,16 @@ def sync_detailed(
def sync(
*,
client: Client,
string_prop: Union[Unset, str] = "the default string",
datetime_prop: Union[Unset, datetime.datetime] = isoparse("1010-10-10T00:00:00"),
date_prop: Union[Unset, datetime.date] = isoparse("1010-10-10").date(),
float_prop: Union[Unset, float] = 3.14,
int_prop: Union[Unset, int] = 7,
boolean_prop: Union[Unset, bool] = False,
list_prop: Union[Unset, List[AnEnum]] = UNSET,
union_prop: Union[Unset, float, str] = "not a float",
union_prop_with_ref: Union[Unset, float, AnEnum] = 0.6,
enum_prop: Union[Unset, AnEnum] = UNSET,
string_prop: Union[Unset, None, str] = "the default string",
datetime_prop: Union[Unset, None, datetime.datetime] = isoparse("1010-10-10T00:00:00"),
date_prop: Union[Unset, None, datetime.date] = isoparse("1010-10-10").date(),
float_prop: Union[Unset, None, float] = 3.14,
int_prop: Union[Unset, None, int] = 7,
boolean_prop: Union[Unset, None, bool] = False,
list_prop: Union[Unset, None, List[AnEnum]] = None,
union_prop: Union[Unset, None, float, str] = "not a float",
union_prop_with_ref: Union[Unset, None, float, AnEnum] = 0.6,
enum_prop: Union[Unset, None, AnEnum] = None,
) -> Optional[Union[None, HTTPValidationError]]:
""" """

Expand All @@ -186,16 +186,16 @@ def sync(
async def asyncio_detailed(
*,
client: Client,
string_prop: Union[Unset, str] = "the default string",
datetime_prop: Union[Unset, datetime.datetime] = isoparse("1010-10-10T00:00:00"),
date_prop: Union[Unset, datetime.date] = isoparse("1010-10-10").date(),
float_prop: Union[Unset, float] = 3.14,
int_prop: Union[Unset, int] = 7,
boolean_prop: Union[Unset, bool] = False,
list_prop: Union[Unset, List[AnEnum]] = UNSET,
union_prop: Union[Unset, float, str] = "not a float",
union_prop_with_ref: Union[Unset, float, AnEnum] = 0.6,
enum_prop: Union[Unset, AnEnum] = UNSET,
string_prop: Union[Unset, None, str] = "the default string",
datetime_prop: Union[Unset, None, datetime.datetime] = isoparse("1010-10-10T00:00:00"),
date_prop: Union[Unset, None, datetime.date] = isoparse("1010-10-10").date(),
float_prop: Union[Unset, None, float] = 3.14,
int_prop: Union[Unset, None, int] = 7,
boolean_prop: Union[Unset, None, bool] = False,
list_prop: Union[Unset, None, List[AnEnum]] = None,
union_prop: Union[Unset, None, float, str] = "not a float",
union_prop_with_ref: Union[Unset, None, float, AnEnum] = 0.6,
enum_prop: Union[Unset, None, AnEnum] = None,
) -> Response[Union[None, HTTPValidationError]]:
kwargs = _get_kwargs(
client=client,
Expand All @@ -220,16 +220,16 @@ async def asyncio_detailed(
async def asyncio(
*,
client: Client,
string_prop: Union[Unset, str] = "the default string",
datetime_prop: Union[Unset, datetime.datetime] = isoparse("1010-10-10T00:00:00"),
date_prop: Union[Unset, datetime.date] = isoparse("1010-10-10").date(),
float_prop: Union[Unset, float] = 3.14,
int_prop: Union[Unset, int] = 7,
boolean_prop: Union[Unset, bool] = False,
list_prop: Union[Unset, List[AnEnum]] = UNSET,
union_prop: Union[Unset, float, str] = "not a float",
union_prop_with_ref: Union[Unset, float, AnEnum] = 0.6,
enum_prop: Union[Unset, AnEnum] = UNSET,
string_prop: Union[Unset, None, str] = "the default string",
datetime_prop: Union[Unset, None, datetime.datetime] = isoparse("1010-10-10T00:00:00"),
date_prop: Union[Unset, None, datetime.date] = isoparse("1010-10-10").date(),
float_prop: Union[Unset, None, float] = 3.14,
int_prop: Union[Unset, None, int] = 7,
boolean_prop: Union[Unset, None, bool] = False,
list_prop: Union[Unset, None, List[AnEnum]] = None,
union_prop: Union[Unset, None, float, str] = "not a float",
union_prop_with_ref: Union[Unset, None, float, AnEnum] = 0.6,
enum_prop: Union[Unset, None, AnEnum] = None,
) -> Optional[Union[None, HTTPValidationError]]:
""" """

Expand Down
Loading