Ran Python Petstore sample for #2028

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java

@@ -415,7 +415,6 @@ public String getTypeDeclaration(Schema p) {
             Schema inner = ModelUtils.getAdditionalProperties(p);
 
             return getSchemaType(p) + "(str, " + getTypeDeclaration(inner) + ")";
-
         }
         return super.getTypeDeclaration(p);
     }

samples/client/petstore/python/petstore_api/api_client.py

@@ -209,7 +209,11 @@ def sanitize_for_serialization(self, obj):
             return obj.isoformat()
 
         if isinstance(obj, dict):
-            obj_dict = obj
+            to_dict_attr = getattr(obj, 'to_dict', None)
+            if to_dict_attr is not None and callable(to_dict_attr):
+                obj_dict = obj.to_dict()
+            else:
+                obj_dict = obj
         else:
             # Convert model obj to dict except
             # attributes `openapi_types`, `attribute_map`
@@ -627,6 +631,12 @@ def __deserialize_model(self, data, klass):
 
         instance = klass(**kwargs)
 
+        if (isinstance(instance, dict) and
+                klass.openapi_types is not None and
+                isinstance(data, dict)):
+            for key, value in data.items():
+                if key not in klass.openapi_types:
+                    instance[key] = value
         if hasattr(instance, 'get_real_child_model'):
             klass_name = instance.get_real_child_model(data)
             if klass_name:

samples/client/petstore/python/petstore_api/models/additional_properties_class.py

@@ -115,6 +115,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(AdditionalPropertiesClass, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/animal.py

@@ -127,6 +127,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Animal, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/api_response.py

@@ -141,6 +141,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ApiResponse, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/array_of_array_of_number_only.py

@@ -89,6 +89,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ArrayOfArrayOfNumberOnly, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/array_of_number_only.py

@@ -89,6 +89,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ArrayOfNumberOnly, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/array_test.py

@@ -141,6 +141,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ArrayTest, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/capitalization.py

@@ -221,6 +221,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Capitalization, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/cat.py

@@ -16,7 +16,7 @@
 import six
 
 
-class Cat(object):
+class Cat(Animal):
     """NOTE: This class is auto generated by OpenAPI Generator.
     Ref: https://openapi-generator.tech
 
@@ -89,6 +89,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Cat, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/category.py

@@ -116,6 +116,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Category, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/class_model.py

@@ -89,6 +89,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ClassModel, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/client.py

@@ -89,6 +89,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Client, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/dog.py

@@ -16,7 +16,7 @@
 import six
 
 
-class Dog(object):
+class Dog(Animal):
     """NOTE: This class is auto generated by OpenAPI Generator.
     Ref: https://openapi-generator.tech
 
@@ -89,6 +89,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Dog, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/enum_arrays.py

@@ -128,6 +128,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(EnumArrays, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/enum_class.py

@@ -68,6 +68,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(EnumClass, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/enum_test.py

@@ -218,6 +218,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(EnumTest, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/file.py

@@ -91,6 +91,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(File, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/file_schema_test_class.py

@@ -115,6 +115,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(FileSchemaTestClass, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/format_test.py

@@ -433,6 +433,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(FormatTest, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/has_only_read_only.py

@@ -115,6 +115,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(HasOnlyReadOnly, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/list.py

@@ -89,6 +89,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(List, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/map_test.py

@@ -174,6 +174,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(MapTest, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py

@@ -141,6 +141,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(MixedPropertiesAndAdditionalPropertiesClass, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/model200_response.py

@@ -115,6 +115,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Model200Response, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/model_return.py

@@ -89,6 +89,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ModelReturn, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/name.py

@@ -168,6 +168,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Name, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/number_only.py

@@ -89,6 +89,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(NumberOnly, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/order.py

@@ -227,6 +227,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Order, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/outer_composite.py

@@ -141,6 +141,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(OuterComposite, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/outer_enum.py

@@ -68,6 +68,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(OuterEnum, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/pet.py

@@ -229,6 +229,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Pet, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/read_only_first.py

@@ -115,6 +115,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ReadOnlyFirst, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/special_model_name.py

@@ -89,6 +89,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(SpecialModelName, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/tag.py

@@ -115,6 +115,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Tag, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore/python/petstore_api/models/type_holder_default.py

@@ -198,6 +198,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(TypeHolderDefault, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result