fix model_<anyof/oneof>.mustache

add to_json / to_dict/ to_str
./mvnw clean package || exit
./bin/generate-samples.sh ./bin/configs/*.yaml || exit
./bin/utils/export_docs_generators.sh || exit

Author: padznich

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

@@ -1,13 +1,10 @@
 from __future__ import annotations
-import re  # noqa: F401
-{{#vendorExtensions.x-py-other-imports}}
-{{{.}}}
-{{/vendorExtensions.x-py-other-imports}}
+import pprint
 {{#vendorExtensions.x-py-model-imports}}
 {{{.}}}
 {{/vendorExtensions.x-py-model-imports}}
-from typing import Union
 from pydantic import Field, RootModel
+from typing import Any, Dict, Optional, Union
 
 {{#lambda.uppercase}}{{{classname}}}{{/lambda.uppercase}}_ANY_OF_SCHEMAS = [{{#anyOf}}"{{.}}"{{^-last}}, {{/-last}}{{/anyOf}}]
 
@@ -36,6 +33,18 @@ class {{classname}}(RootModel[Union[{{#anyOf}}{{.}}{{^-last}}, {{/-last}}{{/anyO
 
         raise AttributeError(f"'{self.__class__.__name__}' object has no attribute '{name}'")
 
+    def to_json(self) -> str:
+        """Returns the JSON representation of the actual instance"""
+        return self.model_dump_json(by_alias=True)
+
+    def to_dict(self) -> Optional[Union[Dict[str, Any], {{#anyOf}}{{.}}{{^-last}}, {{/-last}}{{/anyOf}}]]:
+        """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_oneof.mustache

@@ -1,12 +1,10 @@
 from __future__ import annotations
-{{#vendorExtensions.x-py-other-imports}}
-{{{.}}}
-{{/vendorExtensions.x-py-other-imports}}
+import pprint
 {{#vendorExtensions.x-py-model-imports}}
 {{{.}}}
 {{/vendorExtensions.x-py-model-imports}}
 from pydantic import Field, RootModel
-from typing import Union
+from typing import Any, Dict, Optional, Union
 
 {{#lambda.uppercase}}{{{classname}}}{{/lambda.uppercase}}_ONE_OF_SCHEMAS = [{{#oneOf}}"{{.}}"{{^-last}}, {{/-last}}{{/oneOf}}]
 
@@ -32,3 +30,15 @@ class {{classname}}(RootModel[Union[{{#oneOf}}{{{.}}}{{^-last}}, {{/-last}}{{/on
             return getattr(root, name)
 
         raise AttributeError(f"'{self.__class__.__name__}' object has no attribute '{name}'")
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the actual instance"""
+        return self.model_dump_json(by_alias=True)
+
+    def to_dict(self) -> Optional[Union[Dict[str, Any], {{#anyOf}}{{.}}{{^-last}}, {{/-last}}{{/anyOf}}]]:
+        """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"))

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

@@ -13,12 +13,9 @@
 
 
 from __future__ import annotations
-import re  # noqa: F401
-from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator
-from typing import List, Optional
-from typing_extensions import Annotated
-from typing import Union
+import pprint
 from pydantic import Field, RootModel
+from typing import Any, Dict, Optional, Union
 
 ANYOFCOLOR_ANY_OF_SCHEMAS = ["List[int]", "str"]
 
@@ -47,4 +44,16 @@ def __getattr__(self, name):
 
         raise AttributeError(f"'{self.__class__.__name__}' object has no attribute '{name}'")
 
+    def to_json(self) -> str:
+        """Returns the JSON representation of the actual instance"""
+        return self.model_dump_json(by_alias=True)
+
+    def to_dict(self) -> Optional[Union[Dict[str, Any], List[int], str]]:
+        """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"))
+
 

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

@@ -13,13 +13,11 @@
 
 
 from __future__ import annotations
-import re  # noqa: F401
-from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator
-from typing import Optional
+import pprint
 from petstore_api.models.basque_pig import BasquePig
 from petstore_api.models.danish_pig import DanishPig
-from typing import Union
 from pydantic import Field, RootModel
+from typing import Any, Dict, Optional, Union
 
 ANYOFPIG_ANY_OF_SCHEMAS = ["BasquePig", "DanishPig"]
 
@@ -48,4 +46,16 @@ def __getattr__(self, name):
 
         raise AttributeError(f"'{self.__class__.__name__}' object has no attribute '{name}'")
 
+    def to_json(self) -> str:
+        """Returns the JSON representation of the actual instance"""
+        return self.model_dump_json(by_alias=True)
+
+    def to_dict(self) -> Optional[Union[Dict[str, Any], BasquePig, DanishPig]]:
+        """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"))
+
 

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

@@ -13,11 +13,9 @@
 
 
 from __future__ import annotations
-from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator
-from typing import Any, List, Optional
-from typing_extensions import Annotated
+import pprint
 from pydantic import Field, RootModel
-from typing import Union
+from typing import Any, Dict, Optional, Union
 
 COLOR_ONE_OF_SCHEMAS = ["List[int]", "str"]
 
@@ -44,3 +42,15 @@ def __getattr__(self, name):
 
         raise AttributeError(f"'{self.__class__.__name__}' object has no attribute '{name}'")
 
+    def to_json(self) -> str:
+        """Returns the JSON representation of the actual instance"""
+        return self.model_dump_json(by_alias=True)
+
+    def to_dict(self) -> Optional[Union[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"))
+

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

@@ -13,11 +13,9 @@
 
 
 from __future__ import annotations
-from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator
-from typing import Any, List, Optional
-from typing_extensions import Annotated
+import pprint
 from pydantic import Field, RootModel
-from typing import Union
+from typing import Any, Dict, Optional, Union
 
 INTORSTRING_ONE_OF_SCHEMAS = ["int", "str"]
 
@@ -44,3 +42,15 @@ def __getattr__(self, name):
 
         raise AttributeError(f"'{self.__class__.__name__}' object has no attribute '{name}'")
 
+    def to_json(self) -> str:
+        """Returns the JSON representation of the actual instance"""
+        return self.model_dump_json(by_alias=True)
+
+    def to_dict(self) -> Optional[Union[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"))
+

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

@@ -13,12 +13,11 @@
 
 
 from __future__ import annotations
-from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator
-from typing import Any, List, Optional
+import pprint
 from petstore_api.models.basque_pig import BasquePig
 from petstore_api.models.danish_pig import DanishPig
 from pydantic import Field, RootModel
-from typing import Union
+from typing import Any, Dict, Optional, Union
 
 PIG_ONE_OF_SCHEMAS = ["BasquePig", "DanishPig"]
 
@@ -45,3 +44,15 @@ def __getattr__(self, name):
 
         raise AttributeError(f"'{self.__class__.__name__}' object has no attribute '{name}'")
 
+    def to_json(self) -> str:
+        """Returns the JSON representation of the actual instance"""
+        return self.model_dump_json(by_alias=True)
+
+    def to_dict(self) -> Optional[Union[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"))
+

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

@@ -13,13 +13,12 @@
 
 
 from __future__ import annotations
-from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator
-from typing import Any, List, Optional
+import pprint
 from petstore_api.models.bathing import Bathing
 from petstore_api.models.feeding import Feeding
 from petstore_api.models.poop_cleaning import PoopCleaning
 from pydantic import Field, RootModel
-from typing import Union
+from typing import Any, Dict, Optional, Union
 
 TASKACTIVITY_ONE_OF_SCHEMAS = ["Bathing", "Feeding", "PoopCleaning"]
 
@@ -46,3 +45,15 @@ def __getattr__(self, name):
 
         raise AttributeError(f"'{self.__class__.__name__}' object has no attribute '{name}'")
 
+    def to_json(self) -> str:
+        """Returns the JSON representation of the actual instance"""
+        return self.model_dump_json(by_alias=True)
+
+    def to_dict(self) -> Optional[Union[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"))
+

samples/openapi3/client/petstore/python-httpx/petstore_api/models/any_of_color.py

@@ -13,12 +13,9 @@
 
 
 from __future__ import annotations
-import re  # noqa: F401
-from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator
-from typing import List, Optional
-from typing_extensions import Annotated
-from typing import Union
+import pprint
 from pydantic import Field, RootModel
+from typing import Any, Dict, Optional, Union
 
 ANYOFCOLOR_ANY_OF_SCHEMAS = ["List[int]", "str"]
 
@@ -47,4 +44,16 @@ def __getattr__(self, name):
 
         raise AttributeError(f"'{self.__class__.__name__}' object has no attribute '{name}'")
 
+    def to_json(self) -> str:
+        """Returns the JSON representation of the actual instance"""
+        return self.model_dump_json(by_alias=True)
+
+    def to_dict(self) -> Optional[Union[Dict[str, Any], List[int], str]]:
+        """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"))
+
 

samples/openapi3/client/petstore/python-httpx/petstore_api/models/any_of_pig.py

@@ -13,13 +13,11 @@
 
 
 from __future__ import annotations
-import re  # noqa: F401
-from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator
-from typing import Optional
+import pprint
 from petstore_api.models.basque_pig import BasquePig
 from petstore_api.models.danish_pig import DanishPig
-from typing import Union
 from pydantic import Field, RootModel
+from typing import Any, Dict, Optional, Union
 
 ANYOFPIG_ANY_OF_SCHEMAS = ["BasquePig", "DanishPig"]
 
@@ -48,4 +46,16 @@ def __getattr__(self, name):
 
         raise AttributeError(f"'{self.__class__.__name__}' object has no attribute '{name}'")
 
+    def to_json(self) -> str:
+        """Returns the JSON representation of the actual instance"""
+        return self.model_dump_json(by_alias=True)
+
+    def to_dict(self) -> Optional[Union[Dict[str, Any], BasquePig, DanishPig]]:
+        """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"))
+