api update

Author: Elasticemail

ElasticEmail/__init__.py

@@ -11,7 +11,7 @@
 """
 
 
-__version__ = "4.0.13"
+__version__ = "4.0.15"
 
 # import ApiClient
 from ElasticEmail.api_client import ApiClient

ElasticEmail/api/campaigns_api.py

@@ -77,7 +77,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'OpenAPI-Generator/4.0.13/python'
+        self.user_agent = 'OpenAPI-Generator/4.0.15/python'
 
     def __enter__(self):
         return self
@@ -589,12 +589,12 @@ def select_header_content_type(self, content_types):
         else:
             return content_types[0]
 
-    def update_params_for_auth(self, headers, querys, auth_settings,
+    def update_params_for_auth(self, headers, queries, auth_settings,
                                resource_path, method, body):
         """Updates header and query params based on authentication setting.
 
         :param headers: Header parameters dict to be updated.
-        :param querys: Query parameters tuple list to be updated.
+        :param queries: Query parameters tuple list to be updated.
         :param auth_settings: Authentication setting identifiers list.
         :param resource_path: A string representation of the HTTP request resource path.
         :param method: A string representation of the HTTP request method.
@@ -613,7 +613,7 @@ def update_params_for_auth(self, headers, querys, auth_settings,
                     if auth_setting['type'] != 'http-signature':
                         headers[auth_setting['key']] = auth_setting['value']
                 elif auth_setting['in'] == 'query':
-                    querys.append((auth_setting['key'], auth_setting['value']))
+                    queries.append((auth_setting['key'], auth_setting['value']))
                 else:
                     raise ApiValueError(
                         'Authentication token must be in `query` or `header`'
@@ -827,9 +827,10 @@ def call_with_http_info(self, **kwargs):
 
         content_type_headers_list = self.headers_map['content_type']
         if content_type_headers_list:
-            header_list = self.api_client.select_header_content_type(
-                content_type_headers_list)
-            params['header']['Content-Type'] = header_list
+            if params['body'] != "":
+                header_list = self.api_client.select_header_content_type(
+                    content_type_headers_list)
+                params['header']['Content-Type'] = header_list
 
         return self.api_client.call_api(
             self.settings['endpoint_path'], self.settings['http_method'],

ElasticEmail/api/contacts_api.py

@@ -74,7 +74,7 @@ class Configuration(object):
     :param server_operation_variables: Mapping from operation ID to a mapping with
       string values to replace variables in templated server configuration.
       The validation of enums is performed for variables with defined enum values before.
-    :param ssl_ca_cert: str - the path to a file of concatenated CA certificates 
+    :param ssl_ca_cert: str - the path to a file of concatenated CA certificates
       in PEM format
 
     :Example:
@@ -407,7 +407,7 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 4.0.0\n"\
-               "SDK Package Version: 4.0.13".\
+               "SDK Package Version: 4.0.15".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):

ElasticEmail/api/emails_api.py

@@ -106,13 +106,7 @@ class AccessLevel(ModelSimple):
     validations = {
     }
 
-    @cached_property
-    def additional_properties_type():
-        """
-        This must be a method because a model may have properties that are
-        of type self, this must run after the class is loaded
-        """
-        return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
+    additional_properties_type = None
 
     _nullable = False
 

ElasticEmail/api/events_api.py

@@ -64,13 +64,7 @@ class AccountStatusEnum(ModelSimple):
     validations = {
     }
 
-    @cached_property
-    def additional_properties_type():
-        """
-        This must be a method because a model may have properties that are
-        of type self, this must run after the class is loaded
-        """
-        return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
+    additional_properties_type = None
 
     _nullable = False
 

ElasticEmail/api/files_api.py

@@ -63,13 +63,7 @@ class BodyContentType(ModelSimple):
     validations = {
     }
 
-    @cached_property
-    def additional_properties_type():
-        """
-        This must be a method because a model may have properties that are
-        of type self, this must run after the class is loaded
-        """
-        return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
+    additional_properties_type = None
 
     _nullable = False
 

ElasticEmail/api/inbound_route_api.py

@@ -30,6 +30,10 @@
 from ElasticEmail.exceptions import ApiAttributeError
 
 
+def lazy_import():
+    from ElasticEmail.model.body_content_type import BodyContentType
+    globals()['BodyContentType'] = BodyContentType
+
 
 class BodyPart(ModelNormal):
     """NOTE: This class is auto generated by OpenAPI Generator.
@@ -67,6 +71,7 @@ def additional_properties_type():
         This must be a method because a model may have properties that are
         of type self, this must run after the class is loaded
         """
+        lazy_import()
         return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
 
     _nullable = False
@@ -81,8 +86,9 @@ def openapi_types():
             openapi_types (dict): The key is attribute name
                 and the value is attribute type.
         """
+        lazy_import()
         return {
-            'content_type': (dict,),  # noqa: E501
+            'content_type': (BodyContentType,),  # noqa: E501
             'content': (str,),  # noqa: E501
             'charset': (str,),  # noqa: E501
         }
@@ -109,7 +115,7 @@ def _from_openapi_data(cls, content_type, *args, **kwargs):  # noqa: E501
         """BodyPart - a model defined in OpenAPI
 
         Args:
-            content_type (dict): Type of the body part
+            content_type (BodyContentType):
 
         Keyword Args:
             _check_type (bool): if True, values for parameters in openapi_types
@@ -196,7 +202,7 @@ def __init__(self, content_type, *args, **kwargs):  # noqa: E501
         """BodyPart - a model defined in OpenAPI
 
         Args:
-            content_type (dict): Type of the body part
+            content_type (BodyContentType):
 
         Keyword Args:
             _check_type (bool): if True, values for parameters in openapi_types

ElasticEmail/api/lists_api.py

@@ -31,7 +31,13 @@
 
 
 def lazy_import():
+    from ElasticEmail.model.campaign_options import CampaignOptions
+    from ElasticEmail.model.campaign_recipient import CampaignRecipient
+    from ElasticEmail.model.campaign_status import CampaignStatus
     from ElasticEmail.model.campaign_template import CampaignTemplate
+    globals()['CampaignOptions'] = CampaignOptions
+    globals()['CampaignRecipient'] = CampaignRecipient
+    globals()['CampaignStatus'] = CampaignStatus
     globals()['CampaignTemplate'] = CampaignTemplate
 
 
@@ -89,10 +95,10 @@ def openapi_types():
         lazy_import()
         return {
             'name': (str,),  # noqa: E501
-            'recipients': (dict,),  # noqa: E501
+            'recipients': (CampaignRecipient,),  # noqa: E501
             'content': ([CampaignTemplate],),  # noqa: E501
-            'status': (dict,),  # noqa: E501
-            'options': (dict,),  # noqa: E501
+            'status': (CampaignStatus,),  # noqa: E501
+            'options': (CampaignOptions,),  # noqa: E501
         }
 
     @cached_property
@@ -120,7 +126,7 @@ def _from_openapi_data(cls, name, recipients, *args, **kwargs):  # noqa: E501
 
         Args:
             name (str): Campaign name
-            recipients (dict): Recipients this campaign should be sent to
+            recipients (CampaignRecipient):
 
         Keyword Args:
             _check_type (bool): if True, values for parameters in openapi_types
@@ -154,8 +160,8 @@ def _from_openapi_data(cls, name, recipients, *args, **kwargs):  # noqa: E501
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
             content ([CampaignTemplate]): Campaign's email content. Provide multiple items to send an A/X Split Campaign. [optional]  # noqa: E501
-            status (dict): Campaign status. [optional]  # noqa: E501
-            options (dict): Campaign sending options. [optional]  # noqa: E501
+            status (CampaignStatus): [optional]  # noqa: E501
+            options (CampaignOptions): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
@@ -210,7 +216,7 @@ def __init__(self, name, recipients, *args, **kwargs):  # noqa: E501
 
         Args:
             name (str): Campaign name
-            recipients (dict): Recipients this campaign should be sent to
+            recipients (CampaignRecipient):
 
         Keyword Args:
             _check_type (bool): if True, values for parameters in openapi_types
@@ -244,8 +250,8 @@ def __init__(self, name, recipients, *args, **kwargs):  # noqa: E501
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
             content ([CampaignTemplate]): Campaign's email content. Provide multiple items to send an A/X Split Campaign. [optional]  # noqa: E501
-            status (dict): Campaign status. [optional]  # noqa: E501
-            options (dict): Campaign sending options. [optional]  # noqa: E501
+            status (CampaignStatus): [optional]  # noqa: E501
+            options (CampaignOptions): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)

ElasticEmail/api/security_api.py

@@ -30,6 +30,12 @@
 from ElasticEmail.exceptions import ApiAttributeError
 
 
+def lazy_import():
+    from ElasticEmail.model.delivery_optimization_type import DeliveryOptimizationType
+    from ElasticEmail.model.split_options import SplitOptions
+    globals()['DeliveryOptimizationType'] = DeliveryOptimizationType
+    globals()['SplitOptions'] = SplitOptions
+
 
 class CampaignOptions(ModelNormal):
     """NOTE: This class is auto generated by OpenAPI Generator.
@@ -67,6 +73,7 @@ def additional_properties_type():
         This must be a method because a model may have properties that are
         of type self, this must run after the class is loaded
         """
+        lazy_import()
         return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
 
     _nullable = False
@@ -81,12 +88,13 @@ def openapi_types():
             openapi_types (dict): The key is attribute name
                 and the value is attribute type.
         """
+        lazy_import()
         return {
-            'delivery_optimization': (dict,),  # noqa: E501
+            'delivery_optimization': (DeliveryOptimizationType,),  # noqa: E501
             'track_opens': (bool, none_type,),  # noqa: E501
             'track_clicks': (bool, none_type,),  # noqa: E501
             'schedule_for': (datetime, none_type,),  # noqa: E501
-            'split_options': (dict,),  # noqa: E501
+            'split_options': (SplitOptions,),  # noqa: E501
         }
 
     @cached_property
@@ -143,11 +151,11 @@ def _from_openapi_data(cls, *args, **kwargs):  # noqa: E501
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            delivery_optimization (dict): How to order email delivery - by recipients' engagement score or by the time they open the most of the emails that were sent to them. [optional]  # noqa: E501
+            delivery_optimization (DeliveryOptimizationType): [optional]  # noqa: E501
             track_opens (bool, none_type): Should the opens be tracked? If no value has been provided, Account's default setting will be used.. [optional]  # noqa: E501
             track_clicks (bool, none_type): Should the clicks be tracked? If no value has been provided, Account's default setting will be used.. [optional]  # noqa: E501
             schedule_for (datetime, none_type): Date when this Campaign is scheduled to be sent on. [optional]  # noqa: E501
-            split_options (dict): Optional options for A/X split campaigns. Will be ignored if only one template content was provided. [optional]  # noqa: E501
+            split_options (SplitOptions): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
@@ -229,11 +237,11 @@ def __init__(self, *args, **kwargs):  # noqa: E501
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            delivery_optimization (dict): How to order email delivery - by recipients' engagement score or by the time they open the most of the emails that were sent to them. [optional]  # noqa: E501
+            delivery_optimization (DeliveryOptimizationType): [optional]  # noqa: E501
             track_opens (bool, none_type): Should the opens be tracked? If no value has been provided, Account's default setting will be used.. [optional]  # noqa: E501
             track_clicks (bool, none_type): Should the clicks be tracked? If no value has been provided, Account's default setting will be used.. [optional]  # noqa: E501
             schedule_for (datetime, none_type): Date when this Campaign is scheduled to be sent on. [optional]  # noqa: E501
-            split_options (dict): Optional options for A/X split campaigns. Will be ignored if only one template content was provided. [optional]  # noqa: E501
+            split_options (SplitOptions): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)

ElasticEmail/api/segments_api.py

@@ -67,13 +67,7 @@ class CampaignStatus(ModelSimple):
     validations = {
     }
 
-    @cached_property
-    def additional_properties_type():
-        """
-        This must be a method because a model may have properties that are
-        of type self, this must run after the class is loaded
-        """
-        return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
+    additional_properties_type = None
 
     _nullable = False
 

ElasticEmail/api/statistics_api.py

@@ -30,6 +30,10 @@
 from ElasticEmail.exceptions import ApiAttributeError
 
 
+def lazy_import():
+    from ElasticEmail.model.utm import Utm
+    globals()['Utm'] = Utm
+
 
 class CampaignTemplate(ModelNormal):
     """NOTE: This class is auto generated by OpenAPI Generator.
@@ -67,6 +71,7 @@ def additional_properties_type():
         This must be a method because a model may have properties that are
         of type self, this must run after the class is loaded
         """
+        lazy_import()
         return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
 
     _nullable = False
@@ -81,14 +86,15 @@ def openapi_types():
             openapi_types (dict): The key is attribute name
                 and the value is attribute type.
         """
+        lazy_import()
         return {
             'poolname': (str,),  # noqa: E501
             '_from': (str,),  # noqa: E501
             'reply_to': (str,),  # noqa: E501
             'subject': (str,),  # noqa: E501
             'template_name': (str,),  # noqa: E501
             'attach_files': ([str],),  # noqa: E501
-            'utm': (dict,),  # noqa: E501
+            'utm': (Utm,),  # noqa: E501
         }
 
     @cached_property
@@ -153,7 +159,7 @@ def _from_openapi_data(cls, *args, **kwargs):  # noqa: E501
             subject (str): Default subject of email.. [optional]  # noqa: E501
             template_name (str): Name of template.. [optional]  # noqa: E501
             attach_files ([str]): Names of previously uploaded files that should be sent as downloadable attachments. [optional]  # noqa: E501
-            utm (dict): Utm marketing data to be attached to every link in this e-mail.. [optional]  # noqa: E501
+            utm (Utm): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
@@ -241,7 +247,7 @@ def __init__(self, *args, **kwargs):  # noqa: E501
             subject (str): Default subject of email.. [optional]  # noqa: E501
             template_name (str): Name of template.. [optional]  # noqa: E501
             attach_files ([str]): Names of previously uploaded files that should be sent as downloadable attachments. [optional]  # noqa: E501
-            utm (dict): Utm marketing data to be attached to every link in this e-mail.. [optional]  # noqa: E501
+            utm (Utm): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)

ElasticEmail/api/sub_accounts_api.py

@@ -61,13 +61,7 @@ class CompressionFormat(ModelSimple):
     validations = {
     }
 
-    @cached_property
-    def additional_properties_type():
-        """
-        This must be a method because a model may have properties that are
-        of type self, this must run after the class is loaded
-        """
-        return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
+    additional_properties_type = None
 
     _nullable = False