digitalhub 0.11.0b2__py3-none-any.whl → 0.11.0b3__py3-none-any.whl

digitalhub/stores/client/dhcore/configurator.py

@@ -22,8 +22,8 @@ AUTH_KEY = "_auth"
 
 # API levels that are supported
 MAX_API_LEVEL = 20
-MIN_API_LEVEL = 10
-LIB_VERSION = 10
+MIN_API_LEVEL = 11
+LIB_VERSION = 11
 
 
 class ClientDHCoreConfigurator:
@@ -159,10 +159,10 @@ class ClientDHCoreConfigurator:
         None
         """
         # Give priority to access token
-        access_token = configurator.load_var(DhcoreEnvVar.ACCESS_TOKEN.value)
+        access_token = self._load_dhcore_oauth_vars(DhcoreEnvVar.ACCESS_TOKEN.value)
         if access_token is not None:
             configurator.set_credential(AUTH_KEY, AuthType.OAUTH2.value)
-            configurator.set_credential(DhcoreEnvVar.ACCESS_TOKEN.value, access_token)
+            configurator.set_credential(DhcoreEnvVar.ACCESS_TOKEN.value.removeprefix("DHCORE_"), access_token)
 
         # Fallback to basic
         else:
@@ -223,7 +223,7 @@ class ClientDHCoreConfigurator:
         elif self.oauth2_auth():
             if "headers" not in kwargs:
                 kwargs["headers"] = {}
-            access_token = creds[DhcoreEnvVar.ACCESS_TOKEN.value]
+            access_token = creds[DhcoreEnvVar.ACCESS_TOKEN.value.removeprefix("DHCORE_")]
             kwargs["headers"]["Authorization"] = f"Bearer {access_token}"
         return kwargs
 
@@ -246,7 +246,7 @@ class ClientDHCoreConfigurator:
 
         # Otherwise try token from file
         if response.status_code in (400, 401, 403):
-            refresh_token = configurator.load_from_file(DhcoreEnvVar.REFRESH_TOKEN.value)
+            refresh_token = configurator.load_from_file(DhcoreEnvVar.REFRESH_TOKEN.value.removeprefix("DHCORE_"))
             response = self._call_refresh_token_endpoint(url, refresh_token)
 
         response.raise_for_status()
@@ -267,12 +267,42 @@ class ClientDHCoreConfigurator:
         -------
         None
         """
-        keys = list_enum(DhcoreEnvVar) + list_enum(S3StoreEnv) + list_enum(SqlStoreEnv)
+        keys = [
+            *self._remove_prefix_dhcore(list_enum(DhcoreEnvVar)),
+            *list_enum(S3StoreEnv),
+            *list_enum(SqlStoreEnv),
+            ]
         for key in keys:
-            if (value := response.get(key.lower().removeprefix("dhcore_"))) is not None:
+            if (value := response.get(key.lower())) is not None:
                 configurator.set_credential(key, value)
         configurator.write_env(keys)
 
+    def _remove_prefix_dhcore(self, keys: list[str]) -> list[str]:
+        """
+        Remove prefix from selected keys. (Compatibility with CLI)
+
+        Parameters
+        ----------
+        keys : list[str]
+            List of keys.
+
+        Returns
+        -------
+        list[str]
+            List of keys without prefix.
+        """
+        new_list = []
+        for key in keys:
+            if key in (DhcoreEnvVar.REFRESH_TOKEN.value,
+                       DhcoreEnvVar.ACCESS_TOKEN.value,
+                       DhcoreEnvVar.ISSUER.value,
+                       #DhcoreEnvVar.CLIENT_ID.value,
+                       ):
+                new_list.append(key.removeprefix("DHCORE_"))
+            else:
+                new_list.append(key)
+        return new_list
+
     def _get_refresh_endpoint(self) -> str:
         """
         Get the refresh endpoint.
@@ -283,11 +313,11 @@ class ClientDHCoreConfigurator:
             Refresh endpoint.
         """
         # Get issuer endpoint
-        endpoint_issuer = configurator.load_var(DhcoreEnvVar.ISSUER.value)
+        endpoint_issuer = self._load_dhcore_oauth_vars(DhcoreEnvVar.ISSUER.value)
         if endpoint_issuer is None:
             raise ClientError("Issuer endpoint not set.")
         endpoint_issuer = self._sanitize_endpoint(endpoint_issuer)
-        configurator.set_credential(DhcoreEnvVar.ISSUER.value, endpoint_issuer)
+        configurator.set_credential(DhcoreEnvVar.ISSUER.value.removeprefix("DHCORE_"), endpoint_issuer)
 
         # Standard issuer endpoint path
         url = endpoint_issuer + "/.well-known/openid-configuration"
@@ -315,6 +345,7 @@ class ClientDHCoreConfigurator:
         """
         # Get client id
         client_id = configurator.load_var(DhcoreEnvVar.CLIENT_ID.value)
+        #client_id = self._load_dhcore_oauth_vars(DhcoreEnvVar.CLIENT_ID.value)
         if client_id is None:
             raise ClientError("Client id not set.")
 
@@ -327,3 +358,22 @@ class ClientDHCoreConfigurator:
         }
         headers = {"Content-Type": "application/x-www-form-urlencoded"}
         return request("POST", url, data=payload, headers=headers, timeout=60)
+
+    def _load_dhcore_oauth_vars(self, oauth_var: str) -> str | None:
+        """
+        Load DHCore oauth variables.
+
+        Parameters
+        ----------
+        oauth_var : str
+            The oauth variable to load.
+
+        Returns
+        -------
+        str
+            The oauth variable.
+        """
+        read_var = configurator.load_from_env(oauth_var)
+        if read_var is None:
+            read_var = configurator.load_from_file(oauth_var.removeprefix("DHCORE_"))
+        return read_var

digitalhub/stores/configurator/ini_module.py

@@ -112,7 +112,7 @@ def set_current_env(environment: str) -> None:
         raise ClientError(f"Failed to write env file: {e}")
 
 
-def read_env_from_file() -> str:
+def read_env_from_file() -> str | None:
     """
     Read the current credentials set from the .dhcore.ini file.
 
@@ -124,5 +124,5 @@ def read_env_from_file() -> str:
     try:
         cfg = load_file()
         return cfg["DEFAULT"]["current_environment"]
-    except Exception as e:
-        raise ClientError(f"Failed to read env file: {e}")
+    except Exception:
+        return None

{digitalhub-0.11.0b2.dist-info → digitalhub-0.11.0b3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalhub
-Version: 0.11.0b2
+Version: 0.11.0b3
 Summary: Python SDK for Digitalhub
 Project-URL: Homepage, https://github.com/scc-digitalhub/digitalhub-sdk
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>

{digitalhub-0.11.0b2.dist-info → digitalhub-0.11.0b3.dist-info}/RECORD

@@ -190,7 +190,7 @@ digitalhub/stores/client/_base/params_builder.py,sha256=lCk4WE6DqvGP7-cx0anZEC8G
 digitalhub/stores/client/dhcore/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/stores/client/dhcore/api_builder.py,sha256=J1kOMw4B4_PZKkEs7GPNcEkd1w-ZyJeB9G1UBZiMbl0,3975
 digitalhub/stores/client/dhcore/client.py,sha256=SdwtCZ3HsQIxzYGUI3BPbwDEeRbcdpMliQNMWMEV4MA,9890
-digitalhub/stores/client/dhcore/configurator.py,sha256=kLly2-87YAylsAZ8vhnTHmbfOhUSfn39Rl8M9n8Pc5g,9760
+digitalhub/stores/client/dhcore/configurator.py,sha256=_U4AjS7KKEixOjaRnSfIOIbHVWa00d8BXBwBjh9ptE4,11286
 digitalhub/stores/client/dhcore/enums.py,sha256=kaVXZTTa2WmsFbcc1CKWNLOM0JtUtcjL-KpspnTOhEE,523
 digitalhub/stores/client/dhcore/error_parser.py,sha256=GJUUkhp12cvC_LBIrC0teh4msmyb5WFxY2g4WNOkUwM,3305
 digitalhub/stores/client/dhcore/key_builder.py,sha256=YuSS5tRNRJTYlH14buetFSCU_bLuBBKLqMFO3MQ6r4g,1324
@@ -208,7 +208,7 @@ digitalhub/stores/configurator/api.py,sha256=-dRdkXh99SztWaeRfqztVXhT8f95aVBjDK7
 digitalhub/stores/configurator/configurator.py,sha256=z9RaQ_xKm_d1S3GdrSqfbV3ikEfHg6XogQMWDL7xc84,4762
 digitalhub/stores/configurator/credentials_store.py,sha256=kiaCm37Sl1SN9OaMbsfZA1l1a9Xg6R6a00H7Upcf8Vg,1508
 digitalhub/stores/configurator/enums.py,sha256=3Sf6UbYWYiJK4LaDzfgS2ay8Jxh-jIzR_3WRLt6m9do,288
-digitalhub/stores/configurator/ini_module.py,sha256=fGMQ8n28wXqmDCnk6x_VCE99KWqa7qU1OmQEEfWhQa8,2960
+digitalhub/stores/configurator/ini_module.py,sha256=VfBPFo-EVrFokDk2j9CtzstlKuxTXtsG1ro-nfTPSfs,2923
 digitalhub/stores/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/stores/data/api.py,sha256=R-yBTWpLDrFfcFAju0PJVl0_CDROM8lV2QHKtIMwGrI,543
 digitalhub/stores/data/builder.py,sha256=fh1JFFos7TpfgWlEWL9WmIEdrpt4t1dQU2Ivq8qE4QE,2291
@@ -250,7 +250,7 @@ digitalhub/utils/io_utils.py,sha256=8jD4Rp_b7LZEpY5JSMxVUowZsnifKnbGpHT5Hijx9-g,
 digitalhub/utils/logger.py,sha256=ml3ne6D8wuRdNZ4F6ywmvWotSxjmZWnmKgNiuHb4R5M,437
 digitalhub/utils/types.py,sha256=x8zXsbivD8vdaNeNRZLKOPvGbz6d-59nncuvO0FsueY,109
 digitalhub/utils/uri_utils.py,sha256=wVkA2OcfHG5EcQOr9YxLJzo--VV6sjFjgXDNx-gP94I,4021
-digitalhub-0.11.0b2.dist-info/METADATA,sha256=ZEdvCZlv8Gh7AfR2ppDjJvKhfqUL7yMN5UHtP5vmL-s,15037
-digitalhub-0.11.0b2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-digitalhub-0.11.0b2.dist-info/licenses/LICENSE.txt,sha256=qmrTTXPlgU0kSRlRVbjhlyGs1IXs2QPxo_Y-Mn06J0k,11589
-digitalhub-0.11.0b2.dist-info/RECORD,,
+digitalhub-0.11.0b3.dist-info/METADATA,sha256=aaqK7yjXNErABxVJh3OMUYtufydkfo0JMljz4MYcp2E,15037
+digitalhub-0.11.0b3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+digitalhub-0.11.0b3.dist-info/licenses/LICENSE.txt,sha256=qmrTTXPlgU0kSRlRVbjhlyGs1IXs2QPxo_Y-Mn06J0k,11589
+digitalhub-0.11.0b3.dist-info/RECORD,,