Merge pull request #8414 from Open-MBEE/issue-8075

[PYTHON] Issue 8075 - additionalProperties support

Author: HugoMario

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java

@@ -77,6 +77,8 @@ public PythonClientCodegen() {
         languageSpecificPrimitives.add("date");
         languageSpecificPrimitives.add("object");
 
+        instantiationTypes.put("map", "dict");
+
         typeMapping.clear();
         typeMapping.put("integer", "int");
         typeMapping.put("float", "float");
@@ -350,6 +352,14 @@ public String modelTestFileFolder() {
         return outputFolder + File.separatorChar + testFolder;
     }
 
+    @Override
+    public String toInstantiationType(Property p) {
+        if (p instanceof MapProperty) {
+            return instantiationTypes.get("map");
+        }
+        return null;
+    }
+
     @Override
     public String getTypeDeclaration(Property p) {
         if (p instanceof ArrayProperty) {

modules/swagger-codegen/src/main/resources/python/api_client.mustache

@@ -620,6 +620,12 @@ class ApiClient(object):
 
         instance = klass(**kwargs)
 
+        if (isinstance(instance, dict) and
+                klass.swagger_types is not None and
+                isinstance(data, dict)):
+            for key, value in data.items():
+                if key not in klass.swagger_types:
+                    instance[key] = value
         if hasattr(instance, 'get_real_child_model'):
             klass_name = instance.get_real_child_model(data)
             if klass_name:

modules/swagger-codegen/src/main/resources/python/model.mustache

@@ -14,7 +14,7 @@ import six
 
 {{#models}}
 {{#model}}
-class {{classname}}(object):
+class {{classname}}({{#parent}}{{parent}}{{/parent}}{{^parent}}object{{/parent}}):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.
@@ -194,6 +194,9 @@ class {{classname}}(object):
                 ))
             else:
                 result[attr] = value
+        if issubclass({{classname}}, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 

samples/client/petstore-security-test/python/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.3.0-SNAPSHOT
+2.4.0-SNAPSHOT

samples/client/petstore-security-test/python/README.md

@@ -50,8 +50,9 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+
 # create an instance of the API class
-api_instance = petstore_api.FakeApi()
+api_instance = petstore_api.FakeApi(petstore_api.ApiClient(configuration))
 test_code_inject____end____rn_n_r = 'test_code_inject____end____rn_n_r_example' # str | To test code injection */ ' \" =end -- \\r\\n \\n \\r (optional)
 
 try:

samples/client/petstore-security-test/python/git_push.sh

@@ -36,7 +36,7 @@ git_remote=`git remote`
 if [ "$git_remote" = "" ]; then # git remote not defined
 
     if [ "$GIT_TOKEN" = "" ]; then
-        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
         git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
     else
         git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git

samples/client/petstore-security-test/python/petstore_api/api_client.py

@@ -614,6 +614,12 @@ def __deserialize_model(self, data, klass):
 
         instance = klass(**kwargs)
 
+        if (isinstance(instance, dict) and
+                klass.swagger_types is not None and
+                isinstance(data, dict)):
+            for key, value in data.items():
+                if key not in klass.swagger_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-security-test/python/petstore_api/models/model_return.py

@@ -91,6 +91,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-security-test/python/tox.ini

@@ -4,7 +4,7 @@ envlist = py27, py3
 [testenv]
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
-       
+
 commands=
    nosetests \
-      []
+      []

samples/client/petstore/python/README.md

@@ -50,8 +50,9 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+
 # create an instance of the API class
-api_instance = petstore_api.AnotherFakeApi()
+api_instance = petstore_api.AnotherFakeApi(petstore_api.ApiClient(configuration))
 body = petstore_api.Client() # Client | client model
 
 try:
@@ -74,6 +75,7 @@ Class | Method | HTTP request | Description
 *FakeApi* | [**fake_outer_composite_serialize**](docs/FakeApi.md#fake_outer_composite_serialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fake_outer_number_serialize**](docs/FakeApi.md#fake_outer_number_serialize) | **POST** /fake/outer/number | 
 *FakeApi* | [**fake_outer_string_serialize**](docs/FakeApi.md#fake_outer_string_serialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**test_body_with_query_params**](docs/FakeApi.md#test_body_with_query_params) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**test_client_model**](docs/FakeApi.md#test_client_model) | **PATCH** /fake | To test \"client\" model
 *FakeApi* | [**test_endpoint_parameters**](docs/FakeApi.md#test_endpoint_parameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 *FakeApi* | [**test_enum_parameters**](docs/FakeApi.md#test_enum_parameters) | **GET** /fake | To test enum parameters