digitalhub 0.11.0b3__tar.gz → 0.11.0b4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalhub
-Version: 0.11.0b3
+Version: 0.11.0b4
 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 → digitalhub-0.11.0b4}/digitalhub/entities/_commons/enums.py

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

{digitalhub-0.11.0b3 → digitalhub-0.11.0b4}/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-0.11.0b3 → digitalhub-0.11.0b4}/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)
@@ -345,7 +346,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)
+        # 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.0b3 → digitalhub-0.11.0b4}/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-0.11.0b3 → digitalhub-0.11.0b4}/pyproject.toml

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