chore(templates): unify 204 handling and body variable naming across aiohttp/httpx/requests

Author: Doug Borg

src/openapi_python_generator/language_converters/python/templates/aiohttp.jinja2

@@ -34,16 +34,16 @@ async def {{ operation_id }}(api_config_override : Optional[APIConfig] = None{%
             if initial_response.status != {{ return_type.status_code }}:
                 raise HTTPException(initial_response.status, f'{{ operation_id }} failed with status code: {initial_response.status}')
             # Only parse JSON when a body is expected (avoid errors on 204 No Content)
-            response = None if {{ return_type.status_code }} == 204 else await initial_response.json()
+            body = None if {{ return_type.status_code }} == 204 else await initial_response.json()
 
 {% if return_type.type is none or return_type.type.converted_type is none %}
-            return None
+        return None
 {% elif return_type.complex_type %}
     {%- if return_type.list_type is none %}
-            return {{ return_type.type.converted_type }}(**response) if response is not None else {{ return_type.type.converted_type }}()
+        return {{ return_type.type.converted_type }}(**body) if body is not None else {{ return_type.type.converted_type }}()
     {%- else %}
-            return [{{ return_type.list_type }}(**item) for item in response]
+        return [{{ return_type.list_type }}(**item) for item in body]
     {%- endif %}
 {% else %}
-            return response
+        return body
 {% endif %}

src/openapi_python_generator/language_converters/python/templates/httpx.jinja2

@@ -39,20 +39,18 @@ with httpx.Client(base_url=base_path, verify=api_config.verify) as client:
 
     if response.status_code != {{ return_type.status_code }}:
         raise HTTPException(response.status_code, f'{{ operation_id }} failed with status code: {response.status_code}')
-
-    {% if return_type.status_code == 204 %}
-    # 204 No Content: return early without attempting to parse body
-    return None
-    {% endif %}
+    else:
+        {# Conditional body parsing: avoid calling .json() for 204 #}
+        body = None if {{ return_type.status_code }} == 204 else response.json()
 
 {% if return_type.type is none or return_type.type.converted_type is none %}
     return None
 {% elif return_type.complex_type %}
     {%- if return_type.list_type is none %}
-    return {{ return_type.type.converted_type }}(**response.json()) if response.json() is not None else {{ return_type.type.converted_type }}()
+    return {{ return_type.type.converted_type }}(**body) if body is not None else {{ return_type.type.converted_type }}()
     {%- else %}
-    return [{{ return_type.list_type }}(**item) for item in response.json()]
+    return [{{ return_type.list_type }}(**item) for item in body]
     {%- endif %}
 {% else %}
-    return response.json()
+    return body
 {% endif %}

src/openapi_python_generator/language_converters/python/templates/requests.jinja2

@@ -33,20 +33,18 @@ def {{ operation_id }}(api_config_override : Optional[APIConfig] = None{% if par
     )
     if response.status_code != {{ return_type.status_code }}:
         raise HTTPException(response.status_code, f'{{ operation_id }} failed with status code: {response.status_code}')
-
-    {% if return_type.status_code == 204 %}
-    # 204 No Content: return early without attempting to parse body
-    return None
-    {% endif %}
+    else:
+        {# Conditional body parsing: avoid calling .json() for 204 #}
+        body = None if {{ return_type.status_code }} == 204 else response.json()
 
 {% if return_type.type is none or return_type.type.converted_type is none %}
     return None
 {% elif return_type.complex_type %}
     {%- if return_type.list_type is none %}
-    return {{ return_type.type.converted_type }}(**response.json()) if response.json() is not None else {{ return_type.type.converted_type }}()
+    return {{ return_type.type.converted_type }}(**body) if body is not None else {{ return_type.type.converted_type }}()
     {%- else %}
-    return [{{ return_type.list_type }}(**item) for item in response.json()]
+    return [{{ return_type.list_type }}(**item) for item in body]
     {%- endif %}
 {% else %}
-    return response.json()
+    return body
 {% endif %}