try make an happy CI

Author: p1-ra

openapi_python_client/parser/properties/__init__.py

@@ -352,13 +352,12 @@ def build_union_property(
 ) -> Tuple[Union[UnionProperty, PropertyError], Schemas]:
     sub_properties: List[Property] = []
 
-    for i, sub_prop_data in enumerate(
-        [
-            data
-            for sublists in filter(lambda x: isinstance(x, Iterable), [[], data.anyOf, data.oneOf])
-            for data in sublists
-        ]
-    ):
+    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,
@@ -445,12 +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
-        for sublists in filter(lambda x: isinstance(x, Iterable), [[], data.allOf, data.anyOf, data.oneOf])
-        for data in sublists
-    ]
     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/schema/openapi_schema_pydantic/encoding.py

@@ -22,6 +22,7 @@ class Encoding(BaseModel):
     or a comma-separated list of the two types.
     """
 
+    # type: ignore
     headers: Optional[Dict[str, Union["Header", Reference]]] = None  # noqa
     """
     A map allowing additional information to be provided as headers, for example `Content-Disposition`.

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