correct openapi_schema_pydantic schemas breaking changes

  - anyOf, allOf, oneOf now default to `None` instead
    of `[]`

Author: Nementon

openapi_python_client/parser/properties/__init__.py

@@ -9,7 +9,6 @@
     "property_from_data",
 ]
 
-from itertools import chain
 from typing import Any, ClassVar, Dict, Generic, Iterable, Iterator, List, Optional, Set, Tuple, TypeVar, Union
 
 import attr
@@ -352,7 +351,13 @@ def build_union_property(
     *, data: oai.Schema, name: str, required: bool, schemas: Schemas, parent_name: str, config: Config
 ) -> Tuple[Union[UnionProperty, PropertyError], Schemas]:
     sub_properties: List[Property] = []
-    for i, sub_prop_data in enumerate(chain(data.anyOf, data.oneOf)):
+
+    sub_data: List[Union[oai.Schema, oai.Reference]] = []
+    for _data in [data.anyOf, data.oneOf]:
+        if isinstance(_data, Iterable):
+            sub_data.extend(_data)
+
+    for i, sub_prop_data in enumerate(sub_data):
         sub_prop, schemas = property_from_data(
             name=f"{name}_type{i}",
             required=required,
@@ -439,8 +444,12 @@ def _property_from_data(
     if isinstance(data, oai.Reference):
         return _property_from_ref(name=name, required=required, parent=None, data=data, schemas=schemas)
 
+    sub_data: List[Union[oai.Schema, oai.Reference]] = []
+    for _data in [data.allOf, data.anyOf, data.oneOf]:
+        if isinstance(_data, Iterable):
+            sub_data.extend(_data)
+
     # A union of a single reference should just be passed through to that reference (don't create copy class)
-    sub_data = (data.allOf or []) + data.anyOf + data.oneOf
     if len(sub_data) == 1 and isinstance(sub_data[0], oai.Reference):
         return _property_from_ref(name=name, required=required, parent=data, data=sub_data[0], schemas=schemas)
 

openapi_python_client/parser/properties/property.py

@@ -22,7 +22,7 @@ class Property:
 
     name: str
     required: bool
-    nullable: bool
+    nullable: bool = attr.ib(converter=utils.optin_bool_to_bool_converter)
     _type_string: ClassVar[str] = ""
     _json_type_string: ClassVar[str] = ""  # Type of the property after JSON serialization
     default: Optional[str] = attr.ib()

openapi_python_client/utils.py

@@ -1,7 +1,7 @@
 import builtins
 import re
 from keyword import iskeyword
-from typing import List
+from typing import List, Optional
 
 delimiters = " _-"
 
@@ -73,3 +73,13 @@ def to_valid_python_identifier(value: str) -> str:
         return new_value
 
     return f"{FIELD_PREFIX}{new_value}"
+
+
+def optin_bool_to_bool_converter(value: Optional[bool]) -> bool:
+    """
+    Given an Option[bool] return a bool
+    None are converted to False
+    """
+    if value is None:
+        return False
+    return value