Deploy

DX-Bandwidth · DX-Bandwidth · commit 952a88a22934 · 2020-05-07T19:50:21.000Z
diff --git a/bandwidth/__init__.py b/bandwidth/__init__.py
@@ -1,5 +1,10 @@
 __all__ = [
-    'models',
+    'api_helper',
+    'bandwidth_client',
+    'configuration',
     'controllers',
-    'BandwidthClient',
+    'decorators',
+    'exceptions',
+    'http',
+    'models',
 ]
diff --git a/bandwidth/api_helper.py b/bandwidth/api_helper.py
@@ -53,7 +53,7 @@ def json_serialize(obj):
         """JSON Serialization of a given object.
 
         Args:
-            obj (object): The object to serialise.
+            obj (object): The object to serialize.
 
         Returns:
             str: The JSON serialized string of the object.
@@ -79,7 +79,7 @@ def json_serialize(obj):
 
     @staticmethod
     def json_deserialize(json, unboxing_function=None):
-        """JSON Deerialization of a given string.
+        """JSON Deserialization of a given string.
 
         Args:
             json (str): The JSON serialized string to deserialize.
diff --git a/bandwidth/controllers/base_controller.py b/bandwidth/controllers/base_controller.py
@@ -27,7 +27,7 @@ class BaseController(object):
     """
 
     global_headers = {
-        'user-agent': 'python-sdk-refs/tags/python6.0.0'
+        'user-agent': 'python-sdk-refs/tags/python6.1.0'
     }
 
     def __init__(self, config, call_back=None):
diff --git a/bandwidth/http/__init__.py b/bandwidth/http/__init__.py
@@ -1,6 +1,5 @@
 __all__ = [
-    'messaging_basic_auth',
-    'voice_basic_auth',
+    'auth',
     'http_method_enum',
     'http_request',
     'http_response',
diff --git a/bandwidth/messaging/__init__.py b/bandwidth/messaging/__init__.py
@@ -1,5 +1,6 @@
 __all__ = [
-    'models',
     'controllers',
-    'messaging_client',
+    'exceptions',
+    'messaging_client',
+    'models',
 ]
diff --git a/bandwidth/messaging/controllers/api_controller.py b/bandwidth/messaging/controllers/api_controller.py
@@ -37,7 +37,9 @@ def list_media(self,
                 here.
 
         Returns:
-            list of Media: Response from the API. successful operation
+            ApiResponse: An object with the response value as well as other
+                useful information such as status codes and headers.
+                successful operation
 
         Raises:
             APIException: When an error occurs while fetching the data from
@@ -98,7 +100,9 @@ def get_media(self,
             media_id (string): TODO: type description here.
 
         Returns:
-            binary: Response from the API. successful operation
+            ApiResponse: An object with the response value as well as other
+                useful information such as status codes and headers.
+                successful operation
 
         Raises:
             APIException: When an error occurs while fetching the data from
@@ -163,7 +167,8 @@ def upload_media(self,
             cache_control (string, optional): TODO: type description here.
 
         Returns:
-            void: Response from the API.
+            ApiResponse: An object with the response value as well as other
+                useful information such as status codes and headers.
 
         Raises:
             APIException: When an error occurs while fetching the data from
@@ -218,7 +223,8 @@ def upload_media(self,
         self.validate_response(_response)
 
         # Return appropriate type
-        ApiResponse(_response)
+        return ApiResponse(_response)
+
     def delete_media(self,
                      user_id,
                      media_id):
@@ -231,7 +237,8 @@ def delete_media(self,
             media_id (string): TODO: type description here.
 
         Returns:
-            void: Response from the API.
+            ApiResponse: An object with the response value as well as other
+                useful information such as status codes and headers.
 
         Raises:
             APIException: When an error occurs while fetching the data from
@@ -272,7 +279,8 @@ def delete_media(self,
         self.validate_response(_response)
 
         # Return appropriate type
-        ApiResponse(_response)
+        return ApiResponse(_response)
+
     def create_message(self,
                        user_id,
                        body=None):
@@ -285,7 +293,9 @@ def create_message(self,
             body (MessageRequest, optional): TODO: type description here.
 
         Returns:
-            BandwidthMessage: Response from the API. successful operation
+            ApiResponse: An object with the response value as well as other
+                useful information such as status codes and headers.
+                successful operation
 
         Raises:
             APIException: When an error occurs while fetching the data from
diff --git a/bandwidth/messaging/controllers/base_controller.py b/bandwidth/messaging/controllers/base_controller.py
@@ -27,7 +27,7 @@ class BaseController(object):
     """
 
     global_headers = {
-        'user-agent': 'python-sdk-refs/tags/python6.0.0'
+        'user-agent': 'python-sdk-refs/tags/python6.1.0'
     }
 
     def __init__(self, config, call_back=None):
diff --git a/bandwidth/messaging/models/bandwidth_callback_message.py b/bandwidth/messaging/models/bandwidth_callback_message.py
@@ -5,7 +5,7 @@
 
 This file was automatically generated by APIMATIC v2.0 ( https://apimatic.io ).
 """
-import bandwidth.messaging.models.bandwidth_message
+from bandwidth.messaging.models.bandwidth_message import BandwidthMessage
 
 
 class BandwidthCallbackMessage(object):
@@ -74,7 +74,7 @@ def from_dictionary(cls,
         to = dictionary.get('to')
         error_code = dictionary.get('errorCode')
         description = dictionary.get('description')
-        message = bandwidth.messaging.models.bandwidth_message.BandwidthMessage.from_dictionary(dictionary.get('message')) if dictionary.get('message') else None
+        message = BandwidthMessage.from_dictionary(dictionary.get('message')) if dictionary.get('message') else None
 
         # Return an object of this model
         return cls(time,
diff --git a/bandwidth/messaging/models/media.py b/bandwidth/messaging/models/media.py
@@ -5,7 +5,7 @@
 
 This file was automatically generated by APIMATIC v2.0 ( https://apimatic.io ).
 """
-import bandwidth.messaging.models.tag
+from bandwidth.messaging.models.tag import Tag
 
 
 class Media(object):
@@ -92,7 +92,7 @@ def from_dictionary(cls,
         content_type = dictionary.get('contentType')
         tags = None
         if dictionary.get('tags') is not None:
-            tags = [bandwidth.messaging.models.tag.Tag.from_dictionary(x) for x in dictionary.get('tags')]
+            tags = [Tag.from_dictionary(x) for x in dictionary.get('tags')]
         user_id = dictionary.get('userId')
         media_name = dictionary.get('mediaName')
         media_id = dictionary.get('mediaId')
diff --git a/bandwidth/voice/__init__.py b/bandwidth/voice/__init__.py
@@ -1,6 +1,7 @@
 __all__ = [
     'bxml',
-    'models',
     'controllers',
+    'exceptions',
+    'models',
     'voice_client',
 ]
diff --git a/bandwidth/voice/bxml/verbs/pause.py b/bandwidth/voice/bxml/verbs/pause.py
@@ -19,7 +19,7 @@ def __init__(self, duration):
         """
         Initializes the Pause class with the duration parameter
 
-        :param int duration: The number of seconds to pause
+        :param float duration: The time in seconds to pause
         """
         self.duration = duration
 
diff --git a/bandwidth/voice/bxml/verbs/record.py b/bandwidth/voice/bxml/verbs/record.py
@@ -17,7 +17,8 @@ class Record(AbstractBxmlVerb):
 
     def __init__(self, tag=None, username=None, password=None, record_complete_url=None, record_complete_method=None,
         recording_available_url=None, recording_available_method=None, terminating_digits=None, max_duration=None,
-        file_format=None, transcribe=None, transcription_available_url=None, transcription_available_method=None):
+        file_format=None, transcribe=None, transcription_available_url=None, transcription_available_method=None,
+        silence_timeout=None):
         """
         Initializes the Record class with the following parameters
 
@@ -34,6 +35,7 @@ def __init__(self, tag=None, username=None, password=None, record_complete_url=N
         :param bool transcribe: True to transcribe the recording on completion, False otherwise
         :param str transcription_available_url: URL to send the transcriptionAvailable event to.
         :param str transcription_available_method: The HTTP method to use for the request to transcriptionAvailableUrl. GET or POST
+        :param int silence_timeout: Number of seconds of silence that ends the recording
         """
         self.tag = tag
         self.username = username
@@ -48,6 +50,7 @@ def __init__(self, tag=None, username=None, password=None, record_complete_url=N
         self.transcribe = transcribe
         self.transcription_available_url = transcription_available_url
         self.transcription_available_method = transcription_available_method
+        self.silence_timeout = silence_timeout
 
     def to_bxml(self):
         root = etree.Element(RECORD_TAG)
@@ -79,4 +82,6 @@ def to_bxml(self):
             root.set("transcriptionAvailableUrl", self.transcription_available_url)
         if self.transcription_available_method is not None:
             root.set("transcriptionAvailableMethod", self.transcription_available_method)
+        if self.silence_timeout is not None:
+            root.set("silenceTimeout", str(self.silence_timeout))
         return etree.tostring(root).decode()
diff --git a/bandwidth/voice/bxml/verbs/send_dtmf.py b/bandwidth/voice/bxml/verbs/send_dtmf.py
@@ -15,15 +15,24 @@
 
 class SendDtmf(AbstractBxmlVerb):
 
-    def __init__(self, dtmf):
+    def __init__(self, dtmf, tone_duration=None, tone_interval=None):
         """
         Initializes the SendDtmf class with the dtmf parameter
 
         :param str dtmf: The dtmf to build the SendDtmf verb
+        :param double tone_duration: The length in milliseconds of each DTMF tone
+        :param double tone_interval: The duration of silence in milliseconds following each DTMF tone
         """
         self.dtmf = dtmf
+        self.tone_duration = tone_duration
+        self.tone_interval = tone_interval
 
     def to_bxml(self):
         root = etree.Element(SEND_DTMF_TAG)
         root.text = self.dtmf
+        if self.tone_duration is not None:
+            root.set("toneDuration", str(self.tone_duration))
+        if self.tone_interval is not None:
+            root.set("toneInterval", str(self.tone_interval))
+
         return etree.tostring(root).decode()
diff --git a/bandwidth/voice/controllers/api_controller.py b/bandwidth/voice/controllers/api_controller.py
diff --git a/bandwidth/voice/controllers/base_controller.py b/bandwidth/voice/controllers/base_controller.py
diff --git a/bandwidth/voice/models/recording_metadata_response.py b/bandwidth/voice/models/recording_metadata_response.py
diff --git a/bandwidth/voice/models/transcription_response.py b/bandwidth/voice/models/transcription_response.py
diff --git a/setup.py b/setup.py

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class BaseController(object):`
`27`	`27`	`"""`
`28`	`28`
`29`	`29`	`global_headers = {`
`30`		`- 'user-agent': 'python-sdk-refs/tags/python6.0.0'`
	`30`	`+ 'user-agent': 'python-sdk-refs/tags/python6.1.0'`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`def __init__(self, config, call_back=None):`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`__all__ = [`
`2`		`- 'models',`
`3`	`2`	`'controllers',`
`4`		`- 'messaging_client',`
	`3`	`+ 'exceptions',`
	`4`	`+ 'messaging_client',`
	`5`	`+ 'models',`
`5`	`6`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`__all__ = [`
`2`	`2`	`'bxml',`
`3`		`- 'models',`
`4`	`3`	`'controllers',`
	`4`	`+ 'exceptions',`
	`5`	`+ 'models',`
`5`	`6`	`'voice_client',`
`6`	`7`	`]`