benchling-sdk 1.11.0a0__py3-none-any.whl → 1.11.0a2__py3-none-any.whl

benchling_sdk/auth/client_credentials_oauth2.py

@@ -1,13 +1,17 @@
+from __future__ import annotations
+
 import base64
 from datetime import datetime, timedelta
+from json import JSONDecodeError
 import threading
-from typing import Optional
+from typing import NoReturn, Optional
 from urllib.parse import urljoin
 
 from benchling_api_client.v2.benchling_client import AuthorizationMethod, BenchlingApiClient
 import httpx
 
 from benchling_sdk.errors import BenchlingError
+from benchling_sdk.helpers.logging_helpers import sdk_logger
 
 MINIMUM_TOKEN_EXPIRY_BUFFER = 60
 
@@ -30,7 +34,7 @@ class Token:
         return datetime.now() < self.refresh_time
 
     @classmethod
-    def from_token_response(cls, token_response):
+    def from_token_response(cls, token_response) -> Token:
         """
         Construct Token from deserializing token endpoint response.
 
@@ -107,13 +111,7 @@ class ClientCredentialsOAuth2(AuthorizationMethod):
             as_json = response.json()
             self._token = Token.from_token_response(as_json)
         else:
-            raise BenchlingError(
-                status_code=response.status_code,
-                headers=response.headers,
-                json=response.json(),
-                content=response.content,
-                parsed=None,
-            )
+            _raise_error_from_response(response)
 
     def get_authorization_header(self, base_url: str) -> str:
         """
@@ -127,3 +125,20 @@ class ClientCredentialsOAuth2(AuthorizationMethod):
                 self.vend_new_token(base_url)
         assert self._token is not None
         return f"Bearer {self._token.access_token}"
+
+
+def _raise_error_from_response(response: httpx.Response) -> NoReturn:
+    json_content = None
+    # Rather than rely on Content-Type header, try to parse JSON
+    # If the response isn't JSON, just swallow the exception
+    try:
+        json_content = response.json()
+    except JSONDecodeError as e:
+        sdk_logger.debug("Received error response without JSON OAuth vending token", e)
+    raise BenchlingError(
+        status_code=response.status_code,
+        headers=response.headers,
+        json=json_content,
+        content=response.content,
+        parsed=None,
+    )

{benchling_sdk-1.11.0a0.dist-info → benchling_sdk-1.11.0a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: benchling-sdk
-Version: 1.11.0a0
+Version: 1.11.0a2
 Summary: SDK for interacting with the Benchling Platform.
 License: Apache-2.0
 Author: Benchling Support

{benchling_sdk-1.11.0a0.dist-info → benchling_sdk-1.11.0a2.dist-info}/RECORD

@@ -26,7 +26,7 @@ benchling_sdk/apps/types.py,sha256=TBTfAB3IOoZjZqzTOK25kN3b6RTU9Z7tOMdBbq6u8lA,1
 benchling_sdk/auth/__init__.py,sha256=N4pJYVUnTLzg5HO9ZldHaI-Am97i6AOCdQS0M5QcVpA,120
 benchling_sdk/auth/api_key_auth.py,sha256=Ui-cnvGMjcwVPV_b2GdBaoTjEyHJIu9CjtZScVBEUvU,641
 benchling_sdk/auth/bearer_token_auth.py,sha256=nymI8V91evcnK-TWKkBXZwck8U1qSh4WaseyQbvF-Cg,1268
-benchling_sdk/auth/client_credentials_oauth2.py,sha256=LTcwtivobyhVRPJs7O2QpHW1NclkIffs3fHcqtT4W74,5271
+benchling_sdk/auth/client_credentials_oauth2.py,sha256=auHj8FAJxUrDf1HJp9wfmcC_pJ-3rj4tdQbsUIvSUQs,5801
 benchling_sdk/benchling.py,sha256=eED0ge5hWspr1kFFZ1fOovPvw-JdVKhylAGT-n_GUSA,25943
 benchling_sdk/docs/__init__.py,sha256=ySHo76PzLndmXOVWrF80VjB5Pi48G82CCQNdzUEzbCY,38
 benchling_sdk/docs/__main__.py,sha256=1ZlGXdn2gHGC0fAuan5i54mh35VkDf5mhY9VeKNyCRA,244
@@ -115,7 +115,7 @@ benchling_sdk/services/v2/v2_alpha_service.py,sha256=vNfYK0Dheml9ozR_0tzTlA3blPD
 benchling_sdk/services/v2/v2_beta_service.py,sha256=0vbjFFfPQNUGUhckR_cnzGjypRMBpBP6c5c49zrA3mk,11564
 benchling_sdk/services/v2/v2_stable_service.py,sha256=YIc-_0p6x1NQqj7awnWgCTHxbxYO7ZOolePZyW90whc,35246
 benchling_sdk/services/v2_service.py,sha256=3eoIjYEmGLPdWCpBN0pl7q7_HNWCsUvfvTn3Hcz0wSM,2860
-benchling_sdk-1.11.0a0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-benchling_sdk-1.11.0a0.dist-info/METADATA,sha256=kIJQoX4idjcIolmANOqV6HXFfbk9DpZ-ZG9TJ5hJXHk,2126
-benchling_sdk-1.11.0a0.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-benchling_sdk-1.11.0a0.dist-info/RECORD,,
+benchling_sdk-1.11.0a2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+benchling_sdk-1.11.0a2.dist-info/METADATA,sha256=3EWwCQDYWFZq3y_mtICWlnsZvpAkFk-dPHHveVIjRSA,2126
+benchling_sdk-1.11.0a2.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+benchling_sdk-1.11.0a2.dist-info/RECORD,,