python-pydantic-v1: Return the primitive type in to_dict for anyOf mo…

…dels (#19488)

* python: Return the primitive type in to_dict for anyOf models

* Regenerate samples

* Update test

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

@@ -176,7 +176,8 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
         if callable(to_json):
             return self.actual_instance.to_dict()
         else:
-            return json.dumps(self.actual_instance)
+            # primitive type
+            return self.actual_instance
 
     def to_str(self) -> str:
         """Returns the string representation of the actual instance"""

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

@@ -166,7 +166,8 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
         if callable(to_json):
             return self.actual_instance.to_dict()
         else:
-            return json.dumps(self.actual_instance)
+            # primitive type
+            return self.actual_instance
 
     def to_str(self) -> str:
         """Returns the string representation of the actual instance"""

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

@@ -146,7 +146,8 @@ def to_dict(self) -> dict:
         if callable(to_json):
             return self.actual_instance.to_dict()
         else:
-            return json.dumps(self.actual_instance)
+            # primitive type
+            return self.actual_instance
 
     def to_str(self) -> str:
         """Returns the string representation of the actual instance"""

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

@@ -125,7 +125,8 @@ def to_dict(self) -> dict:
         if callable(to_json):
             return self.actual_instance.to_dict()
         else:
-            return json.dumps(self.actual_instance)
+            # primitive type
+            return self.actual_instance
 
     def to_str(self) -> str:
         """Returns the string representation of the actual instance"""

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

@@ -146,7 +146,8 @@ def to_dict(self) -> dict:
         if callable(to_json):
             return self.actual_instance.to_dict()
         else:
-            return json.dumps(self.actual_instance)
+            # primitive type
+            return self.actual_instance
 
     def to_str(self) -> str:
         """Returns the string representation of the actual instance"""

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

@@ -125,7 +125,8 @@ def to_dict(self) -> dict:
         if callable(to_json):
             return self.actual_instance.to_dict()
         else:
-            return json.dumps(self.actual_instance)
+            # primitive type
+            return self.actual_instance
 
     def to_str(self) -> str:
         """Returns the string representation of the actual instance"""

samples/openapi3/client/petstore/python-pydantic-v1/tests/test_model.py

@@ -177,7 +177,7 @@ def test_anyOf_array_of_integers(self):
         except ValueError as e:
             self.assertTrue("ensure this value is less than or equal to 255" in str(e))
 
-        # test from_josn
+        # test from_json
         json_str = '[12,34,56]'
         p = petstore_api.AnyOfColor.from_json(json_str)
         self.assertEqual(p.actual_instance, [12, 34,56])
@@ -187,6 +187,28 @@ def test_anyOf_array_of_integers(self):
         except ValueError as e:
             self.assertTrue("ensure this value is less than or equal to 255" in str(e))
 
+         # test from_json, schema 3
+        json_str = '"#123456"'
+        p = petstore_api.AnyOfColor.from_json(json_str)
+        self.assertIsInstance(p.actual_instance, str)
+        self.assertEqual(p.actual_instance, '#123456')
+
+        # test to_json, schema 3
+        p = petstore_api.AnyOfColor(actual_instance='#123456')
+        self.assertEqual(p.to_json(), '"#123456"')
+
+         # test from_dict, schema 3
+        obj = '#123456'
+        p = petstore_api.AnyOfColor.from_dict(obj)
+        self.assertIsInstance(p.actual_instance, str)
+        self.assertEqual(p.actual_instance, '#123456')
+
+        # test to_dict, schema 3
+        p = petstore_api.AnyOfColor(actual_instance='#123456')
+        self.assertEqual(p.to_dict(), '#123456')
+        p = petstore_api.AnyOfColor.from_dict(p.to_dict())
+        self.assertEqual(p.actual_instance, '#123456')
+
     def test_oneOf(self):
         # test new Pig
         bp = petstore_api.BasquePig.from_dict({"className": "BasquePig", "color": "red"})
@@ -300,6 +322,9 @@ def test_anyOf(self):
                 "  DanishPig expected dict not int (type=type_error)")
             self.assertEqual(str(e), error_message)
 
+        # test to_dict
+        self.assertEqual(p.to_dict(), {'className': 'BasquePig', 'color': 'red'})
+
         # test to_json
         self.assertEqual(p.to_json(), '{"className": "BasquePig", "color": "red"}')