fix: Allow None in enum properties

Needed for some OpenAPI schemas generated by django-rest-framework / drf-spectacular.

Author: juspence

openapi_python_client/parser/properties/__init__.py

@@ -296,7 +296,7 @@ def build_enum_property(
     name: str,
     required: bool,
     schemas: Schemas,
-    enum: Union[List[str], List[int]],
+    enum: Union[List[Optional[str]], List[Optional[int]]],
     parent_name: Optional[str],
     config: Config,
 ) -> Tuple[Union[EnumProperty, PropertyError], Schemas]:

openapi_python_client/parser/properties/enum_property.py

@@ -8,7 +8,7 @@
 from .property import Property
 from .schemas import Class
 
-ValueType = Union[str, int]
+ValueType = Union[str, int, None]
 
 
 @attr.s(auto_attribs=True, frozen=True)
@@ -41,8 +41,8 @@ def get_imports(self, *, prefix: str) -> Set[str]:
         return imports
 
     @staticmethod
-    def values_from_list(values: Union[List[str], List[int]]) -> Dict[str, ValueType]:
-        """Convert a list of values into dict of {name: value}"""
+    def values_from_list(values: Union[List[Optional[str]], List[Optional[int]]]) -> Dict[str, ValueType]:
+        """Convert a list of values into dict of {name: value}, where value can sometimes be None"""
         output: Dict[str, ValueType] = {}
 
         for i, value in enumerate(values):
@@ -60,5 +60,6 @@ def values_from_list(values: Union[List[str], List[int]]) -> Dict[str, ValueType
             if key in output:
                 raise ValueError(f"Duplicate key {key} in Enum")
             sanitized_key = utils.snake_case(key).upper()
-            output[sanitized_key] = utils.remove_string_escapes(value)
+            output[sanitized_key] = utils.remove_string_escapes(value) if isinstance(value, str) else value
+            # If value is the string "null", this becomes Python's None instead of a str, so must special-case it
         return output

openapi_python_client/schema/openapi_schema_pydantic/schema.py

@@ -35,7 +35,7 @@ class Schema(BaseModel):
     maxProperties: Optional[int] = Field(default=None, ge=0)
     minProperties: Optional[int] = Field(default=None, ge=0)
     required: Optional[List[str]] = Field(default=None, min_items=1)
-    enum: Union[None, List[StrictInt], List[StrictStr]] = Field(default=None, min_items=1)
+    enum: Union[None, List[Optional[StrictInt]], List[Optional[StrictStr]]] = Field(default=None, min_items=1)
     type: Optional[DataType] = Field(default=None)
     allOf: Optional[List[Union[Reference, "Schema"]]] = None
     oneOf: List[Union[Reference, "Schema"]] = []