Merge branch 'main' into enhance-split-words

Author: dbanty

CHANGELOG.md

@@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.9.1
+
+### Features
+
+- Allow references to non-object, non-enum types [#371][#418][#425]. Thanks @p1-ra!
+- Allow for attrs 21.x in generated clients [#412]
+- Allow for using any version of Black [#416] [#411]. Thanks @christhekeele!
+
+### Fixes
+
+- Prevent crash when providing a non-string default to a string attribute. [#414] [#415]
+- Deserialization of optional nullable properties when no value is returned from the API [#420] [#381]. Thanks @forest-benchling!
+
 ## 0.9.0 - 2021-05-04
 
 ### Breaking Changes
@@ -45,9 +58,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
   - `none` will not create a project folder at all, only the inner package folder (which won't be inner anymore)
 
 - Attempt to detect and alert users if they are using an unsupported version of OpenAPI (#281).
+
 - The media type application/vnd.api+json will now be handled just like application/json (#307). Thanks @jrversteegh!
+
 - Support passing models into query parameters (#316). Thanks @forest-benchling!
+
 - Add support for cookie parameters (#326).
+
 - New `--file-encoding` command line option (#330). Sets the encoding used when writing generated files (defaults to utf-8). Thanks @dongfangtianyu!
 
 ### Changes
@@ -96,13 +113,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Breaking Changes
 
 - Any request/response field that is not `required` and wasn't specified is now set to `UNSET` instead of `None`.
+
 - Values that are `UNSET` will not be sent along in API calls
+
 - Schemas defined with `type=object` will now be converted into classes, just like if they were created as ref components. The previous behavior was a combination of skipping and using generic Dicts for these schemas.
+
 - Response schema handling was unified with input schema handling, meaning that responses will behave differently than before. Specifically, instead of the content-type deciding what the generated Python type is, the schema itself will.
 
   - As a result of this, endpoints that used to return `bytes` when content-type was application/octet-stream will now return a `File` object if the type of the data is "binary", just like if you were submitting that type instead of receiving it.
 
 - Instead of skipping input properties with no type, enum, anyOf, or oneOf declared, the property will be declared as `None`.
+
 - Class (models and Enums) names will now contain the name of their parent element (if any). For example, a property declared in an endpoint will be named like {endpoint*name}*{previous*class*name}. Classes will no longer be deduplicated by appending a number to the end of the generated name, so if two names conflict with this new naming scheme, there will be an error instead.
 
 ### Additions
@@ -268,6 +289,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Changes
 
 - The way most imports are handled was changed which _should_ lead to fewer unused imports in generated files.
+
 - Better error messages
 
   - Most error messages will contain some useful information about why it failed instead of a stack trace

dobby.toml

@@ -1,19 +1,19 @@
 [[workflows]]
-name = "Start Task"
+name = "task"
     [[workflows.steps]]
     type = "SelectGitHubIssue"
 
     [[workflows.steps]]
     type = "SwitchBranches"
 
 [[workflows]]
-name = "Prepare Release"
+name = "release"
     [[workflows.steps]]
     type = "UpdateProjectFromCommits"
 
     [[workflows.steps]]
     type = "Command"
-    command = "prettier --write CHANGELOG.md"
+    command = "npx prettier --write CHANGELOG.md"
 
 [github]
 owner = "triaxtec"

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

@@ -1,6 +1,7 @@
 """ Contains all the data models used in inputs/outputs """
 
 from .a_model import AModel
+from .a_model_with_properties_reference_that_are_not_object import AModelWithPropertiesReferenceThatAreNotObject
 from .all_of_sub_model import AllOfSubModel
 from .an_all_of_enum import AnAllOfEnum
 from .an_enum import AnEnum

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

@@ -186,7 +186,6 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
 
         def _parse_a_camel_date_time(data: object) -> Union[datetime.date, datetime.datetime]:
             try:
-                a_camel_date_time_type_0: datetime.datetime
                 if not isinstance(data, str):
                     raise TypeError()
                 a_camel_date_time_type_0 = isoparse(data)
@@ -196,7 +195,6 @@ def _parse_a_camel_date_time(data: object) -> Union[datetime.date, datetime.date
                 pass
             if not isinstance(data, str):
                 raise TypeError()
-            a_camel_date_time_type_1: datetime.date
             a_camel_date_time_type_1 = isoparse(data).date()
 
             return a_camel_date_time_type_1
@@ -209,7 +207,6 @@ def _parse_a_camel_date_time(data: object) -> Union[datetime.date, datetime.date
 
         def _parse_one_of_models(data: object) -> Union[FreeFormModel, ModelWithUnionProperty]:
             try:
-                one_of_models_type_0: FreeFormModel
                 if not isinstance(data, dict):
                     raise TypeError()
                 one_of_models_type_0 = FreeFormModel.from_dict(data)
@@ -219,7 +216,6 @@ def _parse_one_of_models(data: object) -> Union[FreeFormModel, ModelWithUnionPro
                 pass
             if not isinstance(data, dict):
                 raise TypeError()
-            one_of_models_type_1: ModelWithUnionProperty
             one_of_models_type_1 = ModelWithUnionProperty.from_dict(data)
 
             return one_of_models_type_1
@@ -228,9 +224,11 @@ def _parse_one_of_models(data: object) -> Union[FreeFormModel, ModelWithUnionPro
 
         model = ModelWithUnionProperty.from_dict(d.pop("model"))
 
-        an_optional_allof_enum: Union[Unset, AnAllOfEnum] = UNSET
         _an_optional_allof_enum = d.pop("an_optional_allof_enum", UNSET)
-        if not isinstance(_an_optional_allof_enum, Unset):
+        an_optional_allof_enum: Union[Unset, AnAllOfEnum]
+        if isinstance(_an_optional_allof_enum, Unset):
+            an_optional_allof_enum = UNSET
+        else:
             an_optional_allof_enum = AnAllOfEnum(_an_optional_allof_enum)
 
         nested_list_of_enums = []
@@ -245,14 +243,18 @@ def _parse_one_of_models(data: object) -> Union[FreeFormModel, ModelWithUnionPro
 
             nested_list_of_enums.append(nested_list_of_enums_item)
 
-        a_nullable_date = None
         _a_nullable_date = d.pop("a_nullable_date")
-        if _a_nullable_date is not None:
+        a_nullable_date: Optional[datetime.date]
+        if _a_nullable_date is None:
+            a_nullable_date = None
+        else:
             a_nullable_date = isoparse(_a_nullable_date).date()
 
-        a_not_required_date: Union[Unset, datetime.date] = UNSET
         _a_not_required_date = d.pop("a_not_required_date", UNSET)
-        if not isinstance(_a_not_required_date, Unset):
+        a_not_required_date: Union[Unset, datetime.date]
+        if isinstance(_a_not_required_date, Unset):
+            a_not_required_date = UNSET
+        else:
             a_not_required_date = isoparse(_a_not_required_date).date()
 
         attr_1_leading_digit = d.pop("1_leading_digit", UNSET)
@@ -267,7 +269,6 @@ def _parse_nullable_one_of_models(data: object) -> Union[FreeFormModel, ModelWit
             if data is None:
                 return data
             try:
-                nullable_one_of_models_type_0: FreeFormModel
                 if not isinstance(data, dict):
                     raise TypeError()
                 nullable_one_of_models_type_0 = FreeFormModel.from_dict(data)
@@ -277,7 +278,6 @@ def _parse_nullable_one_of_models(data: object) -> Union[FreeFormModel, ModelWit
                 pass
             if not isinstance(data, dict):
                 raise TypeError()
-            nullable_one_of_models_type_1: ModelWithUnionProperty
             nullable_one_of_models_type_1 = ModelWithUnionProperty.from_dict(data)
 
             return nullable_one_of_models_type_1
@@ -288,23 +288,25 @@ def _parse_not_required_one_of_models(data: object) -> Union[FreeFormModel, Mode
             if isinstance(data, Unset):
                 return data
             try:
-                not_required_one_of_models_type_0: Union[Unset, FreeFormModel]
                 if not isinstance(data, dict):
                     raise TypeError()
-                not_required_one_of_models_type_0 = UNSET
                 _not_required_one_of_models_type_0 = data
-                if not isinstance(_not_required_one_of_models_type_0, Unset):
+                not_required_one_of_models_type_0: Union[Unset, FreeFormModel]
+                if isinstance(_not_required_one_of_models_type_0, Unset):
+                    not_required_one_of_models_type_0 = UNSET
+                else:
                     not_required_one_of_models_type_0 = FreeFormModel.from_dict(_not_required_one_of_models_type_0)
 
                 return not_required_one_of_models_type_0
             except:  # noqa: E722
                 pass
             if not isinstance(data, dict):
                 raise TypeError()
-            not_required_one_of_models_type_1: Union[Unset, ModelWithUnionProperty]
-            not_required_one_of_models_type_1 = UNSET
             _not_required_one_of_models_type_1 = data
-            if not isinstance(_not_required_one_of_models_type_1, Unset):
+            not_required_one_of_models_type_1: Union[Unset, ModelWithUnionProperty]
+            if isinstance(_not_required_one_of_models_type_1, Unset):
+                not_required_one_of_models_type_1 = UNSET
+            else:
                 not_required_one_of_models_type_1 = ModelWithUnionProperty.from_dict(_not_required_one_of_models_type_1)
 
             return not_required_one_of_models_type_1
@@ -319,12 +321,13 @@ def _parse_not_required_nullable_one_of_models(
             if isinstance(data, Unset):
                 return data
             try:
-                not_required_nullable_one_of_models_type_0: Union[Unset, FreeFormModel]
                 if not isinstance(data, dict):
                     raise TypeError()
-                not_required_nullable_one_of_models_type_0 = UNSET
                 _not_required_nullable_one_of_models_type_0 = data
-                if not isinstance(_not_required_nullable_one_of_models_type_0, Unset):
+                not_required_nullable_one_of_models_type_0: Union[Unset, FreeFormModel]
+                if isinstance(_not_required_nullable_one_of_models_type_0, Unset):
+                    not_required_nullable_one_of_models_type_0 = UNSET
+                else:
                     not_required_nullable_one_of_models_type_0 = FreeFormModel.from_dict(
                         _not_required_nullable_one_of_models_type_0
                     )
@@ -333,12 +336,13 @@ def _parse_not_required_nullable_one_of_models(
             except:  # noqa: E722
                 pass
             try:
-                not_required_nullable_one_of_models_type_1: Union[Unset, ModelWithUnionProperty]
                 if not isinstance(data, dict):
                     raise TypeError()
-                not_required_nullable_one_of_models_type_1 = UNSET
                 _not_required_nullable_one_of_models_type_1 = data
-                if not isinstance(_not_required_nullable_one_of_models_type_1, Unset):
+                not_required_nullable_one_of_models_type_1: Union[Unset, ModelWithUnionProperty]
+                if isinstance(_not_required_nullable_one_of_models_type_1, Unset):
+                    not_required_nullable_one_of_models_type_1 = UNSET
+                else:
                     not_required_nullable_one_of_models_type_1 = ModelWithUnionProperty.from_dict(
                         _not_required_nullable_one_of_models_type_1
                     )
@@ -352,19 +356,27 @@ def _parse_not_required_nullable_one_of_models(
             d.pop("not_required_nullable_one_of_models", UNSET)
         )
 
-        nullable_model = None
         _nullable_model = d.pop("nullable_model")
-        if _nullable_model is not None:
+        nullable_model: Optional[ModelWithUnionProperty]
+        if _nullable_model is None:
+            nullable_model = None
+        else:
             nullable_model = ModelWithUnionProperty.from_dict(_nullable_model)
 
-        not_required_model: Union[Unset, ModelWithUnionProperty] = UNSET
         _not_required_model = d.pop("not_required_model", UNSET)
-        if not isinstance(_not_required_model, Unset):
+        not_required_model: Union[Unset, ModelWithUnionProperty]
+        if isinstance(_not_required_model, Unset):
+            not_required_model = UNSET
+        else:
             not_required_model = ModelWithUnionProperty.from_dict(_not_required_model)
 
-        not_required_nullable_model = None
         _not_required_nullable_model = d.pop("not_required_nullable_model", UNSET)
-        if _not_required_nullable_model is not None and not isinstance(_not_required_nullable_model, Unset):
+        not_required_nullable_model: Union[Unset, None, ModelWithUnionProperty]
+        if _not_required_nullable_model is None:
+            not_required_nullable_model = None
+        elif isinstance(_not_required_nullable_model, Unset):
+            not_required_nullable_model = UNSET
+        else:
             not_required_nullable_model = ModelWithUnionProperty.from_dict(_not_required_nullable_model)
 
         a_model = cls(