[REF] model_generic.mustache

Author: padznich

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

@@ -5,9 +5,9 @@ from __future__ import annotations
 {{#vendorExtensions.x-py-model-imports}}
 {{{.}}}
 {{/vendorExtensions.x-py-model-imports}}
+from pydantic import Field, RootModel
 from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict
 from typing_extensions import Literal, Self
-from pydantic import Field, RootModel
 
 {{#lambda.uppercase}}{{{classname}}}{{/lambda.uppercase}}_ANY_OF_SCHEMAS = [{{#anyOf}}"{{.}}"{{^-last}}, {{/-last}}{{/anyOf}}]
 

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

@@ -166,17 +166,17 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
         """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 json.dumps(self.model_dump(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_json(self) -> str:
+        """Returns the JSON representation of the actual instance"""
+        return json.dumps(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
+
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
+        return pprint.pformat(self.to_json())
 
 
 {{#vendorExtensions.x-py-postponed-model-imports.size}}

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

@@ -49,17 +49,17 @@ 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 json.dumps(self.model_dump(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_json(self) -> str:
+        """Returns the JSON representation of the actual instance"""
+        return json.dumps(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
+
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
+        return pprint.pformat(self.to_json())
 
 
 

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

@@ -49,17 +49,17 @@ 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 json.dumps(self.model_dump(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_json(self) -> str:
+        """Returns the JSON representation of the actual instance"""
+        return json.dumps(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
+
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
+        return pprint.pformat(self.to_json())
 
 
 

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

@@ -52,17 +52,17 @@ 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 json.dumps(self.model_dump(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_json(self) -> str:
+        """Returns the JSON representation of the actual instance"""
+        return json.dumps(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
+
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
+        return pprint.pformat(self.to_json())
 
 
 

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

@@ -70,17 +70,17 @@ 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 json.dumps(self.model_dump(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_json(self) -> str:
+        """Returns the JSON representation of the actual instance"""
+        return json.dumps(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
+
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
+        return pprint.pformat(self.to_json())
 
 
 

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

@@ -51,17 +51,17 @@ 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 json.dumps(self.model_dump(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_json(self) -> str:
+        """Returns the JSON representation of the actual instance"""
+        return json.dumps(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
+
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
+        return pprint.pformat(self.to_json())
 
 
 

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

@@ -68,17 +68,17 @@ 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 json.dumps(self.model_dump(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_json(self) -> str:
+        """Returns the JSON representation of the actual instance"""
+        return json.dumps(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
+
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
+        return pprint.pformat(self.to_json())
 
 
 

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

@@ -63,17 +63,17 @@ 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 json.dumps(self.model_dump(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_json(self) -> str:
+        """Returns the JSON representation of the actual instance"""
+        return json.dumps(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
+
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
+        return pprint.pformat(self.to_json())
 
 
 

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

@@ -49,17 +49,17 @@ 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 json.dumps(self.model_dump(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_json(self) -> str:
+        """Returns the JSON representation of the actual instance"""
+        return json.dumps(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
+
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.model_dump(by_alias=True, exclude_none=True, mode="json"))
+        return pprint.pformat(self.to_json())