digitalhub 0.8.0b15__py3-none-any.whl → 0.8.1__py3-none-any.whl

digitalhub/client/dhcore/client.py

@@ -5,13 +5,14 @@ import json
 import os
 import typing
 from urllib.parse import urlparse
+from warnings import warn
 
-from dotenv import load_dotenv, set_key
+from dotenv import get_key, set_key
 from requests import request
 from requests.exceptions import HTTPError, JSONDecodeError, RequestException
 
 from digitalhub.client._base.client import Client
-from digitalhub.client.dhcore.env import ENV_FILE, FALLBACK_USER, MAX_API_LEVEL, MIN_API_LEVEL
+from digitalhub.client.dhcore.env import ENV_FILE, FALLBACK_USER, MAX_API_LEVEL, MIN_API_LEVEL, LIB_VERSION
 from digitalhub.client.dhcore.models import BasicAuth, OAuth2TokenAuth
 from digitalhub.utils.exceptions import (
     BackendError,
@@ -332,6 +333,8 @@ class ClientDHCore(Client):
             core_api_level = int(response.headers["X-Api-Level"])
             if not (MIN_API_LEVEL <= core_api_level <= MAX_API_LEVEL):
                 raise BackendError("Backend API level not supported.")
+            if LIB_VERSION < core_api_level:
+                warn("Backend API level is higher than library version. You should consider updating the library.")
 
     def _raise_for_error(self, response: Response) -> None:
         """
@@ -462,8 +465,6 @@ class ClientDHCore(Client):
         -------
         None
         """
-        # Load env from file
-        self._load_env()
 
         self._get_endpoints_from_env()
 
@@ -487,7 +488,8 @@ class ClientDHCore(Client):
         self._get_auth_from_env()
 
         # Propagate access and refresh token to env file
-        self._write_env()
+        if not ENV_FILE.exists():
+            self._write_env()
 
     def _get_endpoints_from_env(self) -> None:
         """
@@ -563,11 +565,21 @@ class ClientDHCore(Client):
         url = self._get_refresh_endpoint()
 
         # Call refresh token endpoint
-        response = self._call_refresh_token_endpoint(url)
+        # Try token from env
+        refresh_token = os.getenv("DHCORE_REFRESH_TOKEN")
+        response = self._call_refresh_token_endpoint(url, refresh_token)
+
+        # Otherwise try token from file
+        if response.status_code in (400, 401, 403):
+            refresh_token = get_key(ENV_FILE, "DHCORE_REFRESH_TOKEN")
+            response = self._call_refresh_token_endpoint(url, refresh_token)
+
+        response.raise_for_status()
+        dict_response = response.json()
 
         # Read new access token and refresh token
-        self._access_token = response["access_token"]
-        self._refresh_token = response["refresh_token"]
+        self._access_token = dict_response["access_token"]
+        self._refresh_token = dict_response["refresh_token"]
 
         # Propagate new access token to env
         self._write_env()
@@ -593,7 +605,7 @@ class ClientDHCore(Client):
         self._raise_for_error(r)
         return r.json().get("token_endpoint")
 
-    def _call_refresh_token_endpoint(self, url: str) -> dict:
+    def _call_refresh_token_endpoint(self, url: str, refresh_token: str) -> Response:
         """
         Call the refresh token endpoint.
 
@@ -601,17 +613,14 @@ class ClientDHCore(Client):
         ----------
         url : str
             Refresh token endpoint.
+        refresh_token : str
+            Refresh token.
 
         Returns
         -------
-        dict
+        Response
             Response object.
         """
-        # Get refersh token from .core file to avoid concurrency
-        # in a shared workspace
-        self._load_env()
-        refresh_token = os.getenv("DHCORE_REFRESH_TOKEN")
-
         # Send request to get new access token
         payload = {
             "grant_type": "refresh_token",
@@ -619,20 +628,7 @@ class ClientDHCore(Client):
             "refresh_token": refresh_token,
         }
         headers = {"Content-Type": "application/x-www-form-urlencoded"}
-        r = request("POST", url, data=payload, headers=headers, timeout=60)
-        self._raise_for_error(r)
-        return r.json()
-
-    @staticmethod
-    def _load_env() -> None:
-        """
-        Load the env variables from the .dhcore file.
-
-        Returns
-        -------
-        None
-        """
-        load_dotenv(dotenv_path=ENV_FILE, override=True)
+        return request("POST", url, data=payload, headers=headers, timeout=60)
 
     def _write_env(self) -> None:
         """

digitalhub/client/dhcore/env.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import os
+from pathlib import Path
 
 # Use env user as fallback in the API calls
 try:
@@ -13,9 +14,10 @@ except Exception:
 # but refresh token is only available once. Is it's used, we cannot
 # overwrite it with coder, so we need to store the new one in a file,
 # preserved for jupyter restart
-ENV_FILE = ".dhcore"
+ENV_FILE = Path.home() / ".dhcore"
 
 
 # API levels that are supported
 MAX_API_LEVEL = 20
 MIN_API_LEVEL = 8
+LIB_VERSION = 8

digitalhub/entities/_base/entity/_constructors/uuid.py

@@ -23,4 +23,4 @@ def build_uuid(uuid: str | None = None) -> str:
         if slugify_string(uuid) != uuid:
             raise ValueError(f"Invalid ID: {uuid}. Must pass slugified ID.")
         return uuid
-    return str(uuid4())
+    return uuid4().hex

digitalhub/entities/project/crud.py

@@ -159,6 +159,8 @@ def import_project(
     # Import related entities
     obj._import_entities(dict_obj)
 
+    obj.refresh()
+
     return obj
 
 

digitalhub/stores/s3/store.py

@@ -284,22 +284,21 @@ class S3Store(Store):
         """
         client, bucket = self._check_factory()
 
+        # Get list of files
         src_pth = Path(src)
         files = [i for i in src_pth.rglob("*") if i.is_file()]
+
+        # Build keys
         keys = []
         for i in files:
-            if src_pth.is_absolute():
-                i = i.relative_to(src_pth)
+            i = i.relative_to(src_pth)
             keys.append(f"{dst}{i}")
 
         # Upload files
         paths = []
-        for i in zip(files, keys):
-            f, k = i
+        for f, k in zip(files, keys):
             self._upload_file(f, k, client, bucket)
-            if src_pth.is_absolute():
-                f = f.relative_to(src_pth)
-            paths.append((k, str(f)))
+            paths.append((k, str(f.relative_to(src_pth))))
         return paths
 
     def _upload_file_list(self, src: list[str], dst: str) -> list[tuple[str, str]]:
@@ -328,8 +327,7 @@ class S3Store(Store):
 
         # Upload files
         paths = []
-        for i in zip(files, keys):
-            f, k = i
+        for f, k in zip(files, keys):
             self._upload_file(f, k, client, bucket)
             paths.append((k, Path(f).name))
         return paths

{digitalhub-0.8.0b15.dist-info → digitalhub-0.8.1.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: digitalhub
-Version: 0.8.0b15
+Version: 0.8.1
 Summary: Python SDK for Digitalhub
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
-License: Apache License
+License:                               Apache License
                                 Version 2.0, January 2004
                              http://www.apache.org/licenses/
         
@@ -240,6 +240,13 @@ Requires-Dist: python-dotenv
 Requires-Dist: GitPython>=3
 Requires-Dist: psycopg2-binary
 Requires-Dist: python-slugify
+Provides-Extra: full
+Requires-Dist: pandas<2.2,>=1.2; extra == "full"
+Requires-Dist: mlflow; extra == "full"
+Provides-Extra: pandas
+Requires-Dist: pandas<2.2,>=1.2; extra == "pandas"
+Provides-Extra: mlflow
+Requires-Dist: mlflow; extra == "mlflow"
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
@@ -250,13 +257,6 @@ Provides-Extra: docs
 Requires-Dist: Sphinx>=7; extra == "docs"
 Requires-Dist: pydata-sphinx-theme>=0.15; extra == "docs"
 Requires-Dist: numpydoc>=1.6; extra == "docs"
-Provides-Extra: full
-Requires-Dist: pandas<2.2,>=1.2; extra == "full"
-Requires-Dist: mlflow; extra == "full"
-Provides-Extra: mlflow
-Requires-Dist: mlflow; extra == "mlflow"
-Provides-Extra: pandas
-Requires-Dist: pandas<2.2,>=1.2; extra == "pandas"
 
 # Digitalhub Library
 

{digitalhub-0.8.0b15.dist-info → digitalhub-0.8.1.dist-info}/RECORD

@@ -5,8 +5,8 @@ digitalhub/client/builder.py,sha256=83PoMCus4s4nbkoWmvcjW2hIpXbNx74sUW93wgQgbuo,
 digitalhub/client/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/client/_base/client.py,sha256=HDv9Vr9DZpoaZVsAT5SSBD9j1oHoVuxA4ILGDl0mBz4,1299
 digitalhub/client/dhcore/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/client/dhcore/client.py,sha256=eh-IQu72Kz4K82uUlMRtatQAQNymvOCMJZZPjB9TdqQ,19169
-digitalhub/client/dhcore/env.py,sha256=F5A5dPTliwd4UUbpw7hQQ3hoVjZYjcVF8MbniTuTFHE,563
+digitalhub/client/dhcore/client.py,sha256=qzZaM0y5wxXkp7aTMbAGWyrXIulGwtrzpVx2ZtnZTZo,19397
+digitalhub/client/dhcore/env.py,sha256=5IsPR4SG0lg2TkqgW4vhHvThieuWVOZyZsBodWH6kKs,618
 digitalhub/client/dhcore/models.py,sha256=KiTg5xR8EzI7Xa1pmYmzixabLdnqlnn5kn-IILZDGIw,900
 digitalhub/client/dhcore/utils.py,sha256=TaLjA3LT6heKpPclmufZx-kZKZNOe4OzS_Jtpj2S5wY,2990
 digitalhub/client/local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -48,7 +48,7 @@ digitalhub/entities/_base/entity/_constructors/metadata.py,sha256=IGB1l6EJ1xlnGM
 digitalhub/entities/_base/entity/_constructors/name.py,sha256=sNU54TzzdYug5sqio8uaus6pP5RkEJYIEl6j0fwR4ho,485
 digitalhub/entities/_base/entity/_constructors/spec.py,sha256=ymUHuJ6m3B8eVL4622XRdNMQdeYxRwBV5drao0L5MiQ,879
 digitalhub/entities/_base/entity/_constructors/status.py,sha256=xrr2u2wlDMmlqrUIV9xVqFRHfn5LV_TqzdrCEWNCzE0,1132
-digitalhub/entities/_base/entity/_constructors/uuid.py,sha256=8wys6Uhk8L1uUo18moh7Rq5YnFHtmUVXfNOkcsTVUN8,556
+digitalhub/entities/_base/entity/_constructors/uuid.py,sha256=QzG0nsVpGU2UDD5CjpkOM2RfVaCHPdLp2HoQt8TM_tk,555
 digitalhub/entities/_base/executable/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/_base/executable/entity.py,sha256=NJCb82RAp9f_KERdCPQYev39WxchlicY6gnEi1P2QTg,10075
 digitalhub/entities/_base/material/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -136,7 +136,7 @@ digitalhub/entities/model/sklearn/entity.py,sha256=pPy4mOqOmbkqNkKFUnhrsIQNt2mGN
 digitalhub/entities/model/sklearn/spec.py,sha256=Md0aKlfNHZ2fhZbJgp9wZxF0Hu6XIkcniQHCgwoRdkk,301
 digitalhub/entities/model/sklearn/status.py,sha256=eqkPPtERX-6_BjPb_GD8j1FIeavpl43k-dfXZGqzGI0,187
 digitalhub/entities/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/entities/project/crud.py,sha256=P2IhKR2-YNmiNy0rpu0PG-LKD9nJGKsAahxvhsovmJA,8971
+digitalhub/entities/project/crud.py,sha256=z2UhAESn8nmZf6nF6KnTQClUyNjO1LCG04OJucNGJfs,8990
 digitalhub/entities/project/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/project/_base/builder.py,sha256=Fx_p8M75SkE_ssVBvKGu45wwqwqAZ5N6l6UZZj9LSNc,3612
 digitalhub/entities/project/_base/entity.py,sha256=CA3MqkwJlvnoI0shUIqsf-SsOoTZUA4Z41wnn0jbT5c,53552
@@ -202,7 +202,7 @@ digitalhub/stores/local/store.py,sha256=KjJ8OG6vfNrckMWbkbEA8KDM6b0Ds0Ed3fwxvTnG
 digitalhub/stores/remote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/stores/remote/store.py,sha256=MBsotmc5Zk-eT5vgAufnYyR2xJmQvgBR28u3bhaSJtM,3615
 digitalhub/stores/s3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/stores/s3/store.py,sha256=dS0TumNf3tDkpVcn_0_kp-ERogP3w87tEa-osIU11AQ,15515
+digitalhub/stores/s3/store.py,sha256=MFP0zCVWXpgg13cz2BB40R5TFeOl0GcxO0rycAYTqIY,15427
 digitalhub/stores/sql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/stores/sql/store.py,sha256=NdELCkP2Rl5ewiRuI4J9eRvTiBzVmpF0cMowZ1NME_8,8654
 digitalhub/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -224,8 +224,8 @@ test/local/CRUD/test_artifacts.py,sha256=Y3J_C7SDRSsQd2SGIZjPIOvyTL92B1sTFrUONG3
 test/local/CRUD/test_dataitems.py,sha256=LQqTzI59uwTGy4zoq8jL0yWVe2W9vXlatkgDU9aB6xg,2968
 test/local/CRUD/test_models.py,sha256=msosbZuRwIMbZtmi3ZaOva4TjQ4lrzkNu9AguIFhrSo,2929
 test/local/imports/test_imports.py,sha256=W-YugO0rpJwvtWp57MXaXfEmE-f5iWuCiLY-n0ZU4z8,1271
-digitalhub-0.8.0b15.dist-info/LICENSE.txt,sha256=_yVOtnbW7Ss28mp058UEEc1X4Rgj8-kQBP_kj8_Sc88,11585
-digitalhub-0.8.0b15.dist-info/METADATA,sha256=nv71Q9Q1Ni-cZ3_fVQ4_T1q29zC0nvaOaViNCL19Xes,15289
-digitalhub-0.8.0b15.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-digitalhub-0.8.0b15.dist-info/top_level.txt,sha256=ae9pDfCF27ZoaVAxuBKONMP0lm5P-N_I-e-no1WlvD8,16
-digitalhub-0.8.0b15.dist-info/RECORD,,
+digitalhub-0.8.1.dist-info/LICENSE.txt,sha256=_yVOtnbW7Ss28mp058UEEc1X4Rgj8-kQBP_kj8_Sc88,11585
+digitalhub-0.8.1.dist-info/METADATA,sha256=1-dYS0X78aKXA0SvnWJF-AhbFOItvrU8P7AahsxqJY0,15316
+digitalhub-0.8.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+digitalhub-0.8.1.dist-info/top_level.txt,sha256=ae9pDfCF27ZoaVAxuBKONMP0lm5P-N_I-e-no1WlvD8,16
+digitalhub-0.8.1.dist-info/RECORD,,

{digitalhub-0.8.0b15.dist-info → digitalhub-0.8.1.dist-info}/WHEEL

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