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

digitalhub/entities/_commons/enums.py

@@ -56,6 +56,7 @@ class State(Enum):
     STOPPED = "STOPPED"
     SUCCESS = "SUCCESS"
     UNKNOWN = "UNKNOWN"
+    UPLOADING = "UPLOADING"
 
 
 class ApiCategories(Enum):

digitalhub/entities/_processors/context.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import typing
 from typing import Any
 
-from digitalhub.entities._commons.enums import ApiCategories, BackendOperations, Relationship
+from digitalhub.entities._commons.enums import ApiCategories, BackendOperations, Relationship, State
 from digitalhub.entities._processors.utils import (
     get_context_from_identifier,
     get_context_from_project,
@@ -120,7 +120,25 @@ class ContextEntityOperationsProcessor:
 
         new_obj: MaterialEntity = self._create_context_entity(context, obj.ENTITY_TYPE, obj.to_dict())
         new_obj = factory.build_entity_from_dict(new_obj)
-        new_obj.upload(source)
+
+        new_obj.status.state = State.UPLOADING.value
+        new_obj = self._update_material_entity(new_obj)
+
+        # Handle file upload
+        try:
+            new_obj.upload(source)
+            uploaded = True
+        except Exception:
+            uploaded = False
+
+        # Update status after upload
+        if uploaded:
+            new_obj.status.state = State.READY.value
+            new_obj = self._update_material_entity(new_obj)
+        else:
+            new_obj.status.state = State.ERROR.value
+            new_obj = self._update_material_entity(new_obj)
+
         return new_obj
 
     def _read_context_entity(
@@ -554,6 +572,30 @@ class ContextEntityOperationsProcessor:
             objects.append(entity)
         return objects
 
+    def _update_material_entity(
+        self,
+        new_obj: MaterialEntity,
+    ) -> dict:
+        """
+        Update material object shortcut.
+
+        Parameters
+        ----------
+        new_obj : MaterialEntity
+            Object instance.
+
+        Returns
+        -------
+        dict
+            Response from backend.
+        """
+        return self.update_context_entity(
+            new_obj.project,
+            new_obj.ENTITY_TYPE,
+            new_obj.id,
+            new_obj.to_dict(),
+        )
+
     def _update_context_entity(
         self,
         context: Context,

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/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/stores/client/dhcore/configurator.py

@@ -271,7 +271,7 @@ class ClientDHCoreConfigurator:
             *self._remove_prefix_dhcore(list_enum(DhcoreEnvVar)),
             *list_enum(S3StoreEnv),
             *list_enum(SqlStoreEnv),
-            ]
+        ]
         for key in keys:
             if (value := response.get(key.lower())) is not None:
                 configurator.set_credential(key, value)
@@ -293,11 +293,12 @@ class ClientDHCoreConfigurator:
         """
         new_list = []
         for key in keys:
-            if key in (DhcoreEnvVar.REFRESH_TOKEN.value,
-                       DhcoreEnvVar.ACCESS_TOKEN.value,
-                       DhcoreEnvVar.ISSUER.value,
-                       #DhcoreEnvVar.CLIENT_ID.value,
-                       ):
+            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)
@@ -344,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/stores/data/enums.py

@@ -8,4 +8,4 @@ class StoreEnv(Enum):
     Environment variables for data stores.
     """
 
-    DEFAULT_FILES_STORE = "DEFAULT_FILES_STORE"
+    DEFAULT_FILES_STORE = "DHCORE_DEFAULT_FILES_STORE"

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/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/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.0b3.dist-info → digitalhub-0.11.0b5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalhub
-Version: 0.11.0b3
+Version: 0.11.0b5
 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.0b3.dist-info → digitalhub-0.11.0b5.dist-info}/RECORD

@@ -37,13 +37,13 @@ digitalhub/entities/_base/versioned/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQ
 digitalhub/entities/_base/versioned/builder.py,sha256=0niRbqpCnHqBK0hTQxdrtUl43BbJuGXMLVbruhpUUuU,1896
 digitalhub/entities/_base/versioned/entity.py,sha256=h4YX6smpPjIVW8DOVdRYW-abOcoJ_F0OkozLhLxpjWI,899
 digitalhub/entities/_commons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/entities/_commons/enums.py,sha256=GJnVOPCPZKL1f53e7SvKi9n76k4Y4TfMmXcLzr62mg0,1989
+digitalhub/entities/_commons/enums.py,sha256=KUzaKLUz31qW2QTT8lZ3tP6nbjJZvkw_vTzSrH9iS30,2017
 digitalhub/entities/_commons/metrics.py,sha256=SYb980t9smzJVUWGqE4Ug0t-0wPXYJZ_nJRi_9bhcpw,3405
 digitalhub/entities/_commons/types.py,sha256=bwK-2iQHL2gdtOPfRcXWBRWqqS1Tic6ywRQsJSocn9c,118
 digitalhub/entities/_commons/utils.py,sha256=354ZL5wKvijJ2A25pM0xK5JMhgTyZF6urjHZNjosINI,1846
 digitalhub/entities/_processors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/_processors/base.py,sha256=K_XfwgzsYWKMQ5Que1C_oTwQU67jQJPbA98g26OND58,13440
-digitalhub/entities/_processors/context.py,sha256=y7TYLANbH88mFsZdt77B-1NKTzpd_rpN06JceKSjtVc,33385
+digitalhub/entities/_processors/context.py,sha256=D6X9l6ZSnsqi94h93IiyyCLahayUcvYAEXaqlfu6SUA,34445
 digitalhub/entities/_processors/utils.py,sha256=byhWUv3CfaS-RNPu5FdOdNNCakaKh5zNQFziJvwZdkY,3791
 digitalhub/entities/artifact/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/artifact/crud.py,sha256=smyZLWfkBEH1pxwFJXhoqfFpLrKeeWTqXmahyPj8QAY,7983
@@ -126,7 +126,7 @@ digitalhub/entities/project/utils.py,sha256=zwm82RaIVLJNYrg70jRnGdsP0IVWW86y3OrH
 digitalhub/entities/project/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/project/_base/builder.py,sha256=AnD5BNVYBrj8W3rtLUZe5tptJWzt_UKDielogLdEpAE,3776
 digitalhub/entities/project/_base/entity.py,sha256=LmHXEiSwJmU6Bkqw-OSQF4JwYkiVPDkknOBA3lf53oU,57210
-digitalhub/entities/project/_base/models.py,sha256=WFb687zfjl-naEmIj8ujGSS_O2wLE-DSB025Rlu6BXo,372
+digitalhub/entities/project/_base/models.py,sha256=9_MYF468b_mwhHXb7VnIORihM9kJaEWr0-LwUgc9Nmg,374
 digitalhub/entities/project/_base/spec.py,sha256=742_h3q8yvUGqW63vym9OO8mT4TVMgd9Q5TXXwMh1kU,1669
 digitalhub/entities/project/_base/status.py,sha256=w1Hj_yFwr_5X7ZH7SmtZRto4qUdCWb010viFfvbqX48,168
 digitalhub/entities/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -148,7 +148,7 @@ digitalhub/entities/task/crud.py,sha256=-tQNtWU7r3nfoVn3WmmrHBvSyHpGqQIa1_3Ges4k
 digitalhub/entities/task/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/task/_base/builder.py,sha256=21WEbycCR8yaOPcLLcAITaoQ4ZmBNXJXB-Oy0VfSPrg,2358
 digitalhub/entities/task/_base/entity.py,sha256=g08i-iexrcfuYAOz_O4Nw6tfLEDprTst05b9ZvjJUVc,3524
-digitalhub/entities/task/_base/models.py,sha256=Hc-xfLKMGI_TXAunMEgzqiJjp1QE6bqXRxByrfAemlI,5600
+digitalhub/entities/task/_base/models.py,sha256=HmR8dei9ivF0JYbDlICkAIuQlhAD_ilwwE1fymkr-_c,5556
 digitalhub/entities/task/_base/spec.py,sha256=4JsbQxx05UYjAerSNBCrLSjwMLYeMSqgPIYdkJhH7ik,2500
 digitalhub/entities/task/_base/status.py,sha256=FCSSQscQ0dHEpXdc5vSrIkTXon9FNNOr0M1KVh2ZVAA,162
 digitalhub/entities/task/_base/utils.py,sha256=faeAN7r_5q0KWDj1vrbVvFMcCpeMw7fK7vGScSpFZCI,448
@@ -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=_U4AjS7KKEixOjaRnSfIOIbHVWa00d8BXBwBjh9ptE4,11286
+digitalhub/stores/client/dhcore/configurator.py,sha256=lEZISBH_kKWpbf4z5YX_qQuiQzny_5FP2_iBIgD-5cY,11193
 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
@@ -212,8 +212,8 @@ digitalhub/stores/configurator/ini_module.py,sha256=VfBPFo-EVrFokDk2j9CtzstlKuxT
 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
-digitalhub/stores/data/enums.py,sha256=dqDRDnLVK55jiWyg_L-aeTwu3JBo4EcN5epxzdS_ARs,190
-digitalhub/stores/data/utils.py,sha256=Fy-OSy9m2LdbN4EF0J_cyhJS7SikzICEdyJv5HwPcI8,933
+digitalhub/stores/data/enums.py,sha256=8KyVhA5jTffomloR9pwR9FX21Dd3e9h2_qFCsVfd9yo,197
+digitalhub/stores/data/utils.py,sha256=-pzN9JOrS_xz6Qc7Q2M7xI7Ksth31DFnF9LZeuvFBig,951
 digitalhub/stores/data/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/stores/data/_base/store.py,sha256=VC1r7b9EIoObuG2DiqtFk2DQDSOgaS9jYL_UmiOTMHg,5241
 digitalhub/stores/data/local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -222,7 +222,7 @@ digitalhub/stores/data/remote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 digitalhub/stores/data/remote/store.py,sha256=9KCFk8Fz1Mr7AK8gEITMh2sMw_jQldNPaVpk5_Oko9w,6098
 digitalhub/stores/data/s3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/stores/data/s3/configurator.py,sha256=QowR285g3FBY6IktTLq0e8Y3XJdXL_eutzfM2mumLY8,3648
-digitalhub/stores/data/s3/enums.py,sha256=tmSavz83jr6SBW-Gqn4D21TJpFytxvbtbW63htmZG2A,392
+digitalhub/stores/data/s3/enums.py,sha256=lgqcuCMbO00Ic8thcELifoebUL5Zqn1hb6hkos1v8ps,364
 digitalhub/stores/data/s3/store.py,sha256=BXyMdDjF_bj2TqAx5RSXrzWKIGE7PMObFSqEp1n-ZPo,19664
 digitalhub/stores/data/s3/utils.py,sha256=vkgYL9auoyvPtWay50biIfSJ1T4gZT4CmpJdq83L4t8,1650
 digitalhub/stores/data/sql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -244,13 +244,13 @@ digitalhub/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 digitalhub/utils/enums.py,sha256=BjsLkUQ15W3KYTRYd0kuut77jTNMDBtTfJbixMReEew,269
 digitalhub/utils/exceptions.py,sha256=CGiRXx6OvYpjg6d9yEn2OvyfF0FA5n1l8uH6loCDoAY,1233
 digitalhub/utils/file_utils.py,sha256=qRb0ETNaQKwBlF5iwflDFlkrku5TvJXHHhxgHtAeS9w,5117
-digitalhub/utils/generic_utils.py,sha256=8JKmfe1UMYqzrqfptMJZ7x-EvD1-zVNLfBcGoVl8Wcg,4870
+digitalhub/utils/generic_utils.py,sha256=gyFCRvujBreTarv7YCWbQ4WnFBPOeE3pNoaqvGVnrhw,5561
 digitalhub/utils/git_utils.py,sha256=6vnZoJnL6uMZj0ZtHj3Tf-NYJsw3V9yitTJooSaFYEg,3407
 digitalhub/utils/io_utils.py,sha256=8jD4Rp_b7LZEpY5JSMxVUowZsnifKnbGpHT5Hijx9-g,3299
 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.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,,
+digitalhub-0.11.0b5.dist-info/METADATA,sha256=0mlxcxa7sNYnJt6u6wcf4j2ygQ-JRQJ4QqP1edQQBX8,15037
+digitalhub-0.11.0b5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+digitalhub-0.11.0b5.dist-info/licenses/LICENSE.txt,sha256=qmrTTXPlgU0kSRlRVbjhlyGs1IXs2QPxo_Y-Mn06J0k,11589
+digitalhub-0.11.0b5.dist-info/RECORD,,