fix model_<anyof/oneof>.mustache

restore from_dict() / from_json()
./mvnw clean package || exit
./bin/generate-samples.sh ./bin/configs/*.yaml || exit
./bin/utils/export_docs_generators.sh || ex

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, Union
+from typing import Any, Dict, Union, Self
 
 {{#lambda.uppercase}}{{{classname}}}{{/lambda.uppercase}}_ANY_OF_SCHEMAS = [{{#anyOf}}"{{.}}"{{^-last}}, {{/-last}}{{/anyOf}}]
 
@@ -33,6 +33,16 @@ 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)
+
+    @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)

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

@@ -4,7 +4,7 @@ import pprint
 {{{.}}}
 {{/vendorExtensions.x-py-model-imports}}
 from pydantic import Field, RootModel
-from typing import Any, Dict, Union
+from typing import Any, Dict, Union, Self
 
 
 {{#lambda.uppercase}}{{{classname}}}{{/lambda.uppercase}}_ONE_OF_SCHEMAS = [{{#oneOf}}"{{.}}"{{^-last}}, {{/-last}}{{/oneOf}}]
@@ -33,6 +33,16 @@ 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)
+
+    @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)

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

@@ -64,6 +64,9 @@ dependencies = [
 {{#asyncio}}
   "aiohttp (>=3.8.4)",
   "aiohttp-retry (>=2.8.3)",
+{{#httpx}}
+httpx = ">= 0.28.1",
+{{/httpx}}
 {{/asyncio}}
 {{#tornado}}
   "tornado (>=4.2,<5)",

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, Union
+from typing import Any, Dict, Union, Self
 
 ANYOFCOLOR_ANY_OF_SCHEMAS = ["List[int]", "str"]
 
@@ -44,6 +44,16 @@ def __getattr__(self, name):
 
         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)
+
+    @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)

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, Union
+from typing import Any, Dict, Union, Self
 
 ANYOFPIG_ANY_OF_SCHEMAS = ["BasquePig", "DanishPig"]
 
@@ -46,6 +46,16 @@ def __getattr__(self, name):
 
         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)
+
+    @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)

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

@@ -15,7 +15,7 @@
 from __future__ import annotations
 import pprint
 from pydantic import Field, RootModel
-from typing import Any, Dict, Union
+from typing import Any, Dict, Union, Self
 
 
 COLOR_ONE_OF_SCHEMAS = ["List[int]", "str"]
@@ -44,6 +44,16 @@ def __getattr__(self, name):
 
         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)
+
+    @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)

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

@@ -15,7 +15,7 @@
 from __future__ import annotations
 import pprint
 from pydantic import Field, RootModel
-from typing import Any, Dict, Union
+from typing import Any, Dict, Union, Self
 
 
 INTORSTRING_ONE_OF_SCHEMAS = ["int", "str"]
@@ -44,6 +44,16 @@ def __getattr__(self, name):
 
         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)
+
+    @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)

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/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, Union
+from typing import Any, Dict, Union, Self
 
 
 PIG_ONE_OF_SCHEMAS = ["BasquePig", "DanishPig"]
@@ -46,6 +46,16 @@ def __getattr__(self, name):
 
         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)
+
+    @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)

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

@@ -18,7 +18,7 @@
 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, Union
+from typing import Any, Dict, Union, Self
 
 
 TASKACTIVITY_ONE_OF_SCHEMAS = ["Bathing", "Feeding", "PoopCleaning"]
@@ -47,6 +47,16 @@ def __getattr__(self, name):
 
         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)
+
+    @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)

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, Union
+from typing import Any, Dict, Union, Self
 
 ANYOFCOLOR_ANY_OF_SCHEMAS = ["List[int]", "str"]
 
@@ -44,6 +44,16 @@ def __getattr__(self, name):
 
         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)
+
+    @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)