benchling-sdk 1.11.0a0__tar.gz → 1.11.0a2__tar.gz

{benchling_sdk-1.11.0a0 → benchling_sdk-1.11.0a2}/PKG-INFO

@@ -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 → benchling_sdk-1.11.0a2}/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 → benchling_sdk-1.11.0a2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "benchling-sdk"
-version = "1.11.0a0"   # NOTE: This version number is ignored and does not correspond to releases (see README)
+version = "1.11.0a2"   # NOTE: This version number is ignored and does not correspond to releases (see README)
 description = "SDK for interacting with the Benchling Platform."
 authors = ["Benchling Support <support@benchling.com>"]
 packages = [{include = "benchling_sdk"}]