Removed to_dict params and cleaned up type strings

Author: emann

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

@@ -7,22 +7,22 @@
 from ...client import Client
 from ...models.an_enum import AnEnum
 from ...models.http_validation_error import HTTPValidationError
-from ...types import UNSET, Response
+from ...types import UNSET, Response, Unset
 
 
 def _get_kwargs(
     *,
     client: Client,
     json_body: Dict[Any, Any],
-    string_prop: str = "the default string",
-    datetime_prop: datetime.datetime = isoparse("1010-10-10T00:00:00"),
-    date_prop: datetime.date = isoparse("1010-10-10").date(),
-    float_prop: float = 3.14,
-    int_prop: int = 7,
-    boolean_prop: bool = cast(bool, UNSET),
-    list_prop: List[AnEnum] = cast(List[AnEnum], UNSET),
-    union_prop: Union[float, str] = "not a float",
-    enum_prop: AnEnum = cast(AnEnum, UNSET),
+    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[Union[Unset, float], Union[Unset, str]]] = "not a float",
+    enum_prop: Union[Unset, AnEnum] = UNSET,
 ) -> Dict[str, Any]:
     url = "{}/tests/defaults".format(client.base_url)
 
@@ -48,7 +48,7 @@ def _get_kwargs(
             json_list_prop.append(list_prop_item)
 
     if union_prop is UNSET:
-        json_union_prop: Union[float, str] = UNSET
+        json_union_prop: Union[Unset, Union[Union[Unset, float], Union[Unset, str]]] = UNSET
     elif isinstance(union_prop, float):
         json_union_prop = union_prop
     else:
@@ -112,15 +112,15 @@ def sync_detailed(
     *,
     client: Client,
     json_body: Dict[Any, Any],
-    string_prop: str = "the default string",
-    datetime_prop: datetime.datetime = isoparse("1010-10-10T00:00:00"),
-    date_prop: datetime.date = isoparse("1010-10-10").date(),
-    float_prop: float = 3.14,
-    int_prop: int = 7,
-    boolean_prop: bool = cast(bool, UNSET),
-    list_prop: List[AnEnum] = cast(List[AnEnum], UNSET),
-    union_prop: Union[float, str] = "not a float",
-    enum_prop: AnEnum = cast(AnEnum, UNSET),
+    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[Union[Unset, float], Union[Unset, str]]] = "not a float",
+    enum_prop: Union[Unset, AnEnum] = UNSET,
 ) -> Response[Union[None, HTTPValidationError]]:
     kwargs = _get_kwargs(
         client=client,
@@ -147,15 +147,15 @@ def sync(
     *,
     client: Client,
     json_body: Dict[Any, Any],
-    string_prop: str = "the default string",
-    datetime_prop: datetime.datetime = isoparse("1010-10-10T00:00:00"),
-    date_prop: datetime.date = isoparse("1010-10-10").date(),
-    float_prop: float = 3.14,
-    int_prop: int = 7,
-    boolean_prop: bool = cast(bool, UNSET),
-    list_prop: List[AnEnum] = cast(List[AnEnum], UNSET),
-    union_prop: Union[float, str] = "not a float",
-    enum_prop: AnEnum = cast(AnEnum, UNSET),
+    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[Union[Unset, float], Union[Unset, str]]] = "not a float",
+    enum_prop: Union[Unset, AnEnum] = UNSET,
 ) -> Optional[Union[None, HTTPValidationError]]:
     """  """
 
@@ -178,15 +178,15 @@ async def asyncio_detailed(
     *,
     client: Client,
     json_body: Dict[Any, Any],
-    string_prop: str = "the default string",
-    datetime_prop: datetime.datetime = isoparse("1010-10-10T00:00:00"),
-    date_prop: datetime.date = isoparse("1010-10-10").date(),
-    float_prop: float = 3.14,
-    int_prop: int = 7,
-    boolean_prop: bool = cast(bool, UNSET),
-    list_prop: List[AnEnum] = cast(List[AnEnum], UNSET),
-    union_prop: Union[float, str] = "not a float",
-    enum_prop: AnEnum = cast(AnEnum, UNSET),
+    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[Union[Unset, float], Union[Unset, str]]] = "not a float",
+    enum_prop: Union[Unset, AnEnum] = UNSET,
 ) -> Response[Union[None, HTTPValidationError]]:
     kwargs = _get_kwargs(
         client=client,
@@ -212,15 +212,15 @@ async def asyncio(
     *,
     client: Client,
     json_body: Dict[Any, Any],
-    string_prop: str = "the default string",
-    datetime_prop: datetime.datetime = isoparse("1010-10-10T00:00:00"),
-    date_prop: datetime.date = isoparse("1010-10-10").date(),
-    float_prop: float = 3.14,
-    int_prop: int = 7,
-    boolean_prop: bool = cast(bool, UNSET),
-    list_prop: List[AnEnum] = cast(List[AnEnum], UNSET),
-    union_prop: Union[float, str] = "not a float",
-    enum_prop: AnEnum = cast(AnEnum, UNSET),
+    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[Union[Unset, float], Union[Unset, str]]] = "not a float",
+    enum_prop: Union[Unset, AnEnum] = UNSET,
 ) -> Optional[Union[None, HTTPValidationError]]:
     """  """
 

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

@@ -17,7 +17,7 @@ def _get_kwargs(
 
     headers: Dict[str, Any] = client.get_headers()
 
-    json_json_body = json_body.to_dict(exclude_unset=True)
+    json_json_body = json_body.to_dict()
 
     return {
         "url": url,

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

@@ -4,13 +4,13 @@
 
 from ...client import Client
 from ...models.http_validation_error import HTTPValidationError
-from ...types import UNSET, Response
+from ...types import UNSET, Response, Unset
 
 
 def _get_kwargs(
     *,
     client: Client,
-    query_param: List[str] = cast(List[str], UNSET),
+    query_param: Union[Unset, List[str]] = UNSET,
 ) -> Dict[str, Any]:
     url = "{}/tests/optional_query_param/".format(client.base_url)
 
@@ -54,7 +54,7 @@ def _build_response(*, response: httpx.Response) -> Response[Union[None, HTTPVal
 def sync_detailed(
     *,
     client: Client,
-    query_param: List[str] = cast(List[str], UNSET),
+    query_param: Union[Unset, List[str]] = UNSET,
 ) -> Response[Union[None, HTTPValidationError]]:
     kwargs = _get_kwargs(
         client=client,
@@ -71,7 +71,7 @@ def sync_detailed(
 def sync(
     *,
     client: Client,
-    query_param: List[str] = cast(List[str], UNSET),
+    query_param: Union[Unset, List[str]] = UNSET,
 ) -> Optional[Union[None, HTTPValidationError]]:
     """ Test optional query parameters """
 
@@ -84,7 +84,7 @@ def sync(
 async def asyncio_detailed(
     *,
     client: Client,
-    query_param: List[str] = cast(List[str], UNSET),
+    query_param: Union[Unset, List[str]] = UNSET,
 ) -> Response[Union[None, HTTPValidationError]]:
     kwargs = _get_kwargs(
         client=client,
@@ -100,7 +100,7 @@ async def asyncio_detailed(
 async def asyncio(
     *,
     client: Client,
-    query_param: List[str] = cast(List[str], UNSET),
+    query_param: Union[Unset, List[str]] = UNSET,
 ) -> Optional[Union[None, HTTPValidationError]]:
     """ Test optional query parameters """
 

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

@@ -5,14 +5,14 @@
 from ...client import Client
 from ...models.body_upload_file_tests_upload_post import BodyUploadFileTestsUploadPost
 from ...models.http_validation_error import HTTPValidationError
-from ...types import UNSET, Response
+from ...types import UNSET, Response, Unset
 
 
 def _get_kwargs(
     *,
     client: Client,
     multipart_data: BodyUploadFileTestsUploadPost,
-    keep_alive: bool = cast(bool, UNSET),
+    keep_alive: Union[Unset, bool] = UNSET,
 ) -> Dict[str, Any]:
     url = "{}/tests/upload".format(client.base_url)
 
@@ -51,7 +51,7 @@ def sync_detailed(
     *,
     client: Client,
     multipart_data: BodyUploadFileTestsUploadPost,
-    keep_alive: bool = cast(bool, UNSET),
+    keep_alive: Union[Unset, bool] = UNSET,
 ) -> Response[Union[None, HTTPValidationError]]:
     kwargs = _get_kwargs(
         client=client,
@@ -70,7 +70,7 @@ def sync(
     *,
     client: Client,
     multipart_data: BodyUploadFileTestsUploadPost,
-    keep_alive: bool = cast(bool, UNSET),
+    keep_alive: Union[Unset, bool] = UNSET,
 ) -> Optional[Union[None, HTTPValidationError]]:
     """ Upload a file  """
 
@@ -85,7 +85,7 @@ async def asyncio_detailed(
     *,
     client: Client,
     multipart_data: BodyUploadFileTestsUploadPost,
-    keep_alive: bool = cast(bool, UNSET),
+    keep_alive: Union[Unset, bool] = UNSET,
 ) -> Response[Union[None, HTTPValidationError]]:
     kwargs = _get_kwargs(
         client=client,
@@ -103,7 +103,7 @@ async def asyncio(
     *,
     client: Client,
     multipart_data: BodyUploadFileTestsUploadPost,
-    keep_alive: bool = cast(bool, UNSET),
+    keep_alive: Union[Unset, bool] = UNSET,
 ) -> Optional[Union[None, HTTPValidationError]]:
     """ Upload a file  """
 

end_to_end_tests/golden-record/my_test_api_client/models/a_model.py

@@ -1,12 +1,12 @@
 import datetime
-from typing import Any, Dict, List, Optional, Set, Union, cast
+from typing import Any, Dict, List, Optional, Union
 
 import attr
 from dateutil.parser import isoparse
 
 from ..models.an_enum import AnEnum
 from ..models.different_enum import DifferentEnum
-from ..types import UNSET
+from ..types import UNSET, Unset
 
 
 @attr.s(auto_attribs=True)
@@ -17,20 +17,14 @@ class AModel:
     a_camel_date_time: Union[datetime.datetime, datetime.date]
     a_date: datetime.date
     required_not_nullable: str
-    nested_list_of_enums: List[List[DifferentEnum]] = cast(List[List[DifferentEnum]], UNSET)
+    nested_list_of_enums: Union[Unset, List[List[DifferentEnum]]] = UNSET
     some_dict: Optional[Dict[Any, Any]] = None
-    attr_1_leading_digit: str = cast(str, UNSET)
+    attr_1_leading_digit: Union[Unset, str] = UNSET
     required_nullable: Optional[str] = None
-    not_required_nullable: Optional[str] = cast(Optional[str], UNSET)
-    not_required_not_nullable: str = cast(str, UNSET)
-
-    def to_dict(
-        self,
-        include: Optional[Set[str]] = None,
-        exclude: Optional[Set[str]] = None,
-        exclude_unset: bool = False,
-        exclude_none: bool = False,
-    ) -> Dict[str, Any]:
+    not_required_nullable: Union[Unset, Optional[str]] = UNSET
+    not_required_not_nullable: Union[Unset, str] = UNSET
+
+    def to_dict(self) -> Dict[str, Any]:
         an_enum_value = self.an_enum_value.value
 
         if isinstance(self.a_camel_date_time, datetime.datetime):
@@ -64,32 +58,24 @@ def to_dict(
         not_required_nullable = self.not_required_nullable
         not_required_not_nullable = self.not_required_not_nullable
 
-        all_properties = {
+        field_dict = {
             "an_enum_value": an_enum_value,
             "aCamelDateTime": a_camel_date_time,
             "a_date": a_date,
             "required_not_nullable": required_not_nullable,
-            "nested_list_of_enums": nested_list_of_enums,
             "some_dict": some_dict,
-            "1_leading_digit": attr_1_leading_digit,
             "required_nullable": required_nullable,
-            "not_required_nullable": not_required_nullable,
-            "not_required_not_nullable": not_required_not_nullable,
         }
-
-        trimmed_properties: Dict[str, Any] = {}
-        for property_name, property_value in all_properties.items():
-            if include is not None and property_name not in include:
-                continue
-            if exclude is not None and property_name in exclude:
-                continue
-            if exclude_unset and property_value is UNSET:
-                continue
-            if exclude_none and property_value is None:
-                continue
-            trimmed_properties[property_name] = property_value
-
-        return trimmed_properties
+        if nested_list_of_enums is not UNSET:
+            field_dict["nested_list_of_enums"] = nested_list_of_enums
+        if attr_1_leading_digit is not UNSET:
+            field_dict["1_leading_digit"] = attr_1_leading_digit
+        if not_required_nullable is not UNSET:
+            field_dict["not_required_nullable"] = not_required_nullable
+        if not_required_not_nullable is not UNSET:
+            field_dict["not_required_not_nullable"] = not_required_not_nullable
+
+        return field_dict
 
     @staticmethod
     def from_dict(d: Dict[str, Any]) -> "AModel":

end_to_end_tests/golden-record/my_test_api_client/models/body_upload_file_tests_upload_post.py

@@ -1,8 +1,8 @@
-from typing import Any, Dict, Optional, Set
+from typing import Any, Dict
 
 import attr
 
-from ..types import UNSET, File
+from ..types import File
 
 
 @attr.s(auto_attribs=True)
@@ -11,32 +11,14 @@ class BodyUploadFileTestsUploadPost:
 
     some_file: File
 
-    def to_dict(
-        self,
-        include: Optional[Set[str]] = None,
-        exclude: Optional[Set[str]] = None,
-        exclude_unset: bool = False,
-        exclude_none: bool = False,
-    ) -> Dict[str, Any]:
+    def to_dict(self) -> Dict[str, Any]:
         some_file = self.some_file.to_tuple()
 
-        all_properties = {
+        field_dict = {
             "some_file": some_file,
         }
 
-        trimmed_properties: Dict[str, Any] = {}
-        for property_name, property_value in all_properties.items():
-            if include is not None and property_name not in include:
-                continue
-            if exclude is not None and property_name in exclude:
-                continue
-            if exclude_unset and property_value is UNSET:
-                continue
-            if exclude_none and property_value is None:
-                continue
-            trimmed_properties[property_name] = property_value
-
-        return trimmed_properties
+        return field_dict
 
     @staticmethod
     def from_dict(d: Dict[str, Any]) -> "BodyUploadFileTestsUploadPost":