Skip to content

Commit a3bd7c8

Browse files
committed
fix: Remove boilerplate code for empty responses
1 parent 56b8773 commit a3bd7c8

17 files changed

+37
-51
lines changed

end_to_end_tests/golden-record/my_test_api_client/api/default/get_common_parameters.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional, Union, cast
2+
from typing import Any, Dict, Optional, Union
33

44
import httpx
55

@@ -35,8 +35,7 @@ def _get_kwargs(
3535

3636
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any]:
3737
if response.status_code == HTTPStatus.OK:
38-
response_200 = cast(Any, None)
39-
return response_200
38+
return None
4039
if client.raise_on_unexpected_status:
4140
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
4241
else:

end_to_end_tests/golden-record/my_test_api_client/api/default/post_common_parameters.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional, Union, cast
2+
from typing import Any, Dict, Optional, Union
33

44
import httpx
55

@@ -35,8 +35,7 @@ def _get_kwargs(
3535

3636
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any]:
3737
if response.status_code == HTTPStatus.OK:
38-
response_200 = cast(Any, None)
39-
return response_200
38+
return None
4039
if client.raise_on_unexpected_status:
4140
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
4241
else:

end_to_end_tests/golden-record/my_test_api_client/api/location/get_location_header_types.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional, Union, cast
2+
from typing import Any, Dict, Optional, Union
33

44
import httpx
55

@@ -54,8 +54,7 @@ def _get_kwargs(
5454

5555
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any]:
5656
if response.status_code == HTTPStatus.OK:
57-
response_200 = cast(Any, None)
58-
return response_200
57+
return None
5958
if client.raise_on_unexpected_status:
6059
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
6160
else:

end_to_end_tests/golden-record/my_test_api_client/api/location/get_location_query_optionality.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import datetime
22
from http import HTTPStatus
3-
from typing import Any, Dict, Optional, Union, cast
3+
from typing import Any, Dict, Optional, Union
44

55
import httpx
66

@@ -59,8 +59,7 @@ def _get_kwargs(
5959

6060
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any]:
6161
if response.status_code == HTTPStatus.OK:
62-
response_200 = cast(Any, None)
63-
return response_200
62+
return None
6463
if client.raise_on_unexpected_status:
6564
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
6665
else:

end_to_end_tests/golden-record/my_test_api_client/api/parameter_references/get_parameter_references_path_param.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional, cast
2+
from typing import Any, Dict, Optional
33

44
import httpx
55

@@ -45,8 +45,7 @@ def _get_kwargs(
4545

4646
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any]:
4747
if response.status_code == HTTPStatus.OK:
48-
response_200 = cast(Any, None)
49-
return response_200
48+
return None
5049
if client.raise_on_unexpected_status:
5150
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
5251
else:

end_to_end_tests/golden-record/my_test_api_client/api/parameters/delete_common_parameters_overriding_param.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional, Union, cast
2+
from typing import Any, Dict, Optional, Union
33

44
import httpx
55

@@ -36,8 +36,7 @@ def _get_kwargs(
3636

3737
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any]:
3838
if response.status_code == HTTPStatus.OK:
39-
response_200 = cast(Any, None)
40-
return response_200
39+
return None
4140
if client.raise_on_unexpected_status:
4241
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
4342
else:

end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_common_parameters_overriding_param.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional, cast
2+
from typing import Any, Dict, Optional
33

44
import httpx
55

@@ -36,8 +36,7 @@ def _get_kwargs(
3636

3737
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any]:
3838
if response.status_code == HTTPStatus.OK:
39-
response_200 = cast(Any, None)
40-
return response_200
39+
return None
4140
if client.raise_on_unexpected_status:
4241
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
4342
else:

end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_same_name_multiple_locations_param.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional, Union, cast
2+
from typing import Any, Dict, Optional, Union
33

44
import httpx
55

@@ -44,8 +44,7 @@ def _get_kwargs(
4444

4545
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any]:
4646
if response.status_code == HTTPStatus.OK:
47-
response_200 = cast(Any, None)
48-
return response_200
47+
return None
4948
if client.raise_on_unexpected_status:
5049
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
5150
else:

end_to_end_tests/golden-record/my_test_api_client/api/parameters/multiple_path_parameters.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional, cast
2+
from typing import Any, Dict, Optional
33

44
import httpx
55

@@ -34,8 +34,7 @@ def _get_kwargs(
3434

3535
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any]:
3636
if response.status_code == HTTPStatus.OK:
37-
response_200 = cast(Any, None)
38-
return response_200
37+
return None
3938
if client.raise_on_unexpected_status:
4039
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
4140
else:

end_to_end_tests/golden-record/my_test_api_client/api/tag1/get_tag_with_number.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional, cast
2+
from typing import Any, Dict, Optional
33

44
import httpx
55

@@ -28,8 +28,7 @@ def _get_kwargs(
2828

2929
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any]:
3030
if response.status_code == HTTPStatus.OK:
31-
response_200 = cast(Any, None)
32-
return response_200
31+
return None
3332
if client.raise_on_unexpected_status:
3433
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
3534
else:

end_to_end_tests/golden-record/my_test_api_client/api/tests/no_response_tests_no_response_get.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional, cast
2+
from typing import Any, Dict, Optional
33

44
import httpx
55

@@ -28,8 +28,7 @@ def _get_kwargs(
2828

2929
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any]:
3030
if response.status_code == HTTPStatus.OK:
31-
response_200 = cast(Any, response.json())
32-
return response_200
31+
return None
3332
if client.raise_on_unexpected_status:
3433
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
3534
else:

end_to_end_tests/golden-record/my_test_api_client/api/tests/post_form_data.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional, cast
2+
from typing import Any, Dict, Optional
33

44
import httpx
55

@@ -31,8 +31,7 @@ def _get_kwargs(
3131

3232
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any]:
3333
if response.status_code == HTTPStatus.OK:
34-
response_200 = cast(Any, response.json())
35-
return response_200
34+
return None
3635
if client.raise_on_unexpected_status:
3736
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
3837
else:

end_to_end_tests/golden-record/my_test_api_client/api/tests/post_form_data_inline.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional, cast
2+
from typing import Any, Dict, Optional
33

44
import httpx
55

@@ -31,8 +31,7 @@ def _get_kwargs(
3131

3232
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any]:
3333
if response.status_code == HTTPStatus.OK:
34-
response_200 = cast(Any, response.json())
35-
return response_200
34+
return None
3635
if client.raise_on_unexpected_status:
3736
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
3837
else:

end_to_end_tests/golden-record/my_test_api_client/api/tests/token_with_cookie_auth_token_with_cookie_get.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional, cast
2+
from typing import Any, Dict, Optional
33

44
import httpx
55

@@ -31,11 +31,9 @@ def _get_kwargs(
3131

3232
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any]:
3333
if response.status_code == HTTPStatus.OK:
34-
response_200 = cast(Any, response.json())
35-
return response_200
34+
return None
3635
if response.status_code == HTTPStatus.UNAUTHORIZED:
37-
response_401 = cast(Any, None)
38-
return response_401
36+
return None
3937
if client.raise_on_unexpected_status:
4038
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
4139
else:

end_to_end_tests/golden-record/my_test_api_client/api/tests/unsupported_content_tests_unsupported_content_get.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional, cast
2+
from typing import Any, Dict, Optional
33

44
import httpx
55

@@ -28,8 +28,7 @@ def _get_kwargs(
2828

2929
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any]:
3030
if response.status_code == HTTPStatus.OK:
31-
response_200 = cast(Any, response.json())
32-
return response_200
31+
return None
3332
if client.raise_on_unexpected_status:
3433
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
3534
else:

end_to_end_tests/golden-record/my_test_api_client/api/true_/false_.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional, cast
2+
from typing import Any, Dict, Optional
33

44
import httpx
55

@@ -35,8 +35,7 @@ def _get_kwargs(
3535

3636
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any]:
3737
if response.status_code == HTTPStatus.OK:
38-
response_200 = cast(Any, None)
39-
return response_200
38+
return None
4039
if client.raise_on_unexpected_status:
4140
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
4241
else:

openapi_python_client/templates/endpoint_module.py.jinja

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,16 @@ def _get_kwargs(
6262
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[{{ return_string }}]:
6363
{% for response in endpoint.responses %}
6464
if response.status_code == HTTPStatus.{{ response.status_code.name }}:
65-
{% import "property_templates/" + response.prop.template as prop_template %}
65+
{% if parsed_responses %}{% import "property_templates/" + response.prop.template as prop_template %}
6666
{% if prop_template.construct %}
6767
{{ prop_template.construct(response.prop, response.source) | indent(8) }}
6868
{% else %}
6969
{{ response.prop.python_name }} = cast({{ response.prop.get_type_string() }}, {{ response.source }})
7070
{% endif %}
7171
return {{ response.prop.python_name }}
72+
{% else %}
73+
return None
74+
{% endif %}
7275
{% endfor %}
7376
if client.raise_on_unexpected_status:
7477
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")

0 commit comments

Comments
 (0)