Feat/detect discriminator bnch 49688

openapi_python_client/parser/properties/__init__.py

@@ -317,6 +317,11 @@ def build_model_property(
             optional_properties.append(prop)
         relative_imports.update(prop.get_imports(prefix=".."))
 
+    discriminator_mappings: Dict[str, Property] = {}
+    if data.discriminator is not None:
+        for k, v in (data.discriminator.mapping or {}).items():
+            discriminator_mappings[k] = Reference.from_ref(v)
+
     additional_properties: Union[bool, Property, PropertyError]
     if data.additionalProperties is None:
         additional_properties = True
@@ -347,6 +352,8 @@ def build_model_property(
         description=data.description or "",
         default=None,
         nullable=data.nullable,
+        discriminator_property=data.discriminator.propertyName if data.discriminator else None,
+        discriminator_mappings=discriminator_mappings,
         required=required,
         name=name,
         additional_properties=additional_properties,
@@ -446,7 +453,7 @@ def build_union_property(
 
     discriminator_mappings: Dict[str, Property] = {}
     if data.discriminator is not None:
-        for k, v in (data.discriminator.mapping if data.discriminator else {}).items():
+        for k, v in (data.discriminator.mapping or {}).items():
             ref_class_name = Reference.from_ref(v).class_name
             discriminator_mappings[k] = reference_name_to_subprop[ref_class_name]
 

openapi_python_client/parser/properties/model_property.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from collections.abc import Iterable
-from typing import TYPE_CHECKING, ClassVar, Dict, List, Set, Union
+from typing import TYPE_CHECKING, ClassVar, Dict, List, Optional, Set, Union
 
 import attr
 
@@ -22,6 +22,9 @@ class ModelProperty(Property):
     references: List[oai.Reference]
     required_properties: List[Property]
     optional_properties: List[Property]
+    discriminator_property: Optional[str]
+    discriminator_mappings: Dict[str, Property]
+
     description: str
     relative_imports: Set[str]
     additional_properties: Union[bool, Property]
@@ -71,6 +74,9 @@ def resolve_references(
                 self.optional_properties.append(prop)
             self.relative_imports.update(prop.get_imports(prefix=".."))
 
+        for _, value in self.discriminator_mappings.items():
+            self.relative_imports.add(f"from ..models.{value.module_name} import {value.class_name}")
+
         return schemas
 
     def get_base_type_string(self) -> str:

pyproject.toml

@@ -2,7 +2,7 @@
 name = "openapi-python-client"
 # Our versions have diverged and have no relation to upstream code changes
 # Henceforth, openapi-python-package will be maintained internally
-version = "1.0.3"
+version = "1.0.4"
 description = "Generate modern Python clients from OpenAPI"
 repository = "https://github.com/triaxtec/openapi-python-client"
 license = "MIT"