[Python] remove default value

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

@@ -2157,17 +2157,7 @@ private String finalizeType(CodegenProperty cp, PythonType pt) {
 
             //String defaultValue = null;
             if (!cp.required) { //optional
-                if (cp.defaultValue == null) {
-                    pt.setDefaultValue("None");
-                } else {
-                    if (cp.isArray || cp.isMap) {
-                        // TODO handle default value for array/map
-                        pt.setDefaultValue("None");
-                    } else {
-                        //defaultValue = ;
-                        pt.setDefaultValue(cp.defaultValue);
-                    }
-                }
+                pt.setDefaultValue("None");
             }
 
             String typeConstraint = pt.asTypeConstraint(moduleImports);

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

@@ -370,16 +370,11 @@ 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}}}"){{^-last}},{{/-last}}
             {{/isEnumOrRef}}
             {{/isPrimitiveType}}
             {{#isPrimitiveType}}
-            {{#defaultValue}}
-            "{{{baseName}}}": obj.get("{{{baseName}}}") if obj.get("{{{baseName}}}") is not None else {{{defaultValue}}}{{^-last}},{{/-last}}
-            {{/defaultValue}}
-            {{^defaultValue}}
             "{{{baseName}}}": obj.get("{{{baseName}}}"){{^-last}},{{/-last}}
-            {{/defaultValue}}
             {{/isPrimitiveType}}
             {{/isContainer}}
             {{/allVars}}

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

@@ -33,7 +33,7 @@ class Animal(BaseModel):
     Animal
     """ # noqa: E501
     class_name: StrictStr = Field(alias="className")
-    color: Optional[StrictStr] = 'red'
+    color: Optional[StrictStr] = None
     __properties: ClassVar[List[str]] = ["className", "color"]
 
     model_config = ConfigDict(

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

@@ -82,7 +82,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
 
         _obj = cls.model_validate({
             "className": obj.get("className"),
-            "color": obj.get("color") if obj.get("color") is not None else 'red',
+            "color": obj.get("color"),
             "declawed": obj.get("declawed")
         })
         return _obj

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

@@ -82,7 +82,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
 
         _obj = cls.model_validate({
             "id": obj.get("id"),
-            "name": obj.get("name") if obj.get("name") is not None else 'default-name'
+            "name": obj.get("name")
         })
         return _obj
 

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

@@ -82,7 +82,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
 
         _obj = cls.model_validate({
             "className": obj.get("className"),
-            "color": obj.get("color") if obj.get("color") is not None else 'red',
+            "color": obj.get("color"),
             "breed": obj.get("breed")
         })
         return _obj

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

@@ -34,15 +34,15 @@ class EnumTest(BaseModel):
     """ # noqa: E501
     enum_string: Optional[StrictStr] = None
     enum_string_required: StrictStr
-    enum_integer_default: Optional[StrictInt] = 5
+    enum_integer_default: Optional[StrictInt] = None
     enum_integer: Optional[StrictInt] = None
     enum_number: Optional[float] = None
     enum_string_single_member: Optional[StrictStr] = None
     enum_integer_single_member: Optional[StrictInt] = None
     outer_enum: Optional[OuterEnum] = Field(default=None, alias="outerEnum")
     outer_enum_integer: Optional[OuterEnumInteger] = Field(default=None, alias="outerEnumInteger")
-    outer_enum_default_value: Optional[OuterEnumDefaultValue] = Field(default=OuterEnumDefaultValue.PLACED, alias="outerEnumDefaultValue")
-    outer_enum_integer_default_value: Optional[OuterEnumIntegerDefaultValue] = Field(default=OuterEnumIntegerDefaultValue.NUMBER_0, alias="outerEnumIntegerDefaultValue")
+    outer_enum_default_value: Optional[OuterEnumDefaultValue] = Field(default=None, alias="outerEnumDefaultValue")
+    outer_enum_integer_default_value: Optional[OuterEnumIntegerDefaultValue] = Field(default=None, alias="outerEnumIntegerDefaultValue")
     enum_number_vendor_ext: Optional[EnumNumberVendorExt] = Field(default=None, alias="enumNumberVendorExt")
     enum_string_vendor_ext: Optional[EnumStringVendorExt] = Field(default=None, alias="enumStringVendorExt")
     __properties: ClassVar[List[str]] = ["enum_string", "enum_string_required", "enum_integer_default", "enum_integer", "enum_number", "enum_string_single_member", "enum_integer_single_member", "outerEnum", "outerEnumInteger", "outerEnumDefaultValue", "outerEnumIntegerDefaultValue", "enumNumberVendorExt", "enumStringVendorExt"]
@@ -172,15 +172,15 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         _obj = cls.model_validate({
             "enum_string": obj.get("enum_string"),
             "enum_string_required": obj.get("enum_string_required"),
-            "enum_integer_default": obj.get("enum_integer_default") if obj.get("enum_integer_default") is not None else 5,
+            "enum_integer_default": obj.get("enum_integer_default"),
             "enum_integer": obj.get("enum_integer"),
             "enum_number": obj.get("enum_number"),
             "enum_string_single_member": obj.get("enum_string_single_member"),
             "enum_integer_single_member": obj.get("enum_integer_single_member"),
             "outerEnum": obj.get("outerEnum"),
             "outerEnumInteger": obj.get("outerEnumInteger"),
-            "outerEnumDefaultValue": obj.get("outerEnumDefaultValue") if obj.get("outerEnumDefaultValue") is not None else OuterEnumDefaultValue.PLACED,
-            "outerEnumIntegerDefaultValue": obj.get("outerEnumIntegerDefaultValue") if obj.get("outerEnumIntegerDefaultValue") is not None else OuterEnumIntegerDefaultValue.NUMBER_0,
+            "outerEnumDefaultValue": obj.get("outerEnumDefaultValue"),
+            "outerEnumIntegerDefaultValue": obj.get("outerEnumIntegerDefaultValue"),
             "enumNumberVendorExt": obj.get("enumNumberVendorExt"),
             "enumStringVendorExt": obj.get("enumStringVendorExt")
         })

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

@@ -26,7 +26,7 @@ class Foo(BaseModel):
     """
     Foo
     """ # noqa: E501
-    bar: Optional[StrictStr] = 'bar'
+    bar: Optional[StrictStr] = None
     __properties: ClassVar[List[str]] = ["bar"]
 
     model_config = ConfigDict(
@@ -80,7 +80,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "bar": obj.get("bar") if obj.get("bar") is not None else 'bar'
+            "bar": obj.get("bar")
         })
         return _obj
 

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

@@ -26,7 +26,7 @@ class ObjectToTestAdditionalProperties(BaseModel):
     """
     Minimal object
     """ # noqa: E501
-    var_property: Optional[StrictBool] = Field(default=False, description="Property", alias="property")
+    var_property: Optional[StrictBool] = Field(default=None, description="Property", alias="property")
     __properties: ClassVar[List[str]] = ["property"]
 
     model_config = ConfigDict(
@@ -80,7 +80,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "property": obj.get("property") if obj.get("property") is not None else False
+            "property": obj.get("property")
         })
         return _obj
 

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

@@ -32,7 +32,7 @@ class Order(BaseModel):
     quantity: Optional[StrictInt] = None
     ship_date: Optional[datetime] = Field(default=None, alias="shipDate")
     status: Optional[StrictStr] = Field(default=None, description="Order Status")
-    complete: Optional[StrictBool] = False
+    complete: Optional[StrictBool] = None
     __properties: ClassVar[List[str]] = ["id", "petId", "quantity", "shipDate", "status", "complete"]
 
     @field_validator('status')
@@ -101,7 +101,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             "quantity": obj.get("quantity"),
             "shipDate": obj.get("shipDate"),
             "status": obj.get("status"),
-            "complete": obj.get("complete") if obj.get("complete") is not None else False
+            "complete": obj.get("complete")
         })
         return _obj
 

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

@@ -30,9 +30,9 @@ class TestModelWithEnumDefault(BaseModel):
     """ # noqa: E501
     test_enum: TestEnum
     test_string: Optional[StrictStr] = None
-    test_enum_with_default: Optional[TestEnumWithDefault] = TestEnumWithDefault.ZWEI
-    test_string_with_default: Optional[StrictStr] = 'ahoy matey'
-    test_inline_defined_enum_with_default: Optional[StrictStr] = 'B'
+    test_enum_with_default: Optional[TestEnumWithDefault] = None
+    test_string_with_default: Optional[StrictStr] = None
+    test_inline_defined_enum_with_default: Optional[StrictStr] = None
     __properties: ClassVar[List[str]] = ["test_enum", "test_string", "test_enum_with_default", "test_string_with_default", "test_inline_defined_enum_with_default"]
 
     @field_validator('test_inline_defined_enum_with_default')
@@ -98,9 +98,9 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         _obj = cls.model_validate({
             "test_enum": obj.get("test_enum"),
             "test_string": obj.get("test_string"),
-            "test_enum_with_default": obj.get("test_enum_with_default") if obj.get("test_enum_with_default") is not None else TestEnumWithDefault.ZWEI,
-            "test_string_with_default": obj.get("test_string_with_default") if obj.get("test_string_with_default") is not None else 'ahoy matey',
-            "test_inline_defined_enum_with_default": obj.get("test_inline_defined_enum_with_default") if obj.get("test_inline_defined_enum_with_default") is not None else 'B'
+            "test_enum_with_default": obj.get("test_enum_with_default"),
+            "test_string_with_default": obj.get("test_string_with_default"),
+            "test_inline_defined_enum_with_default": obj.get("test_inline_defined_enum_with_default")
         })
         return _obj
 

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

@@ -33,7 +33,7 @@ class Animal(BaseModel):
     Animal
     """ # noqa: E501
     class_name: StrictStr = Field(alias="className")
-    color: Optional[StrictStr] = 'red'
+    color: Optional[StrictStr] = None
     additional_properties: Dict[str, Any] = {}
     __properties: ClassVar[List[str]] = ["className", "color"]
 

samples/openapi3/client/petstore/python/petstore_api/models/cat.py

@@ -90,7 +90,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
 
         _obj = cls.model_validate({
             "className": obj.get("className"),
-            "color": obj.get("color") if obj.get("color") is not None else 'red',
+            "color": obj.get("color"),
             "declawed": obj.get("declawed")
         })
         # store additional fields in additional_properties

samples/openapi3/client/petstore/python/petstore_api/models/category.py

@@ -90,7 +90,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
 
         _obj = cls.model_validate({
             "id": obj.get("id"),
-            "name": obj.get("name") if obj.get("name") is not None else 'default-name'
+            "name": obj.get("name")
         })
         # store additional fields in additional_properties
         for _key in obj.keys():

samples/openapi3/client/petstore/python/petstore_api/models/dog.py

@@ -90,7 +90,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
 
         _obj = cls.model_validate({
             "className": obj.get("className"),
-            "color": obj.get("color") if obj.get("color") is not None else 'red',
+            "color": obj.get("color"),
             "breed": obj.get("breed")
         })
         # store additional fields in additional_properties

samples/openapi3/client/petstore/python/petstore_api/models/enum_test.py

@@ -34,15 +34,15 @@ class EnumTest(BaseModel):
     """ # noqa: E501
     enum_string: Optional[StrictStr] = None
     enum_string_required: StrictStr
-    enum_integer_default: Optional[StrictInt] = 5
+    enum_integer_default: Optional[StrictInt] = None
     enum_integer: Optional[StrictInt] = None
     enum_number: Optional[StrictFloat] = None
     enum_string_single_member: Optional[StrictStr] = None
     enum_integer_single_member: Optional[StrictInt] = None
     outer_enum: Optional[OuterEnum] = Field(default=None, alias="outerEnum")
     outer_enum_integer: Optional[OuterEnumInteger] = Field(default=None, alias="outerEnumInteger")
-    outer_enum_default_value: Optional[OuterEnumDefaultValue] = Field(default=OuterEnumDefaultValue.PLACED, alias="outerEnumDefaultValue")
-    outer_enum_integer_default_value: Optional[OuterEnumIntegerDefaultValue] = Field(default=OuterEnumIntegerDefaultValue.NUMBER_0, alias="outerEnumIntegerDefaultValue")
+    outer_enum_default_value: Optional[OuterEnumDefaultValue] = Field(default=None, alias="outerEnumDefaultValue")
+    outer_enum_integer_default_value: Optional[OuterEnumIntegerDefaultValue] = Field(default=None, alias="outerEnumIntegerDefaultValue")
     enum_number_vendor_ext: Optional[EnumNumberVendorExt] = Field(default=None, alias="enumNumberVendorExt")
     enum_string_vendor_ext: Optional[EnumStringVendorExt] = Field(default=None, alias="enumStringVendorExt")
     additional_properties: Dict[str, Any] = {}
@@ -180,15 +180,15 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         _obj = cls.model_validate({
             "enum_string": obj.get("enum_string"),
             "enum_string_required": obj.get("enum_string_required"),
-            "enum_integer_default": obj.get("enum_integer_default") if obj.get("enum_integer_default") is not None else 5,
+            "enum_integer_default": obj.get("enum_integer_default"),
             "enum_integer": obj.get("enum_integer"),
             "enum_number": obj.get("enum_number"),
             "enum_string_single_member": obj.get("enum_string_single_member"),
             "enum_integer_single_member": obj.get("enum_integer_single_member"),
             "outerEnum": obj.get("outerEnum"),
             "outerEnumInteger": obj.get("outerEnumInteger"),
-            "outerEnumDefaultValue": obj.get("outerEnumDefaultValue") if obj.get("outerEnumDefaultValue") is not None else OuterEnumDefaultValue.PLACED,
-            "outerEnumIntegerDefaultValue": obj.get("outerEnumIntegerDefaultValue") if obj.get("outerEnumIntegerDefaultValue") is not None else OuterEnumIntegerDefaultValue.NUMBER_0,
+            "outerEnumDefaultValue": obj.get("outerEnumDefaultValue"),
+            "outerEnumIntegerDefaultValue": obj.get("outerEnumIntegerDefaultValue"),
             "enumNumberVendorExt": obj.get("enumNumberVendorExt"),
             "enumStringVendorExt": obj.get("enumStringVendorExt")
         })

samples/openapi3/client/petstore/python/petstore_api/models/foo.py

@@ -26,7 +26,7 @@ class Foo(BaseModel):
     """
     Foo
     """ # noqa: E501
-    bar: Optional[StrictStr] = 'bar'
+    bar: Optional[StrictStr] = None
     additional_properties: Dict[str, Any] = {}
     __properties: ClassVar[List[str]] = ["bar"]
 
@@ -88,7 +88,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "bar": obj.get("bar") if obj.get("bar") is not None else 'bar'
+            "bar": obj.get("bar")
         })
         # store additional fields in additional_properties
         for _key in obj.keys():

samples/openapi3/client/petstore/python/petstore_api/models/object_to_test_additional_properties.py

@@ -26,7 +26,7 @@ class ObjectToTestAdditionalProperties(BaseModel):
     """
     Minimal object
     """ # noqa: E501
-    var_property: Optional[StrictBool] = Field(default=False, description="Property", alias="property")
+    var_property: Optional[StrictBool] = Field(default=None, description="Property", alias="property")
     additional_properties: Dict[str, Any] = {}
     __properties: ClassVar[List[str]] = ["property"]
 
@@ -88,7 +88,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "property": obj.get("property") if obj.get("property") is not None else False
+            "property": obj.get("property")
         })
         # store additional fields in additional_properties
         for _key in obj.keys():

samples/openapi3/client/petstore/python/petstore_api/models/order.py

@@ -32,7 +32,7 @@ class Order(BaseModel):
     quantity: Optional[StrictInt] = None
     ship_date: Optional[datetime] = Field(default=None, alias="shipDate")
     status: Optional[StrictStr] = Field(default=None, description="Order Status")
-    complete: Optional[StrictBool] = False
+    complete: Optional[StrictBool] = None
     additional_properties: Dict[str, Any] = {}
     __properties: ClassVar[List[str]] = ["id", "petId", "quantity", "shipDate", "status", "complete"]
 
@@ -109,7 +109,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             "quantity": obj.get("quantity"),
             "shipDate": obj.get("shipDate"),
             "status": obj.get("status"),
-            "complete": obj.get("complete") if obj.get("complete") is not None else False
+            "complete": obj.get("complete")
         })
         # store additional fields in additional_properties
         for _key in obj.keys():

samples/openapi3/client/petstore/python/petstore_api/models/test_model_with_enum_default.py

@@ -30,9 +30,9 @@ class TestModelWithEnumDefault(BaseModel):
     """ # noqa: E501
     test_enum: TestEnum
     test_string: Optional[StrictStr] = None
-    test_enum_with_default: Optional[TestEnumWithDefault] = TestEnumWithDefault.ZWEI
-    test_string_with_default: Optional[StrictStr] = 'ahoy matey'
-    test_inline_defined_enum_with_default: Optional[StrictStr] = 'B'
+    test_enum_with_default: Optional[TestEnumWithDefault] = None
+    test_string_with_default: Optional[StrictStr] = None
+    test_inline_defined_enum_with_default: Optional[StrictStr] = None
     additional_properties: Dict[str, Any] = {}
     __properties: ClassVar[List[str]] = ["test_enum", "test_string", "test_enum_with_default", "test_string_with_default", "test_inline_defined_enum_with_default"]
 
@@ -106,9 +106,9 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         _obj = cls.model_validate({
             "test_enum": obj.get("test_enum"),
             "test_string": obj.get("test_string"),
-            "test_enum_with_default": obj.get("test_enum_with_default") if obj.get("test_enum_with_default") is not None else TestEnumWithDefault.ZWEI,
-            "test_string_with_default": obj.get("test_string_with_default") if obj.get("test_string_with_default") is not None else 'ahoy matey',
-            "test_inline_defined_enum_with_default": obj.get("test_inline_defined_enum_with_default") if obj.get("test_inline_defined_enum_with_default") is not None else 'B'
+            "test_enum_with_default": obj.get("test_enum_with_default"),
+            "test_string_with_default": obj.get("test_string_with_default"),
+            "test_inline_defined_enum_with_default": obj.get("test_inline_defined_enum_with_default")
         })
         # store additional fields in additional_properties
         for _key in obj.keys():

samples/openapi3/client/petstore/python/tests/test_deserialization.py

@@ -291,7 +291,7 @@ def test_deserialize_animal(self):
         self.assertTrue(isinstance(deserialized, petstore_api.Cat))
         self.assertEqual(deserialized.class_name, "Cat")
         self.assertEqual(deserialized.declawed, True)
-        self.assertEqual(deserialized.to_json(), '{"className": "Cat", "color": "red", "declawed": true}')
+        self.assertEqual(deserialized.to_json(), '{"className": "Cat", "declawed": true}')
 
         # test from json
         json_str = '{"className": "Cat", "color": "red", "declawed": true}'