dnastack-client-library 3.1.205__py3-none-any.whl → 3.1.208__py3-none-any.whl

dnastack/constants.py

@@ -1,5 +1,5 @@
 import os
 
-__version__ = "3.1.205"
+__version__ = "3.1.208"
 
 LOCAL_STORAGE_DIRECTORY = os.path.join(os.path.expanduser("~"), '.dnastack')

dnastack/http/authenticators/factory.py

@@ -1,10 +1,11 @@
 from typing import List, Any, Dict, Optional
+import logging
 
 from dnastack.client.models import ServiceEndpoint
 from dnastack.common.model_mixin import JsonModelMixin
 from dnastack.http.authenticators.abstract import Authenticator
 from dnastack.http.authenticators.oauth2 import OAuth2Authenticator
-from dnastack.http.authenticators.oauth2_adapter.models import OAuth2Authentication
+from dnastack.http.authenticators.oauth2_adapter.models import OAuth2Authentication, SUPPORTED_GRANT_TYPES
 
 
 class UnsupportedAuthenticationInformationError(RuntimeError):
@@ -43,10 +44,21 @@ class HttpAuthenticatorFactory:
 
     @staticmethod
     def get_unique_auth_info_list(endpoints: List[ServiceEndpoint]) -> List[Dict[str, Any]]:
+        logger = logging.getLogger(__name__)
         unique_auth_info_map: Dict[str, Dict[str, Any]] = {}
 
         for endpoint in endpoints:
             for auth_info in endpoint.get_authentications():
+                grant_type = auth_info.get('grant_type')
+
+                # Skip authentication methods with unsupported grant types
+                if grant_type and grant_type not in SUPPORTED_GRANT_TYPES:
+                    logger.debug("Skipping authentication with unsupported grant type '{}' for resource '{}'".format(
+                        grant_type,
+                        auth_info.get('resource_url', 'unknown')
+                    ))
+                    continue
+
                 unique_auth_info_map[JsonModelMixin.hash(auth_info)] = auth_info
 
         return sorted(unique_auth_info_map.values(), key=lambda a: a.get('resource_url') or a.get('type'))

dnastack/http/authenticators/oauth2.py

@@ -130,7 +130,7 @@ class OAuth2Authenticator(Authenticator):
             self.events.dispatch('authentication-failure', event_details)
 
             raise OAuth2MisconfigurationError('Cannot determine the type of authentication '
-                                              f'({auth_info.json(sort_keys=True, exclude_none=True)})')
+                                              f'({auth_info.model_dump_json(exclude_none=True)})')
 
         adapter.check_config_readiness()
         for auth_event_type in ['blocking-response-required', 'blocking-response-ok', 'blocking-response-failed']:
@@ -255,16 +255,12 @@ class OAuth2Authenticator(Authenticator):
                 except JSONDecodeError:
                     error_msg = refresh_token_res.text
 
-                # Handle Wallet-specific implementation
-                reauthentication_required = (
-                        refresh_token_res.status_code == 401
-                        or
-                        (refresh_token_res.status_code == 400 and 'JWT expired' in error_msg)
-                )
-
-                if not reauthentication_required:
-                    event_details['reason'] = 'Invalid state while refreshing tokens'
-                    self.events.dispatch('refresh-failure', event_details)
+                # Handle token refresh failure based on HTTP status.
+                # 400/401 = the refresh token is invalid (expired, revoked, key rotated, etc.)
+                #           -> prompt the user to re-authenticate
+                # 5xx     = transient server error, re-login won't help
+                #           -> raise InvalidStateError
+                reauthentication_required = refresh_token_res.status_code in (400, 401)
 
                 exception_details = {
                     'debug_mode': currently_in_debug_mode(),
@@ -285,8 +281,12 @@ class OAuth2Authenticator(Authenticator):
                     }
 
                 if reauthentication_required:
-                    raise ReauthenticationRequired('Refresh token expired')
+                    logger.warning(f'Refresh token rejected by server (HTTP {refresh_token_res.status_code}): {error_msg}')
+                    raise ReauthenticationRequired(f'Refresh token rejected: {error_msg}')
                 else:
+                    event_details['reason'] = 'Invalid state while refreshing tokens'
+                    self.events.dispatch('refresh-failure', event_details)
+
                     raise InvalidStateError('Unable to refresh the access token',
                                             details=exception_details)
         finally:

dnastack/http/authenticators/oauth2_adapter/models.py

@@ -6,6 +6,15 @@ from dnastack.common.model_mixin import JsonModelMixin as HashableModel
 
 
 GRANT_TYPE_TOKEN_EXCHANGE = 'urn:ietf:params:oauth:grant-type:token-exchange'
+GRANT_TYPE_DEVICE_CODE = 'urn:ietf:params:oauth:grant-type:device_code'
+GRANT_TYPE_CLIENT_CREDENTIALS = 'client_credentials'
+
+# List of grant types supported by the CLI
+SUPPORTED_GRANT_TYPES = [
+    GRANT_TYPE_DEVICE_CODE,
+    GRANT_TYPE_CLIENT_CREDENTIALS,
+    GRANT_TYPE_TOKEN_EXCHANGE,
+]
 
 
 class OAuth2Authentication(BaseModel, HashableModel):

{dnastack_client_library-3.1.205.dist-info → dnastack_client_library-3.1.208.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dnastack-client-library
-Version: 3.1.205
+Version: 3.1.208
 Summary: DNAstack's GA4GH library and CLI
 Author-email: DNAstack <devs@dnastack.com>
 License: Apache License, Version 2.0

{dnastack_client_library-3.1.205.dist-info → dnastack_client_library-3.1.208.dist-info}/RECORD

@@ -1,6 +1,6 @@
 dnastack/__init__.py,sha256=mslf7se8vBSK_HkqWTGPdibeVhT4xyKXgzQBV7dEK1M,333
 dnastack/__main__.py,sha256=EKmtIs4TBseQJi-OT_U6LqRyKLiyrGTBuTQg9zE-G2I,4376
-dnastack/constants.py,sha256=AUWbWRGqG9cdfi5lRRv-aBoiIeEYaeFJhbiafQ4bq-o,113
+dnastack/constants.py,sha256=vo13riOSgV4v11y-Mf0p_xg3AUpi_3kAP2ZnW4t_TBY,113
 dnastack/feature_flags.py,sha256=UMNDB07R_ep6Fx3iClhzwOpkWfyYnb418FpoJo50CGs,1411
 dnastack/json_path.py,sha256=TyghhDf7nGQmnsUWBhenU_fKsE_Ez-HLVER6HgH5-hU,2700
 dnastack/omics_cli.py,sha256=ZppKZTHv_XjUUZyRIzSkx0Ug5ODAYrCOTsU0ezCOVrA,3694
@@ -188,19 +188,19 @@ dnastack/http/session_info.py,sha256=7Fny2U1Zixab4CFGwNsn8Am4tNKYYHF7C1ERG3BhHBI
 dnastack/http/authenticators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dnastack/http/authenticators/abstract.py,sha256=Q74LnZwsMKs5TfGI_4oZtXBCpgJKkkimkv_Y8YPHuoM,9246
 dnastack/http/authenticators/constants.py,sha256=mSpBnm5lMMmMJwr13KIfCoOXXJLP4qGDkFprYXALu8o,1278
-dnastack/http/authenticators/factory.py,sha256=Kt6PH0-Umfa4ah-Jn8fZthUp2XXKyguhebj3-B0fAZc,2064
-dnastack/http/authenticators/oauth2.py,sha256=yZ_bBaIVscDZC25f2vwBptkdcLwX47nFakhL6PW28lM,20071
+dnastack/http/authenticators/factory.py,sha256=zjV5xMZKlkKqUHA2QDXmut-2HxTnqAz8vwxTBEkMg60,2627
+dnastack/http/authenticators/oauth2.py,sha256=6shpSY9v7Ccs6Iy4GjWgx22uq9r_wkEg3z4xeWlHlxE,20298
 dnastack/http/authenticators/oauth2_adapter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dnastack/http/authenticators/oauth2_adapter/abstract.py,sha256=Tm4Nnroo5_vp0UgZHhcEDVRRbhIrvVdfPr8nTyihoH4,2832
 dnastack/http/authenticators/oauth2_adapter/client_credential.py,sha256=2iVOof4YZEVGizDRDBISbv8U_xIemtUnHzzxa3mxswc,2770
 dnastack/http/authenticators/oauth2_adapter/cloud_providers.py,sha256=UHQ-YHHr5ipqSQVzCfr95Uv3zkFcop_RCpK4q6a2yJg,4317
 dnastack/http/authenticators/oauth2_adapter/device_code_flow.py,sha256=dXI5CyUcsqYg6gf5vDC_3eY6Cc-H1C8W7FeD_24j92A,6750
 dnastack/http/authenticators/oauth2_adapter/factory.py,sha256=ZtNXOklWEim-26ooNoPp3ji_hRg1vf4fHHnY94F0wLI,1087
-dnastack/http/authenticators/oauth2_adapter/models.py,sha256=Dry1supZCVe4aR_0mGdVry5Ctwnvz_mpa1wsGZYloCw,1048
+dnastack/http/authenticators/oauth2_adapter/models.py,sha256=7UsC8DkStMBx7Bz_xHQNi_J1UO_H4nfHme7oBhokj2I,1339
 dnastack/http/authenticators/oauth2_adapter/token_exchange.py,sha256=nSuAsSKWa_UNqHSbPMOEk4komaFITYAnE04Sk5WOrLc,6332
-dnastack_client_library-3.1.205.dist-info/licenses/LICENSE,sha256=uwybO-wUbQhxkosgjhJlxmYATMy-AzoULFO9FUedE34,11580
-dnastack_client_library-3.1.205.dist-info/METADATA,sha256=tpMwOSCq7qzAEN1nu82BVY4Djq3w46weU0sBkvaa84U,1761
-dnastack_client_library-3.1.205.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dnastack_client_library-3.1.205.dist-info/entry_points.txt,sha256=Y6OeicsiyGn3-8D-SiV4NiKlJgXfkSqK88kFBR6R1rY,89
-dnastack_client_library-3.1.205.dist-info/top_level.txt,sha256=P2RgRyqJ7hfNy1wLVRoVLJYEppUVkCX3syGK9zBqkt8,9
-dnastack_client_library-3.1.205.dist-info/RECORD,,
+dnastack_client_library-3.1.208.dist-info/licenses/LICENSE,sha256=uwybO-wUbQhxkosgjhJlxmYATMy-AzoULFO9FUedE34,11580
+dnastack_client_library-3.1.208.dist-info/METADATA,sha256=U-cQKV_41yMifjZPSaIVaXO_I6EuX7366ZFnMJ4UfBI,1761
+dnastack_client_library-3.1.208.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+dnastack_client_library-3.1.208.dist-info/entry_points.txt,sha256=Y6OeicsiyGn3-8D-SiV4NiKlJgXfkSqK88kFBR6R1rY,89
+dnastack_client_library-3.1.208.dist-info/top_level.txt,sha256=P2RgRyqJ7hfNy1wLVRoVLJYEppUVkCX3syGK9zBqkt8,9
+dnastack_client_library-3.1.208.dist-info/RECORD,,

{dnastack_client_library-3.1.205.dist-info → dnastack_client_library-3.1.208.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any