Always check

Author: forest-benchling

end_to_end_tests/golden-record-custom/custom_e2e/api/tests/defaults_tests_defaults_post.py

@@ -52,6 +52,7 @@ def httpx_request(
     union_prop_with_ref: Union[Unset, float, AnEnum] = 0.6,
     enum_prop: Union[Unset, AnEnum] = UNSET,
     model_prop: Union[ModelWithUnionProperty, Unset] = UNSET,
+    required_model_prop: ModelWithUnionProperty,
 ) -> Response[Union[None, HTTPValidationError]]:
 
     json_datetime_prop: Union[Unset, str] = UNSET
@@ -95,6 +96,8 @@ def httpx_request(
     if not isinstance(model_prop, Unset):
         json_model_prop = model_prop.to_dict()
 
+    json_required_model_prop = required_model_prop.to_dict()
+
     params: Dict[str, Any] = {
         "string_prop": string_prop,
         "datetime_prop": json_datetime_prop,
@@ -107,8 +110,9 @@ def httpx_request(
         "union_prop_with_ref": json_union_prop_with_ref,
         "enum_prop": json_enum_prop,
     }
-    if not isinstance(json_model_prop, Unset):
+    if not isinstance(json_model_prop, Unset) and json_model_prop is not None:
         params.update(json_model_prop)
+    params.update(json_required_model_prop)
     params = {k: v for k, v in params.items() if v is not UNSET and v is not None}
 
     response = client.request(

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

@@ -25,6 +25,7 @@ def _get_kwargs(
     union_prop_with_ref: Union[Unset, float, AnEnum] = 0.6,
     enum_prop: Union[Unset, AnEnum] = UNSET,
     model_prop: Union[ModelWithUnionProperty, Unset] = UNSET,
+    required_model_prop: ModelWithUnionProperty,
 ) -> Dict[str, Any]:
     url = "{}/tests/defaults".format(client.base_url)
 
@@ -71,6 +72,8 @@ def _get_kwargs(
     if not isinstance(model_prop, Unset):
         json_model_prop = model_prop.to_dict()
 
+    json_required_model_prop = required_model_prop.to_dict()
+
     params: Dict[str, Any] = {
         "string_prop": string_prop,
         "datetime_prop": json_datetime_prop,
@@ -83,8 +86,9 @@ def _get_kwargs(
         "union_prop_with_ref": json_union_prop_with_ref,
         "enum_prop": json_enum_prop,
     }
-    if not isinstance(json_model_prop, Unset):
+    if not isinstance(json_model_prop, Unset) and json_model_prop is not None:
         params.update(json_model_prop)
+    params.update(json_required_model_prop)
     params = {k: v for k, v in params.items() if v is not UNSET and v is not None}
 
     return {
@@ -131,6 +135,7 @@ def sync_detailed(
     union_prop_with_ref: Union[Unset, float, AnEnum] = 0.6,
     enum_prop: Union[Unset, AnEnum] = UNSET,
     model_prop: Union[ModelWithUnionProperty, Unset] = UNSET,
+    required_model_prop: ModelWithUnionProperty,
 ) -> Response[Union[None, HTTPValidationError]]:
     kwargs = _get_kwargs(
         client=client,
@@ -145,6 +150,7 @@ def sync_detailed(
         union_prop_with_ref=union_prop_with_ref,
         enum_prop=enum_prop,
         model_prop=model_prop,
+        required_model_prop=required_model_prop,
     )
 
     response = httpx.post(
@@ -168,6 +174,7 @@ def sync(
     union_prop_with_ref: Union[Unset, float, AnEnum] = 0.6,
     enum_prop: Union[Unset, AnEnum] = UNSET,
     model_prop: Union[ModelWithUnionProperty, Unset] = UNSET,
+    required_model_prop: ModelWithUnionProperty,
 ) -> Optional[Union[None, HTTPValidationError]]:
     """  """
 
@@ -184,6 +191,7 @@ def sync(
         union_prop_with_ref=union_prop_with_ref,
         enum_prop=enum_prop,
         model_prop=model_prop,
+        required_model_prop=required_model_prop,
     ).parsed
 
 
@@ -201,6 +209,7 @@ async def asyncio_detailed(
     union_prop_with_ref: Union[Unset, float, AnEnum] = 0.6,
     enum_prop: Union[Unset, AnEnum] = UNSET,
     model_prop: Union[ModelWithUnionProperty, Unset] = UNSET,
+    required_model_prop: ModelWithUnionProperty,
 ) -> Response[Union[None, HTTPValidationError]]:
     kwargs = _get_kwargs(
         client=client,
@@ -215,6 +224,7 @@ async def asyncio_detailed(
         union_prop_with_ref=union_prop_with_ref,
         enum_prop=enum_prop,
         model_prop=model_prop,
+        required_model_prop=required_model_prop,
     )
 
     async with httpx.AsyncClient() as _client:
@@ -237,6 +247,7 @@ async def asyncio(
     union_prop_with_ref: Union[Unset, float, AnEnum] = 0.6,
     enum_prop: Union[Unset, AnEnum] = UNSET,
     model_prop: Union[ModelWithUnionProperty, Unset] = UNSET,
+    required_model_prop: ModelWithUnionProperty,
 ) -> Optional[Union[None, HTTPValidationError]]:
     """  """
 
@@ -254,5 +265,6 @@ async def asyncio(
             union_prop_with_ref=union_prop_with_ref,
             enum_prop=enum_prop,
             model_prop=model_prop,
+            required_model_prop=required_model_prop,
         )
     ).parsed

end_to_end_tests/openapi.json

@@ -404,6 +404,14 @@
             },
             "name": "model_prop",
             "in": "query"
+          },
+          {
+            "required": true,
+            "schema": {
+              "$ref": "#/components/schemas/ModelWithUnionProperty"
+            },
+            "name": "required_model_prop",
+            "in": "query"
           }
         ],
         "responses": {

openapi_python_client/templates/endpoint_macros.py.jinja

@@ -37,7 +37,7 @@ params: Dict[str, Any] = {
             {% if property.required and not property.nullable %}
 params.update({{ property_name }})
             {% else %}
-if {% if not property.required %}not isinstance({{ property_name }}, Unset){% endif %}{% if not property.required and property.nullable %} and {% endif %}{% if property.nullable %}{{ property_name }} is not None{% endif %}:
+if not isinstance({{ property_name }}, Unset) and {{ property_name }} is not None:
     params.update({{ "json_" + property.python_name }})
             {% endif %}
         {% endif %}