digitalhub 0.11.0b5__tar.gz → 0.11.0b7__tar.gz

{digitalhub-0.11.0b5 → digitalhub-0.11.0b7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalhub
-Version: 0.11.0b5
+Version: 0.11.0b7
 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.0b5 → digitalhub-0.11.0b7}/digitalhub/entities/_base/executable/entity.py

@@ -12,7 +12,7 @@ from digitalhub.utils.exceptions import EntityAlreadyExistsError, EntityError
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities._base.entity.metadata import Metadata
-    from digitalhub.entities._base.entity.spec import Spec
+    from digitalhub.entities._base.entity.spec import Spec, SpecValidator
     from digitalhub.entities._base.entity.status import Status
     from digitalhub.entities.run._base.entity import Run
     from digitalhub.entities.task._base.entity import Task
@@ -409,22 +409,43 @@ class ExecutableEntity(VersionedEntity):
     #  Trigger
     ##############################
 
-    def new_trigger(self, trigger_kind: str, **kwargs) -> Trigger:
+    def trigger(self, action: str, trigger_kind: str, trigger_name: str, **kwargs) -> Trigger:
         """
-        Create new trigger.
+        Trigger function.
 
         Parameters
         ----------
+        action : str
+            Action to execute.
         trigger_kind : str
-            Kind the object.
+            Trigger kind.
         **kwargs : dict
-            Keyword arguments.
+            Keyword arguments passed to Run builder.
 
         Returns
         -------
-        Trigger
-            New trigger.
+        Run
+            Run instance.
         """
+        # Get task
+        task_kind = factory.get_task_kind_from_action(self.kind, action)
+        task = self._get_or_create_task(task_kind)
+        task_string = task._get_task_string()
+
+        # Get run validator for building trigger template
+        run_kind = factory.get_run_kind(self.kind)
+        run_validator: SpecValidator = factory.get_spec_validator(run_kind)
+        if kwargs is None:
+            kwargs = {}
+
+        # Override kwargs
+        kwargs["project"] = self.project
+        kwargs["kind"] = trigger_kind
+        kwargs["name"] = trigger_name
+        kwargs[self.ENTITY_TYPE] = self._get_executable_string()
+        kwargs["task"] = task_string
+        kwargs["template"] = run_validator(**kwargs).to_dict()
+
         # Create object instance
         trigger: Trigger = factory.build_entity_from_params(**kwargs)
         trigger.save()

{digitalhub-0.11.0b5 → digitalhub-0.11.0b7}/digitalhub/entities/_commons/enums.py

@@ -106,3 +106,4 @@ class EntityKinds(Enum):
     MODEL_SKLEARN = "sklearn"
     SECRET_SECRET = "secret"
     TRIGGER_SCHEDULER = "scheduler"
+    TRIGGER_LIFECYCLE = "lifecycle"

{digitalhub-0.11.0b5 → digitalhub-0.11.0b7}/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.0b5 → digitalhub-0.11.0b7}/digitalhub/entities/function/_base/entity.py

@@ -10,11 +10,9 @@ from digitalhub.utils.exceptions import BackendError
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities._base.entity.metadata import Metadata
-    from digitalhub.entities._base.entity.spec import SpecValidator
     from digitalhub.entities.function._base.spec import FunctionSpec
     from digitalhub.entities.function._base.status import FunctionStatus
     from digitalhub.entities.run._base.entity import Run
-    from digitalhub.entities.trigger._base.entity import Trigger
 
 
 class Function(ExecutableEntity):
@@ -102,47 +100,3 @@ class Function(ExecutableEntity):
             result = executor.submit(run.run)
             r = result.result()
         return r
-
-    def trigger(self, action: str, trigger_kind: str, trigger_name: str, **kwargs) -> Trigger:
-        """
-        Trigger function.
-
-        Parameters
-        ----------
-        action : str
-            Action to execute.
-        trigger_kind : str
-            Trigger kind.
-        **kwargs : dict
-            Keyword arguments passed to Run builder.
-
-        Returns
-        -------
-        Run
-            Run instance.
-        """
-        # Get task
-        task_kind = factory.get_task_kind_from_action(self.kind, action)
-        task = self._get_or_create_task(task_kind)
-        task_string = task._get_task_string()
-
-        # Get run validator for building trigger template
-        run_kind = factory.get_run_kind(self.kind)
-        run_validator: SpecValidator = factory.get_spec_validator(run_kind)
-        if kwargs is None:
-            kwargs = {}
-        kwargs[self.ENTITY_TYPE] = self._get_executable_string()
-        kwargs["task"] = task_string
-
-        template = run_validator(**kwargs).to_dict()
-
-        # Override kwargs
-        kwargs["project"] = self.project
-        kwargs["kind"] = trigger_kind
-        kwargs["name"] = trigger_name
-        kwargs["template"] = template
-
-        # Create object instance
-        trigger: Trigger = factory.build_entity_from_params(**kwargs)
-        trigger.save()
-        return trigger

{digitalhub-0.11.0b5 → digitalhub-0.11.0b7}/digitalhub/entities/trigger/_base/spec.py

@@ -8,11 +8,18 @@ class TriggerSpec(Spec):
     TriggerSpec specifications.
     """
 
-    def __init__(self, task: str, function: str, template: dict) -> None:
+    def __init__(
+        self,
+        task: str,
+        template: dict,
+        function: str | None = None,
+        workflow: str | None = None,
+    ) -> None:
         super().__init__()
         self.task = task
-        self.function = function
         self.template = template
+        self.function = function
+        self.workflow = workflow
 
 
 class TriggerValidator(SpecValidator):
@@ -23,8 +30,11 @@ class TriggerValidator(SpecValidator):
     task: str
     """Task string."""
 
-    function: str
+    template: dict
+    """Template map."""
+
+    function: str = None
     """Function string."""
 
-    template: dict
-    """Template string."""
+    workflow: str = None
+    """Workflow string."""

{digitalhub-0.11.0b5 → digitalhub-0.11.0b7}/digitalhub/entities/trigger/crud.py

@@ -18,6 +18,7 @@ def new_trigger(
     kind: str,
     task: str,
     function: str | None = None,
+    workflow: str | None = None,
     uuid: str | None = None,
     description: str | None = None,
     labels: list[str] | None = None,
@@ -58,12 +59,17 @@ def new_trigger(
     >>>                   kind="trigger",
     >>>                   name="my-trigger",)
     """
+    if workflow is None and function is None:
+        raise ValueError("Workflow or function must be provided")
     if kwargs is None:
         kwargs = {}
     if template is None:
         template = {}
     template["task"] = task
-    template["function"] = function
+    if workflow is not None:
+        template["workflow"] = workflow
+    if function is not None:
+        template["function"] = function
     kwargs["template"] = template
     return context_processor.create_context_entity(
         project=project,

digitalhub-0.11.0b7/digitalhub/entities/trigger/lifecycle/builder.py

@@ -0,0 +1,19 @@
+from __future__ import annotations
+
+from digitalhub.entities._commons.enums import EntityKinds
+from digitalhub.entities.trigger._base.builder import TriggerBuilder
+from digitalhub.entities.trigger.lifecycle.entity import TriggerLifecycle
+from digitalhub.entities.trigger.lifecycle.spec import TriggerSpecLifecycle, TriggerValidatorLifecycle
+from digitalhub.entities.trigger.lifecycle.status import TriggerStatusLifecycle
+
+
+class TriggerLifecycleBuilder(TriggerBuilder):
+    """
+    TriggerLifecycle builder.
+    """
+
+    ENTITY_CLASS = TriggerLifecycle
+    ENTITY_SPEC_CLASS = TriggerSpecLifecycle
+    ENTITY_SPEC_VALIDATOR = TriggerValidatorLifecycle
+    ENTITY_STATUS_CLASS = TriggerStatusLifecycle
+    ENTITY_KIND = EntityKinds.TRIGGER_LIFECYCLE.value

digitalhub-0.11.0b7/digitalhub/entities/trigger/lifecycle/entity.py

@@ -0,0 +1,32 @@
+from __future__ import annotations
+
+import typing
+
+from digitalhub.entities.trigger._base.entity import Trigger
+
+if typing.TYPE_CHECKING:
+    from digitalhub.entities._base.entity.metadata import Metadata
+    from digitalhub.entities.trigger.lifecycle.spec import TriggerSpecLifecycle
+    from digitalhub.entities.trigger.lifecycle.status import TriggerStatusLifecycle
+
+
+class TriggerLifecycle(Trigger):
+    """
+    TriggerLifecycle class.
+    """
+
+    def __init__(
+        self,
+        project: str,
+        name: str,
+        uuid: str,
+        kind: str,
+        metadata: Metadata,
+        spec: TriggerSpecLifecycle,
+        status: TriggerStatusLifecycle,
+        user: str | None = None,
+    ) -> None:
+        super().__init__(project, name, uuid, kind, metadata, spec, status, user)
+
+        self.spec: TriggerSpecLifecycle
+        self.status: TriggerStatusLifecycle

digitalhub-0.11.0b7/digitalhub/entities/trigger/lifecycle/spec.py

@@ -0,0 +1,38 @@
+from __future__ import annotations
+
+from pydantic import Field
+
+from digitalhub.entities.trigger._base.spec import TriggerSpec, TriggerValidator
+
+regexp = r"store://([^/]+)/(.+)"
+
+
+class TriggerSpecLifecycle(TriggerSpec):
+    """
+    TriggerSpecLifecycle specifications.
+    """
+
+    def __init__(
+        self,
+        task: str,
+        template: dict,
+        function: str | None = None,
+        workflow: str | None = None,
+        key: str | None = None,
+        states: list[str] | None = None,
+    ) -> None:
+        super().__init__(task, template, function, workflow)
+        self.key = key
+        self.states = states
+
+
+class TriggerValidatorLifecycle(TriggerValidator):
+    """
+    TriggerValidatorLifecycle validator.
+    """
+
+    key: str = Field(pattern=regexp)
+    """Entity key."""
+
+    states: list[str] = None
+    """List of entity states."""

digitalhub-0.11.0b7/digitalhub/entities/trigger/lifecycle/status.py

@@ -0,0 +1,9 @@
+from __future__ import annotations
+
+from digitalhub.entities.trigger._base.status import TriggerStatus
+
+
+class TriggerStatusLifecycle(TriggerStatus):
+    """
+    TriggerStatusLifecycle status.
+    """

{digitalhub-0.11.0b5 → digitalhub-0.11.0b7}/digitalhub/entities/trigger/scheduler/spec.py

@@ -8,8 +8,15 @@ class TriggerSpecScheduler(TriggerSpec):
     TriggerSpecScheduler specifications.
     """
 
-    def __init__(self, task: str, function: str, template: dict, schedule: str) -> None:
-        super().__init__(task, function, template)
+    def __init__(
+        self,
+        task: str,
+        template: dict,
+        function: str | None = None,
+        workflow: str | None = None,
+        schedule: str | None = None,
+    ) -> None:
+        super().__init__(task, template, function, workflow)
         self.schedule = schedule
 
 

{digitalhub-0.11.0b5 → digitalhub-0.11.0b7}/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.0b5 → digitalhub-0.11.0b7}/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.0b5 → digitalhub-0.11.0b7}/pyproject.toml

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