Persist requests.Session for SyncClient (#279)

Author: logan-stytch

stytch/core/http/client.py

@@ -33,12 +33,26 @@ def __init__(self, project_id: str, secret: str) -> None:
 
 
 class SyncClient(ClientBase):
-    def __init__(self, project_id: str, secret: str) -> None:
+    def __init__(
+        self,
+        project_id: str,
+        secret: str,
+        session: Optional[requests.Session] = None,
+    ) -> None:
         super().__init__(project_id, secret)
         self.auth = requests.auth.HTTPBasicAuth(project_id, secret)
+        self.__session = session
+
+    @property
+    def _session(self) -> requests.Session:
+        if self.__session is None:
+            self.__session = requests.Session()
+        return self.__session
 
     @classmethod
-    def _response_from_request(cls, r: requests.Response) -> ResponseWithJson:
+    def _response_from_request(
+        cls, r: requests.Response
+    ) -> ResponseWithJson[requests.Response]:
         try:
             resp_json = r.json()
         except Exception:
@@ -50,51 +64,53 @@ def get(
         url: str,
         params: Optional[Dict[str, Any]],
         headers: Optional[Dict[str, str]] = None,
-    ) -> ResponseWithJson:
+    ) -> ResponseWithJson[requests.Response]:
         final_headers = self.headers.copy()
         final_headers.update(headers or {})
-        resp = requests.get(url, params=params, headers=final_headers, auth=self.auth)
+        resp = self._session.get(
+            url, params=params, headers=final_headers, auth=self.auth
+        )
         return self._response_from_request(resp)
 
     def post(
         self,
         url: str,
         json: Optional[Dict[str, Any]],
         headers: Optional[Dict[str, str]] = None,
-    ) -> ResponseWithJson:
+    ) -> ResponseWithJson[requests.Response]:
         final_headers = self.headers.copy()
         final_headers.update(headers or {})
-        resp = requests.post(url, json=json, headers=final_headers, auth=self.auth)
+        resp = self._session.post(url, json=json, headers=final_headers, auth=self.auth)
         return self._response_from_request(resp)
 
     def post_form(
         self,
         url: str,
         form: Optional[Dict[str, Any]],
         headers: Optional[Dict[str, str]] = None,
-    ) -> ResponseWithJson:
+    ) -> ResponseWithJson[requests.Response]:
         final_headers = self.headers.copy()
         final_headers.update(headers or {})
-        resp = requests.post(url, data=form, headers=final_headers, auth=self.auth)
+        resp = self._session.post(url, data=form, headers=final_headers, auth=self.auth)
         return self._response_from_request(resp)
 
     def put(
         self,
         url: str,
         json: Optional[Dict[str, Any]],
         headers: Optional[Dict[str, str]] = None,
-    ) -> ResponseWithJson:
+    ) -> ResponseWithJson[requests.Response]:
         final_headers = self.headers.copy()
         final_headers.update(headers or {})
-        resp = requests.put(url, json=json, headers=final_headers, auth=self.auth)
+        resp = self._session.put(url, json=json, headers=final_headers, auth=self.auth)
         return self._response_from_request(resp)
 
     def delete(
         self, url: str, headers: Optional[Dict[str, str]] = None
-    ) -> ResponseWithJson:
+    ) -> ResponseWithJson[requests.Response]:
         final_headers = self.headers.copy()
         final_headers.update(headers or {})
-        resp = requests.delete(url, headers=final_headers, auth=self.auth)
+        resp = self._session.delete(url, headers=final_headers, auth=self.auth)
         return self._response_from_request(resp)
 
 
@@ -133,20 +149,21 @@ def __del__(self) -> None:
     @classmethod
     async def _response_from_request(
         cls, r: aiohttp.ClientResponse
-    ) -> ResponseWithJson:
+    ) -> ResponseWithJson[aiohttp.ClientResponse]:
         try:
             resp_json = await r.json()
         except Exception:
             resp_json = {}
         return ResponseWithJson(response=r, json=resp_json)
 
+    @classmethod
     async def _response_from_post_form_request(
         cls, r: aiohttp.ClientResponse
-    ) -> ResponseWithJson:
+    ) -> ResponseWithJson[aiohttp.ClientResponse]:
         try:
             content = await r.content.read()
             resp_json = json.loads(content.decode())
-        except Exception as e:
+        except Exception:
             resp_json = {}
         return ResponseWithJson(response=r, json=resp_json)
 
@@ -155,7 +172,7 @@ async def get(
         url: str,
         params: Optional[Dict[str, Any]],
         headers: Optional[Dict[str, str]] = None,
-    ) -> ResponseWithJson:
+    ) -> ResponseWithJson[aiohttp.ClientResponse]:
         final_headers = self.headers.copy()
         final_headers.update(headers or {})
         resp = await self._session.get(
@@ -168,7 +185,7 @@ async def post(
         url: str,
         json: Optional[Dict[str, Any]],
         headers: Optional[Dict[str, str]] = None,
-    ) -> ResponseWithJson:
+    ) -> ResponseWithJson[aiohttp.ClientResponse]:
         final_headers = self.headers.copy()
         final_headers.update(headers or {})
         resp = await self._session.post(
@@ -181,7 +198,7 @@ async def post_form(
         url: str,
         form: Optional[Dict[str, Any]],
         headers: Optional[Dict[str, str]] = None,
-    ) -> ResponseWithJson:
+    ) -> ResponseWithJson[aiohttp.ClientResponse]:
         final_headers = self.headers.copy()
         final_headers.update(headers or {})
         resp = await self._session.post(
@@ -194,7 +211,7 @@ async def put(
         url: str,
         json: Optional[Dict[str, Any]],
         headers: Optional[Dict[str, str]] = None,
-    ) -> ResponseWithJson:
+    ) -> ResponseWithJson[aiohttp.ClientResponse]:
         final_headers = self.headers.copy()
         final_headers.update(headers or {})
         resp = await self._session.put(
@@ -204,7 +221,7 @@ async def put(
 
     async def delete(
         self, url: str, headers: Optional[Dict[str, str]] = None
-    ) -> ResponseWithJson:
+    ) -> ResponseWithJson[aiohttp.ClientResponse]:
         final_headers = self.headers.copy()
         final_headers.update(headers or {})
         resp = await self._session.delete(url, headers=final_headers, auth=self.auth)

stytch/version.py

@@ -1 +1 @@
-__version__ = "13.16.0"
+__version__ = "13.17.0"