feat!: Merge branch '9.0.0-rc' into main (#767)

* feat: json content type (#737) * feat: add application/json support for client * feat: add application/json support for client * feat: add application/json support for client * feat: add application/json support for client * feat: add application/json support for client * chore: updated changelogs for rc-branch * chore: add domain detail (#739) * feat: add domain detail to twilio python * feat: add domain detail to twilio python * feat: add domain detail to twilio python * feat: add domain detail to twilio python * corrected rc version * Update setup.py * Update setup.py * chore: corrected cluster test * [Librarian] Regenerated @ 517c6276943255de674e1d20cdae01266b89160c dc7e93834d14ebcc1f96c25b9fbc8af35330f99a * Release 9.0.0-rc.1 * chore: disables cluster test (#765) * chore: disables cluster test * chore: added make prettier to workflow * [Librarian] Regenerated @ c3db20dd5f24647ef2bd3fb8b955496c59bb22bd d02e25fbcbae2224a4c0e6c23612622c320cce9f * Release 9.0.0-rc.2 * feat!: MVR release preparation (#766) * feat!: MVR release preparation * fix: added test for json data in http client --------- Co-authored-by: Manisha Singh <[email protected]> Co-authored-by: sbansla <[email protected]> Co-authored-by: Twilio <[email protected]>
twilio · Feb 23, 2024 · b045fbc · b045fbc
1 parent 69441eb
commit b045fbc
Show file tree

Hide file tree

Showing 22 changed files with 1,089 additions and 230 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -3,6 +3,15 @@
 _`MAJOR` version bumps will have upgrade notes
 posted here._
 
+## [2024-02-20] 8.x.x to 9.x.x
+### Overview
+
+##### Twilio Python Helper Library’s major version 9.0.0 is now available. We ensured that you can upgrade to Python helper Library 9.0.0 version without any breaking changes of existing apis
+
+Behind the scenes Python Helper is now auto-generated via OpenAPI with this release. This enables us to rapidly add new features and enhance consistency across versions and languages.
+We're pleased to inform you that version 9.0.0 adds support for the application/json content type in the request body.
+
+
 ## [2023-04-05] 7.x.x to 8.x.x
 
 - **Supported Python versions updated**

diff --git a/tests/unit/http/test_http_client.py b/tests/unit/http/test_http_client.py
@@ -145,6 +145,32 @@ def test_last_request_last_response_exist(self):
                 "testing-unicode: Ω≈ç√, 💩", self.client._test_only_last_response.text
             )
 
+    def test_request_with_json(self):
+        self.request_mock.url = "https://api.twilio.com/"
+        self.request_mock.headers = {"Host": "other.twilio.com"}
+
+        self.client.request(
+            "doesnt-matter-method",
+            "doesnt-matter-url",
+            {"params-value": "params-key"},
+            {"json-key": "json-value"},
+            {"Content-Type": "application/json"},
+        )
+
+        self.assertIsNotNone(self.client._test_only_last_request)
+        self.assertEqual(
+            {"Content-Type": "application/json"},
+            self.client._test_only_last_request.headers,
+        )
+
+        self.assertIsNotNone(self.client._test_only_last_response)
+
+        if self.client._test_only_last_response is not None:
+            self.assertEqual(200, self.client._test_only_last_response.status_code)
+            self.assertEqual(
+                "testing-unicode: Ω≈ç√, 💩", self.client._test_only_last_response.text
+            )
+
     def test_last_response_empty_on_error(self):
         self.session_mock.send.side_effect = Exception("voltron")
 

diff --git a/twilio/http/http_client.py b/twilio/http/http_client.py
@@ -27,11 +27,10 @@ def __init__(
     ):
         """
         Constructor for the TwilioHttpClient
-
         :param pool_connections
         :param request_hooks
         :param timeout: Timeout for the requests.
-                        Timeout should never be zero (0) or less.
+                    Timeout should never be zero (0) or less
         :param logger
         :param proxy: Http proxy for the requests session
         :param max_retries: Maximum number of retries each request should attempt
@@ -65,10 +64,10 @@ def request(
         :param headers: HTTP Headers to send with the request
         :param auth: Basic Auth arguments
         :param timeout: Socket/Read timeout for the request
-        :param allow_redirects: Whether or not to allow redirects
+        :param allow_redirects: Whether to allow redirects
         See the requests documentation for explanation of all these parameters
 
-        :return: An http response
+        :return: An HTTP response
         """
         if timeout is None:
             timeout = self.timeout
@@ -79,12 +78,14 @@ def request(
             "method": method.upper(),
             "url": url,
             "params": params,
-            "data": data,
             "headers": headers,
             "auth": auth,
             "hooks": self.request_hooks,
         }
-
+        if headers and headers.get("Content-Type") == "application/json":
+            kwargs["json"] = data
+        else:
+            kwargs["data"] = data
         self.log_request(kwargs)
 
         self._test_only_last_response = None

diff --git a/twilio/rest/__init__.py b/twilio/rest/__init__.py
@@ -28,6 +28,7 @@
     from twilio.rest.ip_messaging import IpMessaging
     from twilio.rest.lookups import Lookups
     from twilio.rest.media import Media
+    from twilio.rest.preview_messaging import PreviewMessaging
     from twilio.rest.messaging import Messaging
     from twilio.rest.microvisor import Microvisor
     from twilio.rest.monitor import Monitor
@@ -135,6 +136,7 @@ def __init__(
         self._ip_messaging: Optional["IpMessaging"] = None
         self._lookups: Optional["Lookups"] = None
         self._media: Optional["Media"] = None
+        self._preview_messaging: Optional["PreviewMessaging"] = None
         self._messaging: Optional["Messaging"] = None
         self._microvisor: Optional["Microvisor"] = None
         self._monitor: Optional["Monitor"] = None
@@ -338,6 +340,19 @@ def media(self) -> "Media":
             self._media = Media(self)
         return self._media
 
+    @property
+    def preview_messaging(self) -> "PreviewMessaging":
+        """
+        Access the PreviewMessaging Twilio Domain
+
+        :returns: PreviewMessaging Twilio Domain
+        """
+        if self._preview_messaging is None:
+            from twilio.rest.preview_messaging import PreviewMessaging
+
+            self._preview_messaging = PreviewMessaging(self)
+        return self._preview_messaging
+
     @property
     def messaging(self) -> "Messaging":
         """