DX-2088 voice and MFA class and method renames, messaging upload media removal of content length (breaking changes) (#25)

* New deploy

* updated tests

* bumped version

* fixed import

* lxml added to requirements

* moar fixes

* bxml import fix

Co-authored-by: jmulford-bw <[email protected]>

Author: jmulford-bw

bandwidth/api_helper.py

@@ -3,7 +3,8 @@
 """
 bandwidth
 
-This file was automatically generated by APIMATIC v2.0 ( https://apimatic.io ).
+This file was automatically generated by APIMATIC v3.0 (
+ https://www.apimatic.io ).
 """
 
 import re
@@ -78,7 +79,7 @@ def json_serialize(obj):
         return jsonpickle.encode(obj, False)
 
     @staticmethod
-    def json_deserialize(json, unboxing_function=None):
+    def json_deserialize(json, unboxing_function=None, as_dict=False):
         """JSON Deserialization of a given string.
 
         Args:
@@ -99,6 +100,9 @@ def json_deserialize(json, unboxing_function=None):
 
         if unboxing_function is None:
             return decoded
+
+        if as_dict:
+            return {k: unboxing_function(v) for k, v in decoded.items()}
         elif isinstance(decoded, list):
             return [unboxing_function(element) for element in decoded]
         else:

bandwidth/bandwidth_client.py

@@ -3,14 +3,15 @@
 """
 bandwidth
 
-This file was automatically generated by APIMATIC v2.0 ( https://apimatic.io ).
+This file was automatically generated by APIMATIC v3.0 (
+ https://www.apimatic.io ).
 """
 
 from bandwidth.decorators import lazy_property
 from bandwidth.configuration import Configuration
 from bandwidth.configuration import Environment
 from bandwidth.messaging.messaging_client import MessagingClient
-from bandwidth.twofactorauth.two_factor_auth_client import TwoFactorAuthClient
+from bandwidth.multifactorauth.multi_factor_auth_client import MultiFactorAuthClient
 from bandwidth.phonenumberlookup.phone_number_lookup_client import PhoneNumberLookupClient
 from bandwidth.voice.voice_client import VoiceClient
 from bandwidth.webrtc.web_rtc_client import WebRtcClient
@@ -23,8 +24,8 @@ def messaging_client(self):
         return MessagingClient(config=self.config)
 
     @lazy_property
-    def two_factor_auth_client(self):
-        return TwoFactorAuthClient(config=self.config)
+    def multi_factor_auth_client(self):
+        return MultiFactorAuthClient(config=self.config)
 
     @lazy_property
     def phone_number_lookup_client(self):
@@ -38,13 +39,15 @@ def voice_client(self):
     def web_rtc_client(self):
         return WebRtcClient(config=self.config)
 
-    def __init__(self, timeout=60, max_retries=3, backoff_factor=0,
+    def __init__(self, timeout=60, max_retries=0, backoff_factor=2,
+                 retry_statuses=[408, 413, 429, 500, 502, 503, 504, 521, 522, 524, 408, 413, 429, 500, 502, 503, 504, 521, 522, 524],
+                 retry_methods=['GET', 'PUT', 'GET', 'PUT'],
                  environment=Environment.PRODUCTION,
                  base_url='https://www.example.com',
                  messaging_basic_auth_user_name='TODO: Replace',
                  messaging_basic_auth_password='TODO: Replace',
-                 two_factor_auth_basic_auth_user_name='TODO: Replace',
-                 two_factor_auth_basic_auth_password='TODO: Replace',
+                 multi_factor_auth_basic_auth_user_name='TODO: Replace',
+                 multi_factor_auth_basic_auth_password='TODO: Replace',
                  phone_number_lookup_basic_auth_user_name='TODO: Replace',
                  phone_number_lookup_basic_auth_password='TODO: Replace',
                  voice_basic_auth_user_name='TODO: Replace',
@@ -55,12 +58,14 @@ def __init__(self, timeout=60, max_retries=3, backoff_factor=0,
             self.config = Configuration(timeout=timeout,
                                         max_retries=max_retries,
                                         backoff_factor=backoff_factor,
+                                        retry_statuses=retry_statuses,
+                                        retry_methods=retry_methods,
                                         environment=environment,
                                         base_url=base_url,
                                         messaging_basic_auth_user_name=messaging_basic_auth_user_name,
                                         messaging_basic_auth_password=messaging_basic_auth_password,
-                                        two_factor_auth_basic_auth_user_name=two_factor_auth_basic_auth_user_name,
-                                        two_factor_auth_basic_auth_password=two_factor_auth_basic_auth_password,
+                                        multi_factor_auth_basic_auth_user_name=multi_factor_auth_basic_auth_user_name,
+                                        multi_factor_auth_basic_auth_password=multi_factor_auth_basic_auth_password,
                                         phone_number_lookup_basic_auth_user_name=phone_number_lookup_basic_auth_user_name,
                                         phone_number_lookup_basic_auth_password=phone_number_lookup_basic_auth_password,
                                         voice_basic_auth_user_name=voice_basic_auth_user_name,

bandwidth/configuration.py

@@ -3,7 +3,8 @@
 """
 bandwidth
 
-This file was automatically generated by APIMATIC v2.0 ( https://apimatic.io ).
+This file was automatically generated by APIMATIC v3.0 (
+ https://www.apimatic.io ).
 """
 
 from enum import Enum
@@ -21,7 +22,7 @@ class Server(Enum):
     """An enum for API servers"""
     DEFAULT = 0
     MESSAGINGDEFAULT = 1
-    TWOFACTORAUTHDEFAULT = 2
+    MULTIFACTORAUTHDEFAULT = 2
     PHONENUMBERLOOKUPDEFAULT = 3
     VOICEDEFAULT = 4
     WEBRTCDEFAULT = 5
@@ -47,6 +48,14 @@ def max_retries(self):
     def backoff_factor(self):
         return self._backoff_factor
 
+    @property
+    def retry_statuses(self):
+        return self._retry_statuses
+
+    @property
+    def retry_methods(self):
+        return self._retry_methods
+
     @property
     def environment(self):
         return self._environment
@@ -64,12 +73,12 @@ def messaging_basic_auth_password(self):
         return self._messaging_basic_auth_password
 
     @property
-    def two_factor_auth_basic_auth_user_name(self):
-        return self._two_factor_auth_basic_auth_user_name
+    def multi_factor_auth_basic_auth_user_name(self):
+        return self._multi_factor_auth_basic_auth_user_name
 
     @property
-    def two_factor_auth_basic_auth_password(self):
-        return self._two_factor_auth_basic_auth_password
+    def multi_factor_auth_basic_auth_password(self):
+        return self._multi_factor_auth_basic_auth_password
 
     @property
     def phone_number_lookup_basic_auth_user_name(self):
@@ -95,19 +104,16 @@ def web_rtc_basic_auth_user_name(self):
     def web_rtc_basic_auth_password(self):
         return self._web_rtc_basic_auth_password
 
-    def __init__(self, timeout=60, max_retries=3, backoff_factor=0,
-                 environment=Environment.PRODUCTION,
-                 base_url='https://www.example.com',
-                 messaging_basic_auth_user_name='TODO: Replace',
-                 messaging_basic_auth_password='TODO: Replace',
-                 two_factor_auth_basic_auth_user_name='TODO: Replace',
-                 two_factor_auth_basic_auth_password='TODO: Replace',
-                 phone_number_lookup_basic_auth_user_name='TODO: Replace',
-                 phone_number_lookup_basic_auth_password='TODO: Replace',
-                 voice_basic_auth_user_name='TODO: Replace',
-                 voice_basic_auth_password='TODO: Replace',
-                 web_rtc_basic_auth_user_name='TODO: Replace',
-                 web_rtc_basic_auth_password='TODO: Replace'):
+    def __init__(
+        self, timeout=60, max_retries=0, backoff_factor=2,
+        retry_statuses=[408, 413, 429, 500, 502, 503, 504, 521, 522, 524, 408, 413, 429, 500, 502, 503, 504, 521, 522, 524],
+        retry_methods=['GET', 'PUT', 'GET', 'PUT'], environment=Environment.PRODUCTION, base_url='https://www.example.com',
+        messaging_basic_auth_user_name='TODO: Replace', messaging_basic_auth_password='TODO: Replace',
+        multi_factor_auth_basic_auth_user_name='TODO: Replace', multi_factor_auth_basic_auth_password='TODO: Replace',
+        phone_number_lookup_basic_auth_user_name='TODO: Replace', phone_number_lookup_basic_auth_password='TODO: Replace',
+        voice_basic_auth_user_name='TODO: Replace', voice_basic_auth_password='TODO: Replace',
+        web_rtc_basic_auth_user_name='TODO: Replace', web_rtc_basic_auth_password='TODO: Replace'
+    ):
         # The value to use for connection timeout
         self._timeout = timeout
 
@@ -119,6 +125,12 @@ def __init__(self, timeout=60, max_retries=3, backoff_factor=0,
         # `{backoff factor} * (2 ** ({number of total retries} - 1))`
         self._backoff_factor = backoff_factor
 
+        # The http statuses on which retry is to be done
+        self._retry_statuses = retry_statuses
+
+        # The http methods on which retry is to be done
+        self._retry_methods = retry_methods
+
         # Current API environment
         self._environment = environment
 
@@ -132,10 +144,10 @@ def __init__(self, timeout=60, max_retries=3, backoff_factor=0,
         self._messaging_basic_auth_password = messaging_basic_auth_password
 
         # The username to use with basic authentication
-        self._two_factor_auth_basic_auth_user_name = two_factor_auth_basic_auth_user_name
+        self._multi_factor_auth_basic_auth_user_name = multi_factor_auth_basic_auth_user_name
 
         # The password to use with basic authentication
-        self._two_factor_auth_basic_auth_password = two_factor_auth_basic_auth_password
+        self._multi_factor_auth_basic_auth_password = multi_factor_auth_basic_auth_password
 
         # The username to use with basic authentication
         self._phone_number_lookup_basic_auth_user_name = phone_number_lookup_basic_auth_user_name
@@ -159,11 +171,11 @@ def __init__(self, timeout=60, max_retries=3, backoff_factor=0,
         self._http_client = self.create_http_client()
 
     def clone_with(self, timeout=None, max_retries=None, backoff_factor=None,
-                   environment=None, base_url=None,
-                   messaging_basic_auth_user_name=None,
+                   retry_statuses=None, retry_methods=None, environment=None,
+                   base_url=None, messaging_basic_auth_user_name=None,
                    messaging_basic_auth_password=None,
-                   two_factor_auth_basic_auth_user_name=None,
-                   two_factor_auth_basic_auth_password=None,
+                   multi_factor_auth_basic_auth_user_name=None,
+                   multi_factor_auth_basic_auth_password=None,
                    phone_number_lookup_basic_auth_user_name=None,
                    phone_number_lookup_basic_auth_password=None,
                    voice_basic_auth_user_name=None,
@@ -173,12 +185,14 @@ def clone_with(self, timeout=None, max_retries=None, backoff_factor=None,
         timeout = timeout or self.timeout
         max_retries = max_retries or self.max_retries
         backoff_factor = backoff_factor or self.backoff_factor
+        retry_statuses = retry_statuses or self.retry_statuses
+        retry_methods = retry_methods or self.retry_methods
         environment = environment or self.environment
         base_url = base_url or self.base_url
         messaging_basic_auth_user_name = messaging_basic_auth_user_name or self.messaging_basic_auth_user_name
         messaging_basic_auth_password = messaging_basic_auth_password or self.messaging_basic_auth_password
-        two_factor_auth_basic_auth_user_name = two_factor_auth_basic_auth_user_name or self.two_factor_auth_basic_auth_user_name
-        two_factor_auth_basic_auth_password = two_factor_auth_basic_auth_password or self.two_factor_auth_basic_auth_password
+        multi_factor_auth_basic_auth_user_name = multi_factor_auth_basic_auth_user_name or self.multi_factor_auth_basic_auth_user_name
+        multi_factor_auth_basic_auth_password = multi_factor_auth_basic_auth_password or self.multi_factor_auth_basic_auth_password
         phone_number_lookup_basic_auth_user_name = phone_number_lookup_basic_auth_user_name or self.phone_number_lookup_basic_auth_user_name
         phone_number_lookup_basic_auth_password = phone_number_lookup_basic_auth_password or self.phone_number_lookup_basic_auth_password
         voice_basic_auth_user_name = voice_basic_auth_user_name or self.voice_basic_auth_user_name
@@ -188,11 +202,12 @@ def clone_with(self, timeout=None, max_retries=None, backoff_factor=None,
 
         return Configuration(
             timeout=timeout, max_retries=max_retries,
-            backoff_factor=backoff_factor, environment=environment, base_url=base_url,
+            backoff_factor=backoff_factor, retry_statuses=retry_statuses,
+            retry_methods=retry_methods, environment=environment, base_url=base_url,
             messaging_basic_auth_user_name=messaging_basic_auth_user_name,
             messaging_basic_auth_password=messaging_basic_auth_password,
-            two_factor_auth_basic_auth_user_name=two_factor_auth_basic_auth_user_name,
-            two_factor_auth_basic_auth_password=two_factor_auth_basic_auth_password,
+            multi_factor_auth_basic_auth_user_name=multi_factor_auth_basic_auth_user_name,
+            multi_factor_auth_basic_auth_password=multi_factor_auth_basic_auth_password,
             phone_number_lookup_basic_auth_user_name=phone_number_lookup_basic_auth_user_name,
             phone_number_lookup_basic_auth_password=phone_number_lookup_basic_auth_password,
             voice_basic_auth_user_name=voice_basic_auth_user_name,
@@ -204,22 +219,24 @@ def clone_with(self, timeout=None, max_retries=None, backoff_factor=None,
     def create_http_client(self):
         return RequestsClient(timeout=self.timeout,
                               max_retries=self.max_retries,
-                              backoff_factor=self.backoff_factor)
+                              backoff_factor=self.backoff_factor,
+                              retry_statuses=self.retry_statuses,
+                              retry_methods=self.retry_methods)
 
     # All the environments the SDK can run in
     environments = {
         Environment.PRODUCTION: {
             Server.DEFAULT: 'api.bandwidth.com',
             Server.MESSAGINGDEFAULT: 'https://messaging.bandwidth.com/api/v2',
-            Server.TWOFACTORAUTHDEFAULT: 'https://mfa.bandwidth.com/api/v1',
+            Server.MULTIFACTORAUTHDEFAULT: 'https://mfa.bandwidth.com/api/v1',
             Server.PHONENUMBERLOOKUPDEFAULT: 'https://numbers.bandwidth.com/api/v1',
             Server.VOICEDEFAULT: 'https://voice.bandwidth.com',
             Server.WEBRTCDEFAULT: 'https://api.webrtc.bandwidth.com/v1'
         },
         Environment.CUSTOM: {
             Server.DEFAULT: '{base_url}',
             Server.MESSAGINGDEFAULT: '{base_url}',
-            Server.TWOFACTORAUTHDEFAULT: '{base_url}',
+            Server.MULTIFACTORAUTHDEFAULT: '{base_url}',
             Server.PHONENUMBERLOOKUPDEFAULT: '{base_url}',
             Server.VOICEDEFAULT: '{base_url}',
             Server.WEBRTCDEFAULT: '{base_url}'

bandwidth/controllers/base_controller.py

@@ -3,7 +3,8 @@
 """
 bandwidth
 
-This file was automatically generated by APIMATIC v2.0 ( https://apimatic.io ).
+This file was automatically generated by APIMATIC v3.0 (
+ https://www.apimatic.io ).
 """
 
 from bandwidth.api_helper import APIHelper

bandwidth/decorators.py

@@ -3,7 +3,8 @@
 """
 bandwidth
 
-This file was automatically generated by APIMATIC v2.0 ( https://apimatic.io ).
+This file was automatically generated by APIMATIC v3.0 (
+ https://www.apimatic.io ).
 """
 
 

bandwidth/exceptions/api_exception.py

@@ -3,7 +3,8 @@
 """
 bandwidth
 
-This file was automatically generated by APIMATIC v2.0 ( https://apimatic.io ).
+This file was automatically generated by APIMATIC v3.0 (
+ https://www.apimatic.io ).
 """
 
 

bandwidth/http/auth/__init__.py

@@ -1,6 +1,7 @@
 __all__ = [
     'messaging_basic_auth',
-    'two_factor_auth_basic_auth',
+    'multi_factor_auth_basic_auth',
+    'phone_number_lookup_basic_auth',
     'voice_basic_auth',
     'web_rtc_basic_auth',
 ]

bandwidth/http/auth/messaging_basic_auth.py

@@ -3,7 +3,8 @@
 """
 bandwidth
 
-This file was automatically generated by APIMATIC v2.0 ( https://apimatic.io ).
+This file was automatically generated by APIMATIC v3.0 (
+ https://www.apimatic.io ).
 """
 
 import base64

bandwidth/http/auth/two_factor_auth_basic_auth.py renamed to bandwidth/http/auth/multi_factor_auth_basic_auth.py

@@ -3,13 +3,14 @@
 """
 bandwidth
 
-This file was automatically generated by APIMATIC v2.0 ( https://apimatic.io ).
+This file was automatically generated by APIMATIC v3.0 (
+ https://www.apimatic.io ).
 """
 
 import base64
 
 
-class TwoFactorAuthBasicAuth:
+class MultiFactorAuthBasicAuth:
 
     @staticmethod
     def apply(config, http_request):
@@ -22,8 +23,8 @@ def apply(config, http_request):
                 authentication will be added.
 
         """
-        username = config.two_factor_auth_basic_auth_user_name
-        password = config.two_factor_auth_basic_auth_password
+        username = config.multi_factor_auth_basic_auth_user_name
+        password = config.multi_factor_auth_basic_auth_password
         joined = "{}:{}".format(username, password)
         encoded = base64.b64encode(str.encode(joined)).decode('iso-8859-1')
         header_value = "Basic {}".format(encoded)