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 || exi

Author: padznich

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

@@ -4,7 +4,7 @@ import pprint
 {{{.}}}
 {{/vendorExtensions.x-py-model-imports}}
 from pydantic import Field, RootModel
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, Union
 
 {{#lambda.uppercase}}{{{classname}}}{{/lambda.uppercase}}_ANY_OF_SCHEMAS = [{{#anyOf}}"{{.}}"{{^-last}}, {{/-last}}{{/anyOf}}]
 
@@ -37,7 +37,7 @@ class {{classname}}(RootModel[Union[{{#anyOf}}{{.}}{{^-last}}, {{/-last}}{{/anyO
         """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}}]]:
+    def to_dict(self) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""
         return self.model_dump(by_alias=True)
 

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

@@ -4,10 +4,12 @@ import pprint
 {{{.}}}
 {{/vendorExtensions.x-py-model-imports}}
 from pydantic import Field, RootModel
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, Union
+
 
 {{#lambda.uppercase}}{{{classname}}}{{/lambda.uppercase}}_ONE_OF_SCHEMAS = [{{#oneOf}}"{{.}}"{{^-last}}, {{/-last}}{{/oneOf}}]
 
+
 class {{classname}}(RootModel[Union[{{#oneOf}}{{{.}}}{{^-last}}, {{/-last}}{{/oneOf}}]]):
     """
     {{{description}}}{{^description}}{{{classname}}}{{/description}}
@@ -35,7 +37,7 @@ class {{classname}}(RootModel[Union[{{#oneOf}}{{{.}}}{{^-last}}, {{/-last}}{{/on
         """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}}]]:
+    def to_dict(self) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""
         return self.model_dump(by_alias=True)
 

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

@@ -15,7 +15,7 @@
 from __future__ import annotations
 import pprint
 from pydantic import Field, RootModel
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, Union
 
 ANYOFCOLOR_ANY_OF_SCHEMAS = ["List[int]", "str"]
 
@@ -48,7 +48,7 @@ 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]]:
+    def to_dict(self) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""
         return self.model_dump(by_alias=True)
 

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

@@ -17,7 +17,7 @@
 from petstore_api.models.basque_pig import BasquePig
 from petstore_api.models.danish_pig import DanishPig
 from pydantic import Field, RootModel
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, Union
 
 ANYOFPIG_ANY_OF_SCHEMAS = ["BasquePig", "DanishPig"]
 
@@ -50,7 +50,7 @@ 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]]:
+    def to_dict(self) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""
         return self.model_dump(by_alias=True)
 

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

@@ -15,10 +15,12 @@
 from __future__ import annotations
 import pprint
 from pydantic import Field, RootModel
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, Union
+
 
 COLOR_ONE_OF_SCHEMAS = ["List[int]", "str"]
 
+
 class Color(RootModel[Union[List[int], str]]):
     """
     RGB array, RGBA array, or hex string.
@@ -46,7 +48,7 @@ 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], ]]:
+    def to_dict(self) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""
         return self.model_dump(by_alias=True)
 

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

@@ -15,10 +15,12 @@
 from __future__ import annotations
 import pprint
 from pydantic import Field, RootModel
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, Union
+
 
 INTORSTRING_ONE_OF_SCHEMAS = ["int", "str"]
 
+
 class IntOrString(RootModel[Union[int, str]]):
     """
     IntOrString
@@ -46,7 +48,7 @@ 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], ]]:
+    def to_dict(self) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""
         return self.model_dump(by_alias=True)
 

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

@@ -17,10 +17,12 @@
 from petstore_api.models.basque_pig import BasquePig
 from petstore_api.models.danish_pig import DanishPig
 from pydantic import Field, RootModel
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, Union
+
 
 PIG_ONE_OF_SCHEMAS = ["BasquePig", "DanishPig"]
 
+
 class Pig(RootModel[Union[BasquePig, DanishPig]]):
     """
     Pig
@@ -48,7 +50,7 @@ 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], ]]:
+    def to_dict(self) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""
         return self.model_dump(by_alias=True)
 

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

@@ -18,10 +18,12 @@
 from petstore_api.models.feeding import Feeding
 from petstore_api.models.poop_cleaning import PoopCleaning
 from pydantic import Field, RootModel
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, Union
+
 
 TASKACTIVITY_ONE_OF_SCHEMAS = ["Bathing", "Feeding", "PoopCleaning"]
 
+
 class TaskActivity(RootModel[Union[Bathing, Feeding, PoopCleaning]]):
     """
     TaskActivity
@@ -49,7 +51,7 @@ 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], ]]:
+    def to_dict(self) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""
         return self.model_dump(by_alias=True)
 

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

@@ -15,7 +15,7 @@
 from __future__ import annotations
 import pprint
 from pydantic import Field, RootModel
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, Union
 
 ANYOFCOLOR_ANY_OF_SCHEMAS = ["List[int]", "str"]
 
@@ -48,7 +48,7 @@ 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]]:
+    def to_dict(self) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""
         return self.model_dump(by_alias=True)
 

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

@@ -17,7 +17,7 @@
 from petstore_api.models.basque_pig import BasquePig
 from petstore_api.models.danish_pig import DanishPig
 from pydantic import Field, RootModel
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, Union
 
 ANYOFPIG_ANY_OF_SCHEMAS = ["BasquePig", "DanishPig"]
 
@@ -50,7 +50,7 @@ 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]]:
+    def to_dict(self) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""
         return self.model_dump(by_alias=True)