SWI-5041 (#191)

* Rename `test.yaml` -> 'test.yml`

* Update test.yml

* Remove notify action for now

* Remove all BXML default values

* One too many `=None`'s

* Revert "Remove all BXML default values"

This reverts commit 464fc82.

* Dont make non-strings strings

* Do the string conversion later

* Add gather tests back

* Replace %lt; and > in the xml

* Only do regex replacement on SpeakSentence

Author: ajrice6713

.github/workflows/test.yaml renamed to .github/workflows/test.yml

@@ -78,10 +78,10 @@ jobs:
           echo "Log level: WARNING"
           pytest -v --log-cli-level=WARNING
 
-      - name: Notify Slack of Failures
-        uses: Bandwidth/build-notify-slack-action@v1.0.0
-        if: failure() && !github.event.pull_request.draft
-        with:
-          job-status: ${{ job.status }}
-          slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
-          slack-channel: ${{ secrets.SLACK_CHANNEL }}
+#      - name: Notify Slack of Failures
+#        uses: Bandwidth/build-notify-slack-action@v2.0.0
+#        if: failure() && !github.event.pull_request.draft
+#        with:
+#          job-status: ${{ job.status }}
+#          slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
+#          slack-channel: ${{ secrets.SLACK_CHANNEL }}

bandwidth/models/bxml/verb.py

@@ -60,7 +60,7 @@ def _set_attributes(self, root: ET.Element):
         if self._attributes is not None:
             for key, value in self._attributes.items():
                 if value is not None:
-                    root.set(key.strip("_"), value)
+                    root.set(key.strip("_"), str(value))
 
     def _to_etree_element(self) -> ET.Element:
         """Generate an ET.Element object from a Verb Object
@@ -107,5 +107,6 @@ def to_bxml(self) -> str:
         Returns:
             str: Serialized BXML string
         """
+
         xml_document = self._generate_xml()
         return ET.tostring(xml_document._root).decode('utf8')

bandwidth/models/bxml/verbs/gather.py

@@ -80,8 +80,8 @@ def _attributes(self):
             "fallbackPassword": self.fallback_password,
             "tag": self.tag,
             "terminatingDigits": self.terminating_digits,
-            "maxDigits": str(self.max_digits),
-            "interDigitTimeout": str(self.inter_digit_timeout),
-            "firstDigitTimeout": str(self.first_digit_timeout),
-            "repeatCount": str(self.repeat_count),
+            "maxDigits": self.max_digits,
+            "interDigitTimeout": self.inter_digit_timeout,
+            "firstDigitTimeout": self.first_digit_timeout,
+            "repeatCount": self.repeat_count,
         }

bandwidth/models/bxml/verbs/record.py

@@ -85,7 +85,7 @@ def _attributes(self):
             "fallbackPassword": self.fallback_password,
             "tag": self.tag,
             "terminatingDigits": self.terminating_digits,
-            "maxDuration": str(self.max_duration),
+            "maxDuration": self.max_duration,
             "silenceTimeout": self.silence_timeout,
             "fileFormat": self.file_format
         }

bandwidth/models/bxml/verbs/ring.py

@@ -27,6 +27,6 @@ def __init__(
     @property
     def _attributes(self):
         return {
-            "duration": str(self.duration),
-            "answerCall": str(self.answer_call),
+            "duration": self.duration,
+            "answerCall": self.answer_call,
         }

bandwidth/models/bxml/verbs/send_dtmf.py

@@ -33,6 +33,6 @@ def __init__(
     @property
     def _attributes(self):
         return {
-            "toneDuration": str(self.tone_duration),
-            "toneInterval": str(self.tone_interval)
+            "toneDuration": self.tone_duration,
+            "toneInterval": self.tone_interval
         }

bandwidth/models/bxml/verbs/speak_sentence.py

@@ -5,6 +5,10 @@
 
 @copyright Bandwidth INC
 """
+import re
+
+import xml.etree.ElementTree as ET
+
 from ..terminal_verb import TerminalVerb
 
 
@@ -40,3 +44,9 @@ def _attributes(self):
             "gender": self.gender,
             "locale": self.locale,
         }        
+
+    def to_bxml(self) -> str:
+        SSML_REGEX = r"<([a-zA-Z//].*?)>"
+
+        xml_document = self._generate_xml()
+        return re.sub(SSML_REGEX, r"<\1>", ET.tostring(xml_document._root).decode('utf8'))

bandwidth/models/bxml/verbs/start_recording.py

@@ -50,12 +50,12 @@ def _attributes(self):
         return {
             "recordingAvailableUrl": self.recording_available_url,
             "recordingAvailableMethod": self.recording_available_method,
-            "transcribe": str(self.transcribe),
+            "transcribe": self.transcribe,
             "transcriptionAvailableUrl": self.transcription_available_url,
             "transcriptionAvailableMethod": self.transcription_available_method,
             "username": self.username,
             "password": self.password,
             "tag": self.tag,
             "fileFormat": self.file_format,
-            "multiChannel": str(self.multi_channel)
+            "multiChannel": self.multi_channel
         }

bandwidth/models/bxml/verbs/start_transcription.py

@@ -60,5 +60,5 @@ def _attributes(self):
             "username": self.username,
             "password": self.password,
             "destination": self.destination,
-            "stabilized": str(self.stabilized),
+            "stabilized": self.stabilized,
         }

test/unit/bxml/test_gather.py

@@ -41,6 +41,13 @@ def setUp(self):
             audio_verbs=[self.play_audio]
         )
 
+    def test_defaults(self):
+        gather = Gather(
+            audio_verbs=[self.play_audio]
+        )
+        expected = '<Gather><PlayAudio username="user" password="pass">https://audio.url/audio1.wav</PlayAudio></Gather>'
+        assert(expected == gather.to_bxml())
+
     def test_to_bxml(self):
         expected = '<Gather gatherUrl="test.com" gatherMethod="POST" gatherFallbackUrl="fallback-test.com" gatherFallbackMethod="GET" username="user" password="pass" fallbackUsername="user" fallbackPassword="pass" tag="tag" terminatingDigits="2" maxDigits="5" interDigitTimeout="1" firstDigitTimeout="3" repeatCount="2"><PlayAudio username="user" password="pass">https://audio.url/audio1.wav</PlayAudio></Gather>'
         assert(expected == self.gather.to_bxml())