[FIX] model_generic.mustache

to_str()

Author: padznich

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

@@ -35,6 +35,28 @@ 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_dict(self, exclude_unset: bool = True) -> Dict[str, Any]:
+        """Returns the dict representation of the actual instance"""
+        return self.model_dump(by_alias=True, exclude_unset=exclude_unset)
+
+    def to_json(self, exclude_unset: bool = True) -> str:
+        """Returns the JSON representation of the actual instance"""
+        return json.dumps(self.model_dump(by_alias=True, exclude_unset=exclude_unset, mode="json"))
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.to_dict(exclude_unset=False))
+
 {{#vendorExtensions.x-py-postponed-model-imports.size}}
 {{#vendorExtensions.x-py-postponed-model-imports}}
 {{{.}}}

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_dict(self) -> Dict[str, Any]:
+    def to_dict(self, exclude_unset: bool = True) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""
-        return self.model_dump(by_alias=True, exclude_unset=True)
+        return self.model_dump(by_alias=True, exclude_unset=exclude_unset)
 
-    def to_json(self) -> str:
+    def to_json(self, exclude_unset: bool = True) -> str:
         """Returns the JSON representation of the actual instance"""
-        return json.dumps(self.model_dump(by_alias=True, exclude_unset=True, mode="json"))
+        return json.dumps(self.model_dump(by_alias=True, exclude_unset=exclude_unset, mode="json"))
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.to_json())
+        return pprint.pformat(self.to_dict(exclude_unset=False))
 
 
 {{#vendorExtensions.x-py-postponed-model-imports.size}}

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

@@ -35,6 +35,28 @@ 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_dict(self, exclude_unset: bool = True) -> Dict[str, Any]:
+        """Returns the dict representation of the actual instance"""
+        return self.model_dump(by_alias=True, exclude_unset=exclude_unset)
+
+    def to_json(self, exclude_unset: bool = True) -> str:
+        """Returns the JSON representation of the actual instance"""
+        return json.dumps(self.model_dump(by_alias=True, exclude_unset=exclude_unset, mode="json"))
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.to_dict(exclude_unset=False))
+
 {{#vendorExtensions.x-py-postponed-model-imports.size}}
 {{#vendorExtensions.x-py-postponed-model-imports}}
 {{{.}}}

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_dict(self) -> Dict[str, Any]:
+    def to_dict(self, exclude_unset: bool = True) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""
-        return self.model_dump(by_alias=True, exclude_unset=True)
+        return self.model_dump(by_alias=True, exclude_unset=exclude_unset)
 
-    def to_json(self) -> str:
+    def to_json(self, exclude_unset: bool = True) -> str:
         """Returns the JSON representation of the actual instance"""
-        return json.dumps(self.model_dump(by_alias=True, exclude_unset=True, mode="json"))
+        return json.dumps(self.model_dump(by_alias=True, exclude_unset=exclude_unset, mode="json"))
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.to_json())
+        return pprint.pformat(self.to_dict(exclude_unset=False))
 
 
 

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_dict(self) -> Dict[str, Any]:
+    def to_dict(self, exclude_unset: bool = True) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""
-        return self.model_dump(by_alias=True, exclude_unset=True)
+        return self.model_dump(by_alias=True, exclude_unset=exclude_unset)
 
-    def to_json(self) -> str:
+    def to_json(self, exclude_unset: bool = True) -> str:
         """Returns the JSON representation of the actual instance"""
-        return json.dumps(self.model_dump(by_alias=True, exclude_unset=True, mode="json"))
+        return json.dumps(self.model_dump(by_alias=True, exclude_unset=exclude_unset, mode="json"))
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.to_json())
+        return pprint.pformat(self.to_dict(exclude_unset=False))
 
 
 

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_dict(self) -> Dict[str, Any]:
+    def to_dict(self, exclude_unset: bool = True) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""
-        return self.model_dump(by_alias=True, exclude_unset=True)
+        return self.model_dump(by_alias=True, exclude_unset=exclude_unset)
 
-    def to_json(self) -> str:
+    def to_json(self, exclude_unset: bool = True) -> str:
         """Returns the JSON representation of the actual instance"""
-        return json.dumps(self.model_dump(by_alias=True, exclude_unset=True, mode="json"))
+        return json.dumps(self.model_dump(by_alias=True, exclude_unset=exclude_unset, mode="json"))
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.to_json())
+        return pprint.pformat(self.to_dict(exclude_unset=False))
 
 
 

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_dict(self) -> Dict[str, Any]:
+    def to_dict(self, exclude_unset: bool = True) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""
-        return self.model_dump(by_alias=True, exclude_unset=True)
+        return self.model_dump(by_alias=True, exclude_unset=exclude_unset)
 
-    def to_json(self) -> str:
+    def to_json(self, exclude_unset: bool = True) -> str:
         """Returns the JSON representation of the actual instance"""
-        return json.dumps(self.model_dump(by_alias=True, exclude_unset=True, mode="json"))
+        return json.dumps(self.model_dump(by_alias=True, exclude_unset=exclude_unset, mode="json"))
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.to_json())
+        return pprint.pformat(self.to_dict(exclude_unset=False))
 
 
 

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_dict(self) -> Dict[str, Any]:
+    def to_dict(self, exclude_unset: bool = True) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""
-        return self.model_dump(by_alias=True, exclude_unset=True)
+        return self.model_dump(by_alias=True, exclude_unset=exclude_unset)
 
-    def to_json(self) -> str:
+    def to_json(self, exclude_unset: bool = True) -> str:
         """Returns the JSON representation of the actual instance"""
-        return json.dumps(self.model_dump(by_alias=True, exclude_unset=True, mode="json"))
+        return json.dumps(self.model_dump(by_alias=True, exclude_unset=exclude_unset, mode="json"))
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.to_json())
+        return pprint.pformat(self.to_dict(exclude_unset=False))
 
 
 

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_dict(self) -> Dict[str, Any]:
+    def to_dict(self, exclude_unset: bool = True) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""
-        return self.model_dump(by_alias=True, exclude_unset=True)
+        return self.model_dump(by_alias=True, exclude_unset=exclude_unset)
 
-    def to_json(self) -> str:
+    def to_json(self, exclude_unset: bool = True) -> str:
         """Returns the JSON representation of the actual instance"""
-        return json.dumps(self.model_dump(by_alias=True, exclude_unset=True, mode="json"))
+        return json.dumps(self.model_dump(by_alias=True, exclude_unset=exclude_unset, mode="json"))
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.to_json())
+        return pprint.pformat(self.to_dict(exclude_unset=False))
 
 
 

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_dict(self) -> Dict[str, Any]:
+    def to_dict(self, exclude_unset: bool = True) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""
-        return self.model_dump(by_alias=True, exclude_unset=True)
+        return self.model_dump(by_alias=True, exclude_unset=exclude_unset)
 
-    def to_json(self) -> str:
+    def to_json(self, exclude_unset: bool = True) -> str:
         """Returns the JSON representation of the actual instance"""
-        return json.dumps(self.model_dump(by_alias=True, exclude_unset=True, mode="json"))
+        return json.dumps(self.model_dump(by_alias=True, exclude_unset=exclude_unset, mode="json"))
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.to_json())
+        return pprint.pformat(self.to_dict(exclude_unset=False))