Fix forward references and properly allow Unset for ModelPropertys

Author: dbanty

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

@@ -5,12 +5,11 @@
 Client = httpx.Client
 
 import datetime
-from typing import Dict, List, Union, cast
+from typing import 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
 
@@ -35,7 +34,6 @@ def _build_response(*, response: httpx.Response) -> httpx.Response[Union[None, H
 def httpx_request(
     *,
     client: Client,
-    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(),
@@ -95,12 +93,9 @@ def httpx_request(
     if enum_prop is not UNSET:
         params["enum_prop"] = json_enum_prop
 
-    json_json_body = json_body.to_dict()
-
     response = client.request(
         "post",
         "/tests/defaults",
-        json=json_json_body,
         params=params,
     )
 

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

@@ -0,0 +1,44 @@
+from typing import Optional
+
+import httpx
+
+Client = httpx.Client
+
+from typing import Dict, cast
+
+from ...models.a_model import AModel
+from ...models.http_validation_error import HTTPValidationError
+
+
+def _parse_response(*, response: httpx.Response) -> Optional[Union[None, HTTPValidationError]]:
+    if response.status_code == 200:
+        return None
+    if response.status_code == 422:
+        return HTTPValidationError.from_dict(cast(Dict[str, Any], response.json()))
+    return None
+
+
+def _build_response(*, response: httpx.Response) -> httpx.Response[Union[None, HTTPValidationError]]:
+    return httpx.Response(
+        status_code=response.status_code,
+        content=response.content,
+        headers=response.headers,
+        parsed=_parse_response(response=response),
+    )
+
+
+def httpx_request(
+    *,
+    client: Client,
+    json_body: AModel,
+) -> httpx.Response[Union[None, HTTPValidationError]]:
+
+    json_json_body = json_body.to_dict()
+
+    response = client.request(
+        "post",
+        "/tests/json_body",
+        json=json_json_body,
+    )
+
+    return _build_response(response=response)

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

@@ -1,9 +1,9 @@
-from typing import Optional
-
 import httpx
 
 Client = httpx.Client
 
+from typing import Dict, Union
+
 from ...models.json_body import JsonBody
 from ...types import UNSET, Unset
 
@@ -20,10 +20,10 @@ def _build_response(*, response: httpx.Response) -> httpx.Response[None]:
 def httpx_request(
     *,
     client: Client,
-    json_body: Optional[JsonBody],
+    json_body: Union[JsonBody, Unset],
 ) -> httpx.Response[None]:
 
-    json_json_body: Optional[JsonBody] = UNSET
+    json_json_body: Dict[str, Any] = UNSET
     if not isinstance(json_body, Unset):
         json_json_body = json_body.to_dict()
 

end_to_end_tests/golden-record-custom/my_test_api_client/models/__init__.py

@@ -1,9 +1,10 @@
 """ 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

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

@@ -0,0 +1,123 @@
+import datetime
+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, Unset
+
+
+@attr.s(auto_attribs=True)
+class AModel:
+    """ A Model for testing all the ways custom objects can be used  """
+
+    an_enum_value: AnEnum
+    a_camel_date_time: Union[datetime.datetime, datetime.date]
+    a_date: datetime.date
+    required_not_nullable: str
+    required_nullable: Optional[str]
+    nested_list_of_enums: Union[Unset, List[List[DifferentEnum]]] = UNSET
+    attr_1_leading_digit: Union[Unset, str] = UNSET
+    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):
+            a_camel_date_time = self.a_camel_date_time.isoformat()
+
+        else:
+            a_camel_date_time = self.a_camel_date_time.isoformat()
+
+        a_date = self.a_date.isoformat()
+
+        required_not_nullable = self.required_not_nullable
+        nested_list_of_enums: Union[Unset, List[Any]] = UNSET
+        if not isinstance(self.nested_list_of_enums, Unset):
+            nested_list_of_enums = []
+            for nested_list_of_enums_item_data in self.nested_list_of_enums:
+                nested_list_of_enums_item = []
+                for nested_list_of_enums_item_item_data in nested_list_of_enums_item_data:
+                    nested_list_of_enums_item_item = nested_list_of_enums_item_item_data.value
+
+                    nested_list_of_enums_item.append(nested_list_of_enums_item_item)
+
+                nested_list_of_enums.append(nested_list_of_enums_item)
+
+        attr_1_leading_digit = self.attr_1_leading_digit
+        required_nullable = self.required_nullable
+        not_required_nullable = self.not_required_nullable
+        not_required_not_nullable = self.not_required_not_nullable
+
+        field_dict = {
+            "an_enum_value": an_enum_value,
+            "aCamelDateTime": a_camel_date_time,
+            "a_date": a_date,
+            "required_not_nullable": required_not_nullable,
+            "required_nullable": required_nullable,
+        }
+        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":
+        an_enum_value = AnEnum(d["an_enum_value"])
+
+        def _parse_a_camel_date_time(data: Dict[str, Any]) -> Union[datetime.datetime, datetime.date]:
+            a_camel_date_time: Union[datetime.datetime, datetime.date]
+            try:
+                a_camel_date_time = isoparse(d["aCamelDateTime"])
+
+                return a_camel_date_time
+            except:  # noqa: E722
+                pass
+            a_camel_date_time = isoparse(d["aCamelDateTime"]).date()
+
+            return a_camel_date_time
+
+        a_camel_date_time = _parse_a_camel_date_time(d["aCamelDateTime"])
+
+        a_date = isoparse(d["a_date"]).date()
+
+        required_not_nullable = d["required_not_nullable"]
+
+        nested_list_of_enums = []
+        for nested_list_of_enums_item_data in d.get("nested_list_of_enums", UNSET) or []:
+            nested_list_of_enums_item = []
+            for nested_list_of_enums_item_item_data in nested_list_of_enums_item_data:
+                nested_list_of_enums_item_item = DifferentEnum(nested_list_of_enums_item_item_data)
+
+                nested_list_of_enums_item.append(nested_list_of_enums_item_item)
+
+            nested_list_of_enums.append(nested_list_of_enums_item)
+
+        attr_1_leading_digit = d.get("1_leading_digit", UNSET)
+
+        required_nullable = d["required_nullable"]
+
+        not_required_nullable = d.get("not_required_nullable", UNSET)
+
+        not_required_not_nullable = d.get("not_required_not_nullable", UNSET)
+
+        return AModel(
+            an_enum_value=an_enum_value,
+            a_camel_date_time=a_camel_date_time,
+            a_date=a_date,
+            required_not_nullable=required_not_nullable,
+            nested_list_of_enums=nested_list_of_enums,
+            attr_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,
+        )

end_to_end_tests/golden-record-custom/my_test_api_client/models/dict_prop.py

@@ -0,0 +1,40 @@
+from typing import Any, Dict, List, Union
+
+import attr
+
+from ..models.validation_error import ValidationError
+from ..types import UNSET, Unset
+
+
+@attr.s(auto_attribs=True)
+class HTTPValidationError:
+    """  """
+
+    detail: Union[Unset, List[ValidationError]] = UNSET
+
+    def to_dict(self) -> Dict[str, Any]:
+        detail: Union[Unset, List[Any]] = UNSET
+        if not isinstance(self.detail, Unset):
+            detail = []
+            for detail_item_data in self.detail:
+                detail_item = detail_item_data.to_dict()
+
+                detail.append(detail_item)
+
+        field_dict = {}
+        if detail is not UNSET:
+            field_dict["detail"] = detail
+
+        return field_dict
+
+    @staticmethod
+    def from_dict(d: Dict[str, Any]) -> "HTTPValidationError":
+        detail = []
+        for detail_item_data in d.get("detail", UNSET) or []:
+            detail_item = ValidationError.from_dict(detail_item_data)
+
+            detail.append(detail_item)
+
+        return HTTPValidationError(
+            detail=detail,
+        )

end_to_end_tests/golden-record-custom/my_test_api_client/models/http_validation_error.py

@@ -6,15 +6,13 @@
 
 from ...client import Client
 from ...models.an_enum import AnEnum
-from ...models.dict_prop import DictProp
 from ...models.http_validation_error import HTTPValidationError
 from ...types import UNSET, Response, Unset
 
 
 def _get_kwargs(
     *,
     client: Client,
-    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(),
@@ -77,14 +75,11 @@ def _get_kwargs(
     if enum_prop is not UNSET:
         params["enum_prop"] = json_enum_prop
 
-    json_json_body = json_body.to_dict()
-
     return {
         "url": url,
         "headers": headers,
         "cookies": client.get_cookies(),
         "timeout": client.get_timeout(),
-        "json": json_json_body,
         "params": params,
     }
 
@@ -109,7 +104,6 @@ def _build_response(*, response: httpx.Response) -> Response[Union[None, HTTPVal
 def sync_detailed(
     *,
     client: Client,
-    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(),
@@ -122,7 +116,6 @@ def sync_detailed(
 ) -> Response[Union[None, HTTPValidationError]]:
     kwargs = _get_kwargs(
         client=client,
-        json_body=json_body,
         string_prop=string_prop,
         datetime_prop=datetime_prop,
         date_prop=date_prop,
@@ -144,7 +137,6 @@ def sync_detailed(
 def sync(
     *,
     client: Client,
-    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(),
@@ -159,7 +151,6 @@ def sync(
 
     return sync_detailed(
         client=client,
-        json_body=json_body,
         string_prop=string_prop,
         datetime_prop=datetime_prop,
         date_prop=date_prop,
@@ -175,7 +166,6 @@ def sync(
 async def asyncio_detailed(
     *,
     client: Client,
-    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(),
@@ -188,7 +178,6 @@ async def asyncio_detailed(
 ) -> Response[Union[None, HTTPValidationError]]:
     kwargs = _get_kwargs(
         client=client,
-        json_body=json_body,
         string_prop=string_prop,
         datetime_prop=datetime_prop,
         date_prop=date_prop,
@@ -209,7 +198,6 @@ async def asyncio_detailed(
 async def asyncio(
     *,
     client: Client,
-    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(),
@@ -225,7 +213,6 @@ async def asyncio(
     return (
         await asyncio_detailed(
             client=client,
-            json_body=json_body,
             string_prop=string_prop,
             datetime_prop=datetime_prop,
             date_prop=date_prop,