Manually fix a bunch of tests after merging main and feature/unset into this branch.

Author: dbanty

end_to_end_tests/golden-record-custom/my_test_api_client/api/default/__init__.py

@@ -5,12 +5,14 @@
 Client = httpx.Client
 
 import datetime
-from typing import Dict, List, Optional, Union, cast
+from typing import Dict, List, Union, cast
 
 from dateutil.parser import isoparse
 
 from ...models.an_enum import AnEnum
+from ...models.dict_prop import DictProp
 from ...models.http_validation_error import HTTPValidationError
+from ...types import UNSET, Unset
 
 
 def _parse_response(*, response: httpx.Response) -> Optional[Union[None, HTTPValidationError]]:
@@ -33,61 +35,65 @@ def _build_response(*, response: httpx.Response) -> httpx.Response[Union[None, H
 def httpx_request(
     *,
     client: Client,
-    json_body: Dict[Any, Any],
-    string_prop: Optional[str] = "the default string",
-    datetime_prop: Optional[datetime.datetime] = isoparse("1010-10-10T00:00:00"),
-    date_prop: Optional[datetime.date] = isoparse("1010-10-10").date(),
-    float_prop: Optional[float] = 3.14,
-    int_prop: Optional[int] = 7,
-    boolean_prop: Optional[bool] = False,
-    list_prop: Optional[List[AnEnum]] = None,
-    union_prop: Optional[Union[Optional[float], Optional[str]]] = "not a float",
-    enum_prop: Optional[AnEnum] = None,
+    json_body: DictProp,
+    string_prop: Union[Unset, str] = "the default string",
+    datetime_prop: Union[Unset, datetime.datetime] = isoparse("1010-10-10T00:00:00"),
+    date_prop: Union[Unset, datetime.date] = isoparse("1010-10-10").date(),
+    float_prop: Union[Unset, float] = 3.14,
+    int_prop: Union[Unset, int] = 7,
+    boolean_prop: Union[Unset, bool] = UNSET,
+    list_prop: Union[Unset, List[AnEnum]] = UNSET,
+    union_prop: Union[Unset, Union[float, str]] = "not a float",
+    an_enum: AnEnum,
 ) -> httpx.Response[Union[None, HTTPValidationError]]:
 
-    json_datetime_prop = datetime_prop.isoformat() if datetime_prop else None
+    json_datetime_prop: Union[Unset, str] = UNSET
+    if not isinstance(datetime_prop, Unset):
+        json_datetime_prop = datetime_prop.isoformat()
 
-    json_date_prop = date_prop.isoformat() if date_prop else None
+    json_date_prop: Union[Unset, str] = UNSET
+    if not isinstance(date_prop, Unset):
+        json_date_prop = date_prop.isoformat()
 
-    if list_prop is None:
-        json_list_prop = None
-    else:
+    json_list_prop: Union[Unset, List[Any]] = UNSET
+    if not isinstance(list_prop, Unset):
         json_list_prop = []
-        for list_prop_item_data in list_prop:
-            list_prop_item = list_prop_item_data.value
+        for an_enum_data in list_prop:
+            an_enum = an_enum_data.value
 
-            json_list_prop.append(list_prop_item)
+            json_list_prop.append(an_enum)
 
-    if union_prop is None:
-        json_union_prop: Optional[Union[Optional[float], Optional[str]]] = None
+    json_union_prop: Union[Unset, Union[float, str]]
+    if isinstance(union_prop, Unset):
+        json_union_prop = UNSET
     elif isinstance(union_prop, float):
         json_union_prop = union_prop
     else:
         json_union_prop = union_prop
 
-    json_enum_prop = enum_prop.value if enum_prop else None
+    json_an_enum = an_enum.value
 
-    params: Dict[str, Any] = {}
-    if string_prop is not None:
+    params: Dict[str, Any] = {
+        "AnEnum": json_an_enum,
+    }
+    if string_prop is not UNSET:
         params["string_prop"] = string_prop
-    if datetime_prop is not None:
+    if datetime_prop is not UNSET:
         params["datetime_prop"] = json_datetime_prop
-    if date_prop is not None:
+    if date_prop is not UNSET:
         params["date_prop"] = json_date_prop
-    if float_prop is not None:
+    if float_prop is not UNSET:
         params["float_prop"] = float_prop
-    if int_prop is not None:
+    if int_prop is not UNSET:
         params["int_prop"] = int_prop
-    if boolean_prop is not None:
+    if boolean_prop is not UNSET:
         params["boolean_prop"] = boolean_prop
-    if list_prop is not None:
+    if list_prop is not UNSET:
         params["list_prop"] = json_list_prop
-    if union_prop is not None:
+    if union_prop is not UNSET:
         params["union_prop"] = json_union_prop
-    if enum_prop is not None:
-        params["enum_prop"] = json_enum_prop
 
-    json_json_body = json_body
+    json_json_body = json_body.to_dict()
 
     response = client.request(
         "post",

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

@@ -5,7 +5,7 @@
 Client = httpx.Client
 
 import datetime
-from typing import Dict, List, Union, cast
+from typing import List, Union, cast
 
 from ...models.a_model import AModel
 from ...models.an_enum import AnEnum
@@ -37,10 +37,10 @@ def httpx_request(
 ) -> httpx.Response[Union[List[AModel], HTTPValidationError]]:
 
     json_an_enum_value = []
-    for an_enum_value_item_data in an_enum_value:
-        an_enum_value_item = an_enum_value_item_data.value
+    for an_enum_data in an_enum_value:
+        an_enum = an_enum_data.value
 
-        json_an_enum_value.append(an_enum_value_item)
+        json_an_enum_value.append(an_enum)
 
     if isinstance(some_date, datetime.date):
         json_some_date = some_date.isoformat()

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

@@ -4,8 +4,6 @@
 
 Client = httpx.Client
 
-from typing import Dict, cast
-
 from ...models.an_int_enum import AnIntEnum
 from ...models.http_validation_error import HTTPValidationError
 
@@ -30,13 +28,13 @@ def _build_response(*, response: httpx.Response) -> httpx.Response[Union[None, H
 def httpx_request(
     *,
     client: Client,
-    int_enum: AnIntEnum,
+    an_int_enum: AnIntEnum,
 ) -> httpx.Response[Union[None, HTTPValidationError]]:
 
-    json_int_enum = int_enum.value
+    json_an_int_enum = an_int_enum.value
 
     params: Dict[str, Any] = {
-        "int_enum": json_int_enum,
+        "AnIntEnum": json_an_int_enum,
     }
 
     response = client.request(

end_to_end_tests/golden-record-custom/my_test_api_client/api/tests/int_enum_tests_int_enum_post.py

@@ -4,10 +4,10 @@
 
 Client = httpx.Client
 
-from typing import Dict, cast
+from typing import List, Union
 
-from ...models.a_model import AModel
 from ...models.http_validation_error import HTTPValidationError
+from ...types import UNSET, Unset
 
 
 def _parse_response(*, response: httpx.Response) -> Optional[Union[None, HTTPValidationError]]:
@@ -30,15 +30,21 @@ def _build_response(*, response: httpx.Response) -> httpx.Response[Union[None, H
 def httpx_request(
     *,
     client: Client,
-    json_body: AModel,
+    query_param: Union[Unset, List[str]] = UNSET,
 ) -> httpx.Response[Union[None, HTTPValidationError]]:
 
-    json_json_body = json_body.to_dict()
+    json_query_param: Union[Unset, List[Any]] = UNSET
+    if not isinstance(query_param, Unset):
+        json_query_param = query_param
+
+    params: Dict[str, Any] = {}
+    if query_param is not UNSET:
+        params["query_param"] = json_query_param
 
     response = client.request(
-        "post",
-        "/tests/json_body",
-        json=json_json_body,
+        "get",
+        "/tests/optional_query_param/",
+        params=params,
     )
 
     return _build_response(response=response)

end_to_end_tests/golden-record-custom/my_test_api_client/api/tests/json_body_tests_json_body_post.py renamed to end_to_end_tests/golden-record-custom/my_test_api_client/api/tests/optional_value_tests_optional_query_param.py

@@ -4,30 +4,33 @@
 
 Client = httpx.Client
 
+from ...models.json_body import JsonBody
+from ...types import UNSET, Unset
 
-def _parse_response(*, response: httpx.Response) -> Optional[bool]:
-    if response.status_code == 200:
-        return bool(response.text)
-    return None
 
-
-def _build_response(*, response: httpx.Response) -> httpx.Response[bool]:
+def _build_response(*, response: httpx.Response) -> httpx.Response[None]:
     return httpx.Response(
         status_code=response.status_code,
         content=response.content,
         headers=response.headers,
-        parsed=_parse_response(response=response),
+        parsed=None,
     )
 
 
 def httpx_request(
     *,
     client: Client,
-) -> httpx.Response[bool]:
+    json_body: Optional[JsonBody],
+) -> httpx.Response[None]:
+
+    json_json_body: Optional[JsonBody] = UNSET
+    if not isinstance(json_body, Unset):
+        json_json_body = json_body.to_dict()
 
     response = client.request(
-        "get",
-        "/ping",
+        "post",
+        "/tests/inline_objects",
+        json=json_json_body,
     )
 
     return _build_response(response=response)

end_to_end_tests/golden-record-custom/my_test_api_client/api/default/ping_ping_get.py renamed to end_to_end_tests/golden-record-custom/my_test_api_client/api/tests/test_inline_objects.py

@@ -4,10 +4,11 @@
 
 Client = httpx.Client
 
-from typing import Optional
+from typing import Union
 
 from ...models.body_upload_file_tests_upload_post import BodyUploadFileTestsUploadPost
 from ...models.http_validation_error import HTTPValidationError
+from ...types import UNSET, Unset
 
 
 def _parse_response(*, response: httpx.Response) -> Optional[Union[
@@ -37,12 +38,12 @@ def _build_response(*, response: httpx.Response) -> httpx.Response[Union[
 def httpx_request(*,
     client: Client,
     multipart_data: BodyUploadFileTestsUploadPost,
-    keep_alive: Optional[bool] = None,
+    keep_alive: Union[Unset, bool] = UNSET,
 ) -> httpx.Response[Union[
     None,
     HTTPValidationError
 ]]:
-    if keep_alive is not None:
+    if keep_alive is not UNSET:
         headers["keep-alive"] = keep_alive
 
 

end_to_end_tests/golden-record-custom/my_test_api_client/api/tests/upload_file_tests_upload_post.py

@@ -1,9 +1,9 @@
 """ Contains all the data models used in inputs/outputs """
 
-from .a_model import AModel
 from .an_enum import AnEnum
 from .an_int_enum import AnIntEnum
 from .body_upload_file_tests_upload_post import BodyUploadFileTestsUploadPost
+from .dict_prop import DictProp
 from .different_enum import DifferentEnum
-from .http_validation_error import HTTPValidationError
+from .json_body import JsonBody
 from .validation_error import ValidationError