cleanup

Author: padznich

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

@@ -442,7 +442,7 @@ public String generatePackageName(String packageName) {
 
     @Override
     public String generatorLanguageVersion() {
-        return "3.9+";
+        return "3.11+";
     }
 
     @Override
@@ -454,6 +454,23 @@ protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Sc
         }
     }
 
+    @Override
+    public CodegenModel fromModel(String name, Schema model) {
+        CodegenModel codegenModel = super.fromModel(name, model);
+        setEnumDiscriminatorDefaultValue(codegenModel);
+        
+        // Additional logic: mark className fields as discriminators for Pydantic v2 compatibility
+        if (codegenModel.vars != null) {
+            for (CodegenProperty property : codegenModel.vars) {
+                if ("className".equals(property.baseName)) {
+                    property.isDiscriminator = true;
+                }
+            }
+        }
+        
+        return codegenModel;
+    }
+
     @Override
     public String escapeReservedWord(String name) {
         if (this.reservedWordsMappings().containsKey(name)) {

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

@@ -62,7 +62,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
   {{/isEnum}}
   {{^isEnum}}
     {{#isDiscriminator}}
-    {{name}}: Literal['{{{vendorExtensions.x-py-discriminator-value}}}'] = Field(
+    {{name}}: Literal['{{classname}}'] = Field(
         {{#required}}...{{/required}}{{^required}}None{{/required}},
         description="{{description}}{{^description}}{{{name}}} of the {{classname}}{{/description}}",
         alias="{{{baseName}}}"

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/animal.py

@@ -32,7 +32,7 @@ class Animal(BaseModel):
     """
     Animal
     """ # noqa: E501
-    class_name: Literal[''] = Field(
+    class_name: Literal['Animal'] = Field(
         ...,
         description="class_name of the Animal",
         alias="className"

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/base_discriminator.py

@@ -32,7 +32,7 @@ class BaseDiscriminator(BaseModel):
     """
     BaseDiscriminator
     """ # noqa: E501
-    type_name: Literal[''] = Field(
+    type_name: Literal['BaseDiscriminator'] = Field(
         None,
         description="type_name of the BaseDiscriminator",
         alias="_typeName"

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/creature.py

@@ -33,7 +33,7 @@ class Creature(BaseModel):
     Creature
     """ # noqa: E501
     info: CreatureInfo
-    type: Literal[''] = Field(
+    type: Literal['Creature'] = Field(
         ...,
         description="type of the Creature",
         alias="type"

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/discriminator_all_of_super.py

@@ -31,7 +31,7 @@ class DiscriminatorAllOfSuper(BaseModel):
     """
     DiscriminatorAllOfSuper
     """ # noqa: E501
-    element_type: Literal[''] = Field(
+    element_type: Literal['DiscriminatorAllOfSuper'] = Field(
         ...,
         description="element_type of the DiscriminatorAllOfSuper",
         alias="elementType"

samples/openapi3/client/petstore/python-httpx/petstore_api/models/animal.py

@@ -32,7 +32,7 @@ class Animal(BaseModel):
     """
     Animal
     """ # noqa: E501
-    class_name: Literal[''] = Field(
+    class_name: Literal['Animal'] = Field(
         ...,
         description="class_name of the Animal",
         alias="className"

samples/openapi3/client/petstore/python-httpx/petstore_api/models/base_discriminator.py

@@ -32,7 +32,7 @@ class BaseDiscriminator(BaseModel):
     """
     BaseDiscriminator
     """ # noqa: E501
-    type_name: Literal[''] = Field(
+    type_name: Literal['BaseDiscriminator'] = Field(
         None,
         description="type_name of the BaseDiscriminator",
         alias="_typeName"

samples/openapi3/client/petstore/python-httpx/petstore_api/models/creature.py

@@ -33,7 +33,7 @@ class Creature(BaseModel):
     Creature
     """ # noqa: E501
     info: CreatureInfo
-    type: Literal[''] = Field(
+    type: Literal['Creature'] = Field(
         ...,
         description="type of the Creature",
         alias="type"

samples/openapi3/client/petstore/python-httpx/petstore_api/models/discriminator_all_of_super.py

@@ -31,7 +31,7 @@ class DiscriminatorAllOfSuper(BaseModel):
     """
     DiscriminatorAllOfSuper
     """ # noqa: E501
-    element_type: Literal[''] = Field(
+    element_type: Literal['DiscriminatorAllOfSuper'] = Field(
         ...,
         description="element_type of the DiscriminatorAllOfSuper",
         alias="elementType"