digitalhub 0.11.0b4__tar.gz → 0.11.0b6__tar.gz

{digitalhub-0.11.0b4 → digitalhub-0.11.0b6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalhub
-Version: 0.11.0b4
+Version: 0.11.0b6
 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.0b4 → digitalhub-0.11.0b6}/digitalhub/entities/_processors/context.py

@@ -128,8 +128,12 @@ class ContextEntityOperationsProcessor:
         try:
             new_obj.upload(source)
             uploaded = True
-        except Exception:
+            msg = None
+        except Exception as e:
             uploaded = False
+            msg = str(e)
+
+        new_obj.status.message = msg
 
         # Update status after upload
         if uploaded:
@@ -138,6 +142,7 @@ class ContextEntityOperationsProcessor:
         else:
             new_obj.status.state = State.ERROR.value
             new_obj = self._update_material_entity(new_obj)
+            raise EntityError(msg)
 
         return new_obj
 

{digitalhub-0.11.0b4 → digitalhub-0.11.0b6}/digitalhub/entities/project/_base/models.py

@@ -4,7 +4,7 @@ from typing import Optional
 
 from pydantic import BaseModel
 
-_DEFAULT_FILE_STORE = "s3://datalake"
+_DEFAULT_FILES_STORE = "s3://datalake"
 
 
 class ProfileConfig(BaseModel):
@@ -12,7 +12,7 @@ class ProfileConfig(BaseModel):
     Configuration profiles.
     """
 
-    default_files_store: Optional[str] = _DEFAULT_FILE_STORE
+    default_files_store: Optional[str] = _DEFAULT_FILES_STORE
 
     def to_dict(self) -> dict:
         return self.model_dump(by_alias=True, exclude_none=True)

{digitalhub-0.11.0b4 → digitalhub-0.11.0b6}/digitalhub/entities/task/_base/models.py

@@ -20,9 +20,9 @@ class SpecEmptyDir(BaseModel):
     Spec empty dir model.
     """
 
-    medium: Optional[str] = None
+    size_limit: str
 
-    size_limit: Optional[str] = "128Mi"
+    medium: Optional[str] = None
 
 
 class SpecPVC(BaseModel):
@@ -32,8 +32,6 @@ class SpecPVC(BaseModel):
 
     size: str
 
-    storage_class: str
-
 
 class Volume(BaseModel):
     """

{digitalhub-0.11.0b4 → digitalhub-0.11.0b6}/digitalhub/stores/client/dhcore/configurator.py

@@ -297,7 +297,7 @@ class ClientDHCoreConfigurator:
                 DhcoreEnvVar.REFRESH_TOKEN.value,
                 DhcoreEnvVar.ACCESS_TOKEN.value,
                 DhcoreEnvVar.ISSUER.value,
-                # DhcoreEnvVar.CLIENT_ID.value,
+                DhcoreEnvVar.CLIENT_ID.value,
             ):
                 new_list.append(key.removeprefix("DHCORE_"))
             else:
@@ -345,8 +345,7 @@ class ClientDHCoreConfigurator:
             Response object.
         """
         # Get client id
-        client_id = configurator.load_var(DhcoreEnvVar.CLIENT_ID.value)
-        # client_id = self._load_dhcore_oauth_vars(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.")
 

{digitalhub-0.11.0b4 → digitalhub-0.11.0b6}/digitalhub/stores/data/s3/enums.py

@@ -8,10 +8,9 @@ class S3StoreEnv(Enum):
     S3Store environment
     """
 
-    ENDPOINT_URL = "S3_ENDPOINT_URL"
+    ENDPOINT_URL = "AWS_ENDPOINT_URL"
     ACCESS_KEY_ID = "AWS_ACCESS_KEY_ID"
     SECRET_ACCESS_KEY = "AWS_SECRET_ACCESS_KEY"
     SESSION_TOKEN = "AWS_SESSION_TOKEN"
-    BUCKET_NAME = "S3_BUCKET"
-    REGION = "S3_REGION"
+    REGION = "AWS_REGION"
     SIGNATURE_VERSION = "S3_SIGNATURE_VERSION"

{digitalhub-0.11.0b4 → digitalhub-0.11.0b6}/digitalhub/stores/data/s3/store.py

@@ -649,8 +649,8 @@ class S3Store(Store):
         """
         try:
             client.head_bucket(Bucket=bucket)
-        except (ClientError, NoCredentialsError):
-            raise StoreError("No access to s3 bucket!")
+        except (ClientError, NoCredentialsError) as err:
+            raise StoreError(f"No access to s3 bucket! Error: {err}")
 
     @staticmethod
     def _get_key(path: str) -> str:

{digitalhub-0.11.0b4 → digitalhub-0.11.0b6}/digitalhub/stores/data/utils.py

@@ -28,7 +28,7 @@ def get_default_store(project: str) -> str:
         raise ValueError(
             "No default store found. "
             "Please set a default store "
-            "in your environment (e.g. export DEFAULT_FILES_STORE=) "
+            f"in your environment (e.g. export {StoreEnv.DEFAULT_FILES_STORE.value}=) "
             "or set it in project config."
         )
     return store

{digitalhub-0.11.0b4 → digitalhub-0.11.0b6}/digitalhub/utils/file_utils.py

@@ -190,7 +190,7 @@ def get_file_info_from_s3(path: str, metadata: dict) -> None | dict:
         if size < file_size_limit_multipart:
             file_hash = "md5:" + file_hash
         else:
-            file_hash = "LiteralETag:" + file_hash
+            file_hash = "ETag:" + file_hash
 
         name = get_path_name(path)
         content_type = metadata["ContentType"]

{digitalhub-0.11.0b4 → digitalhub-0.11.0b6}/digitalhub/utils/generic_utils.py

@@ -8,6 +8,7 @@ from enum import Enum, EnumMeta
 from pathlib import Path
 from types import MappingProxyType
 from typing import Any, Callable
+from warnings import warn
 from zipfile import ZipFile
 
 import numpy as np
@@ -235,3 +236,39 @@ def list_enum(enum: EnumMeta) -> list[Any]:
     """
     vals: MappingProxyType[str, Enum] = enum.__members__
     return [member.value for member in vals.values()]
+
+
+def carriage_return_warn(string: str) -> None:
+    """
+    Print a warning message if string contains a carriage return (\r\n).
+
+    Parameters
+    ----------
+    string : str
+        The string to check.
+
+    Returns
+    -------
+    None
+    """
+    if "\r\n" in string:
+        warn("String contains a carriage return. It may not be parsed correctly from remote runtimes.")
+
+
+def read_source(path: str) -> str:
+    """
+    Read a file.
+
+    Parameters
+    ----------
+    path : Path
+        Path to the file.
+
+    Returns
+    -------
+    str
+        File content.
+    """
+    text = read_text(path)
+    carriage_return_warn(text)
+    return encode_string(text)

{digitalhub-0.11.0b4 → digitalhub-0.11.0b6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "digitalhub"
-version = "0.11.0b4"
+version = "0.11.0b6"
 description = "Python SDK for Digitalhub"
 readme = "README.md"
 authors = [
@@ -68,7 +68,7 @@ line-length = 120
 convention = "numpy"
 
 [tool.bumpver]
-current_version = "0.11.0b4"
+current_version = "0.11.0b6"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = false