[FIX] model_generic.mustache

add exclude_none=True, on
.to_str()

Author: padznich

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

@@ -1,6 +1,4 @@
 from __future__ import annotations
-import pprint
-import re  # noqa: F401
 {{#vendorExtensions.x-py-other-imports}}
 {{{.}}}
 {{/vendorExtensions.x-py-other-imports}}
@@ -18,9 +16,8 @@ class {{classname}}(RootModel[Union[{{#anyOf}}{{.}}{{^-last}}, {{/-last}}{{/anyO
     """
     {{{description}}}{{^description}}{{{classname}}}{{/description}}
     """
-
     root: Union[{{#anyOf}}{{.}}{{^-last}}, {{/-last}}{{/anyOf}}{{#isNullable}}, None{{/isNullable}}] = Field(
-        {{#isNullable}}None{{/isNullable}}{{^isNullable}}...{{/isNullable}}{{#discriminator}}, discriminator="{{discriminatorName}}"{{/discriminator}}
+      {{#isNullable}}None{{/isNullable}}{{^isNullable}}...{{/isNullable}}{{#discriminator}}, discriminator="{{discriminatorName}}"{{/discriminator}}
     )
 
     def __getattr__(self, name):
@@ -38,29 +35,6 @@ class {{classname}}(RootModel[Union[{{#anyOf}}{{.}}{{^-last}}, {{/-last}}{{/anyO
 
         raise AttributeError(f"'{self.__class__.__name__}' object has no attribute '{name}'")
 
-    @classmethod
-    def from_dict(cls, obj: Dict[str, Any]) -> Self:
-        """Returns the object represented by the Dict"""
-        return cls.model_validate(obj, strict=True)
-
-    @classmethod
-    def from_json(cls, json_str: str) -> Self:
-        """Returns the object represented by the json string"""
-        return cls.model_validate_json(json_str)
-
-    def to_json(self) -> str:
-        """Returns the JSON representation of the actual instance"""
-        return self.model_dump_json(by_alias=True, exclude_none=True)
-
-    def to_dict(self) -> Dict[str, Any]:
-        """Returns the dict representation of the actual instance"""
-        return self.model_dump(by_alias=True)
-
-    def to_str(self) -> str:
-        """Returns the string representation of the actual instance"""
-        return pprint.pformat(self.model_dump(by_alias=True, mode="json"))
-
-
 {{#vendorExtensions.x-py-postponed-model-imports.size}}
 {{#vendorExtensions.x-py-postponed-model-imports}}
 {{{.}}}

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

@@ -176,7 +176,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.model_dump(by_alias=True))
+        return pprint.pformat(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
 
 
 {{#vendorExtensions.x-py-postponed-model-imports.size}}

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

@@ -1,6 +1,4 @@
 from __future__ import annotations
-import json
-import pprint
 {{#vendorExtensions.x-py-other-imports}}
 {{{.}}}
 {{/vendorExtensions.x-py-other-imports}}
@@ -13,6 +11,7 @@ from typing_extensions import Literal, Self
 
 {{#lambda.uppercase}}{{{classname}}}{{/lambda.uppercase}}_ONE_OF_SCHEMAS = [{{#oneOf}}"{{.}}"{{^-last}}, {{/-last}}{{/oneOf}}]
 
+
 class {{classname}}(RootModel[Union[{{#oneOf}}{{{.}}}{{^-last}}, {{/-last}}{{/oneOf}}]]):
     """
     {{{description}}}{{^description}}{{{classname}}}{{/description}}
@@ -36,28 +35,6 @@ class {{classname}}(RootModel[Union[{{#oneOf}}{{{.}}}{{^-last}}, {{/-last}}{{/on
 
         raise AttributeError(f"'{self.__class__.__name__}' object has no attribute '{name}'")
 
-    @classmethod
-    def from_dict(cls, obj: Dict[str, Any]) -> Self:
-        """Returns the object represented by the Dict"""
-        return cls.model_validate(obj, strict=True)
-
-    @classmethod
-    def from_json(cls, json_str: str) -> Self:
-        """Returns the object represented by the json string"""
-        return cls.model_validate_json(json_str)
-
-    def to_json(self) -> str:
-        """Returns the JSON representation of the actual instance"""
-        return self.model_dump_json(by_alias=True, exclude_none=True)
-
-    def to_dict(self) -> Dict[str, Any]:
-        """Returns the dict representation of the actual instance"""
-        return self.model_dump(by_alias=True)
-
-    def to_str(self) -> str:
-        """Returns the string representation of the actual instance"""
-        return pprint.pformat(self.model_dump(by_alias=True, mode="json"))
-
 {{#vendorExtensions.x-py-postponed-model-imports.size}}
 {{#vendorExtensions.x-py-postponed-model-imports}}
 {{{.}}}

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

@@ -59,7 +59,7 @@ def to_dict(self) -> Dict[str, Any]:
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.model_dump(by_alias=True))
+        return pprint.pformat(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
 
 
 

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

@@ -59,7 +59,7 @@ def to_dict(self) -> Dict[str, Any]:
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.model_dump(by_alias=True))
+        return pprint.pformat(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
 
 
 

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

@@ -62,7 +62,7 @@ def to_dict(self) -> Dict[str, Any]:
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.model_dump(by_alias=True))
+        return pprint.pformat(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
 
 
 

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

@@ -80,7 +80,7 @@ def to_dict(self) -> Dict[str, Any]:
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.model_dump(by_alias=True))
+        return pprint.pformat(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
 
 
 

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

@@ -61,7 +61,7 @@ def to_dict(self) -> Dict[str, Any]:
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.model_dump(by_alias=True))
+        return pprint.pformat(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
 
 
 

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

@@ -78,7 +78,7 @@ def to_dict(self) -> Dict[str, Any]:
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.model_dump(by_alias=True))
+        return pprint.pformat(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
 
 
 

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

@@ -73,7 +73,7 @@ def to_dict(self) -> Dict[str, Any]:
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.model_dump(by_alias=True))
+        return pprint.pformat(self.model_dump(by_alias=True, exclude_none=True, mode="json"))