Handle optional correctly

Author: jakubno

end_to_end_tests/baseline_openapi_3.0.json

@@ -162,6 +162,19 @@
             "in": "query",
             "explode": false
           },
+          {
+            "required": false,
+            "schema": {
+              "title": "Optional non exploded array",
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "name": "optional_non_exploded_array",
+            "in": "query",
+            "explode": false
+          },
           {
             "required": true,
             "schema": {

end_to_end_tests/baseline_openapi_3.1.yaml

@@ -158,6 +158,20 @@ info:
           "in": "query",
           "explode": false
         },
+
+        {
+          "required": false,
+          "schema": {
+            "title": "Optional non exploded array",
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "name": "optional_non_exploded_array",
+          "in": "query",
+          "explode": false
+        },
         {
           "required": true,
           "schema": {

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

@@ -10,7 +10,7 @@
 from ...models.an_enum import AnEnum
 from ...models.an_enum_with_null import AnEnumWithNull
 from ...models.http_validation_error import HTTPValidationError
-from ...types import UNSET, Response
+from ...types import UNSET, Response, Unset
 
 
 def _get_kwargs(
@@ -19,6 +19,7 @@ def _get_kwargs(
     an_enum_value_with_null: list[Union[AnEnumWithNull, None]],
     an_enum_value_with_only_null: list[None],
     non_exploded_array: list[str],
+    optional_non_exploded_array: Union[Unset, list[str]] = UNSET,
     some_date: Union[datetime.date, datetime.datetime],
 ) -> dict[str, Any]:
     params: dict[str, Any] = {}
@@ -49,6 +50,13 @@ def _get_kwargs(
 
     params["non_exploded_array"] = ",".join(str(item) for item in json_non_exploded_array)
 
+    json_optional_non_exploded_array: Union[Unset, list[str]] = UNSET
+    if not isinstance(optional_non_exploded_array, Unset):
+        json_optional_non_exploded_array = optional_non_exploded_array
+
+    if not isinstance(json_optional_non_exploded_array, Unset):
+        params["optional_non_exploded_array"] = ",".join(str(item) for item in json_optional_non_exploded_array)
+
     json_some_date: str
     if isinstance(some_date, datetime.date):
         json_some_date = some_date.isoformat()
@@ -112,6 +120,7 @@ def sync_detailed(
     an_enum_value_with_null: list[Union[AnEnumWithNull, None]],
     an_enum_value_with_only_null: list[None],
     non_exploded_array: list[str],
+    optional_non_exploded_array: Union[Unset, list[str]] = UNSET,
     some_date: Union[datetime.date, datetime.datetime],
 ) -> Response[Union[HTTPValidationError, list["AModel"]]]:
     """Get List
@@ -123,6 +132,7 @@ def sync_detailed(
         an_enum_value_with_null (list[Union[AnEnumWithNull, None]]):
         an_enum_value_with_only_null (list[None]):
         non_exploded_array (list[str]):
+        optional_non_exploded_array (Union[Unset, list[str]]):
         some_date (Union[datetime.date, datetime.datetime]):
 
     Raises:
@@ -138,6 +148,7 @@ def sync_detailed(
         an_enum_value_with_null=an_enum_value_with_null,
         an_enum_value_with_only_null=an_enum_value_with_only_null,
         non_exploded_array=non_exploded_array,
+        optional_non_exploded_array=optional_non_exploded_array,
         some_date=some_date,
     )
 
@@ -155,6 +166,7 @@ def sync(
     an_enum_value_with_null: list[Union[AnEnumWithNull, None]],
     an_enum_value_with_only_null: list[None],
     non_exploded_array: list[str],
+    optional_non_exploded_array: Union[Unset, list[str]] = UNSET,
     some_date: Union[datetime.date, datetime.datetime],
 ) -> Optional[Union[HTTPValidationError, list["AModel"]]]:
     """Get List
@@ -166,6 +178,7 @@ def sync(
         an_enum_value_with_null (list[Union[AnEnumWithNull, None]]):
         an_enum_value_with_only_null (list[None]):
         non_exploded_array (list[str]):
+        optional_non_exploded_array (Union[Unset, list[str]]):
         some_date (Union[datetime.date, datetime.datetime]):
 
     Raises:
@@ -182,6 +195,7 @@ def sync(
         an_enum_value_with_null=an_enum_value_with_null,
         an_enum_value_with_only_null=an_enum_value_with_only_null,
         non_exploded_array=non_exploded_array,
+        optional_non_exploded_array=optional_non_exploded_array,
         some_date=some_date,
     ).parsed
 
@@ -193,6 +207,7 @@ async def asyncio_detailed(
     an_enum_value_with_null: list[Union[AnEnumWithNull, None]],
     an_enum_value_with_only_null: list[None],
     non_exploded_array: list[str],
+    optional_non_exploded_array: Union[Unset, list[str]] = UNSET,
     some_date: Union[datetime.date, datetime.datetime],
 ) -> Response[Union[HTTPValidationError, list["AModel"]]]:
     """Get List
@@ -204,6 +219,7 @@ async def asyncio_detailed(
         an_enum_value_with_null (list[Union[AnEnumWithNull, None]]):
         an_enum_value_with_only_null (list[None]):
         non_exploded_array (list[str]):
+        optional_non_exploded_array (Union[Unset, list[str]]):
         some_date (Union[datetime.date, datetime.datetime]):
 
     Raises:
@@ -219,6 +235,7 @@ async def asyncio_detailed(
         an_enum_value_with_null=an_enum_value_with_null,
         an_enum_value_with_only_null=an_enum_value_with_only_null,
         non_exploded_array=non_exploded_array,
+        optional_non_exploded_array=optional_non_exploded_array,
         some_date=some_date,
     )
 
@@ -234,6 +251,7 @@ async def asyncio(
     an_enum_value_with_null: list[Union[AnEnumWithNull, None]],
     an_enum_value_with_only_null: list[None],
     non_exploded_array: list[str],
+    optional_non_exploded_array: Union[Unset, list[str]] = UNSET,
     some_date: Union[datetime.date, datetime.datetime],
 ) -> Optional[Union[HTTPValidationError, list["AModel"]]]:
     """Get List
@@ -245,6 +263,7 @@ async def asyncio(
         an_enum_value_with_null (list[Union[AnEnumWithNull, None]]):
         an_enum_value_with_only_null (list[None]):
         non_exploded_array (list[str]):
+        optional_non_exploded_array (Union[Unset, list[str]]):
         some_date (Union[datetime.date, datetime.datetime]):
 
     Raises:
@@ -262,6 +281,7 @@ async def asyncio(
             an_enum_value_with_null=an_enum_value_with_null,
             an_enum_value_with_only_null=an_enum_value_with_only_null,
             non_exploded_array=non_exploded_array,
+            optional_non_exploded_array=optional_non_exploded_array,
             some_date=some_date,
         )
     ).parsed

openapi_python_client/templates/endpoint_macros.py.jinja

@@ -46,9 +46,14 @@ params: dict[str, Any] = {}
         {% set destination = "json_" + property.python_name %}
 {{ prop_template.transform(property, property.python_name, destination) }}
     {% endif %}
-    {%- if not property.json_is_dict %}
+    {%- if not property.json_is_dict  %}
         {% if property.explode == False %}
+            {% if property.required %}
 params["{{ property.name }}"] = ",".join(str(item) for item in {{ destination }})
+            {% else %}
+if not isinstance({{ destination }}, Unset):
+    params["{{ property.name }}"] = ",".join(str(item) for item in {{ destination }})
+            {% endif %}
         {% else %}
 params["{{ property.name }}"] = {{ destination }}
         {% endif %}