UncountablePythonSDK 0.0.37__py3-none-any.whl → 0.0.38__py3-none-any.whl

{UncountablePythonSDK-0.0.37.dist-info → UncountablePythonSDK-0.0.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.37
+Version: 0.0.38
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git

{UncountablePythonSDK-0.0.37.dist-info → UncountablePythonSDK-0.0.38.dist-info}/RECORD

@@ -65,7 +65,7 @@ uncountable/__init__.py,sha256=8l8XWNCKsu7TG94c-xa2KHpDegvxDC2FyQISdWC763Y,89
 uncountable/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uncountable/core/__init__.py,sha256=RFv0kO6rKFf1PtBPu83hCGmxqkJamRtsgQ9_-ztw7tA,341
 uncountable/core/async_batch.py,sha256=Zo02TICZ7AK81Qa02NQ8fp8uaijQph1FEta28K3cKb0,749
-uncountable/core/client.py,sha256=6T8qecNK0MypHs5gD6VdW7KpiHjX7_jMNiqkmEn3CHM,9657
+uncountable/core/client.py,sha256=lKg_58RSjKwGqDNOT2HYZXvJ4mGmxjVK4AtzlJAxIJ8,10159
 uncountable/core/file_upload.py,sha256=t4cutIFB5rNN2qVCx3H0HotSjCSJSxis2_QBarDuXyc,2833
 uncountable/core/types.py,sha256=s2CjqYJpsmbC7xMwxxT7kJ_V9bwokrjjWVVjpMcQpKI,333
 uncountable/integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -185,7 +185,7 @@ uncountable/types/api/recipes/unarchive_recipes.py,sha256=WcwFYbBsX2SKXnoBQ8locn
 uncountable/types/api/recipes/unlock_recipes.py,sha256=m_CC9LZW7GRVrAu9uwDTTgEZr63-dOSduBAI5Ciud2I,1103
 uncountable/types/api/triggers/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
 uncountable/types/api/triggers/run_trigger.py,sha256=9m9M8-nlGB_sAU2Qm2lWugp4h4Osqj6QpjNfU8osd1U,901
-UncountablePythonSDK-0.0.37.dist-info/METADATA,sha256=3-tRSmnyCgOtzaRuyGhiBDX6GoHPqmEr4P7evG4BxcE,1577
-UncountablePythonSDK-0.0.37.dist-info/WHEEL,sha256=-oYQCr74JF3a37z2nRlQays_SX2MqOANoqVjBBAP2yE,91
-UncountablePythonSDK-0.0.37.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
-UncountablePythonSDK-0.0.37.dist-info/RECORD,,
+UncountablePythonSDK-0.0.38.dist-info/METADATA,sha256=JNH2Bj5C8pcbAOM9uGBcWUEZ4DHrvvigkSkT9c4oSjo,1577
+UncountablePythonSDK-0.0.38.dist-info/WHEEL,sha256=-oYQCr74JF3a37z2nRlQays_SX2MqOANoqVjBBAP2yE,91
+UncountablePythonSDK-0.0.38.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
+UncountablePythonSDK-0.0.38.dist-info/RECORD,,

uncountable/core/client.py

@@ -60,6 +60,8 @@ HTTPRequest = HTTPPostRequest | HTTPGetRequest
 @dataclass(kw_only=True)
 class ClientConfig:
     allow_insecure_tls: bool = False
+    extra_headers: dict[str, str] | None = None
+    transform_request: typing.Callable[[requests.Request], requests.Request] | None = None
 
 
 OAUTH_REFRESH_WINDOW_SECONDS = 60 * 5
@@ -144,6 +146,7 @@ class Client(ClientMethods):
     _file_uploader: FileUploader
     _cfg: ClientConfig
     _oauth_bearer_token_cache: OAuthBearerTokenCache | None = None
+    _session: requests.Session
 
     def __init__(
         self,
@@ -156,6 +159,8 @@ class Client(ClientMethods):
         self._base_url = base_url
         self._file_uploader = FileUploader(self._base_url, self._auth_details)
         self._cfg = config or ClientConfig()
+        self._session = requests.Session()
+        self._session.verify = not self._cfg.allow_insecure_tls
 
     def _get_response_json(
         self, response: requests.Response, request_id: str
@@ -176,6 +181,15 @@ class Client(ClientMethods):
         except JSONDecodeError as e:
             raise SDKError("unable to process response", request_id=request_id) from e
 
+    def _send_request(self, request: requests.Request) -> requests.Response:
+        if self._cfg.extra_headers is not None:
+            request.headers = {**request.headers, **self._cfg.extra_headers}
+        if self._cfg.transform_request is not None:
+            request = self._cfg.transform_request(request)
+        prepared_request = request.prepare()
+        response = self._session.send(prepared_request)
+        return response
+
     def do_request(self, *, api_request: APIRequest, return_type: type[DT]) -> DT:
         request_id = str(uuid4())
         http_request = self._build_http_request(
@@ -183,21 +197,15 @@ class Client(ClientMethods):
         )
         match http_request:
             case HTTPGetRequest():
-                response = requests.get(
-                    http_request.url,
-                    headers=http_request.headers,
-                    params=http_request.query_params,
-                    verify=not self._cfg.allow_insecure_tls,
-                )
+                request = requests.Request("GET", http_request.url)
+                request.params = http_request.query_params
             case HTTPPostRequest():
-                response = requests.post(
-                    http_request.url,
-                    headers=http_request.headers,
-                    data=http_request.body,
-                    verify=not self._cfg.allow_insecure_tls,
-                )
+                request = requests.Request("POST", http_request.url)
+                request.data = http_request.body
             case _:
                 typing.assert_never(http_request)
+        request.headers = http_request.headers
+        response = self._send_request(request)
         response_data = self._get_response_json(response, request_id=request_id)
         cached_parser = self._get_cached_parser(return_type)
         try:
@@ -220,15 +228,13 @@ class Client(ClientMethods):
             < OAUTH_REFRESH_WINDOW_SECONDS
         ):
             refresh_url = urljoin(self._base_url, "/token/get_bearer_token")
-            response = requests.post(
-                refresh_url,
-                data={
-                    "client_secret": oauth_details.refresh_token,
-                    "scope": oauth_details.scope,
-                    "grant_type": "client_credentials",
-                },
-                verify=not self._cfg.allow_insecure_tls,
-            )
+            request = requests.Request("POST", refresh_url)
+            request.data = {
+                "client_secret": oauth_details.refresh_token,
+                "scope": oauth_details.scope,
+                "grant_type": "client_credentials",
+            }
+            response = self._send_request(request)
             data = self._get_response_json(response, request_id=str(uuid4()))
             token_data = oauth_bearer_token_data_parser.parse_storage(data)
             self._oauth_bearer_token_cache = OAuthBearerTokenCache(