[python] Fix Circular imports on inherited discriminators.

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java

@@ -927,10 +927,7 @@ private ModelsMap postProcessModelsMap(ModelsMap objs) {
                 // if super class
                 if (model.getDiscriminator() != null && model.getDiscriminator().getMappedModels() != null) {
                     moduleImports.add("typing", "Union");
-                    Set<CodegenDiscriminator.MappedModel> discriminator = model.getDiscriminator().getMappedModels();
-                    for (CodegenDiscriminator.MappedModel mappedModel : discriminator) {
-                        postponedModelImports.add(mappedModel.getModelName());
-                    }
+                    moduleImports.add("importlib", "import_module");
                 }
             }
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonPydanticV1Codegen.java

@@ -879,10 +879,6 @@ private ModelsMap postProcessModelsMap(ModelsMap objs) {
                 // if super class
                 if (model.getDiscriminator() != null && model.getDiscriminator().getMappedModels() != null) {
                     typingImports.add("Union");
-                    Set<CodegenDiscriminator.MappedModel> discriminator = model.getDiscriminator().getMappedModels();
-                    for (CodegenDiscriminator.MappedModel mappedModel : discriminator) {
-                        postponedModelImports.add(mappedModel.getModelName());
-                    }
                 }
             }
 

modules/openapi-generator/src/main/resources/python-pydantic-v1/model_generic.mustache

@@ -10,6 +10,16 @@ import json
 {{{.}}}
 {{/vendorExtensions.x-py-model-imports}}
 
+{{#hasChildren}}{{#discriminator}}
+{{! If this model is a super class, importlib is used. So import the necessary modules for the type here. }}
+from typing import TYPE_CHECKING
+from importlib import import_module
+if TYPE_CHECKING:
+{{#mappedModels}}
+    from {{packageName}}.models.{{model.classVarName}} import {{modelName}}
+{{/mappedModels}}
+{{/discriminator}}{{/hasChildren}}
+
 class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}):
     """
     {{#description}}{{{description}}}  # noqa: E501{{/description}}{{^description}}{{{classname}}}{{/description}}
@@ -222,13 +232,13 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
         {{#discriminator}}
         # look up the object type based on discriminator mapping
         object_type = cls.get_discriminator_value(obj)
-        if object_type:
-            klass = globals()[object_type]
-            return klass.from_dict(obj)
-        else:
-            raise ValueError("{{{classname}}} failed to lookup discriminator value from " +
-                             json.dumps(obj) + ". Discriminator property name: " + cls.__discriminator_property_name +
-                             ", mapping: " + json.dumps(cls.__discriminator_value_class_map))
+        {{#mappedModels}}
+        if object_type ==  '{{{mappingName}}}':
+            return import_module("{{packageName}}.models.{{model.classVarName}}").{{modelName}}.from_dict(obj)
+        {{/mappedModels}}
+        raise ValueError("{{{classname}}} failed to lookup discriminator value from " +
+                            json.dumps(obj) + ". Discriminator property name: " + cls.__discriminator_property_name +
+                            ", mapping: " + json.dumps(cls.__discriminator_value_class_map))
         {{/discriminator}}
         {{/hasChildren}}
         {{^hasChildren}}

modules/openapi-generator/src/main/resources/python/model_generic.mustache

@@ -12,6 +12,15 @@ import json
 from typing import Optional, Set
 from typing_extensions import Self
 
+{{#hasChildren}}{{#discriminator}}
+{{! If this model is a super class, importlib is used. So import the necessary modules for the type here. }}
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+{{#mappedModels}}
+    from {{packageName}}.models.{{model.classVarName}} import {{modelName}}
+{{/mappedModels}}
+{{/discriminator}}{{/hasChildren}}
+
 class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}):
     """
     {{#description}}{{{description}}}{{/description}}{{^description}}{{{classname}}}{{/description}}
@@ -113,7 +122,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
         return json.dumps(self.to_dict())
 
     @classmethod
-    def from_json(cls, json_str: str) -> Optional[{{^hasChildren}}Self{{/hasChildren}}{{#hasChildren}}{{#discriminator}}Union[{{#children}}Self{{^-last}}, {{/-last}}{{/children}}]{{/discriminator}}{{^discriminator}}Self{{/discriminator}}{{/hasChildren}}]:
+    def from_json(cls, json_str: str) -> Optional[{{^hasChildren}}Self{{/hasChildren}}{{#hasChildren}}{{#discriminator}}Union[{{#mappedModels}}{{{modelName}}}{{^-last}}, {{/-last}}{{/mappedModels}}]{{/discriminator}}{{^discriminator}}Self{{/discriminator}}{{/hasChildren}}]:
         """Create an instance of {{{classname}}} from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
@@ -236,18 +245,19 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
 
     {{#hasChildren}}
     @classmethod
-    def from_dict(cls, obj: Dict[str, Any]) -> Optional[{{#discriminator}}Union[{{#children}}Self{{^-last}}, {{/-last}}{{/children}}]{{/discriminator}}{{^discriminator}}Self{{/discriminator}}]:
+    def from_dict(cls, obj: Dict[str, Any]) -> Optional[{{#discriminator}}Union[{{#mappedModels}}{{{modelName}}}{{^-last}}, {{/-last}}{{/mappedModels}}]{{/discriminator}}{{^discriminator}}Self{{/discriminator}}]:
         """Create an instance of {{{classname}}} from a dict"""
         {{#discriminator}}
         # look up the object type based on discriminator mapping
         object_type = cls.get_discriminator_value(obj)
-        if object_type:
-            klass = globals()[object_type]
-            return klass.from_dict(obj)
-        else:
-            raise ValueError("{{{classname}}} failed to lookup discriminator value from " +
-                             json.dumps(obj) + ". Discriminator property name: " + cls.__discriminator_property_name +
-                             ", mapping: " + json.dumps(cls.__discriminator_value_class_map))
+        {{#mappedModels}}
+        if object_type ==  '{{{mappingName}}}':
+            return import_module("{{packageName}}.models.{{model.classVarName}}").{{modelName}}.from_dict(obj)
+        {{/mappedModels}}
+
+        raise ValueError("{{{classname}}} failed to lookup discriminator value from " +
+                            json.dumps(obj) + ". Discriminator property name: " + cls.__discriminator_property_name +
+                            ", mapping: " + json.dumps(cls.__discriminator_value_class_map))
         {{/discriminator}}
     {{/hasChildren}}
     {{^hasChildren}}

modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml

@@ -1640,6 +1640,20 @@ components:
       required:
         - id
         - activity
+    DiscriminatorAllOfSuper:
+      type: object
+      required:
+        - elementType
+      discriminator:
+        propertyName: elementType
+      properties:
+        elementType:
+          type: string
+    DiscriminatorAllOfSub:
+      allOf:
+        - $ref: '#/components/schemas/DiscriminatorAllOfSuper'
+        - type: object
+          properties: {}
     Pet:
       type: object
       required:

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/bird.py

@@ -23,6 +23,8 @@
 from typing import Optional, Set
 from typing_extensions import Self
 
+
+
 class Bird(BaseModel):
     """
     Bird

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/category.py

@@ -23,6 +23,8 @@
 from typing import Optional, Set
 from typing_extensions import Self
 
+
+
 class Category(BaseModel):
     """
     Category

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/data_query.py

@@ -25,6 +25,8 @@
 from typing import Optional, Set
 from typing_extensions import Self
 
+
+
 class DataQuery(Query):
     """
     DataQuery

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/default_value.py

@@ -24,6 +24,8 @@
 from typing import Optional, Set
 from typing_extensions import Self
 
+
+
 class DefaultValue(BaseModel):
     """
     to test the default value of properties

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/number_properties_only.py

@@ -24,6 +24,8 @@
 from typing import Optional, Set
 from typing_extensions import Self
 
+
+
 class NumberPropertiesOnly(BaseModel):
     """
     NumberPropertiesOnly

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/pet.py

@@ -25,6 +25,8 @@
 from typing import Optional, Set
 from typing_extensions import Self
 
+
+
 class Pet(BaseModel):
     """
     Pet

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/query.py

@@ -23,6 +23,8 @@
 from typing import Optional, Set
 from typing_extensions import Self
 
+
+
 class Query(BaseModel):
     """
     Query

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/tag.py

@@ -23,6 +23,8 @@
 from typing import Optional, Set
 from typing_extensions import Self
 
+
+
 class Tag(BaseModel):
     """
     Tag

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py

@@ -23,6 +23,8 @@
 from typing import Optional, Set
 from typing_extensions import Self
 
+
+
 class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter(BaseModel):
     """
     TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/test_query_style_form_explode_true_array_string_query_object_parameter.py

@@ -23,6 +23,8 @@
 from typing import Optional, Set
 from typing_extensions import Self
 
+
+
 class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter(BaseModel):
     """
     TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter

samples/client/echo_api/python-pydantic-v1/openapi_client/models/bird.py

@@ -22,6 +22,8 @@
 from typing import Optional
 from pydantic import BaseModel, StrictStr
 
+
+
 class Bird(BaseModel):
     """
     Bird

samples/client/echo_api/python-pydantic-v1/openapi_client/models/category.py

@@ -22,6 +22,8 @@
 from typing import Optional
 from pydantic import BaseModel, StrictInt, StrictStr
 
+
+
 class Category(BaseModel):
     """
     Category

samples/client/echo_api/python-pydantic-v1/openapi_client/models/data_query.py

@@ -23,6 +23,8 @@
 from pydantic import Field, StrictStr
 from openapi_client.models.query import Query
 
+
+
 class DataQuery(Query):
     """
     DataQuery

samples/client/echo_api/python-pydantic-v1/openapi_client/models/default_value.py

@@ -23,6 +23,8 @@
 from pydantic import BaseModel, StrictInt, StrictStr, conlist, validator
 from openapi_client.models.string_enum_ref import StringEnumRef
 
+
+
 class DefaultValue(BaseModel):
     """
     to test the default value of properties  # noqa: E501

samples/client/echo_api/python-pydantic-v1/openapi_client/models/number_properties_only.py

@@ -22,6 +22,8 @@
 from typing import Optional, Union
 from pydantic import BaseModel, StrictFloat, StrictInt, confloat, conint
 
+
+
 class NumberPropertiesOnly(BaseModel):
     """
     NumberPropertiesOnly

samples/client/echo_api/python-pydantic-v1/openapi_client/models/pet.py

@@ -24,6 +24,8 @@
 from openapi_client.models.category import Category
 from openapi_client.models.tag import Tag
 
+
+
 class Pet(BaseModel):
     """
     Pet

samples/client/echo_api/python-pydantic-v1/openapi_client/models/query.py

@@ -22,6 +22,8 @@
 from typing import List, Optional
 from pydantic import BaseModel, Field, StrictInt, StrictStr, conlist, validator
 
+
+
 class Query(BaseModel):
     """
     Query

samples/client/echo_api/python-pydantic-v1/openapi_client/models/tag.py

@@ -22,6 +22,8 @@
 from typing import Optional
 from pydantic import BaseModel, StrictInt, StrictStr
 
+
+
 class Tag(BaseModel):
     """
     Tag

samples/client/echo_api/python-pydantic-v1/openapi_client/models/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py

@@ -22,6 +22,8 @@
 from typing import Optional
 from pydantic import BaseModel, StrictInt, StrictStr
 
+
+
 class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter(BaseModel):
     """
     TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter

samples/client/echo_api/python-pydantic-v1/openapi_client/models/test_query_style_form_explode_true_array_string_query_object_parameter.py

@@ -22,6 +22,8 @@
 from typing import List, Optional
 from pydantic import BaseModel, StrictStr, conlist
 
+
+
 class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter(BaseModel):
     """
     TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter

samples/client/echo_api/python/openapi_client/models/bird.py

@@ -23,6 +23,8 @@
 from typing import Optional, Set
 from typing_extensions import Self
 
+
+
 class Bird(BaseModel):
     """
     Bird

samples/client/echo_api/python/openapi_client/models/category.py

@@ -23,6 +23,8 @@
 from typing import Optional, Set
 from typing_extensions import Self
 
+
+
 class Category(BaseModel):
     """
     Category

samples/client/echo_api/python/openapi_client/models/data_query.py

@@ -25,6 +25,8 @@
 from typing import Optional, Set
 from typing_extensions import Self
 
+
+
 class DataQuery(Query):
     """
     DataQuery

samples/client/echo_api/python/openapi_client/models/default_value.py

@@ -24,6 +24,8 @@
 from typing import Optional, Set
 from typing_extensions import Self
 
+
+
 class DefaultValue(BaseModel):
     """
     to test the default value of properties

samples/client/echo_api/python/openapi_client/models/number_properties_only.py

@@ -24,6 +24,8 @@
 from typing import Optional, Set
 from typing_extensions import Self
 
+
+
 class NumberPropertiesOnly(BaseModel):
     """
     NumberPropertiesOnly

samples/client/echo_api/python/openapi_client/models/pet.py

@@ -25,6 +25,8 @@
 from typing import Optional, Set
 from typing_extensions import Self
 
+
+
 class Pet(BaseModel):
     """
     Pet

samples/client/echo_api/python/openapi_client/models/query.py

@@ -23,6 +23,8 @@
 from typing import Optional, Set
 from typing_extensions import Self
 
+
+
 class Query(BaseModel):
     """
     Query

samples/client/echo_api/python/openapi_client/models/tag.py

@@ -23,6 +23,8 @@
 from typing import Optional, Set
 from typing_extensions import Self
 
+
+
 class Tag(BaseModel):
     """
     Tag

samples/client/echo_api/python/openapi_client/models/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py

@@ -23,6 +23,8 @@
 from typing import Optional, Set
 from typing_extensions import Self
 
+
+
 class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter(BaseModel):
     """
     TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter