Add support for Unions (anyOf)

- Will now parse "anyOf" in a schema to create a Union with appropriate sub-types.
- Refactored property templates. They now each contain two macros: `construct` replaces the previous constructor template `template`. `transform` replaces old Python functions name `transform`.
- Add some basic error handling when parsing fails.

Author: dbanty

.run/tests.test_end_to_end.regen_golden_master.run.xml

@@ -7,7 +7,7 @@
       <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
     <option name="SDK_HOME" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../end_to_end_tests" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/end_to_end_tests" />
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />

CHANGELOG.md

@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Support for binary format strings (file payloads)
 - Support for multipart/form bodies
 - Support for any supported property within a list (array), including other lists.
+- Support for Union types ("anyOf" in OpenAPI document)
+- Better error messages when failing to parse an OpenAPI document
 
 ### Changes
 - The way most imports are handled was changed which *should* lead to fewer unused imports in generated files.

end_to_end_tests/fastapi_app/__init__.py

@@ -3,7 +3,7 @@
 from datetime import date, datetime
 from enum import Enum
 from pathlib import Path
-from typing import List
+from typing import List, Union
 
 from fastapi import APIRouter, FastAPI, File, Query, UploadFile
 from pydantic import BaseModel
@@ -42,14 +42,12 @@ class AModel(BaseModel):
 
     an_enum_value: AnEnum
     nested_list_of_enums: List[List[AnEnum]]
-    aCamelDateTime: datetime
+    aCamelDateTime: Union[datetime, date]
     a_date: date
 
 
 @test_router.get("/", response_model=List[AModel], operation_id="getUserList")
-def get_list(
-    an_enum_value: List[AnEnum] = Query(...), some_date: date = Query(...), some_datetime: datetime = Query(...)
-):
+def get_list(an_enum_value: List[AnEnum] = Query(...), some_date: Union[date, datetime] = Query(...)):
     """ Get a list of things """
     return
 

end_to_end_tests/fastapi_app/openapi.json

@@ -53,21 +53,19 @@
                         "required": true,
                         "schema": {
                             "title": "Some Date",
-                            "type": "string",
-                            "format": "date"
+                            "anyOf": [
+                                {
+                                    "type": "string",
+                                    "format": "date"
+                                },
+                                {
+                                    "type": "string",
+                                    "format": "date-time"
+                                }
+                            ]
                         },
                         "name": "some_date",
                         "in": "query"
-                    },
-                    {
-                        "required": true,
-                        "schema": {
-                            "title": "Some Datetime",
-                            "type": "string",
-                            "format": "date-time"
-                        },
-                        "name": "some_datetime",
-                        "in": "query"
                     }
                 ],
                 "responses": {
@@ -173,8 +171,16 @@
                     },
                     "aCamelDateTime": {
                         "title": "Acameldatetime",
-                        "type": "string",
-                        "format": "date-time"
+                        "anyOf": [
+                            {
+                                "type": "string",
+                                "format": "date-time"
+                            },
+                            {
+                                "type": "string",
+                                "format": "date"
+                            }
+                        ]
                     },
                     "a_date": {
                         "title": "A Date",

end_to_end_tests/golden-master/my_test_api_client/api/users.py

@@ -13,17 +13,28 @@
 
 
 def get_user_list(
-    *, client: Client, an_enum_value: List[AnEnumValueItem], some_date: date, some_datetime: datetime,
+    *, client: Client, an_enum_value: List[AnEnumValueItem], some_date: Union[date, datetime],
 ) -> Union[
     List[AModel], HTTPValidationError,
 ]:
     """ Get a list of things  """
     url = "{}/tests/".format(client.base_url)
 
+    json_an_enum_value = []
+    for an_enum_value_item_data in an_enum_value:
+        an_enum_value_item = an_enum_value_item_data.value
+
+        json_an_enum_value.append(an_enum_value_item)
+
+    if isinstance(some_date, date):
+        json_some_date = some_date.isoformat()
+
+    else:
+        json_some_date = some_date.isoformat()
+
     params = {
-        "an_enum_value": an_enum_value,
-        "some_date": some_date.isoformat(),
-        "some_datetime": some_datetime.isoformat(),
+        "an_enum_value": json_an_enum_value,
+        "some_date": json_some_date,
     }
 
     response = httpx.get(url=url, headers=client.get_headers(), params=params,)

end_to_end_tests/golden-master/my_test_api_client/async_api/users.py

@@ -13,17 +13,28 @@
 
 
 async def get_user_list(
-    *, client: Client, an_enum_value: List[AnEnumValueItem], some_date: date, some_datetime: datetime,
+    *, client: Client, an_enum_value: List[AnEnumValueItem], some_date: Union[date, datetime],
 ) -> Union[
     List[AModel], HTTPValidationError,
 ]:
     """ Get a list of things  """
     url = "{}/tests/".format(client.base_url)
 
+    json_an_enum_value = []
+    for an_enum_value_item_data in an_enum_value:
+        an_enum_value_item = an_enum_value_item_data.value
+
+        json_an_enum_value.append(an_enum_value_item)
+
+    if isinstance(some_date, date):
+        json_some_date = some_date.isoformat()
+
+    else:
+        json_some_date = some_date.isoformat()
+
     params = {
-        "an_enum_value": an_enum_value,
-        "some_date": some_date.isoformat(),
-        "some_datetime": some_datetime.isoformat(),
+        "an_enum_value": json_an_enum_value,
+        "some_date": json_some_date,
     }
 
     async with httpx.AsyncClient() as _client:

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

@@ -2,7 +2,7 @@
 
 from dataclasses import dataclass
 from datetime import date, datetime
-from typing import Any, Dict, List, cast
+from typing import Any, Dict, List, Union, cast
 
 from .an_enum_value import AnEnumValue
 from .nested_list_of_enums_item_item import NestedListOfEnumsItemItem
@@ -14,15 +14,35 @@ class AModel:
 
     an_enum_value: AnEnumValue
     nested_list_of_enums: List[List[NestedListOfEnumsItemItem]]
-    a_camel_date_time: datetime
+    a_camel_date_time: Union[datetime, date]
     a_date: date
 
     def to_dict(self) -> Dict[str, Any]:
+        an_enum_value = self.an_enum_value.value
+
+        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)
+
+        if isinstance(self.a_camel_date_time, 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()
+
         return {
-            "an_enum_value": self.an_enum_value.value,
-            "nested_list_of_enums": self.nested_list_of_enums,
-            "aCamelDateTime": self.a_camel_date_time.isoformat(),
-            "a_date": self.a_date.isoformat(),
+            "an_enum_value": an_enum_value,
+            "nested_list_of_enums": nested_list_of_enums,
+            "aCamelDateTime": a_camel_date_time,
+            "a_date": a_date,
         }
 
     @staticmethod
@@ -39,7 +59,19 @@ def from_dict(d: Dict[str, Any]) -> AModel:
 
             nested_list_of_enums.append(nested_list_of_enums_item)
 
-        a_camel_date_time = datetime.fromisoformat(d["aCamelDateTime"])
+        def _parse_a_camel_date_time(data: Dict[str, Any]) -> Union[datetime, date]:
+            a_camel_date_time: Union[datetime, date]
+            try:
+                a_camel_date_time = datetime.fromisoformat(d["aCamelDateTime"])
+
+                return a_camel_date_time
+            except:
+                pass
+            a_camel_date_time = date.fromisoformat(d["aCamelDateTime"])
+
+            return a_camel_date_time
+
+        a_camel_date_time = _parse_a_camel_date_time(d["aCamelDateTime"])
 
         a_date = date.fromisoformat(d["a_date"])
 

end_to_end_tests/golden-master/my_test_api_client/models/abc_response.py

@@ -11,8 +11,10 @@ class ABCResponse:
     success: bool
 
     def to_dict(self) -> Dict[str, Any]:
+        success = self.success
+
         return {
-            "success": self.success,
+            "success": success,
         }
 
     @staticmethod

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

@@ -13,8 +13,10 @@ class BodyUploadFileTestsUploadPost:
     some_file: File
 
     def to_dict(self) -> Dict[str, Any]:
+        some_file = self.some_file.to_tuple()
+
         return {
-            "some_file": self.some_file.to_tuple(),
+            "some_file": some_file,
         }
 
     @staticmethod

end_to_end_tests/golden-master/my_test_api_client/models/http_validation_error.py

@@ -13,8 +13,17 @@ class HTTPValidationError:
     detail: Optional[List[ValidationError]] = None
 
     def to_dict(self) -> Dict[str, Any]:
+        if self.detail is None:
+            detail = None
+        else:
+            detail = []
+            for detail_item_data in self.detail:
+                detail_item = detail_item_data.to_dict()
+
+                detail.append(detail_item)
+
         return {
-            "detail": self.detail if self.detail is not None else None,
+            "detail": detail,
         }
 
     @staticmethod