Skip to content

Commit 27421c4

Browse files
committed
Improve template code readability
1 parent e42e694 commit 27421c4

File tree

3 files changed

+20
-18
lines changed

3 files changed

+20
-18
lines changed

Diff for: src/openapi_python_generator/language_converters/python/templates/aiohttp.jinja2

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ async def {{ operation_id }}({{ params }}) -> {% if return_type.type is none or
2424
raise HTTPException(inital_response.status, f'{{ operationId }} failed with status code: {inital_response.status}')
2525
response = await inital_response.json()
2626

27-
{% if return_type.type is not none and return_type.type.converted_type is not none %}
28-
{% if return_type.complex_type %}
29-
{% if return_type.list_type is none %}
27+
{% if return_type.type is none or return_type.type.converted_type is none %}
28+
return None
29+
{% elif return_type.complex_type %}
30+
{%- if return_type.list_type is none %}
3031
return {{ return_type.type.converted_type }}(**response.json()) if response.json() is not None else {{ return_type.type.converted_type }}()
31-
{% else %}
32+
{%- else %}
3233
return [{{ return_type.list_type }}(**item) for item in response.json()]
33-
{% endif %}
34+
{%- endif %}
3435
{% else %}
3536
return response.json()
3637
{% endif %}
37-
{% endif %}

Diff for: src/openapi_python_generator/language_converters/python/templates/httpx.jinja2

+7-6
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,15 @@ with httpx.Client(base_url=base_path, verify=APIConfig.verify) as client:
3636

3737
if response.status_code != {{ return_type.status_code }}:
3838
raise HTTPException(response.status_code, f'{{ operationId }} failed with status code: {response.status_code}')
39-
{% if return_type.type is not none and return_type.type.converted_type is not none %}
40-
{% if return_type.complex_type %}
41-
{% if return_type.list_type is none %}
39+
40+
{% if return_type.type is none or return_type.type.converted_type is none %}
41+
return None
42+
{% elif return_type.complex_type %}
43+
{%- if return_type.list_type is none %}
4244
return {{ return_type.type.converted_type }}(**response.json()) if response.json() is not None else {{ return_type.type.converted_type }}()
43-
{% else %}
45+
{%- else %}
4446
return [{{ return_type.list_type }}(**item) for item in response.json()]
45-
{% endif %}
47+
{%- endif %}
4648
{% else %}
4749
return response.json()
4850
{% endif %}
49-
{% endif %}

Diff for: src/openapi_python_generator/language_converters/python/templates/requests.jinja2

+7-6
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,15 @@ def {{ operation_id }}({{ params }}) -> {% if return_type.type is none or return
3030
)
3131
if response.status_code != {{ return_type.status_code }}:
3232
raise HTTPException(response.status_code, f'{{ operationId }} failed with status code: {response.status_code}')
33-
{% if return_type.type is not none and return_type.type.converted_type is not none %}
34-
{% if return_type.complex_type %}
35-
{% if return_type.list_type is none %}
33+
34+
{% if return_type.type is none or return_type.type.converted_type is none %}
35+
return None
36+
{% elif return_type.complex_type %}
37+
{%- if return_type.list_type is none %}
3638
return {{ return_type.type.converted_type }}(**response.json()) if response.json() is not None else {{ return_type.type.converted_type }}()
37-
{% else %}
39+
{%- else %}
3840
return [{{ return_type.list_type }}(**item) for item in response.json()]
39-
{% endif %}
41+
{%- endif %}
4042
{% else %}
4143
return response.json()
4244
{% endif %}
43-
{% endif %}

0 commit comments

Comments
 (0)