[python] fix default value when enum is a reference

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

@@ -343,7 +343,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
             "{{{name}}}": {{{dataType}}}.from_dict(obj.get("{{{baseName}}}")) if obj.get("{{{baseName}}}") is not None else None{{^-last}},{{/-last}}
             {{/isEnumOrRef}}
             {{#isEnumOrRef}}
-            "{{{name}}}": obj.get("{{{baseName}}}"){{#defaultValue}} if obj.get("{{baseName}}") is not None else {{defaultValue}}{{/defaultValue}}{{^-last}},{{/-last}}
+            "{{{name}}}": obj.get("{{{baseName}}}"){{#defaultValue}} if obj.get("{{baseName}}") is not None else {{{defaultValue}}}{{/defaultValue}}{{^-last}},{{/-last}}
             {{/isEnumOrRef}}
             {{/isPrimitiveType}}
             {{#isPrimitiveType}}

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

@@ -370,7 +370,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
             "{{{baseName}}}": {{{dataType}}}.from_dict(obj["{{{baseName}}}"]) if obj.get("{{{baseName}}}") is not None else None{{^-last}},{{/-last}}
             {{/isEnumOrRef}}
             {{#isEnumOrRef}}
-            "{{{baseName}}}": obj.get("{{{baseName}}}"){{#defaultValue}} if obj.get("{{baseName}}") is not None else {{defaultValue}}{{/defaultValue}}{{^-last}},{{/-last}}
+            "{{{baseName}}}": obj.get("{{{baseName}}}"){{#defaultValue}} if obj.get("{{baseName}}") is not None else {{{defaultValue}}}{{/defaultValue}}{{^-last}},{{/-last}}
             {{/isEnumOrRef}}
             {{/isPrimitiveType}}
             {{#isPrimitiveType}}

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

@@ -2910,3 +2910,12 @@ components:
         - 1.0
         - 0.5
         - 0.25
+    EnumRefWithDefaultValue:
+      type: object
+      properties:
+        report_format:
+          $ref: '#/components/schemas/DataOutputFormat'
+    DataOutputFormat:
+      type: string
+      enum: [JSON, CSV, XML]
+      default: JSON

samples/openapi3/client/petstore/python-aiohttp/.openapi-generator/FILES

@@ -31,6 +31,7 @@ docs/Color.md
 docs/Creature.md
 docs/CreatureInfo.md
 docs/DanishPig.md
+docs/DataOutputFormat.md
 docs/DefaultApi.md
 docs/DeprecatedObject.md
 docs/DiscriminatorAllOfSub.md
@@ -40,6 +41,7 @@ docs/DummyModel.md
 docs/EnumArrays.md
 docs/EnumClass.md
 docs/EnumNumberVendorExt.md
+docs/EnumRefWithDefaultValue.md
 docs/EnumString1.md
 docs/EnumString2.md
 docs/EnumStringVendorExt.md
@@ -164,6 +166,7 @@ petstore_api/models/color.py
 petstore_api/models/creature.py
 petstore_api/models/creature_info.py
 petstore_api/models/danish_pig.py
+petstore_api/models/data_output_format.py
 petstore_api/models/deprecated_object.py
 petstore_api/models/discriminator_all_of_sub.py
 petstore_api/models/discriminator_all_of_super.py
@@ -172,6 +175,7 @@ petstore_api/models/dummy_model.py
 petstore_api/models/enum_arrays.py
 petstore_api/models/enum_class.py
 petstore_api/models/enum_number_vendor_ext.py
+petstore_api/models/enum_ref_with_default_value.py
 petstore_api/models/enum_string1.py
 petstore_api/models/enum_string2.py
 petstore_api/models/enum_string_vendor_ext.py

samples/openapi3/client/petstore/python-aiohttp/README.md

@@ -178,6 +178,7 @@ Class | Method | HTTP request | Description
  - [Creature](docs/Creature.md)
  - [CreatureInfo](docs/CreatureInfo.md)
  - [DanishPig](docs/DanishPig.md)
+ - [DataOutputFormat](docs/DataOutputFormat.md)
  - [DeprecatedObject](docs/DeprecatedObject.md)
  - [DiscriminatorAllOfSub](docs/DiscriminatorAllOfSub.md)
  - [DiscriminatorAllOfSuper](docs/DiscriminatorAllOfSuper.md)
@@ -186,6 +187,7 @@ Class | Method | HTTP request | Description
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumNumberVendorExt](docs/EnumNumberVendorExt.md)
+ - [EnumRefWithDefaultValue](docs/EnumRefWithDefaultValue.md)
  - [EnumString1](docs/EnumString1.md)
  - [EnumString2](docs/EnumString2.md)
  - [EnumStringVendorExt](docs/EnumStringVendorExt.md)

samples/openapi3/client/petstore/python-aiohttp/docs/DataOutputFormat.md

@@ -0,0 +1,14 @@
+# DataOutputFormat
+
+
+## Enum
+
+* `JSON` (value: `'JSON'`)
+
+* `CSV` (value: `'CSV'`)
+
+* `XML` (value: `'XML'`)
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

samples/openapi3/client/petstore/python-aiohttp/docs/EnumRefWithDefaultValue.md

@@ -0,0 +1,29 @@
+# EnumRefWithDefaultValue
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**report_format** | [**DataOutputFormat**](DataOutputFormat.md) |  | [optional] [default to DataOutputFormat.JSON]
+
+## Example
+
+```python
+from petstore_api.models.enum_ref_with_default_value import EnumRefWithDefaultValue
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of EnumRefWithDefaultValue from a JSON string
+enum_ref_with_default_value_instance = EnumRefWithDefaultValue.from_json(json)
+# print the JSON string representation of the object
+print(EnumRefWithDefaultValue.to_json())
+
+# convert the object into a dict
+enum_ref_with_default_value_dict = enum_ref_with_default_value_instance.to_dict()
+# create an instance of EnumRefWithDefaultValue from a dict
+enum_ref_with_default_value_from_dict = EnumRefWithDefaultValue.from_dict(enum_ref_with_default_value_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

samples/openapi3/client/petstore/python-aiohttp/petstore_api/__init__.py

@@ -63,6 +63,7 @@
     "Creature",
     "CreatureInfo",
     "DanishPig",
+    "DataOutputFormat",
     "DeprecatedObject",
     "DiscriminatorAllOfSub",
     "DiscriminatorAllOfSuper",
@@ -71,6 +72,7 @@
     "EnumArrays",
     "EnumClass",
     "EnumNumberVendorExt",
+    "EnumRefWithDefaultValue",
     "EnumString1",
     "EnumString2",
     "EnumStringVendorExt",
@@ -199,6 +201,7 @@
     from petstore_api.models.creature import Creature as Creature
     from petstore_api.models.creature_info import CreatureInfo as CreatureInfo
     from petstore_api.models.danish_pig import DanishPig as DanishPig
+    from petstore_api.models.data_output_format import DataOutputFormat as DataOutputFormat
     from petstore_api.models.deprecated_object import DeprecatedObject as DeprecatedObject
     from petstore_api.models.discriminator_all_of_sub import DiscriminatorAllOfSub as DiscriminatorAllOfSub
     from petstore_api.models.discriminator_all_of_super import DiscriminatorAllOfSuper as DiscriminatorAllOfSuper
@@ -207,6 +210,7 @@
     from petstore_api.models.enum_arrays import EnumArrays as EnumArrays
     from petstore_api.models.enum_class import EnumClass as EnumClass
     from petstore_api.models.enum_number_vendor_ext import EnumNumberVendorExt as EnumNumberVendorExt
+    from petstore_api.models.enum_ref_with_default_value import EnumRefWithDefaultValue as EnumRefWithDefaultValue
     from petstore_api.models.enum_string1 import EnumString1 as EnumString1
     from petstore_api.models.enum_string2 import EnumString2 as EnumString2
     from petstore_api.models.enum_string_vendor_ext import EnumStringVendorExt as EnumStringVendorExt
@@ -341,6 +345,7 @@
 from petstore_api.models.creature import Creature as Creature
 from petstore_api.models.creature_info import CreatureInfo as CreatureInfo
 from petstore_api.models.danish_pig import DanishPig as DanishPig
+from petstore_api.models.data_output_format import DataOutputFormat as DataOutputFormat
 from petstore_api.models.deprecated_object import DeprecatedObject as DeprecatedObject
 from petstore_api.models.discriminator_all_of_sub import DiscriminatorAllOfSub as DiscriminatorAllOfSub
 from petstore_api.models.discriminator_all_of_super import DiscriminatorAllOfSuper as DiscriminatorAllOfSuper
@@ -349,6 +354,7 @@
 from petstore_api.models.enum_arrays import EnumArrays as EnumArrays
 from petstore_api.models.enum_class import EnumClass as EnumClass
 from petstore_api.models.enum_number_vendor_ext import EnumNumberVendorExt as EnumNumberVendorExt
+from petstore_api.models.enum_ref_with_default_value import EnumRefWithDefaultValue as EnumRefWithDefaultValue
 from petstore_api.models.enum_string1 import EnumString1 as EnumString1
 from petstore_api.models.enum_string2 import EnumString2 as EnumString2
 from petstore_api.models.enum_string_vendor_ext import EnumStringVendorExt as EnumStringVendorExt

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

@@ -42,6 +42,7 @@
     from petstore_api.models.creature import Creature
     from petstore_api.models.creature_info import CreatureInfo
     from petstore_api.models.danish_pig import DanishPig
+    from petstore_api.models.data_output_format import DataOutputFormat
     from petstore_api.models.deprecated_object import DeprecatedObject
     from petstore_api.models.discriminator_all_of_sub import DiscriminatorAllOfSub
     from petstore_api.models.discriminator_all_of_super import DiscriminatorAllOfSuper
@@ -50,6 +51,7 @@
     from petstore_api.models.enum_arrays import EnumArrays
     from petstore_api.models.enum_class import EnumClass
     from petstore_api.models.enum_number_vendor_ext import EnumNumberVendorExt
+    from petstore_api.models.enum_ref_with_default_value import EnumRefWithDefaultValue
     from petstore_api.models.enum_string1 import EnumString1
     from petstore_api.models.enum_string2 import EnumString2
     from petstore_api.models.enum_string_vendor_ext import EnumStringVendorExt
@@ -160,6 +162,7 @@
 from petstore_api.models.creature import Creature
 from petstore_api.models.creature_info import CreatureInfo
 from petstore_api.models.danish_pig import DanishPig
+from petstore_api.models.data_output_format import DataOutputFormat
 from petstore_api.models.deprecated_object import DeprecatedObject
 from petstore_api.models.discriminator_all_of_sub import DiscriminatorAllOfSub
 from petstore_api.models.discriminator_all_of_super import DiscriminatorAllOfSuper
@@ -168,6 +171,7 @@
 from petstore_api.models.enum_arrays import EnumArrays
 from petstore_api.models.enum_class import EnumClass
 from petstore_api.models.enum_number_vendor_ext import EnumNumberVendorExt
+from petstore_api.models.enum_ref_with_default_value import EnumRefWithDefaultValue
 from petstore_api.models.enum_string1 import EnumString1
 from petstore_api.models.enum_string2 import EnumString2
 from petstore_api.models.enum_string_vendor_ext import EnumStringVendorExt

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

@@ -0,0 +1,38 @@
+# coding: utf-8
+
+"""
+    OpenAPI Petstore
+
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import json
+from enum import Enum
+from typing_extensions import Self
+
+
+class DataOutputFormat(str, Enum):
+    """
+    DataOutputFormat
+    """
+
+    """
+    allowed enum values
+    """
+    JSON = 'JSON'
+    CSV = 'CSV'
+    XML = 'XML'
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Self:
+        """Create an instance of DataOutputFormat from a JSON string"""
+        return cls(json.loads(json_str))
+
+

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

@@ -0,0 +1,88 @@
+# coding: utf-8
+
+"""
+    OpenAPI Petstore
+
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict
+from typing import Any, ClassVar, Dict, List, Optional
+from petstore_api.models.data_output_format import DataOutputFormat
+from typing import Optional, Set
+from typing_extensions import Self
+
+class EnumRefWithDefaultValue(BaseModel):
+    """
+    EnumRefWithDefaultValue
+    """ # noqa: E501
+    report_format: Optional[DataOutputFormat] = DataOutputFormat.JSON
+    __properties: ClassVar[List[str]] = ["report_format"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of EnumRefWithDefaultValue from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of EnumRefWithDefaultValue from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "report_format": obj.get("report_format") if obj.get("report_format") is not None else DataOutputFormat.JSON
+        })
+        return _obj
+
+

samples/openapi3/client/petstore/python-aiohttp/test/test_data_output_format.py

@@ -0,0 +1,33 @@
+# coding: utf-8
+
+"""
+    OpenAPI Petstore
+
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+
+from petstore_api.models.data_output_format import DataOutputFormat
+
+class TestDataOutputFormat(unittest.TestCase):
+    """DataOutputFormat unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testDataOutputFormat(self):
+        """Test DataOutputFormat"""
+        # inst = DataOutputFormat()
+
+if __name__ == '__main__':
+    unittest.main()