Merge pull request #97 from HubSpot/feature/regen06042022

Feature/regen06042022

Author: plaurynovich-hubspot

Diff for: CHANGELOG.md

@@ -5,7 +5,27 @@ 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.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/HubSpot/hubspot-api-python/compare/v4.0.2...HEAD)
+## [Unreleased](https://github.com/HubSpot/hubspot-api-python/compare/v5.0.0...HEAD)
+
+## [5.0.0](https://github.com/HubSpot/hubspot-api-python/compare/v4.0.6...v5.0.0) - 2022-04-12
+
+### Added
+
+- cms.source_code API client
+- crm.objects.calls API client
+- crm.objects.emails API client
+- crm.objects.meetings API client
+- crm.objects.notes API client
+- crm.objects.tasks API client
+- marketing.forms API client
+- marketing.events API client
+- settings.users API client
+
+### Changed (no discovery breaking changes)
+
+- cms.blogs.authors.author_api => cms.blogs.authors.blog_authors_api
+- cms.blogs.blog_posts.default_api => cms.blogs.blog_posts.blog_posts_api
+- cms.blogs.tags.default_api => cms.blogs.tags.blog_tags_api
 
 ## [4.0.2](https://github.com/HubSpot/hubspot-api-python/compare/v4.0.1...v4.0.1) - 2021-11-03
 

Diff for: VERSION

@@ -1 +1 @@
-4.0.6
+5.0.0

Diff for: hubspot/auth/oauth/api/access_tokens_api.py

@@ -18,7 +18,7 @@
 import six
 
 from hubspot.auth.oauth.api_client import ApiClient
-from hubspot.auth.oauth.exceptions import ApiTypeError, ApiValueError  # noqa: F401
+from hubspot.auth.oauth.exceptions import ApiTypeError, ApiValueError
 
 
 class AccessTokensApi(object):
@@ -83,8 +83,11 @@ def get_access_token_with_http_info(self, token, **kwargs):  # noqa: E501
 
         local_var_params = locals()
 
-        all_params = ["token"]
-        all_params.extend(["async_req", "_return_http_data_only", "_preload_content", "_request_timeout"])
+        all_params = ["token"]  # noqa: E501
+        all_params.append("async_req")
+        all_params.append("_return_http_data_only")
+        all_params.append("_preload_content")
+        all_params.append("_request_timeout")
 
         for key, val in six.iteritems(local_var_params["kwargs"]):
             if key not in all_params:

Diff for: hubspot/auth/oauth/api/refresh_tokens_api.py

@@ -18,7 +18,7 @@
 import six
 
 from hubspot.auth.oauth.api_client import ApiClient
-from hubspot.auth.oauth.exceptions import ApiTypeError, ApiValueError  # noqa: F401
+from hubspot.auth.oauth.exceptions import ApiTypeError, ApiValueError
 
 
 class RefreshTokensApi(object):
@@ -83,8 +83,11 @@ def archive_refresh_token_with_http_info(self, token, **kwargs):  # noqa: E501
 
         local_var_params = locals()
 
-        all_params = ["token"]
-        all_params.extend(["async_req", "_return_http_data_only", "_preload_content", "_request_timeout"])
+        all_params = ["token"]  # noqa: E501
+        all_params.append("async_req")
+        all_params.append("_return_http_data_only")
+        all_params.append("_preload_content")
+        all_params.append("_request_timeout")
 
         for key, val in six.iteritems(local_var_params["kwargs"]):
             if key not in all_params:
@@ -183,8 +186,11 @@ def get_refresh_token_with_http_info(self, token, **kwargs):  # noqa: E501
 
         local_var_params = locals()
 
-        all_params = ["token"]
-        all_params.extend(["async_req", "_return_http_data_only", "_preload_content", "_request_timeout"])
+        all_params = ["token"]  # noqa: E501
+        all_params.append("async_req")
+        all_params.append("_return_http_data_only")
+        all_params.append("_preload_content")
+        all_params.append("_request_timeout")
 
         for key, val in six.iteritems(local_var_params["kwargs"]):
             if key not in all_params:

Diff for: hubspot/auth/oauth/api/tokens_api.py

@@ -18,7 +18,7 @@
 import six
 
 from hubspot.auth.oauth.api_client import ApiClient
-from hubspot.auth.oauth.exceptions import ApiTypeError, ApiValueError  # noqa: F401
+from hubspot.auth.oauth.exceptions import ApiTypeError, ApiValueError
 
 
 class TokensApi(object):
@@ -93,8 +93,11 @@ def create_token_with_http_info(self, **kwargs):  # noqa: E501
 
         local_var_params = locals()
 
-        all_params = ["grant_type", "code", "redirect_uri", "client_id", "client_secret", "refresh_token"]
-        all_params.extend(["async_req", "_return_http_data_only", "_preload_content", "_request_timeout"])
+        all_params = ["grant_type", "code", "redirect_uri", "client_id", "client_secret", "refresh_token"]  # noqa: E501
+        all_params.append("async_req")
+        all_params.append("_return_http_data_only")
+        all_params.append("_preload_content")
+        all_params.append("_request_timeout")
 
         for key, val in six.iteritems(local_var_params["kwargs"]):
             if key not in all_params:

Diff for: hubspot/auth/oauth/api_client.py

@@ -10,7 +10,6 @@
 
 from __future__ import absolute_import
 
-import atexit
 import datetime
 from dateutil.parser import parse
 import json
@@ -27,7 +26,7 @@
 from hubspot.auth.oauth.configuration import Configuration
 import hubspot.auth.oauth.models
 from hubspot.auth.oauth import rest
-from hubspot.auth.oauth.exceptions import ApiValueError, ApiException
+from hubspot.auth.oauth.exceptions import ApiValueError
 
 
 class ApiClient(object):
@@ -67,7 +66,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.get_default_copy()
+            configuration = Configuration()
         self.configuration = configuration
         self.pool_threads = pool_threads
 
@@ -80,27 +79,18 @@ def __init__(self, configuration=None, header_name=None, header_value=None, cook
         self.user_agent = "OpenAPI-Generator/1.0.0/python"
         self.client_side_validation = configuration.client_side_validation
 
-    def __enter__(self):
-        return self
-
-    def __exit__(self, exc_type, exc_value, traceback):
-        self.close()
-
-    def close(self):
+    def __del__(self):
         if self._pool:
             self._pool.close()
             self._pool.join()
             self._pool = None
-            if hasattr(atexit, "unregister"):
-                atexit.unregister(self.close)
 
     @property
     def pool(self):
         """Create thread pool on first request
         avoids instantiating unused threadpool for blocking clients.
         """
         if self._pool is None:
-            atexit.register(self.close)
             self._pool = ThreadPool(self.pool_threads)
         return self._pool
 
@@ -180,36 +170,20 @@ def __call_api(
             # use server/host defined in path or operation instead
             url = _host + resource_path
 
-        try:
-            # perform request and return response
-            response_data = self.request(
-                method, url, query_params=query_params, headers=header_params, post_params=post_params, body=body, _preload_content=_preload_content, _request_timeout=_request_timeout
-            )
-        except ApiException as e:
-            e.body = e.body.decode("utf-8") if six.PY3 else e.body
-            raise e
-
-        content_type = response_data.getheader("content-type")
+        # perform request and return response
+        response_data = self.request(
+            method, url, query_params=query_params, headers=header_params, post_params=post_params, body=body, _preload_content=_preload_content, _request_timeout=_request_timeout
+        )
 
         self.last_response = response_data
 
         return_data = response_data
-
-        if not _preload_content:
-            return return_data
-
-        if six.PY3 and response_type not in ["file", "bytes"]:
-            match = None
-            if content_type is not None:
-                match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type)
-            encoding = match.group(1) if match else "utf-8"
-            response_data.data = response_data.data.decode(encoding)
-
-        # deserialize response data
-        if response_type:
-            return_data = self.deserialize(response_data, response_type)
-        else:
-            return_data = None
+        if _preload_content:
+            # deserialize response data
+            if response_type:
+                return_data = self.deserialize(response_data, response_type)
+            else:
+                return_data = None
 
         if _return_http_data_only:
             return return_data
@@ -522,7 +496,9 @@ def update_params_for_auth(self, headers, querys, auth_settings):
         for auth in auth_settings:
             auth_setting = self.configuration.auth_settings().get(auth)
             if auth_setting:
-                if auth_setting["in"] == "cookie":
+                if not auth_setting["value"]:
+                    continue
+                elif auth_setting["in"] == "cookie":
                     headers["Cookie"] = auth_setting["value"]
                 elif auth_setting["in"] == "header":
                     headers[auth_setting["key"]] = auth_setting["value"]
@@ -611,11 +587,8 @@ def __deserialize_model(self, data, klass):
         :param klass: class literal.
         :return: model object.
         """
-        has_discriminator = False
-        if hasattr(klass, "get_real_child_model") and klass.discriminator_value_class_map:
-            has_discriminator = True
 
-        if not klass.openapi_types and has_discriminator is False:
+        if not klass.openapi_types and not hasattr(klass, "get_real_child_model"):
             return data
 
         kwargs = {}
@@ -627,7 +600,7 @@ def __deserialize_model(self, data, klass):
 
         instance = klass(**kwargs)
 
-        if has_discriminator:
+        if hasattr(instance, "get_real_child_model"):
             klass_name = instance.get_real_child_model(data)
             if klass_name:
                 instance = self.__deserialize(data, klass_name)