Refactor existing verbs for changes to attributes

Author: ajrice6713

bandwidth/model/bxml/terminal_verb.py

@@ -12,15 +12,14 @@ class TerminalVerb(Verb):
     """Base class for BXML verbs
     """
 
-    def __init__(self, tag: str, content: str = None, attributes: dict = None):
+    def __init__(self, tag: str, content: str = None):
         """Initialize the verb model
 
         Args:
             tag (str): Name of the XML element
             content (str, optional): XML element content. Defaults to None.
-            attributes (dict, optional): XML element attributes. Defaults to None.
         """
-        super().__init__(tag=tag, content=content, attributes=attributes, nested_verbs=None)
+        super().__init__(tag=tag, content=content, nested_verbs=None)
 
     def add_verb(self, verb: Verb):
         """Adding verbs is not allowed for this class

bandwidth/model/bxml/verb.py

@@ -13,13 +13,12 @@ class Verb:
     """Base class for BXML verbs
     """
 
-    def __init__(self, tag: str, content: str = None, attributes: dict = None, nested_verbs: list[Verb] = None):
+    def __init__(self, tag: str, content: str = None, nested_verbs: list[Verb] = None):
         """Initialize the verb model
 
         Args:
             tag (str): Name of the XML element
             content (str, optional): XML element content. Defaults to None.
-            attributes (dict, optional): XML element attributes. Defaults to None.
             nested_verbs (list[BxmlVerb], optional): XML element children. Defaults to None.
         """
         self._tag = tag
@@ -29,8 +28,8 @@ def __init__(self, tag: str, content: str = None, attributes: dict = None, neste
             self._nested_verbs = []
 
     @property
-    def attributes():
-        return {}
+    def attributes(self):
+        return None
 
     def __len__(self) -> int:
         """Override default len method. Returns length of _nested_verbs array
@@ -57,7 +56,7 @@ def _set_attributes(self, root: ET.Element):
         Args:
             root (ET.Element): XML Element to add attributes to
         """
-        if self.attributes:
+        if self.attributes is not None:
             for key, value in self.attributes.items():
                 if value is not None:
                     root.set(key, value)

bandwidth/model/bxml/verbs/bridge.py

@@ -55,7 +55,14 @@ def __init__(
         self.fallback_username = fallback_username
         self.fallback_password = fallback_password
         self.tag = tag
-        self.attributes = {
+        super().__init__(
+            tag="Bridge",
+            content=self.target_call,
+        )
+
+    @property
+    def attributes(self):
+        return {
             "bridgeCompleteUrl": self.bridge_complete_url,
             "bridgeCompleteMethod": self.bridge_complete_method,
             "bridgeCompleteFallbackUrl": self.bridge_complete_fallback_url,
@@ -70,8 +77,3 @@ def __init__(
             "fallbackPassword": self.fallback_password,
             "tag": self.tag
         }
-        super().__init__(
-            tag="Bridge",
-            content=self.target_call,
-            attributes=self.attributes
-        )

bandwidth/model/bxml/verbs/phone_number.py

@@ -44,7 +44,14 @@ def __init__(
         self.fallback_username = fallback_username
         self.fallback_password = fallback_password
         self.tag = tag
-        self.attributes = {
+        super().__init__(
+            tag="PhoneNumber",
+            content=self.number
+        )
+
+    @property
+    def attributes(self):
+        return {
             "transferAnswerUrl": self.transfer_answer_url,
             "transferAnswerMethod": self.transfer_answer_method,
             "transferAnswerFallbackUrl": self.transfer_answer_fallback_url,
@@ -57,8 +64,3 @@ def __init__(
             "fallbackPassword": self.fallback_password,
             "tag": self.tag
         }
-        super().__init__(
-            tag="PhoneNumber",
-            content=self.number,
-            attributes=self.attributes
-        )

bandwidth/model/bxml/verbs/record.py

@@ -64,7 +64,7 @@ def __init__(
         self.max_duration = max_duration
         self.silence_timeout = silence_timeout
         self.file_format = file_format
-        super().__init__(tag="Record", content=None, attributes=self.attributes)
+        super().__init__(tag="Record", content=None)
 
     @property
     def attributes(self):

bandwidth/model/bxml/verbs/sip_uri.py

@@ -46,8 +46,15 @@ def __init__(
         self.fallback_username = fallback_username
         self.fallback_password = fallback_password
         self.tag = tag
-        self.attributes = {
-            "uui": uui,
+        super().__init__(
+            tag="SipUri",
+            content=self.uri,
+        )
+
+    @property
+    def attributes(self):
+        return {
+            "uui": self.uui,
             "transferAnswerUrl": self.transfer_answer_url,
             "transferAnswerMethod": self.transfer_answer_method,
             "transferAnswerFallbackUrl": self.transfer_answer_fallback_url,
@@ -60,8 +67,3 @@ def __init__(
             "fallbackPassword": self.fallback_password,
             "tag": self.tag
         }
-        super().__init__(
-            tag="SipUri",
-            content=self.uri,
-            attributes=self.attributes
-        )

bandwidth/model/bxml/verbs/tag.py

@@ -17,4 +17,4 @@ def __init__(self, content=""):
             content (str, optional): Custom tag value. Defaults to "".
         """
         self.content = content
-        super().__init__(tag="Tag", content=self.content, attributes=None)
+        super().__init__(tag="Tag", content=self.content)

bandwidth/model/bxml/verbs/transfer.py

@@ -75,7 +75,15 @@ def __init__(
         self.tag = tag
         self.diversion_treatment = diversion_treatment
         self.diversion_reason = diversion_reason
-        self.attributes = {
+        super().__init__(
+            tag="Transfer",
+            content=None,
+            nested_verbs=self.transfer_to
+        )
+
+    @property
+    def attributes(self):
+        return {
             "transferCallerId": self.transfer_caller_id,
             "callTimeout": self.call_timeout,
             "transferCompleteUrl": self.transfer_complete_url,
@@ -90,12 +98,6 @@ def __init__(
             "diversionTreatment": self.diversion_treatment,
             "diversionReason": self.diversion_reason
         }
-        super().__init__(
-            tag="Transfer",
-            content=None,
-            attributes=self.attributes,
-            nested_verbs=self.transfer_to
-        )
 
     def add_transfer_recipient(self, recipient: Union[PhoneNumber, SipUri]):
         super().add_verb(recipient)