fix: preserve omitted and null JSON request bodies

end_to_end_tests/golden-records/escapes-client/escapes_client/api/default/misc_metadata_escapes.py

@@ -21,6 +21,10 @@ def _get_kwargs(
     }
 
     _kwargs["json"] = body.to_dict()
+    if _kwargs["json"] is None:
+        # HTTPX treats json=None as no body; send JSON null explicitly.
+        _kwargs["content"] = b"null"
+        del _kwargs["json"]
 
     headers["Content-Type"] = "application/json"
 

end_to_end_tests/golden-records/escapes-client/escapes_client/api/default/non_string_example.py

@@ -21,6 +21,10 @@ def _get_kwargs(
     }
 
     _kwargs["json"] = body.to_dict()
+    if _kwargs["json"] is None:
+        # HTTPX treats json=None as no body; send JSON null explicitly.
+        _kwargs["content"] = b"null"
+        del _kwargs["json"]
 
     headers["Content-Type"] = "application/json"
 

end_to_end_tests/golden-records/escapes-client/escapes_client/api/default/property_escapes.py

@@ -21,6 +21,10 @@ def _get_kwargs(
     }
 
     _kwargs["json"] = body.to_dict()
+    if _kwargs["json"] is None:
+        # HTTPX treats json=None as no body; send JSON null explicitly.
+        _kwargs["content"] = b"null"
+        del _kwargs["json"]
 
     headers["Content-Type"] = "application/json"
 

end_to_end_tests/golden-records/escapes-client/escapes_client/api/printtag_escape/with_braces_path.py

@@ -33,6 +33,10 @@ def _get_kwargs(
     }
 
     _kwargs["json"] = body.to_dict()
+    if _kwargs["json"] is None:
+        # HTTPX treats json=None as no body; send JSON null explicitly.
+        _kwargs["content"] = b"null"
+        del _kwargs["json"]
 
     headers["Content-Type"] = 'application/json; profile="https://example.com/escape" + print("uh oh") + "'
 

end_to_end_tests/golden-records/my-test-api-client/my_test_api_client/api/bodies/json_like.py

@@ -20,8 +20,15 @@ def _get_kwargs(
         "url": "/bodies/json-like",
     }
 
+    _kwargs["json"] = UNSET
     if not isinstance(body, Unset):
         _kwargs["json"] = body.to_dict()
+    if isinstance(_kwargs["json"], Unset):
+        del _kwargs["json"]
+    elif _kwargs["json"] is None:
+        # HTTPX treats json=None as no body; send JSON null explicitly.
+        _kwargs["content"] = b"null"
+        del _kwargs["json"]
 
     headers["Content-Type"] = "application/vnd+json"
 

end_to_end_tests/golden-records/my-test-api-client/my_test_api_client/api/bodies/optional_body.py

@@ -20,8 +20,15 @@ def _get_kwargs(
         "url": "/bodies/optional",
     }
 
+    _kwargs["json"] = UNSET
     if not isinstance(body, Unset):
         _kwargs["json"] = body.to_dict()
+    if isinstance(_kwargs["json"], Unset):
+        del _kwargs["json"]
+    elif _kwargs["json"] is None:
+        # HTTPX treats json=None as no body; send JSON null explicitly.
+        _kwargs["content"] = b"null"
+        del _kwargs["json"]
 
     headers["Content-Type"] = "application/json"
 

end_to_end_tests/golden-records/my-test-api-client/my_test_api_client/api/bodies/post_bodies_multiple.py

@@ -23,8 +23,15 @@ def _get_kwargs(
     }
 
     if isinstance(body, PostBodiesMultipleJsonBody):
+        _kwargs["json"] = UNSET
         if not isinstance(body, Unset):
             _kwargs["json"] = body.to_dict()
+        if isinstance(_kwargs["json"], Unset):
+            del _kwargs["json"]
+        elif _kwargs["json"] is None:
+            # HTTPX treats json=None as no body; send JSON null explicitly.
+            _kwargs["content"] = b"null"
+            del _kwargs["json"]
 
         headers["Content-Type"] = "application/json"
     if isinstance(body, File):

end_to_end_tests/golden-records/my-test-api-client/my_test_api_client/api/bodies/refs.py

@@ -20,8 +20,15 @@ def _get_kwargs(
         "url": "/bodies/refs",
     }
 
+    _kwargs["json"] = UNSET
     if not isinstance(body, Unset):
         _kwargs["json"] = body.to_dict()
+    if isinstance(_kwargs["json"], Unset):
+        del _kwargs["json"]
+    elif _kwargs["json"] is None:
+        # HTTPX treats json=None as no body; send JSON null explicitly.
+        _kwargs["content"] = b"null"
+        del _kwargs["json"]
 
     headers["Content-Type"] = "application/json"
 

end_to_end_tests/golden-records/my-test-api-client/my_test_api_client/api/config/content_type_override.py

@@ -19,8 +19,13 @@ def _get_kwargs(
         "url": "/config/content-type-override",
     }
 
-    if not isinstance(body, Unset):
-        _kwargs["json"] = body
+    _kwargs["json"] = body
+    if isinstance(_kwargs["json"], Unset):
+        del _kwargs["json"]
+    elif _kwargs["json"] is None:
+        # HTTPX treats json=None as no body; send JSON null explicitly.
+        _kwargs["content"] = b"null"
+        del _kwargs["json"]
 
     headers["Content-Type"] = "openapi/python/client"
 

end_to_end_tests/golden-records/my-test-api-client/my_test_api_client/api/default/post_types_unions_duplicate_types.py

@@ -20,9 +20,18 @@ def _get_kwargs(
         "url": "/types/unions/duplicate-types",
     }
 
-    if isinstance(body, AModel):
+    if isinstance(body, Unset):
+        _kwargs["json"] = UNSET
+    else:
         _kwargs["json"] = body.to_dict()
 
+    if isinstance(_kwargs["json"], Unset):
+        del _kwargs["json"]
+    elif _kwargs["json"] is None:
+        # HTTPX treats json=None as no body; send JSON null explicitly.
+        _kwargs["content"] = b"null"
+        del _kwargs["json"]
+
     headers["Content-Type"] = "application/json"
 
     _kwargs["headers"] = headers

end_to_end_tests/golden-records/my-test-api-client/my_test_api_client/api/naming/post_naming_property_conflict_with_import.py

@@ -23,8 +23,15 @@ def _get_kwargs(
         "url": "/naming/property-conflict-with-import",
     }
 
+    _kwargs["json"] = UNSET
     if not isinstance(body, Unset):
         _kwargs["json"] = body.to_dict()
+    if isinstance(_kwargs["json"], Unset):
+        del _kwargs["json"]
+    elif _kwargs["json"] is None:
+        # HTTPX treats json=None as no body; send JSON null explicitly.
+        _kwargs["content"] = b"null"
+        del _kwargs["json"]
 
     headers["Content-Type"] = "application/json"
 

end_to_end_tests/golden-records/my-test-api-client/my_test_api_client/api/tests/callback_test.py

@@ -22,6 +22,10 @@ def _get_kwargs(
     }
 
     _kwargs["json"] = body.to_dict()
+    if _kwargs["json"] is None:
+        # HTTPX treats json=None as no body; send JSON null explicitly.
+        _kwargs["content"] = b"null"
+        del _kwargs["json"]
 
     headers["Content-Type"] = "application/json"
 

end_to_end_tests/golden-records/my-test-api-client/my_test_api_client/api/tests/json_body_tests_json_body_post.py

@@ -22,6 +22,10 @@ def _get_kwargs(
     }
 
     _kwargs["json"] = body.to_dict()
+    if _kwargs["json"] is None:
+        # HTTPX treats json=None as no body; send JSON null explicitly.
+        _kwargs["content"] = b"null"
+        del _kwargs["json"]
 
     headers["Content-Type"] = "application/json"
 

end_to_end_tests/golden-records/my-test-api-client/my_test_api_client/api/tests/post_tests_json_body_string.py

@@ -21,6 +21,10 @@ def _get_kwargs(
     }
 
     _kwargs["json"] = body
+    if _kwargs["json"] is None:
+        # HTTPX treats json=None as no body; send JSON null explicitly.
+        _kwargs["content"] = b"null"
+        del _kwargs["json"]
 
     headers["Content-Type"] = "application/json"
 

end_to_end_tests/golden-records/my-test-api-client/my_test_api_client/api/tests/test_inline_objects.py

@@ -22,6 +22,10 @@ def _get_kwargs(
     }
 
     _kwargs["json"] = body.to_dict()
+    if _kwargs["json"] is None:
+        # HTTPX treats json=None as no body; send JSON null explicitly.
+        _kwargs["content"] = b"null"
+        del _kwargs["json"]
 
     headers["Content-Type"] = "application/json"
 

end_to_end_tests/golden-records/test-3-1-features-client/test_3_1_features_client/api/const/post_const_path.py

@@ -36,6 +36,10 @@ def _get_kwargs(
     }
 
     _kwargs["json"] = body.to_dict()
+    if _kwargs["json"] is None:
+        # HTTPX treats json=None as no body; send JSON null explicitly.
+        _kwargs["content"] = b"null"
+        del _kwargs["json"]
 
     headers["Content-Type"] = "application/json"
 

end_to_end_tests/golden-records/test-3-1-features-client/test_3_1_features_client/api/prefix_items/post_prefix_items.py

@@ -21,6 +21,10 @@ def _get_kwargs(
     }
 
     _kwargs["json"] = body.to_dict()
+    if _kwargs["json"] is None:
+        # HTTPX treats json=None as no body; send JSON null explicitly.
+        _kwargs["content"] = b"null"
+        del _kwargs["json"]
 
     headers["Content-Type"] = "application/json"
 

openapi_python_client/templates/endpoint_macros.py.jinja

@@ -84,13 +84,18 @@ if not isinstance(body, Unset):
 {% set property = body.prop %}
 {% import "property_templates/" + property.template as prop_template %}
 {% if prop_template.transform %}
-{{ prop_template.transform(property, property.python_name, "_kwargs[\"json\"]", skip_unset=True, declare_type=False) }}
-{% elif property.required %}
-_kwargs["json"] = {{ property.python_name }}
+{{ prop_template.transform(property, property.python_name, "_kwargs[\"json\"]", declare_type=False) }}
 {% else %}
-if not isinstance({{property.python_name}}, Unset):
-    _kwargs["json"] = {{ property.python_name }}
+_kwargs["json"] = {{ property.python_name }}
+{% endif %}
+{% if not property.required %}
+if isinstance(_kwargs["json"], Unset):
+    del _kwargs["json"]
 {% endif %}
+{% if property.required %}if{% else %}elif{% endif %} _kwargs["json"] is None:
+    # HTTPX treats json=None as no body; send JSON null explicitly.
+    _kwargs["content"] = b"null"
+    del _kwargs["json"]
 {% endmacro %}
 
 {% macro multipart_body(body) %}