fix: Don't allow mixed types in enums.

Author: dbanty

openapi_python_client/parser/properties/__init__.py

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

openapi_python_client/parser/properties/enum_property.py

@@ -1,6 +1,6 @@
 __all__ = ["EnumProperty"]
 
-from typing import Any, ClassVar, Dict, List, Optional, Set, Type, Union
+from typing import Any, ClassVar, Dict, List, Optional, Set, Type, Union, cast
 
 import attr
 
@@ -41,11 +41,12 @@ def get_imports(self, *, prefix: str) -> Set[str]:
         return imports
 
     @staticmethod
-    def values_from_list(values: List[ValueType]) -> Dict[str, ValueType]:
+    def values_from_list(values: Union[List[str], List[int]]) -> Dict[str, ValueType]:
         """Convert a list of values into dict of {name: value}"""
         output: Dict[str, ValueType] = {}
 
         for i, value in enumerate(values):
+            value = cast(Union[str, int], value)
             if isinstance(value, int):
                 if value < 0:
                     output[f"VALUE_NEGATIVE_{-value}"] = value

openapi_python_client/schema/openapi_schema_pydantic/schema.py

@@ -1,6 +1,6 @@
 from typing import Any, Dict, List, Optional, Union
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, StrictInt, StrictStr
 
 from ..data_type import DataType
 from .discriminator import Discriminator
@@ -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: Optional[List[Union[str, int]]] = Field(default=None, min_items=1)
+    enum: Union[None, List[StrictInt], List[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"]] = []