Removes additional_properties_map, creates model_to_dict function to …

…use in model.to_dict and serialization

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

@@ -18,6 +18,7 @@ import tornado.gen
 {{/tornado}}
 
 from {{packageName}}.configuration import Configuration
+from {{packageName}}.utils import model_to_dict
 import {{modelPackage}}
 from {{packageName}} import rest
 
@@ -222,14 +223,10 @@ class ApiClient(object):
         if isinstance(obj, dict):
             obj_dict = obj
         else:
-            # Convert model obj to dict except
-            # attributes `openapi_types`, `attribute_map`
-            # and attributes which value is not None.
+            # Convert model obj to dict
             # Convert attribute name to json key in
             # model definition for request.
-            obj_dict = {obj.attribute_map[attr]: getattr(obj, attr)
-                        for attr, _ in six.iteritems(obj.openapi_types)
-                        if getattr(obj, attr) is not None}
+            obj_dict = model_to_dict(obj, serialize=True)
 
         return {key: self.sanitize_for_serialization(val)
                 for key, val in six.iteritems(obj_dict)}

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

@@ -7,7 +7,7 @@ import re  # noqa: F401
 
 import six
 
-from {{packageName}}.utils import recursive_type, valid_type
+from {{packageName}}.utils import model_to_dict, recursive_type, valid_type
 
 
 {{#models}}
@@ -34,12 +34,10 @@ class {{classname}}(object):
                             Optional and required variables only.
       attribute_map (dict): The key is attribute name
                             and the value is json key in definition.
-                            Optional and required variables only.
+                            Optional, required variables, and
+                            additional properties.
 {{#additionalProperties}}
-      additional_properties_type (str): The attribute type.
-                                        additional_properties variables only.
-      additional_properties_map (dict): The key is attribute name
-                                        and the value is json key in definition.
+      additional_properties_type (str): The attribute type for
                                         additional_properties variables only.
 {{/additionalProperties}}
     """
@@ -55,7 +53,6 @@ class {{classname}}(object):
     }
 {{#additionalProperties}}
     additional_properties_type = '{{{dataType}}}'
-    additional_properties_map = {}
 {{/additionalProperties}}
 {{#discriminator}}
     discriminator_value_class_map = {
@@ -119,8 +116,8 @@ class {{classname}}(object):
 {{#additionalProperties}}
         # set a variable name value for json serialization
         if (name not in self.openapi_types and
-                name not in self.additional_properties_map):
-            self.additional_properties_map[name] = name
+                name not in self.attribute_map):
+            self.attribute_map[name] = name
 {{/additionalProperties}}
 
     def __getitem__(self, name):
@@ -237,26 +234,7 @@ class {{classname}}(object):
 {{/discriminator}}
     def to_dict(self):
         """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, value in six.iteritems(self._data_store):
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-
-        return result
+        return model_to_dict(self, serialize=False)
 
     def to_str(self):
         """Returns the string representation of the model"""

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

@@ -64,3 +64,34 @@ def get_types_remainder(type_string):
             return set([type_prefix[:4]]), type_string[len(type_prefix):-1]
     type_set = set(type_string.split('|'))
     return type_set, ''
+
+
+def model_to_dict(model_instance, serialize=True):
+    """Returns the model properties as a dict
+
+    Kwargs:
+        serialize (bool): if True, the keys in the dict will be values from
+                          attribute_map
+    """
+    result = {}
+
+    for attr, value in six.iteritems(model_instance._data_store):
+        if serialize:
+            attr = model_instance.attribute_map[attr]
+        if isinstance(value, list):
+            result[attr] = list(map(
+                lambda x: model_to_dict(x, serialize=serialize)
+                if hasattr(x, '_data_store') else x, value
+            ))
+        elif hasattr(value, '_data_store'):
+            result[attr] = model_to_dict(value, serialize=serialize)
+        elif isinstance(value, dict):
+            result[attr] = dict(map(
+                lambda item: (item[0], model_to_dict(item[1], serialize=serialize))
+                if hasattr(item[1], '_data_store') else item,
+                value.items()
+            ))
+        else:
+            result[attr] = value
+
+    return result

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

@@ -23,6 +23,7 @@
 from six.moves.urllib.parse import quote
 
 from petstore_api.configuration import Configuration
+from petstore_api.utils import model_to_dict
 import petstore_api.models
 from petstore_api import rest
 
@@ -215,14 +216,10 @@ def sanitize_for_serialization(self, obj):
         if isinstance(obj, dict):
             obj_dict = obj
         else:
-            # Convert model obj to dict except
-            # attributes `openapi_types`, `attribute_map`
-            # and attributes which value is not None.
+            # Convert model obj to dict
             # Convert attribute name to json key in
             # model definition for request.
-            obj_dict = {obj.attribute_map[attr]: getattr(obj, attr)
-                        for attr, _ in six.iteritems(obj.openapi_types)
-                        if getattr(obj, attr) is not None}
+            obj_dict = model_to_dict(obj, serialize=True)
 
         return {key: self.sanitize_for_serialization(val)
                 for key, val in six.iteritems(obj_dict)}

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

@@ -15,7 +15,7 @@
 
 import six
 
-from petstore_api.utils import recursive_type, valid_type
+from petstore_api.utils import model_to_dict, recursive_type, valid_type
 
 
 class AdditionalPropertiesAnyType(object):
@@ -32,11 +32,9 @@ class AdditionalPropertiesAnyType(object):
                             Optional and required variables only.
       attribute_map (dict): The key is attribute name
                             and the value is json key in definition.
-                            Optional and required variables only.
-      additional_properties_type (str): The attribute type.
-                                        additional_properties variables only.
-      additional_properties_map (dict): The key is attribute name
-                                        and the value is json key in definition.
+                            Optional, required variables, and
+                            additional properties.
+      additional_properties_type (str): The attribute type for
                                         additional_properties variables only.
     """
     openapi_types = {
@@ -46,7 +44,6 @@ class AdditionalPropertiesAnyType(object):
         'name': 'name'
     }
     additional_properties_type = 'str|float|int|bool|list|dict'
-    additional_properties_map = {}
 
     def __init__(self, _check_type=False, **kwargs):  # noqa: E501
         """AdditionalPropertiesAnyType - a model defined in OpenAPI
@@ -90,8 +87,8 @@ def __setitem__(self, name, value):
         self._data_store[name] = value
         # set a variable name value for json serialization
         if (name not in self.openapi_types and
-                name not in self.additional_properties_map):
-            self.additional_properties_map[name] = name
+                name not in self.attribute_map):
+            self.attribute_map[name] = name
 
     def __getitem__(self, name):
         if name in self.openapi_types:
@@ -124,26 +121,7 @@ def name(self, name):
 
     def to_dict(self):
         """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, value in six.iteritems(self._data_store):
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-
-        return result
+        return model_to_dict(self, serialize=False)
 
     def to_str(self):
         """Returns the string representation of the model"""

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

@@ -15,7 +15,7 @@
 
 import six
 
-from petstore_api.utils import recursive_type, valid_type
+from petstore_api.utils import model_to_dict, recursive_type, valid_type
 
 
 class AdditionalPropertiesArray(object):
@@ -32,11 +32,9 @@ class AdditionalPropertiesArray(object):
                             Optional and required variables only.
       attribute_map (dict): The key is attribute name
                             and the value is json key in definition.
-                            Optional and required variables only.
-      additional_properties_type (str): The attribute type.
-                                        additional_properties variables only.
-      additional_properties_map (dict): The key is attribute name
-                                        and the value is json key in definition.
+                            Optional, required variables, and
+                            additional properties.
+      additional_properties_type (str): The attribute type for
                                         additional_properties variables only.
     """
     openapi_types = {
@@ -46,7 +44,6 @@ class AdditionalPropertiesArray(object):
         'name': 'name'
     }
     additional_properties_type = 'list[str|float|int|bool|list|dict]'
-    additional_properties_map = {}
 
     def __init__(self, _check_type=False, **kwargs):  # noqa: E501
         """AdditionalPropertiesArray - a model defined in OpenAPI
@@ -90,8 +87,8 @@ def __setitem__(self, name, value):
         self._data_store[name] = value
         # set a variable name value for json serialization
         if (name not in self.openapi_types and
-                name not in self.additional_properties_map):
-            self.additional_properties_map[name] = name
+                name not in self.attribute_map):
+            self.attribute_map[name] = name
 
     def __getitem__(self, name):
         if name in self.openapi_types:
@@ -124,26 +121,7 @@ def name(self, name):
 
     def to_dict(self):
         """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, value in six.iteritems(self._data_store):
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-
-        return result
+        return model_to_dict(self, serialize=False)
 
     def to_str(self):
         """Returns the string representation of the model"""

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

@@ -15,7 +15,7 @@
 
 import six
 
-from petstore_api.utils import recursive_type, valid_type
+from petstore_api.utils import model_to_dict, recursive_type, valid_type
 
 
 class AdditionalPropertiesBoolean(object):
@@ -32,11 +32,9 @@ class AdditionalPropertiesBoolean(object):
                             Optional and required variables only.
       attribute_map (dict): The key is attribute name
                             and the value is json key in definition.
-                            Optional and required variables only.
-      additional_properties_type (str): The attribute type.
-                                        additional_properties variables only.
-      additional_properties_map (dict): The key is attribute name
-                                        and the value is json key in definition.
+                            Optional, required variables, and
+                            additional properties.
+      additional_properties_type (str): The attribute type for
                                         additional_properties variables only.
     """
     openapi_types = {
@@ -46,7 +44,6 @@ class AdditionalPropertiesBoolean(object):
         'name': 'name'
     }
     additional_properties_type = 'bool'
-    additional_properties_map = {}
 
     def __init__(self, _check_type=False, **kwargs):  # noqa: E501
         """AdditionalPropertiesBoolean - a model defined in OpenAPI
@@ -90,8 +87,8 @@ def __setitem__(self, name, value):
         self._data_store[name] = value
         # set a variable name value for json serialization
         if (name not in self.openapi_types and
-                name not in self.additional_properties_map):
-            self.additional_properties_map[name] = name
+                name not in self.attribute_map):
+            self.attribute_map[name] = name
 
     def __getitem__(self, name):
         if name in self.openapi_types:
@@ -124,26 +121,7 @@ def name(self, name):
 
     def to_dict(self):
         """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, value in six.iteritems(self._data_store):
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-
-        return result
+        return model_to_dict(self, serialize=False)
 
     def to_str(self):
         """Returns the string representation of the model"""