DataDog
diff --git a/‎api.mustache
Lines changed: 26 additions & 10 deletions b/‎api.mustache
Lines changed: 26 additions & 10 deletions
diff --git a/‎api_client.mustache
Lines changed: 14 additions & 2 deletions b/‎api_client.mustache
Lines changed: 14 additions & 2 deletions
diff --git a/‎api_doc_example.mustache
Lines changed: 2 additions & 9 deletions b/‎api_doc_example.mustache
Lines changed: 2 additions & 9 deletions
diff --git a/‎asyncio/rest.mustache
Lines changed: 13 additions & 12 deletions b/‎asyncio/rest.mustache
Lines changed: 13 additions & 12 deletions
diff --git a/‎configuration.mustache
Lines changed: 55 additions & 0 deletions b/‎configuration.mustache
Lines changed: 55 additions & 0 deletions
diff --git a/‎gitlab-ci.mustache
Lines changed: 38 additions & 0 deletions b/‎gitlab-ci.mustache
Lines changed: 38 additions & 0 deletions
diff --git a/‎python-experimental/api_client.mustache
Lines changed: 2 additions & 1 deletion b/‎python-experimental/api_client.mustache
Lines changed: 2 additions & 1 deletion
diff --git a/‎python-experimental/api_doc_example.mustache
Lines changed: 3 additions & 8 deletions b/‎python-experimental/api_doc_example.mustache
Lines changed: 3 additions & 8 deletions
diff --git a/‎python-experimental/model.mustache
Lines changed: 1 addition & 0 deletions b/‎python-experimental/model.mustache
Lines changed: 1 addition & 0 deletions
diff --git a/‎python-experimental/model_templates/method_init_composed.mustache
Lines changed: 17 additions & 10 deletions b/‎python-experimental/model_templates/method_init_composed.mustache
Lines changed: 17 additions & 10 deletions
@@ -10,7 +10,7 @@ import re  # noqa: F401
 import six
 
 from {{packageName}}.api_client import ApiClient
-from {{packageName}}.exceptions import (
+from {{packageName}}.exceptions import (  # noqa: F401
     ApiTypeError,
     ApiValueError
 )
@@ -99,20 +99,36 @@ class {{classname}}(object):
         """
 
         {{#servers.0}}
-        local_var_hosts = [{{#servers}}'{{{url}}}'{{^-last}}, {{/-last}}{{/servers}}]  # noqa: E501
+        local_var_hosts = [
+{{#servers}}
+            '{{{url}}}'{{^-last}},{{/-last}}
+{{/servers}}
+        ]
         local_var_host = local_var_hosts[0]
         if kwargs.get('_host_index'):
-            if int(kwags.get('_host_index')) < 0 or int(kawgs.get('_host_index')) >= len(local_var_hosts):
-                raise ApiValueError("Invalid host index. Must be 0 <= index < %s" % len(local_var_host))
-            local_var_host = local_var_hosts[int(kwargs.get('_host_index'))]
+            _host_index = int(kwargs.get('_host_index'))
+            if _host_index < 0 or _host_index >= len(local_var_hosts):
+                raise ApiValueError(
+                    "Invalid host index. Must be 0 <= index < %s"
+                    % len(local_var_host)
+                )
+            local_var_host = local_var_hosts[_host_index]
         {{/servers.0}}
         local_var_params = locals()
 
-        all_params = [{{#allParams}}'{{paramName}}'{{#hasMore}}, {{/hasMore}}{{/allParams}}]  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
+        all_params = [
+{{#allParams}}
+            '{{paramName}}'{{#hasMore}},{{/hasMore}}
+{{/allParams}}
+        ]
+        all_params.extend(
+            [
+                'async_req',
+                '_return_http_data_only',
+                '_preload_content',
+                '_request_timeout'
+            ]
+        )
 
         for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params{{#servers.0}} and key != "_host_index"{{/servers.0}}:
 
@@ -63,7 +63,7 @@ class ApiClient(object):
     def __init__(self, configuration=None, header_name=None, header_value=None,
                  cookie=None, pool_threads=1):
         if configuration is None:
-            configuration = Configuration()
+            configuration = Configuration.get_default_copy()
         self.configuration = configuration
         self.pool_threads = pool_threads
 
@@ -76,13 +76,25 @@ class ApiClient(object):
         self.user_agent = '{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}OpenAPI-Generator/{{{packageVersion}}}/python{{/httpUserAgent}}'
         self.client_side_validation = configuration.client_side_validation
 
+    {{#asyncio}}
+    async def __aenter__(self):
+        return self
+
+    async def __aexit__(self, exc_type, exc_value, traceback):
+        await self.close()
+    {{/asyncio}}
+    {{^asyncio}}
     def __enter__(self):
         return self
 
     def __exit__(self, exc_type, exc_value, traceback):
         self.close()
+    {{/asyncio}}
 
-    def close(self):
+    {{#asyncio}}async {{/asyncio}}def close(self):
+        {{#asyncio}}
+        await self.rest_client.close()
+        {{/asyncio}}
         if self._pool:
             self._pool.close()
             self._pool.join()
 
@@ -5,24 +5,17 @@ import {{{packageName}}}
 from {{{packageName}}}.rest import ApiException
 from pprint import pprint
 {{> python_doc_auth_partial}}
-{{#hasAuthMethods}}
-# Defining host is optional and default to {{{basePath}}}
-configuration.host = "{{{basePath}}}"
 # Enter a context with an instance of the API client
+{{#hasAuthMethods}}
 with {{{packageName}}}.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = {{{packageName}}}.{{{classname}}}(api_client)
-    {{#allParams}}{{paramName}} = {{{example}}} # {{{dataType}}} | {{{description}}}{{^required}} (optional){{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
-    {{/allParams}}
 {{/hasAuthMethods}}
 {{^hasAuthMethods}}
-# Enter a context with an instance of the API client
 with {{{packageName}}}.ApiClient() as api_client:
+{{/hasAuthMethods}}
     # Create an instance of the API class
     api_instance = {{{packageName}}}.{{{classname}}}(api_client)
     {{#allParams}}{{paramName}} = {{{example}}} # {{{dataType}}} | {{{description}}}{{^required}} (optional){{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
     {{/allParams}}
-{{/hasAuthMethods}}
 
     try:
     {{#summary}}    # {{{.}}}
 
@@ -10,7 +10,6 @@ import ssl
 
 import aiohttp
 import certifi
-import asyncio
 # python 2 and python 3 compatibility library
 from six.moves.urllib.parse import urlencode
 
@@ -66,19 +65,16 @@ class RESTClientObject(object):
             ssl=ssl_context
         )
 
+        self.proxy = configuration.proxy
+        self.proxy_headers = configuration.proxy_headers
+
         # https pool manager
-        if configuration.proxy:
-            self.pool_manager = aiohttp.ClientSession(
-                connector=connector,
-                proxy=configuration.proxy
-            )
-        else:
-            self.pool_manager = aiohttp.ClientSession(
-                connector=connector
-            )
+        self.pool_manager = aiohttp.ClientSession(
+            connector=connector
+        )
 
-    def __del__(self):
-        asyncio.ensure_future(self.pool_manager.close())
+    async def close(self):
+        await self.pool_manager.close()
 
     async def request(self, method, url, query_params=None, headers=None,
                       body=None, post_params=None, _preload_content=True,
@@ -123,6 +119,11 @@ class RESTClientObject(object):
             "headers": headers
         }
 
+        if self.proxy:
+            args["proxy"] = self.proxy
+        if self.proxy_headers:
+            args["proxy_headers"] = self.proxy_headers
+
         if query_params:
             args["url"] += '?' + urlencode(query_params)
 
 
@@ -4,6 +4,7 @@
 
 from __future__ import absolute_import
 
+import copy
 import logging
 {{^asyncio}}
 import multiprocessing
@@ -31,6 +32,17 @@ class Configuration(object):
       The dict value is an API key prefix when generating the auth data.
     :param username: Username for HTTP basic authentication
     :param password: Password for HTTP basic authentication
+    :param discard_unknown_keys: Boolean value indicating whether to discard
+      unknown properties. A server may send a response that includes additional
+      properties that are not known by the client in the following scenarios:
+      1. The OpenAPI document is incomplete, i.e. it does not match the server
+         implementation.
+      2. The client was generated using an older version of the OpenAPI document
+         and the server has been upgraded since then.
+      If a schema in the OpenAPI document defines the additionalProperties attribute,
+      then all undeclared properties received by the server are injected into the
+      additional properties map. In that case, there are undeclared properties, and
+      nothing to discard.
 {{#hasHttpSignatureMethods}}
     :param signing_info: Configuration parameters for the HTTP signature security scheme.
         Must be an instance of {{{packageName}}}.signing.HttpSigningConfiguration
@@ -117,9 +129,12 @@ class Configuration(object):
 {{/hasAuthMethods}}
     """
 
+    _default = None
+
     def __init__(self, host="{{{basePath}}}",
                  api_key=None, api_key_prefix=None,
                  username=None, password=None,
+                 discard_unknown_keys=False,
 {{#hasHttpSignatureMethods}}
                  signing_info=None,
 {{/hasHttpSignatureMethods}}
@@ -152,6 +167,7 @@ class Configuration(object):
         self.password = password
         """Password for HTTP basic authentication
         """
+        self.discard_unknown_keys = discard_unknown_keys
 {{#hasHttpSignatureMethods}}
         if signing_info is not None:
             signing_info.host = host
@@ -241,6 +257,45 @@ class Configuration(object):
         # Disable client side validation
         self.client_side_validation = True
 
+    def __deepcopy__(self, memo):
+        cls = self.__class__
+        result = cls.__new__(cls)
+        memo[id(self)] = result
+        for k, v in self.__dict__.items():
+            if k not in ('logger', 'logger_file_handler'):
+                setattr(result, k, copy.deepcopy(v, memo))
+        # shallow copy of loggers
+        result.logger = copy.copy(self.logger)
+        # use setters to configure loggers
+        result.logger_file = self.logger_file
+        result.debug = self.debug
+        return result
+
+    @classmethod
+    def set_default(cls, default):
+        """Set default instance of configuration.
+
+        It stores default configuration, which can be
+        returned by get_default_copy method.
+
+        :param default: object of Configuration
+        """
+        cls._default = copy.deepcopy(default)
+
+    @classmethod
+    def get_default_copy(cls):
+        """Return new instance of configuration.
+
+        This method returns newly created, based on default constructor,
+        object of Configuration class or returns a copy of default
+        configuration passed by the set_default method.
+
+        :return: The configuration object.
+        """
+        if cls._default is not None:
+            return copy.deepcopy(cls._default)
+        return Configuration()
+
     @property
     def logger_file(self):
         """The logger file.
 
@@ -0,0 +1,38 @@
+# ref: https://docs.gitlab.com/ee/ci/README.html
+
+stages:
+  - test
+
+.nosetest:
+  stage: test
+  script:
+   - pip install -r requirements.txt
+   - pip install -r test-requirements.txt
+   {{#useNose}}
+   - nosetests
+   {{/useNose}}
+   {{^useNose}}
+   - pytest --cov={{{packageName}}}
+   {{/useNose}}
+
+nosetest-2.7:
+  extends: .nosetest
+  image: python:2.7-alpine
+nosetest-3.3:
+  extends: .nosetest
+  image: python:3.3-alpine
+nosetest-3.4:
+  extends: .nosetest
+  image: python:3.4-alpine
+nosetest-3.5:
+  extends: .nosetest
+  image: python:3.5-alpine
+nosetest-3.6:
+  extends: .nosetest
+  image: python:3.6-alpine
+nosetest-3.7:
+  extends: .nosetest
+  image: python:3.7-alpine
+nosetest-3.8:
+  extends: .nosetest
+  image: python:3.8-alpine
@@ -21,6 +21,7 @@ from {{packageName}}.exceptions import ApiValueError
 from {{packageName}}.model_utils import (
     ModelNormal,
     ModelSimple,
+    ModelComposed,
     date,
     datetime,
     deserialize_file,
@@ -240,7 +241,7 @@ class ApiClient(object):
 
         if isinstance(obj, dict):
             obj_dict = obj
-        elif isinstance(obj, ModelNormal):
+        elif isinstance(obj, ModelNormal) or isinstance(obj, ModelComposed):
             # Convert model obj to dict
             # Convert attribute name to json key in
             # model definition for request
 
@@ -4,20 +4,15 @@ import time
 import {{{packageName}}}
 from pprint import pprint
 {{> python_doc_auth_partial}}
-{{#hasAuthMethods}}
-# Defining host is optional and default to {{{basePath}}}
-configuration.host = "{{{basePath}}}"
 # Enter a context with an instance of the API client
+{{#hasAuthMethods}}
 with {{{packageName}}}.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = {{{packageName}}}.{{{classname}}}(api_client)
 {{/hasAuthMethods}}
 {{^hasAuthMethods}}
-# Enter a context with an instance of the API client
-with {{{packageName}}}.ApiClient(configuration) as api_client:
+with {{{packageName}}}.ApiClient() as api_client:
+{{/hasAuthMethods}}
     # Create an instance of the API class
     api_instance = {{{packageName}}}.{{{classname}}}(api_client)
-{{/hasAuthMethods}}
     {{#requiredParams}}{{^defaultValue}}{{paramName}} = {{{example}}} # {{{dataType}}} | {{{description}}}
     {{/defaultValue}}{{/requiredParams}}{{#optionalParams}}{{paramName}} = {{{example}}} # {{{dataType}}} | {{{description}}}{{^required}} (optional){{/required}}{{#defaultValue}} if omitted the server will use the default value of {{{defaultValue}}}{{/defaultValue}}
     {{/optionalParams}}
 
@@ -7,6 +7,7 @@ import re  # noqa: F401
 import sys  # noqa: F401
 
 import six  # noqa: F401
+import nulltype  # noqa: F401
 
 from {{packageName}}.model_utils import (  # noqa: F401
     ModelComposed,
 
@@ -11,32 +11,39 @@
 
 {{> python-experimental/model_templates/method_init_shared }}
 
-        self._data_store = {}
-        self._check_type = _check_type
-        self._from_server = _from_server
-        self._path_to_item = _path_to_item
-        self._configuration = _configuration
-
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
             '_from_server': _from_server,
             '_configuration': _configuration,
         }
-        model_args = {
+        required_args = {
 {{#requiredVars}}
             '{{name}}': {{name}},
 {{/requiredVars}}
         }
+        # remove args whose value is Null because they are unset
+        required_arg_names = list(required_args.keys())
+        for required_arg_name in required_arg_names:
+            if required_args[required_arg_name] is nulltype.Null:
+                del required_args[required_arg_name]
+        model_args = {}
+        model_args.update(required_args)
         model_args.update(kwargs)
         composed_info = validate_get_composed_info(
             constant_args, model_args, self)
         self._composed_instances = composed_info[0]
         self._var_name_to_model_instances = composed_info[1]
         self._additional_properties_model_instances = composed_info[2]
+        unused_args = composed_info[3]
 
-{{#requiredVars}}
-        self.{{name}} = {{name}}
-{{/requiredVars}}
+        for var_name, var_value in required_args.items():
+            setattr(self, var_name, var_value)
         for var_name, var_value in six.iteritems(kwargs):
+            if var_name in unused_args and \
+                        self._configuration is not None and \
+                        self._configuration.discard_unknown_keys and \
+                        not self._additional_properties_model_instances:
+                # discard variable.
+                continue
             setattr(self, var_name, var_value)