chore: fix pyright errors in http folder (#683)

Author: childish-sambino

tests/unit/http/test_async_http_client.py

@@ -24,9 +24,7 @@ def setUp(self):
         self.session_mock = AsyncMock(wraps=ClientSession)
         self.session_mock.request.return_value = MockResponse("test", 200)
 
-        self.session_patcher = patch(
-            "twilio.http.async_http_client.aiohttp.ClientSession"
-        )
+        self.session_patcher = patch("twilio.http.async_http_client.ClientSession")
         session_constructor_mock = self.session_patcher.start()
         session_constructor_mock.return_value = self.session_mock
 
@@ -69,9 +67,7 @@ def setUp(self):
             MockResponse("Success", 200),
         ]
 
-        self.session_patcher = patch(
-            "twilio.http.async_http_client.aiohttp.ClientSession"
-        )
+        self.session_patcher = patch("twilio.http.async_http_client.ClientSession")
         session_constructor_mock = self.session_patcher.start()
         session_constructor_mock.return_value = self.session_mock
 
@@ -97,9 +93,7 @@ async def test_request_retries_until_max(self):
 
 class TestAsyncHttpClientSession(aiounittest.AsyncTestCase):
     def setUp(self):
-        self.session_patcher = patch(
-            "twilio.http.async_http_client.aiohttp.ClientSession"
-        )
+        self.session_patcher = patch("twilio.http.async_http_client.ClientSession")
         self.session_constructor_mock = self.session_patcher.start()
 
     def tearDown(self):

tests/unit/http/test_http_client.py

@@ -46,7 +46,7 @@ def test_request_with_timeout(self):
         self.request_mock.headers = {"Host": "other.twilio.com"}
 
         response = self.client.request(
-            "doesnt matter", "doesnt matter", None, None, None, None, 30, None
+            "doesnt matter", "doesnt matter", None, None, None, None, 30
         )
 
         self.assertEqual("other.twilio.com", self.request_mock.headers["Host"])
@@ -59,7 +59,7 @@ def test_request_where_method_timeout_equals_zero(self):
 
         try:
             self.client.request(
-                "doesnt matter", "doesnt matter", None, None, None, None, 0, None
+                "doesnt matter", "doesnt matter", None, None, None, None, 0
             )
         except Exception as e:
             self.assertEqual(ValueError, type(e))
@@ -90,7 +90,7 @@ def test_request_where_class_timeout_and_method_timeout_set(self):
         self.client.timeout = 30
 
         response = self.client.request(
-            "doesnt matter", "doesnt matter", None, None, None, None, 15, None
+            "doesnt matter", "doesnt matter", None, None, None, None, 15
         )
 
         self.assertEqual("other.twilio.com", self.request_mock.headers["Host"])
@@ -138,10 +138,12 @@ def test_last_request_last_response_exist(self):
         self.assertEqual(["a", "b"], self.client._test_only_last_request.auth)
 
         self.assertIsNotNone(self.client._test_only_last_response)
-        self.assertEqual(200, self.client._test_only_last_response.status_code)
-        self.assertEqual(
-            "testing-unicode: Ω≈ç√, 💩", self.client._test_only_last_response.text
-        )
+
+        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")

tests/unit/http/test_validation_client.py

@@ -30,7 +30,7 @@ def test_build_validation_payload_basic(self):
         self.assertEqual("", validation_payload.body)
 
     def test_build_validation_payload_query_string_parsed(self):
-        self.request.url = self.request.url + "?QueryParam=1&Other=true"
+        self.request.url = (self.request.url or "") + "?QueryParam=1&Other=true"
 
         validation_payload = self.client._build_validation_payload(self.request)
 
@@ -41,7 +41,7 @@ def test_build_validation_payload_query_string_parsed(self):
         self.assertEqual("", validation_payload.body)
 
     def test_build_validation_payload_body_parsed(self):
-        self.request.body = "foobar"
+        setattr(self.request, "body", "foobar")
 
         validation_payload = self.client._build_validation_payload(self.request)
 
@@ -52,10 +52,10 @@ def test_build_validation_payload_body_parsed(self):
         self.assertEqual("foobar", validation_payload.body)
 
     def test_build_validation_payload_complex(self):
-        self.request.body = "foobar"
+        setattr(self.request, "body", "foobar")
         self.request.url = (
-            self.request.url + "?QueryParam=Value&OtherQueryParam=OtherValue"
-        )
+            self.request.url or ""
+        ) + "?QueryParam=Value&OtherQueryParam=OtherValue"
 
         validation_payload = self.client._build_validation_payload(self.request)
 

twilio/http/async_http_client.py

@@ -1,7 +1,6 @@
-import aiohttp
 import logging
 
-from aiohttp import BasicAuth
+from aiohttp import BasicAuth, ClientSession
 from aiohttp_retry import ExponentialRetry, RetryClient
 from twilio.http import AsyncHttpClient
 from twilio.http.request import Request as TwilioRequest
@@ -39,7 +38,7 @@ def __init__(
         self.proxy_url = proxy_url
         self.trace_configs = trace_configs
         self.session = (
-            aiohttp.ClientSession(trace_configs=self.trace_configs)
+            ClientSession(trace_configs=self.trace_configs)
             if pool_connections
             else None
         )
@@ -102,7 +101,7 @@ async def request(
         if self.session:
             session = self.session
         else:
-            session = aiohttp.ClientSession()
+            session = ClientSession()
             temp = True
         self._test_only_last_request = TwilioRequest(**kwargs)
         response = await session.request(**kwargs)
@@ -131,4 +130,5 @@ async def __aexit__(self, *excinfo):
         """
         Async context manager exit
         """
-        await self.session.close()
+        if self.session:
+            await self.session.close()

twilio/http/http_client.py

@@ -69,7 +69,9 @@ def request(
         :return: An http response
         :rtype: A :class:`Response <twilio.rest.http.response.Response>` object
         """
-        if timeout is not None and timeout <= 0:
+        if timeout is None:
+            timeout = self.timeout
+        elif timeout <= 0:
             raise ValueError(timeout)
 
         kwargs = {
@@ -95,10 +97,12 @@ def request(
             prepped_request.url, self.proxy, None, None, None
         )
 
-        settings["allow_redirects"] = allow_redirects
-        settings["timeout"] = timeout if timeout is not None else self.timeout
-
-        response = session.send(prepped_request, **settings)
+        response = session.send(
+            prepped_request,
+            allow_redirects=allow_redirects,
+            timeout=timeout,
+            **settings
+        )
 
         self.log_response(response.status_code, response)
 

twilio/http/request.py

@@ -1,17 +1,30 @@
+from enum import Enum
+from typing import Dict, Union
 from urllib.parse import urlencode
 
 
+class Match(Enum):
+    ANY = "*"
+
+
 class Request(object):
     """
     An HTTP request.
     """
 
-    ANY = "*"
-
     def __init__(
-        self, method=ANY, url=ANY, auth=ANY, params=ANY, data=ANY, headers=ANY, **kwargs
+        self,
+        method: Union[str, Match] = Match.ANY,
+        url: Union[str, Match] = Match.ANY,
+        auth: Union[tuple, Match] = Match.ANY,
+        params: Union[Dict, Match] = Match.ANY,
+        data: Union[Dict, Match] = Match.ANY,
+        headers: Union[Dict, Match] = Match.ANY,
+        **kwargs
     ):
-        self.method = method.upper()
+        self.method = method
+        if method and method != Match.ANY:
+            self.method = method.upper()
         self.url = url
         self.auth = auth
         self.params = params
@@ -20,7 +33,7 @@ def __init__(
 
     @classmethod
     def attribute_equal(cls, lhs, rhs):
-        if lhs == cls.ANY or rhs == cls.ANY:
+        if lhs == Match.ANY or rhs == Match.ANY:
             # ANY matches everything
             return True
 
@@ -44,23 +57,23 @@ def __eq__(self, other):
 
     def __str__(self):
         auth = ""
-        if self.auth and self.auth != self.ANY:
+        if self.auth and self.auth != Match.ANY:
             auth = "{} ".format(self.auth)
 
         params = ""
-        if self.params and self.params != self.ANY:
+        if self.params and self.params != Match.ANY:
             params = "?{}".format(urlencode(self.params, doseq=True))
 
         data = ""
-        if self.data and self.data != self.ANY:
+        if self.data and self.data != Match.ANY:
             if self.method == "GET":
                 data = "\n -G"
             data += "\n{}".format(
                 "\n".join(' -d "{}={}"'.format(k, v) for k, v in self.data.items())
             )
 
         headers = ""
-        if self.headers and self.headers != self.ANY:
+        if self.headers and self.headers != Match.ANY:
             headers = "\n{}".format(
                 "\n".join(' -H "{}: {}"'.format(k, v) for k, v in self.headers.items())
             )

twilio/http/validation_client.py

@@ -121,7 +121,7 @@ def _build_validation_payload(self, request):
     def _get_host(self, request):
         """Pull the Host out of the request"""
         parsed = urlparse(request.url)
-        return parsed.netloc
+        return str(parsed.netloc)
 
     def validate_ssl_certificate(self, client):
         """