From 8c24fe7efa1c976fc215cad5875f653cc32dc209 Mon Sep 17 00:00:00 2001 From: Malte Becker Date: Sat, 18 Dec 2021 13:54:24 +0100 Subject: [PATCH 1/6] Use httpx.requeset instead of httpx.get/post/... --- openapi_python_client/templates/endpoint_module.py.jinja | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openapi_python_client/templates/endpoint_module.py.jinja b/openapi_python_client/templates/endpoint_module.py.jinja index c8bb190ae..e7efecf6f 100644 --- a/openapi_python_client/templates/endpoint_module.py.jinja +++ b/openapi_python_client/templates/endpoint_module.py.jinja @@ -38,6 +38,7 @@ def _get_kwargs( {{ multipart_body(endpoint) | indent(4) }} return { + "method": "{{ endpoint.method }}", "url": url, "headers": headers, "cookies": cookies, @@ -91,7 +92,7 @@ def sync_detailed( {{ kwargs(endpoint) }} ) - response = httpx.{{ endpoint.method }}( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -117,7 +118,7 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.{{ endpoint.method }}( + response = await _client.request( **kwargs ) From 6a824b85c3ac59ac70d7db768c3dbc07bf6bbddd Mon Sep 17 00:00:00 2001 From: Malte Becker Date: Sat, 18 Dec 2021 13:59:32 +0100 Subject: [PATCH 2/6] change first test --- .../my_test_api_client/api/default/get_common_parameters.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/default/get_common_parameters.py b/end_to_end_tests/golden-record/my_test_api_client/api/default/get_common_parameters.py index f7df7582f..197770636 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/default/get_common_parameters.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/default/get_common_parameters.py @@ -22,6 +22,7 @@ def _get_kwargs( params = {k: v for k, v in params.items() if v is not UNSET and v is not None} return { + "method": "get", "url": url, "headers": headers, "cookies": cookies, @@ -49,7 +50,7 @@ def sync_detailed( common=common, ) - response = httpx.get( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -68,6 +69,6 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.get(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) From c608cbeb1dd66406f8358ae38c94cfc4adbb23fa Mon Sep 17 00:00:00 2001 From: Malte Becker Date: Sat, 18 Dec 2021 14:07:58 +0100 Subject: [PATCH 3/6] Set method in _get_kwargs --- .../my_test_api_client/api/default/post_common_parameters.py | 5 +++-- .../api/location/get_location_query_optionality.py | 1 + .../parameters/delete_common_parameters_overriding_param.py | 1 + .../api/parameters/get_common_parameters_overriding_param.py | 1 + .../api/parameters/get_same_name_multiple_locations_param.py | 1 + .../api/parameters/multiple_path_parameters.py | 1 + .../my_test_api_client/api/tag1/get_tag_with_number.py | 1 + .../api/tests/defaults_tests_defaults_post.py | 1 + .../api/tests/get_basic_list_of_booleans.py | 1 + .../my_test_api_client/api/tests/get_basic_list_of_floats.py | 1 + .../api/tests/get_basic_list_of_integers.py | 1 + .../api/tests/get_basic_list_of_strings.py | 1 + .../my_test_api_client/api/tests/get_user_list.py | 1 + .../api/tests/int_enum_tests_int_enum_post.py | 1 + .../api/tests/json_body_tests_json_body_post.py | 1 + .../api/tests/no_response_tests_no_response_get.py | 1 + .../api/tests/octet_stream_tests_octet_stream_get.py | 1 + .../my_test_api_client/api/tests/post_form_data.py | 1 + .../my_test_api_client/api/tests/test_inline_objects.py | 1 + .../tests/token_with_cookie_auth_token_with_cookie_get.py | 1 + .../unsupported_content_tests_unsupported_content_get.py | 1 + .../api/tests/upload_file_tests_upload_post.py | 1 + .../api/tests/upload_multiple_files_tests_upload_post.py | 1 + .../golden-record/my_test_api_client/api/true_/false_.py | 1 + 24 files changed, 26 insertions(+), 2 deletions(-) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/default/post_common_parameters.py b/end_to_end_tests/golden-record/my_test_api_client/api/default/post_common_parameters.py index 9f9981bc5..a38504654 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/default/post_common_parameters.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/default/post_common_parameters.py @@ -22,6 +22,7 @@ def _get_kwargs( params = {k: v for k, v in params.items() if v is not UNSET and v is not None} return { + "method": "post", "url": url, "headers": headers, "cookies": cookies, @@ -49,7 +50,7 @@ def sync_detailed( common=common, ) - response = httpx.post( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -68,6 +69,6 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.post(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/location/get_location_query_optionality.py b/end_to_end_tests/golden-record/my_test_api_client/api/location/get_location_query_optionality.py index 89ecdac23..396a82fd2 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/location/get_location_query_optionality.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/location/get_location_query_optionality.py @@ -43,6 +43,7 @@ def _get_kwargs( params = {k: v for k, v in params.items() if v is not UNSET and v is not None} return { + "method": "get", "url": url, "headers": headers, "cookies": cookies, diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/parameters/delete_common_parameters_overriding_param.py b/end_to_end_tests/golden-record/my_test_api_client/api/parameters/delete_common_parameters_overriding_param.py index a415417e5..0285761c6 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/parameters/delete_common_parameters_overriding_param.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/parameters/delete_common_parameters_overriding_param.py @@ -23,6 +23,7 @@ def _get_kwargs( params = {k: v for k, v in params.items() if v is not UNSET and v is not None} return { + "method": "delete", "url": url, "headers": headers, "cookies": cookies, diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_common_parameters_overriding_param.py b/end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_common_parameters_overriding_param.py index 78eb855da..5d5704ee0 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_common_parameters_overriding_param.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_common_parameters_overriding_param.py @@ -23,6 +23,7 @@ def _get_kwargs( params = {k: v for k, v in params.items() if v is not UNSET and v is not None} return { + "method": "get", "url": url, "headers": headers, "cookies": cookies, diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_same_name_multiple_locations_param.py b/end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_same_name_multiple_locations_param.py index 067032a7f..eb0c69f6a 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_same_name_multiple_locations_param.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_same_name_multiple_locations_param.py @@ -31,6 +31,7 @@ def _get_kwargs( params = {k: v for k, v in params.items() if v is not UNSET and v is not None} return { + "method": "get", "url": url, "headers": headers, "cookies": cookies, diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/parameters/multiple_path_parameters.py b/end_to_end_tests/golden-record/my_test_api_client/api/parameters/multiple_path_parameters.py index db68369c3..2160aa5fd 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/parameters/multiple_path_parameters.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/parameters/multiple_path_parameters.py @@ -22,6 +22,7 @@ def _get_kwargs( cookies: Dict[str, Any] = client.get_cookies() return { + "method": "get", "url": url, "headers": headers, "cookies": cookies, diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tag1/get_tag_with_number.py b/end_to_end_tests/golden-record/my_test_api_client/api/tag1/get_tag_with_number.py index 322429ec6..f51be9d5e 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tag1/get_tag_with_number.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tag1/get_tag_with_number.py @@ -16,6 +16,7 @@ def _get_kwargs( cookies: Dict[str, Any] = client.get_cookies() return { + "method": "get", "url": url, "headers": headers, "cookies": cookies, diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/defaults_tests_defaults_post.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/defaults_tests_defaults_post.py index 74d6fc26c..cb6f227ba 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/defaults_tests_defaults_post.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/defaults_tests_defaults_post.py @@ -75,6 +75,7 @@ def _get_kwargs( params = {k: v for k, v in params.items() if v is not UNSET and v is not None} return { + "method": "post", "url": url, "headers": headers, "cookies": cookies, diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_booleans.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_booleans.py index 243e145c6..42eedf8f6 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_booleans.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_booleans.py @@ -16,6 +16,7 @@ def _get_kwargs( cookies: Dict[str, Any] = client.get_cookies() return { + "method": "get", "url": url, "headers": headers, "cookies": cookies, diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_floats.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_floats.py index 99200c0b8..627cb7cfc 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_floats.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_floats.py @@ -16,6 +16,7 @@ def _get_kwargs( cookies: Dict[str, Any] = client.get_cookies() return { + "method": "get", "url": url, "headers": headers, "cookies": cookies, diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_integers.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_integers.py index cfb47195a..d9b02c6a1 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_integers.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_integers.py @@ -16,6 +16,7 @@ def _get_kwargs( cookies: Dict[str, Any] = client.get_cookies() return { + "method": "get", "url": url, "headers": headers, "cookies": cookies, diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_strings.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_strings.py index 9a2542862..0cf8462e9 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_strings.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_strings.py @@ -16,6 +16,7 @@ def _get_kwargs( cookies: Dict[str, Any] = client.get_cookies() return { + "method": "get", "url": url, "headers": headers, "cookies": cookies, diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_user_list.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_user_list.py index 24410bef0..6c4e3a64a 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_user_list.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_user_list.py @@ -54,6 +54,7 @@ def _get_kwargs( params = {k: v for k, v in params.items() if v is not UNSET and v is not None} return { + "method": "get", "url": url, "headers": headers, "cookies": cookies, diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/int_enum_tests_int_enum_post.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/int_enum_tests_int_enum_post.py index 3f0ce55ac..fed038af4 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/int_enum_tests_int_enum_post.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/int_enum_tests_int_enum_post.py @@ -26,6 +26,7 @@ def _get_kwargs( params = {k: v for k, v in params.items() if v is not UNSET and v is not None} return { + "method": "post", "url": url, "headers": headers, "cookies": cookies, diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/json_body_tests_json_body_post.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/json_body_tests_json_body_post.py index e74b82581..ea785dace 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/json_body_tests_json_body_post.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/json_body_tests_json_body_post.py @@ -21,6 +21,7 @@ def _get_kwargs( json_json_body = json_body.to_dict() return { + "method": "post", "url": url, "headers": headers, "cookies": cookies, diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/no_response_tests_no_response_get.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/no_response_tests_no_response_get.py index 598632a49..e6846d593 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/no_response_tests_no_response_get.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/no_response_tests_no_response_get.py @@ -16,6 +16,7 @@ def _get_kwargs( cookies: Dict[str, Any] = client.get_cookies() return { + "method": "get", "url": url, "headers": headers, "cookies": cookies, diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/octet_stream_tests_octet_stream_get.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/octet_stream_tests_octet_stream_get.py index 34405a2b0..8dda04cca 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/octet_stream_tests_octet_stream_get.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/octet_stream_tests_octet_stream_get.py @@ -17,6 +17,7 @@ def _get_kwargs( cookies: Dict[str, Any] = client.get_cookies() return { + "method": "get", "url": url, "headers": headers, "cookies": cookies, diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/post_form_data.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/post_form_data.py index ecd55c9e7..fdb9b7986 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/post_form_data.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/post_form_data.py @@ -18,6 +18,7 @@ def _get_kwargs( cookies: Dict[str, Any] = client.get_cookies() return { + "method": "post", "url": url, "headers": headers, "cookies": cookies, diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/test_inline_objects.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/test_inline_objects.py index 655150038..bde790728 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/test_inline_objects.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/test_inline_objects.py @@ -21,6 +21,7 @@ def _get_kwargs( json_json_body = json_body.to_dict() return { + "method": "post", "url": url, "headers": headers, "cookies": cookies, diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/token_with_cookie_auth_token_with_cookie_get.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/token_with_cookie_auth_token_with_cookie_get.py index 2b9191822..3279ee68c 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/token_with_cookie_auth_token_with_cookie_get.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/token_with_cookie_auth_token_with_cookie_get.py @@ -19,6 +19,7 @@ def _get_kwargs( cookies["MyToken"] = my_token return { + "method": "get", "url": url, "headers": headers, "cookies": cookies, diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/unsupported_content_tests_unsupported_content_get.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/unsupported_content_tests_unsupported_content_get.py index 84f1581d5..92da727b8 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/unsupported_content_tests_unsupported_content_get.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/unsupported_content_tests_unsupported_content_get.py @@ -16,6 +16,7 @@ def _get_kwargs( cookies: Dict[str, Any] = client.get_cookies() return { + "method": "get", "url": url, "headers": headers, "cookies": cookies, diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_file_tests_upload_post.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_file_tests_upload_post.py index 652d8c323..d65e40eaa 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_file_tests_upload_post.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_file_tests_upload_post.py @@ -25,6 +25,7 @@ def _get_kwargs( multipart_multipart_data = multipart_data.to_multipart() return { + "method": "post", "url": url, "headers": headers, "cookies": cookies, diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_multiple_files_tests_upload_post.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_multiple_files_tests_upload_post.py index 8c9209a31..a26b23643 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_multiple_files_tests_upload_post.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_multiple_files_tests_upload_post.py @@ -28,6 +28,7 @@ def _get_kwargs( multipart_multipart_data.append(multipart_data_item) return { + "method": "post", "url": url, "headers": headers, "cookies": cookies, diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/true_/false_.py b/end_to_end_tests/golden-record/my_test_api_client/api/true_/false_.py index 87f924558..a727842d9 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/true_/false_.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/true_/false_.py @@ -22,6 +22,7 @@ def _get_kwargs( params = {k: v for k, v in params.items() if v is not UNSET and v is not None} return { + "method": "get", "url": url, "headers": headers, "cookies": cookies, From 8f7ce9ae73b8119ccc992d6fdb000376f2664dcc Mon Sep 17 00:00:00 2001 From: Malte Becker Date: Sat, 18 Dec 2021 14:09:30 +0100 Subject: [PATCH 4/6] change to httpx.request --- .../api/location/get_location_query_optionality.py | 4 ++-- .../parameters/delete_common_parameters_overriding_param.py | 4 ++-- .../api/parameters/get_common_parameters_overriding_param.py | 4 ++-- .../api/parameters/get_same_name_multiple_locations_param.py | 4 ++-- .../api/parameters/multiple_path_parameters.py | 4 ++-- .../my_test_api_client/api/tag1/get_tag_with_number.py | 4 ++-- .../api/tests/defaults_tests_defaults_post.py | 4 ++-- .../api/tests/get_basic_list_of_booleans.py | 4 ++-- .../my_test_api_client/api/tests/get_basic_list_of_floats.py | 4 ++-- .../api/tests/get_basic_list_of_integers.py | 4 ++-- .../my_test_api_client/api/tests/get_basic_list_of_strings.py | 4 ++-- .../my_test_api_client/api/tests/get_user_list.py | 4 ++-- .../api/tests/int_enum_tests_int_enum_post.py | 4 ++-- .../api/tests/json_body_tests_json_body_post.py | 4 ++-- .../api/tests/no_response_tests_no_response_get.py | 4 ++-- .../api/tests/octet_stream_tests_octet_stream_get.py | 4 ++-- .../my_test_api_client/api/tests/post_form_data.py | 4 ++-- .../my_test_api_client/api/tests/test_inline_objects.py | 4 ++-- .../api/tests/token_with_cookie_auth_token_with_cookie_get.py | 4 ++-- .../unsupported_content_tests_unsupported_content_get.py | 4 ++-- .../api/tests/upload_file_tests_upload_post.py | 4 ++-- .../api/tests/upload_multiple_files_tests_upload_post.py | 4 ++-- .../golden-record/my_test_api_client/api/true_/false_.py | 4 ++-- 23 files changed, 46 insertions(+), 46 deletions(-) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/location/get_location_query_optionality.py b/end_to_end_tests/golden-record/my_test_api_client/api/location/get_location_query_optionality.py index 396a82fd2..b5404b8c0 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/location/get_location_query_optionality.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/location/get_location_query_optionality.py @@ -77,7 +77,7 @@ def sync_detailed( not_null_not_required=not_null_not_required, ) - response = httpx.get( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -102,6 +102,6 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.get(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/parameters/delete_common_parameters_overriding_param.py b/end_to_end_tests/golden-record/my_test_api_client/api/parameters/delete_common_parameters_overriding_param.py index 0285761c6..7b6f91821 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/parameters/delete_common_parameters_overriding_param.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/parameters/delete_common_parameters_overriding_param.py @@ -53,7 +53,7 @@ def sync_detailed( param_query=param_query, ) - response = httpx.delete( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -74,6 +74,6 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.delete(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_common_parameters_overriding_param.py b/end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_common_parameters_overriding_param.py index 5d5704ee0..b4416e9e7 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_common_parameters_overriding_param.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_common_parameters_overriding_param.py @@ -53,7 +53,7 @@ def sync_detailed( param_query=param_query, ) - response = httpx.get( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -74,6 +74,6 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.get(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_same_name_multiple_locations_param.py b/end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_same_name_multiple_locations_param.py index eb0c69f6a..73f26f758 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_same_name_multiple_locations_param.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_same_name_multiple_locations_param.py @@ -65,7 +65,7 @@ def sync_detailed( param_cookie=param_cookie, ) - response = httpx.get( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -90,6 +90,6 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.get(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/parameters/multiple_path_parameters.py b/end_to_end_tests/golden-record/my_test_api_client/api/parameters/multiple_path_parameters.py index 2160aa5fd..6fa779d3f 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/parameters/multiple_path_parameters.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/parameters/multiple_path_parameters.py @@ -55,7 +55,7 @@ def sync_detailed( client=client, ) - response = httpx.get( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -80,6 +80,6 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.get(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tag1/get_tag_with_number.py b/end_to_end_tests/golden-record/my_test_api_client/api/tag1/get_tag_with_number.py index f51be9d5e..f8e5e7395 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tag1/get_tag_with_number.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tag1/get_tag_with_number.py @@ -41,7 +41,7 @@ def sync_detailed( client=client, ) - response = httpx.get( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -58,6 +58,6 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.get(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/defaults_tests_defaults_post.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/defaults_tests_defaults_post.py index cb6f227ba..f7f45eb10 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/defaults_tests_defaults_post.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/defaults_tests_defaults_post.py @@ -135,7 +135,7 @@ def sync_detailed( required_model_prop=required_model_prop, ) - response = httpx.post( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -207,7 +207,7 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.post(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_booleans.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_booleans.py index 42eedf8f6..a29983888 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_booleans.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_booleans.py @@ -49,7 +49,7 @@ def sync_detailed( client=client, ) - response = httpx.get( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -77,7 +77,7 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.get(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_floats.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_floats.py index 627cb7cfc..5c6531f31 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_floats.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_floats.py @@ -49,7 +49,7 @@ def sync_detailed( client=client, ) - response = httpx.get( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -77,7 +77,7 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.get(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_integers.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_integers.py index d9b02c6a1..fdd110797 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_integers.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_integers.py @@ -49,7 +49,7 @@ def sync_detailed( client=client, ) - response = httpx.get( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -77,7 +77,7 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.get(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_strings.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_strings.py index 0cf8462e9..7991fc196 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_strings.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_strings.py @@ -49,7 +49,7 @@ def sync_detailed( client=client, ) - response = httpx.get( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -77,7 +77,7 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.get(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_user_list.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_user_list.py index 6c4e3a64a..bcb3a3827 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_user_list.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_user_list.py @@ -109,7 +109,7 @@ def sync_detailed( some_date=some_date, ) - response = httpx.get( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -153,7 +153,7 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.get(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/int_enum_tests_int_enum_post.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/int_enum_tests_int_enum_post.py index fed038af4..3630660d7 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/int_enum_tests_int_enum_post.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/int_enum_tests_int_enum_post.py @@ -66,7 +66,7 @@ def sync_detailed( int_enum=int_enum, ) - response = httpx.post( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -98,7 +98,7 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.post(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/json_body_tests_json_body_post.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/json_body_tests_json_body_post.py index ea785dace..8d2795b6e 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/json_body_tests_json_body_post.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/json_body_tests_json_body_post.py @@ -61,7 +61,7 @@ def sync_detailed( json_body=json_body, ) - response = httpx.post( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -93,7 +93,7 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.post(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/no_response_tests_no_response_get.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/no_response_tests_no_response_get.py index e6846d593..3e7da076e 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/no_response_tests_no_response_get.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/no_response_tests_no_response_get.py @@ -41,7 +41,7 @@ def sync_detailed( client=client, ) - response = httpx.get( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -58,6 +58,6 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.get(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/octet_stream_tests_octet_stream_get.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/octet_stream_tests_octet_stream_get.py index 8dda04cca..f6f747da3 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/octet_stream_tests_octet_stream_get.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/octet_stream_tests_octet_stream_get.py @@ -50,7 +50,7 @@ def sync_detailed( client=client, ) - response = httpx.get( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -78,7 +78,7 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.get(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/post_form_data.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/post_form_data.py index fdb9b7986..7267361af 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/post_form_data.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/post_form_data.py @@ -46,7 +46,7 @@ def sync_detailed( form_data=form_data, ) - response = httpx.post( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -65,6 +65,6 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.post(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/test_inline_objects.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/test_inline_objects.py index bde790728..a3f4ed9ae 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/test_inline_objects.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/test_inline_objects.py @@ -57,7 +57,7 @@ def sync_detailed( json_body=json_body, ) - response = httpx.post( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -89,7 +89,7 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.post(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/token_with_cookie_auth_token_with_cookie_get.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/token_with_cookie_auth_token_with_cookie_get.py index 3279ee68c..bffde8519 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/token_with_cookie_auth_token_with_cookie_get.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/token_with_cookie_auth_token_with_cookie_get.py @@ -46,7 +46,7 @@ def sync_detailed( my_token=my_token, ) - response = httpx.get( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -65,6 +65,6 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.get(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/unsupported_content_tests_unsupported_content_get.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/unsupported_content_tests_unsupported_content_get.py index 92da727b8..ed2b5635e 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/unsupported_content_tests_unsupported_content_get.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/unsupported_content_tests_unsupported_content_get.py @@ -41,7 +41,7 @@ def sync_detailed( client=client, ) - response = httpx.get( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -58,6 +58,6 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.get(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_file_tests_upload_post.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_file_tests_upload_post.py index d65e40eaa..d0a97b2ed 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_file_tests_upload_post.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_file_tests_upload_post.py @@ -67,7 +67,7 @@ def sync_detailed( keep_alive=keep_alive, ) - response = httpx.post( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -103,7 +103,7 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.post(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_multiple_files_tests_upload_post.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_multiple_files_tests_upload_post.py index a26b23643..79f88ebb2 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_multiple_files_tests_upload_post.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_multiple_files_tests_upload_post.py @@ -70,7 +70,7 @@ def sync_detailed( keep_alive=keep_alive, ) - response = httpx.post( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -106,7 +106,7 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.post(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/true_/false_.py b/end_to_end_tests/golden-record/my_test_api_client/api/true_/false_.py index a727842d9..9c517c89a 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/true_/false_.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/true_/false_.py @@ -50,7 +50,7 @@ def sync_detailed( import_=import_, ) - response = httpx.get( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -69,6 +69,6 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.get(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response) From 2d64ecb40757f49ab8b271307801831499518b86 Mon Sep 17 00:00:00 2001 From: Malte Becker Date: Sat, 18 Dec 2021 14:12:24 +0100 Subject: [PATCH 5/6] fix typo --- openapi_python_client/templates/endpoint_module.py.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openapi_python_client/templates/endpoint_module.py.jinja b/openapi_python_client/templates/endpoint_module.py.jinja index e7efecf6f..558089475 100644 --- a/openapi_python_client/templates/endpoint_module.py.jinja +++ b/openapi_python_client/templates/endpoint_module.py.jinja @@ -38,7 +38,7 @@ def _get_kwargs( {{ multipart_body(endpoint) | indent(4) }} return { - "method": "{{ endpoint.method }}", + "method": "{{ endpoint.method }}", "url": url, "headers": headers, "cookies": cookies, From 2177b174f3debb487f35d5895f72bc0cbc37970d Mon Sep 17 00:00:00 2001 From: Dylan Anthony Date: Fri, 7 Jan 2022 13:55:20 -0700 Subject: [PATCH 6/6] chore: Regen golden-record --- .../api/tests/post_tests_json_body_string.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/post_tests_json_body_string.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/post_tests_json_body_string.py index 4770fd7a6..86a5bb096 100644 --- a/end_to_end_tests/golden-record/my_test_api_client/api/tests/post_tests_json_body_string.py +++ b/end_to_end_tests/golden-record/my_test_api_client/api/tests/post_tests_json_body_string.py @@ -20,6 +20,7 @@ def _get_kwargs( json_json_body = json_body return { + "method": "post", "url": url, "headers": headers, "cookies": cookies, @@ -67,7 +68,7 @@ def sync_detailed( json_body=json_body, ) - response = httpx.post( + response = httpx.request( verify=client.verify_ssl, **kwargs, ) @@ -115,7 +116,7 @@ async def asyncio_detailed( ) async with httpx.AsyncClient(verify=client.verify_ssl) as _client: - response = await _client.post(**kwargs) + response = await _client.request(**kwargs) return _build_response(response=response)