Py4HEAppE 2.2.0__tar.gz → 2.4.0__tar.gz

{py4heappe-2.2.0 → py4heappe-2.4.0}/.gitignore

@@ -10,6 +10,7 @@ __pycache__
 lexis_logs.log
 py4heappe.log
 UNKNOWN.egg-info/
+Py4HEAppE.egg-info/
 src/Py4HEAppE.egg-info/
 data_transfer/
 tests/cli_test_results.xml

{py4heappe-2.2.0 → py4heappe-2.4.0}/.gitlab/stages/.generation.yml

@@ -2,14 +2,14 @@
 
 API_client_generation:
   stage: API_generation
-  image: openjdk:11-jre-slim
+  image: eclipse-temurin:11-jdk
   when: manual
   rules:
     - if: '$CI_COMMIT_BRANCH != "develop" && $CI_COMMIT_BRANCH != "main"'
   before_script:
     - apt-get update 
     - apt-get install -y wget zip
-    - wget https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.27/swagger-codegen-cli-2.4.27.jar -O /swagger-codegen-cli.jar
+    - wget https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.71/swagger-codegen-cli-3.0.71.jar -O /swagger-codegen-cli.jar
   script:
     - echo "Generation API client"
     - java -jar /swagger-codegen-cli.jar generate -i Tools/APIWrapperGen/swagger.json -l python -t Tools/APIWrapperGen/Templates/python/ -o ./app/client -c Tools/APIWrapperGen/config.json

{py4heappe-2.2.0 → py4heappe-2.4.0}/CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.4.0
+
+### Compatible with HEAppE V6.1.X, V6.0.X, V5.0.X, V4.3.X and V4.2.X 
+
+## V2.3.0
+
+### Compatible with HEAppE V6.0.X, V5.0.X, V4.3.X and V4.2.X
+
 ## V2.2.0
 
 ### Compatible with HEAppE V5.0.X, V4.3.X and V4.2.X

{py4heappe-2.2.0 → py4heappe-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Py4HEAppE
-Version: 2.2.0
+Version: 2.4.0
 Summary: Py4HEAppE is client library for easy access to HEAppE Middleware
 Author-email: IT4Innovations <support.heappe@it4i.cz>
 License-Expression: MIT
@@ -47,12 +47,14 @@ By using Py4HEAppE, users can quickly integrate HEAppE functionalities into thei
 The library ensures consistent and reliable communication with the HEAppE API, handling errors and edge cases gracefully.
 
 ## Supported HEAppE versions
-| Py4HEAppE      | HEAppE Version       |  Notes                             |
-|:--------------:|:--------------------:|:-----------------------------------|
-| 2.2.X          | 5.0.X, 4.3.X, 4.2.X  | W/O Admin/File sections in CLI     |
-| 2.1.X          | 5.0.X, 4.3.X, 4.2.X  | W/O Admin/Job/File sections in CLI |
-| 2.0.X          | 5.0.X                | W/O Admin/Job/File sections in CLI |
-| 1.X.X          | 4.3.X, 4.2.X         | W/O Admin/Job/File sections in CLI |
+| Py4HEAppE      | HEAppE Version              |  Notes                             |
+|:--------------:|:---------------------------:|:-----------------------------------|
+| 2.4.X          | 6.1.X, 6.0.X, 5.X.X, 4.X.X  | W/O Admin/File sections in CLI     |
+| 2.3.X          | 6.0.x, 5.0.X, 4.X.X         | W/O Admin/File sections in CLI     |
+| 2.2.X          | 5.0.X, 4.3.X, 4.2.X         | W/O Admin/File sections in CLI     |
+| 2.1.X          | 5.0.X, 4.3.X, 4.2.X         | W/O Admin/Job/File sections in CLI |
+| 2.0.X          | 5.0.X                       | W/O Admin/Job/File sections in CLI |
+| 1.X.X          | 4.3.X, 4.2.X                | W/O Admin/Job/File sections in CLI |
 
 <!-- GETTING STARTED -->
 ## Getting Started

{py4heappe-2.2.0 → py4heappe-2.4.0}/README.md

@@ -21,12 +21,14 @@ By using Py4HEAppE, users can quickly integrate HEAppE functionalities into thei
 The library ensures consistent and reliable communication with the HEAppE API, handling errors and edge cases gracefully.
 
 ## Supported HEAppE versions
-| Py4HEAppE      | HEAppE Version       |  Notes                             |
-|:--------------:|:--------------------:|:-----------------------------------|
-| 2.2.X          | 5.0.X, 4.3.X, 4.2.X  | W/O Admin/File sections in CLI     |
-| 2.1.X          | 5.0.X, 4.3.X, 4.2.X  | W/O Admin/Job/File sections in CLI |
-| 2.0.X          | 5.0.X                | W/O Admin/Job/File sections in CLI |
-| 1.X.X          | 4.3.X, 4.2.X         | W/O Admin/Job/File sections in CLI |
+| Py4HEAppE      | HEAppE Version              |  Notes                             |
+|:--------------:|:---------------------------:|:-----------------------------------|
+| 2.4.X          | 6.1.X, 6.0.X, 5.X.X, 4.X.X  | W/O Admin/File sections in CLI     |
+| 2.3.X          | 6.0.x, 5.0.X, 4.X.X         | W/O Admin/File sections in CLI     |
+| 2.2.X          | 5.0.X, 4.3.X, 4.2.X         | W/O Admin/File sections in CLI     |
+| 2.1.X          | 5.0.X, 4.3.X, 4.2.X         | W/O Admin/Job/File sections in CLI |
+| 2.0.X          | 5.0.X                       | W/O Admin/Job/File sections in CLI |
+| 1.X.X          | 4.3.X, 4.2.X                | W/O Admin/Job/File sections in CLI |
 
 <!-- GETTING STARTED -->
 ## Getting Started

{py4heappe-2.2.0 → py4heappe-2.4.0}/Tools/APIWrapperGen/Templates/python/README.mustache

@@ -58,7 +58,7 @@ import time
 import {{{packageName}}}
 from {{{packageName}}}.rest import ApiException
 from pprint import pprint
-{{#apiInfo}}{{#apis}}{{#-first}}{{#operations}}{{#operation}}{{#-first}}{{#hasAuthMethods}}{{#authMethods}}{{#isBasic}}
+{{#apiInfo}}{{#apis}}{{#@first}}{{#operations}}{{#operation}}{{#contents}}{{#@first}}{{#hasAuthMethods}}{{#authMethods}}{{#isBasic}}
 # Configure HTTP basic authorization: {{{name}}}
 configuration = {{{packageName}}}.Configuration()
 configuration.username = 'YOUR_USERNAME'
@@ -75,16 +75,16 @@ configuration.access_token = 'YOUR_ACCESS_TOKEN'{{/isOAuth}}{{/authMethods}}
 
 # create an instance of the API class
 api_instance = {{{packageName}}}.{{{classname}}}({{{packageName}}}.ApiClient(configuration))
-{{#allParams}}{{paramName}} = {{{example}}} # {{{dataType}}} | {{{description}}}{{^required}} (optional){{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
-{{/allParams}}
+{{#parameters}}{{paramName}} = {{{example}}} # {{{dataType}}} | {{{description}}}{{^required}} (optional){{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
+{{/parameters}}
 
 try:
 {{#summary}}    # {{{.}}}
-{{/summary}}    {{#returnType}}api_response = {{/returnType}}api_instance.{{{operationId}}}({{#allParams}}{{#required}}{{paramName}}{{/required}}{{^required}}{{paramName}}={{paramName}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}){{#returnType}}
+{{/summary}}    {{#returnType}}api_response = {{/returnType}}api_instance.{{{operationId}}}({{#parameters}}{{#required}}{{paramName}}{{/required}}{{^required}}{{paramName}}={{paramName}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/parameters}}){{#returnType}}
     pprint(api_response){{/returnType}}
 except ApiException as e:
     print("Exception when calling {{classname}}->{{operationId}}: %s\n" % e)
-{{/-first}}{{/operation}}{{/operations}}{{/-first}}{{/apis}}{{/apiInfo}}
+{{/@first}}{{/contents}}{{/operation}}{{/operations}}{{/@first}}{{/apis}}{{/apiInfo}}
 ```
 
 ## Documentation for API Endpoints
@@ -117,8 +117,8 @@ Class | Method | HTTP request | Description
 - **Flow**: {{{flow}}}
 - **Authorization URL**: {{{authorizationUrl}}}
 - **Scopes**: {{^scopes}}N/A{{/scopes}}
-{{#scopes}} - **{{{scope}}}**: {{{description}}}
-{{/scopes}}
+{{#each scopes}} - **{{@key}}**: {{this}}
+{{/each}}
 {{/isOAuth}}
 
 {{/authMethods}}

py4heappe-2.4.0/Tools/APIWrapperGen/Templates/python/__init__api.mustache

@@ -0,0 +1,7 @@
+from __future__ import absolute_import
+
+# flake8: noqa
+
+# import apis into api package
+{{#apiInfo}}{{#apis}}from {{importPath}} import {{classname}}
+{{/apis}}{{/apiInfo}}

{py4heappe-2.2.0 → py4heappe-2.4.0}/Tools/APIWrapperGen/Templates/python/__init__package.mustache

@@ -7,7 +7,7 @@
 from __future__ import absolute_import
 
 # import apis into sdk package
-{{#apiInfo}}{{#apis}}from {{apiPackage}}.{{classVarName}} import {{classname}}
+{{#apiInfo}}{{#apis}}from {{importPath}} import {{classname}}
 {{/apis}}{{/apiInfo}}
 # import ApiClient
 from {{packageName}}.api_client import ApiClient

{py4heappe-2.2.0 → py4heappe-2.4.0}/Tools/APIWrapperGen/Templates/python/api.mustache

@@ -25,8 +25,9 @@ class {{classname}}(object):
             api_client = ApiClient()
         self.api_client = api_client
 {{#operation}}
+{{#contents}}
 
-    def {{operationId}}(self, {{#sortParamsByRequiredFlag}}{{#allParams}}{{#required}}{{baseName}}, {{/required}}{{/allParams}}{{/sortParamsByRequiredFlag}}**kwargs):  # noqa: E501
+    def {{operationId}}(self, {{#sortParamsByRequiredFlag}}{{#parameters}}{{#required}}{{baseName}}, {{/required}}{{/parameters}}{{/sortParamsByRequiredFlag}}**kwargs):  # noqa: E501
         """{{#summary}}{{{.}}}{{/summary}}{{^summary}}{{operationId}}{{/summary}}  # noqa: E501
 
 {{#notes}}
@@ -35,29 +36,29 @@ class {{classname}}(object):
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
 {{#sortParamsByRequiredFlag}}
-        >>> thread = api.{{operationId}}({{#allParams}}{{#required}}{{baseName}}, {{/required}}{{/allParams}}async_req=True)
+        >>> thread = api.{{operationId}}({{#parameters}}{{#required}}{{baseName}}, {{/required}}{{/parameters}}async_req=True)
 {{/sortParamsByRequiredFlag}}
 {{^sortParamsByRequiredFlag}}
-        >>> thread = api.{{operationId}}({{#allParams}}{{#required}}{{baseName}}={{baseName}}_value, {{/required}}{{/allParams}}async_req=True)
+        >>> thread = api.{{operationId}}({{#parameters}}{{#required}}{{baseName}}={{baseName}}_value, {{/required}}{{/parameters}}async_req=True)
 {{/sortParamsByRequiredFlag}}
         >>> result = thread.get()
 
         :param async_req bool
-{{#allParams}}
+{{#parameters}}
         :param {{dataType}} {{baseName}}:{{#description}} {{{description}}}{{/description}}{{#required}} (required){{/required}}{{#optional}}(optional){{/optional}}
-{{/allParams}}
+{{/parameters}}
         :return: {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}None{{/returnType}}
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.{{operationId}}_with_http_info({{#sortParamsByRequiredFlag}}{{#allParams}}{{#required}}{{baseName}}, {{/required}}{{/allParams}}{{/sortParamsByRequiredFlag}}**kwargs)  # noqa: E501
+            return self.{{operationId}}_with_http_info({{#sortParamsByRequiredFlag}}{{#parameters}}{{#required}}{{baseName}}, {{/required}}{{/parameters}}{{/sortParamsByRequiredFlag}}**kwargs)  # noqa: E501
         else:
-            (data) = self.{{operationId}}_with_http_info({{#sortParamsByRequiredFlag}}{{#allParams}}{{#required}}{{baseName}}, {{/required}}{{/allParams}}{{/sortParamsByRequiredFlag}}**kwargs)  # noqa: E501
+            (data) = self.{{operationId}}_with_http_info({{#sortParamsByRequiredFlag}}{{#parameters}}{{#required}}{{baseName}}, {{/required}}{{/parameters}}{{/sortParamsByRequiredFlag}}**kwargs)  # noqa: E501
             return data
 
-    def {{operationId}}_with_http_info(self, {{#sortParamsByRequiredFlag}}{{#allParams}}{{#required}}{{baseName}}, {{/required}}{{/allParams}}{{/sortParamsByRequiredFlag}}**kwargs):  # noqa: E501
+    def {{operationId}}_with_http_info(self, {{#sortParamsByRequiredFlag}}{{#parameters}}{{#required}}{{baseName}}, {{/required}}{{/parameters}}{{/sortParamsByRequiredFlag}}**kwargs):  # noqa: E501
         """{{#summary}}{{{.}}}{{/summary}}{{^summary}}{{operationId}}{{/summary}}  # noqa: E501
 
 {{#notes}}
@@ -66,23 +67,23 @@ class {{classname}}(object):
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
 {{#sortParamsByRequiredFlag}}
-        >>> thread = api.{{operationId}}_with_http_info({{#allParams}}{{#required}}{{baseName}}, {{/required}}{{/allParams}}async_req=True)
+        >>> thread = api.{{operationId}}_with_http_info({{#parameters}}{{#required}}{{baseName}}, {{/required}}{{/parameters}}async_req=True)
 {{/sortParamsByRequiredFlag}}
 {{^sortParamsByRequiredFlag}}
-        >>> thread = api.{{operationId}}_with_http_info({{#allParams}}{{#required}}{{baseName}}={{baseName}}_value, {{/required}}{{/allParams}}async_req=True)
+        >>> thread = api.{{operationId}}_with_http_info({{#parameters}}{{#required}}{{baseName}}={{baseName}}_value, {{/required}}{{/parameters}}async_req=True)
 {{/sortParamsByRequiredFlag}}
         >>> result = thread.get()
 
         :param async_req bool
-{{#allParams}}
+{{#parameters}}
         :param {{dataType}} {{baseName}}:{{#description}} {{{description}}}{{/description}}{{#required}} (required){{/required}}{{#optional}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/optional}}
-{{/allParams}}
+{{/parameters}}
         :return: {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}None{{/returnType}}
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = [{{#allParams}}'{{baseName}}'{{#hasMore}}, {{/hasMore}}{{/allParams}}]  # noqa: E501
+        all_params = [{{#parameters}}'{{baseName}}'{{#hasMore}}, {{/hasMore}}{{/parameters}}]  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -97,53 +98,53 @@ class {{classname}}(object):
                 )
             params[key] = val
         del params['kwargs']
-{{#allParams}}
+{{#parameters}}
 {{#required}}
         # verify the required parameter '{{baseName}}' is set
-        if self.api_client.client_side_validation and ('{{baseName}}' not in params or
-                                                       params['{{baseName}}'] is None):  # noqa: E501
+        if ('{{baseName}}' not in params or
+                params['{{baseName}}'] is None):
             raise ValueError("Missing the required parameter `{{baseName}}` when calling `{{operationId}}`")  # noqa: E501
 {{/required}}
-{{/allParams}}
+{{/parameters}}
 
-{{#allParams}}
+{{#parameters}}
 {{#hasValidation}}
     {{#maxLength}}
-        if self.api_client.client_side_validation and ('{{baseName}}' in params and
-                                                       len(params['{{baseName}}']) > {{maxLength}}):
+        if ('{{baseName}}' in params and
+                len(params['{{baseName}}']) > {{maxLength}}):
             raise ValueError("Invalid value for parameter `{{baseName}}` when calling `{{operationId}}`, length must be less than or equal to `{{maxLength}}`")  # noqa: E501
     {{/maxLength}}
     {{#minLength}}
-        if self.api_client.client_side_validation and ('{{baseName}}' in params and
-                                                       len(params['{{baseName}}']) < {{minLength}}):
+        if ('{{baseName}}' in params and
+                len(params['{{baseName}}']) < {{minLength}}):
             raise ValueError("Invalid value for parameter `{{baseName}}` when calling `{{operationId}}`, length must be greater than or equal to `{{minLength}}`")  # noqa: E501
     {{/minLength}}
     {{#maximum}}
-        if self.api_client.client_side_validation and ('{{baseName}}' in params and params['{{baseName}}'] >{{#exclusiveMaximum}}={{/exclusiveMaximum}} {{maximum}}):  # noqa: E501
+        if '{{baseName}}' in params and params['{{baseName}}'] >{{#exclusiveMaximum}}={{/exclusiveMaximum}} {{maximum}}:  # noqa: E501
             raise ValueError("Invalid value for parameter `{{baseName}}` when calling `{{operationId}}`, must be a value less than {{^exclusiveMaximum}}or equal to {{/exclusiveMaximum}}`{{maximum}}`")  # noqa: E501
     {{/maximum}}
     {{#minimum}}
-        if self.api_client.client_side_validation and ('{{baseName}}' in params and params['{{baseName}}'] <{{#exclusiveMinimum}}={{/exclusiveMinimum}} {{minimum}}):  # noqa: E501
+        if '{{baseName}}' in params and params['{{baseName}}'] <{{#exclusiveMinimum}}={{/exclusiveMinimum}} {{minimum}}:  # noqa: E501
             raise ValueError("Invalid value for parameter `{{baseName}}` when calling `{{operationId}}`, must be a value greater than {{^exclusiveMinimum}}or equal to {{/exclusiveMinimum}}`{{minimum}}`")  # noqa: E501
     {{/minimum}}
     {{#pattern}}
-        if self.api_client.client_side_validation and ('{{baseName}}' in params and not re.search(r'{{{vendorExtensions.x-regex}}}', params['{{baseName}}']{{#vendorExtensions.x-modifiers}}{{#-first}}, flags={{/-first}}re.{{.}}{{^-last}} | {{/-last}}{{/vendorExtensions.x-modifiers}})):  # noqa: E501
+        if '{{baseName}}' in params and not re.search(r'{{{vendorExtensions.x-regex}}}', params['{{baseName}}']{{#vendorExtensions.x-modifiers}}{{#@first}}, flags={{/@first}}re.{{.}}{{^@last}} | {{/@last}}{{/vendorExtensions.x-modifiers}}):  # noqa: E501
             raise ValueError("Invalid value for parameter `{{baseName}}` when calling `{{operationId}}`, must conform to the pattern `{{{pattern}}}`")  # noqa: E501
     {{/pattern}}
     {{#maxItems}}
-        if self.api_client.client_side_validation and ('{{baseName}}' in params and
-                                            len(params['{{baseName}}']) > {{maxItems}}):
+        if ('{{baseName}}' in params and
+                len(params['{{baseName}}']) > {{maxItems}}):
             raise ValueError("Invalid value for parameter `{{baseName}}` when calling `{{operationId}}`, number of items must be less than or equal to `{{maxItems}}`")  # noqa: E501
     {{/maxItems}}
     {{#minItems}}
-        if self.api_client.client_side_validation and ('{{baseName}}' in params and
-                                            len(params['{{baseName}}']) < {{minItems}}):
+        if ('{{baseName}}' in params and
+                len(params['{{baseName}}']) < {{minItems}}):
             raise ValueError("Invalid value for parameter `{{baseName}}` when calling `{{operationId}}`, number of items must be greater than or equal to `{{minItems}}`")  # noqa: E501
     {{/minItems}}
 {{/hasValidation}}
-{{#-last}}
-{{/-last}}
-{{/allParams}}
+{{#@last}}
+{{/@last}}
+{{/parameters}}
         collection_formats = {}
 
         path_params = {}
@@ -171,7 +172,7 @@ class {{classname}}(object):
         local_var_files = {}
 {{#formParams}}
         if '{{baseName}}' in params:
-            {{#notFile}}form_params.append(('{{baseName}}', params['{{baseName}}'])){{/notFile}}{{#isFile}}local_var_files['{{baseName}}'] = params['{{baseName}}']{{/isFile}}{{#isListContainer}}  # noqa: E501
+            {{^isBinary}}form_params.append(('{{baseName}}', params['{{baseName}}'])){{/isBinary}}{{#isBinary}}local_var_files['{{baseName}}'] = params['{{baseName}}']{{/isBinary}}{{#isListContainer}}  # noqa: E501
             collection_formats['{{baseName}}'] = '{{collectionFormat}}'{{/isListContainer}}  # noqa: E501
 {{/formParams}}
 
@@ -210,5 +211,6 @@ class {{classname}}(object):
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
+{{/contents}}
 {{/operation}}
 {{/operations}}

{py4heappe-2.2.0 → py4heappe-2.4.0}/Tools/APIWrapperGen/Templates/python/api_client.mustache

@@ -60,8 +60,7 @@ class ApiClient(object):
             configuration = Configuration()
         self.configuration = configuration
 
-        # Use the pool property to lazily initialize the ThreadPool.
-        self._pool = None
+        self.pool = ThreadPool()
         self.rest_client = rest.RESTClientObject(configuration)
         self.default_headers = {}
         if header_name is not None:
@@ -69,18 +68,10 @@ class ApiClient(object):
         self.cookie = cookie
         # Set default User-Agent.
         self.user_agent = '{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen/{{{packageVersion}}}/python{{/httpUserAgent}}'
-        self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
-        if self._pool is not None:
-            self._pool.close()
-            self._pool.join()
-
-    @property
-    def pool(self):
-        if self._pool is None:
-            self._pool = ThreadPool()
-        return self._pool
+        self.pool.close()
+        self.pool.join()
 
     @property
     def user_agent(self):
@@ -539,10 +530,14 @@ class ApiClient(object):
             filename = re.search(r'filename=[\'"]?([^\'"\s]+)[\'"]?',
                                  content_disposition).group(1)
             path = os.path.join(os.path.dirname(path), filename)
-
-        with open(path, {{^writeBinary}}"w"{{/writeBinary}}{{#writeBinary}}"wb"{{/writeBinary}}) as f:
-            f.write(response.data)
-
+            response_data = response.data
+            with open(path, "wb") as f:
+                if isinstance(response_data, str):
+                    # change str to bytes so we can write it
+                    response_data = response_data.encode('utf-8')
+                    f.write(response_data)
+                else:
+                    f.write(response_data)
         return path
 
     def __deserialize_primitive(self, data, klass):
@@ -607,7 +602,7 @@ class ApiClient(object):
             )
 
     def __hasattr(self, object, name):
-        return name in object.__class__.__dict__
+            return name in object.__class__.__dict__
 
     def __deserialize_model(self, data, klass):
         """Deserializes list or dict to model.
@@ -617,8 +612,7 @@ class ApiClient(object):
         :return: model object.
         """
 
-        if (not klass.swagger_types and
-                not self.__hasattr(klass, 'get_real_child_model')):
+        if not klass.swagger_types and not self.__hasattr(klass, 'get_real_child_model'):
             return data
 
         kwargs = {}

{py4heappe-2.2.0 → py4heappe-2.4.0}/Tools/APIWrapperGen/Templates/python/api_doc.mustache

@@ -10,8 +10,10 @@ Method | HTTP request | Description
 
 {{#operations}}
 {{#operation}}
+{{#contents}}
+{{#@first}}
 # **{{{operationId}}}**
-> {{#returnType}}{{{returnType}}} {{/returnType}}{{{operationId}}}({{#allParams}}{{#required}}{{{paramName}}}{{/required}}{{^required}}{{{paramName}}}={{{paramName}}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
+> {{#returnType}}{{{returnType}}} {{/returnType}}{{{operationId}}}({{#parameters}}{{#required}}{{{paramName}}}{{/required}}{{^required}}{{{paramName}}}={{{paramName}}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/parameters}})
 
 {{{summary}}}{{#notes}}
 
@@ -40,31 +42,31 @@ configuration.access_token = 'YOUR_ACCESS_TOKEN'{{/isOAuth}}{{/authMethods}}
 
 # create an instance of the API class
 api_instance = {{{packageName}}}.{{{classname}}}({{{packageName}}}.ApiClient(configuration))
-{{#allParams}}{{paramName}} = {{{example}}} # {{{dataType}}} | {{{description}}}{{^required}} (optional){{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
-{{/allParams}}
+{{#parameters}}{{paramName}} = {{{example}}} # {{{dataType}}} | {{{description}}}{{^required}} (optional){{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
+{{/parameters}}
 {{/hasAuthMethods}}
 {{^hasAuthMethods}}
 
 # create an instance of the API class
 api_instance = {{{packageName}}}.{{{classname}}}()
-{{#allParams}}{{paramName}} = {{{example}}} # {{{dataType}}} | {{{description}}}{{^required}} (optional){{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
-{{/allParams}}
+{{#parameters}}{{paramName}} = {{{example}}} # {{{dataType}}} | {{{description}}}{{^required}} (optional){{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
+{{/parameters}}
 {{/hasAuthMethods}}
 
 try:
 {{#summary}}    # {{{.}}}
-{{/summary}}    {{#returnType}}api_response = {{/returnType}}api_instance.{{{operationId}}}({{#allParams}}{{#required}}{{paramName}}{{/required}}{{^required}}{{paramName}}={{paramName}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}){{#returnType}}
+{{/summary}}    {{#returnType}}api_response = {{/returnType}}api_instance.{{{operationId}}}({{#parameters}}{{#required}}{{paramName}}{{/required}}{{^required}}{{paramName}}={{paramName}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/parameters}}){{#returnType}}
     pprint(api_response){{/returnType}}
 except ApiException as e:
     print("Exception when calling {{classname}}->{{operationId}}: %s\n" % e)
 ```
 
 ### Parameters
-{{^allParams}}This endpoint does not need any parameter.{{/allParams}}{{#allParams}}{{#-last}}
+{{^parameters}}This endpoint does not need any parameter.{{/parameters}}{{#parameters}}{{#@last}}
 Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------{{/-last}}{{/allParams}}
-{{#allParams}} **{{paramName}}** | {{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}{{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{baseType}}.md){{/isPrimitiveType}}{{/isFile}}| {{description}} | {{^required}}[optional] {{/required}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
-{{/allParams}}
+------------- | ------------- | ------------- | -------------{{/@last}}{{/parameters}}
+{{#parameters}} **{{paramName}}** | {{#isBinary}}**{{dataType}}**{{/isBinary}}{{^isBinary}}{{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{baseType}}.md){{/isPrimitiveType}}{{/isBinary}}| {{description}} | {{^required}}[optional] {{/required}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
+{{/parameters}}
 
 ### Return type
 
@@ -72,7 +74,7 @@ Name | Type | Description  | Notes
 
 ### Authorization
 
-{{^authMethods}}No authorization required{{/authMethods}}{{#authMethods}}[{{{name}}}](../README.md#{{{name}}}){{^-last}}, {{/-last}}{{/authMethods}}
+{{^authMethods}}No authorization required{{/authMethods}}{{#authMethods}}[{{{name}}}](../README.md#{{{name}}}){{^@last}}, {{/@last}}{{/authMethods}}
 
 ### HTTP request headers
 
@@ -81,5 +83,7 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+{{/@first}}
+{{/contents}}
 {{/operation}}
 {{/operations}}

{py4heappe-2.2.0 → py4heappe-2.4.0}/Tools/APIWrapperGen/Templates/python/api_test.mustache

@@ -7,7 +7,7 @@ from __future__ import absolute_import
 import unittest
 
 import {{packageName}}
-from {{apiPackage}}.{{classVarName}} import {{classname}}  # noqa: E501
+from {{packageName}}.{{apiPackage}}.{{classVarName}} import {{classname}}  # noqa: E501
 from {{packageName}}.rest import ApiException
 
 
@@ -15,7 +15,7 @@ class {{#operations}}Test{{classname}}(unittest.TestCase):
     """{{classname}} unit test stubs"""
 
     def setUp(self):
-        self.api = {{apiPackage}}.{{classVarName}}.{{classname}}()  # noqa: E501
+        self.api = {{classname}}()  # noqa: E501
 
     def tearDown(self):
         pass

{py4heappe-2.2.0 → py4heappe-2.4.0}/Tools/APIWrapperGen/Templates/python/configuration.mustache

@@ -14,22 +14,29 @@ import six
 from six.moves import http_client as httplib
 
 
-class Configuration(object):
+class TypeWithDefault(type):
+    def __init__(cls, name, bases, dct):
+        super(TypeWithDefault, cls).__init__(name, bases, dct)
+        cls._default = None
+
+    def __call__(cls):
+        if cls._default is None:
+            cls._default = type.__call__(cls)
+        return copy.copy(cls._default)
+
+    def set_default(cls, default):
+        cls._default = copy.copy(default)
+
+
+class Configuration(six.with_metaclass(TypeWithDefault, object)):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Ref: https://github.com/swagger-api/swagger-codegen
     Do not edit the class manually.
     """
 
-    _default = None
-
     def __init__(self):
         """Constructor"""
-        if self._default:
-            for key in self._default.__dict__.keys():
-                self.__dict__[key] = copy.copy(self._default.__dict__[key])
-            return
-
         # Default Base url
         self.host = "{{{basePath}}}"
         # Temp file folder for downloading files
@@ -90,13 +97,6 @@ class Configuration(object):
         # Safe chars for path_param
         self.safe_chars_for_path_param = ''
 
-        # Disable client side validation
-        self.client_side_validation = True
-
-    @classmethod
-    def set_default(cls, default):
-        cls._default = default
-
     @property
     def logger_file(self):
         """The logger file.
@@ -199,7 +199,6 @@ class Configuration(object):
         :param identifier: The identifier of apiKey.
         :return: The token for api key authentication.
         """
-
         if self.refresh_api_key_hook:
             self.refresh_api_key_hook(self)