digitalhub 0.14.1b0__tar.gz → 0.14.3__tar.gz

{digitalhub-0.14.1b0 → digitalhub-0.14.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalhub
-Version: 0.14.1b0
+Version: 0.14.3
 Summary: Python SDK for Digitalhub
 Project-URL: Homepage, https://github.com/scc-digitalhub/digitalhub-sdk
 Author-email: Fondazione Bruno Kessler <digitalhub@fbk.eu>, Matteo Martini <mmartini@fbk.eu>

{digitalhub-0.14.1b0 → digitalhub-0.14.3}/digitalhub/entities/_base/executable/entity.py

@@ -464,6 +464,7 @@ class ExecutableEntity(VersionedEntity):
         action: str,
         trigger_kind: str,
         trigger_name: str,
+        template: dict | None = None,
         **kwargs,
     ) -> Trigger:
         """
@@ -475,8 +476,12 @@ class ExecutableEntity(VersionedEntity):
             Action to execute.
         trigger_kind : str
             Trigger kind.
+        trigger_name : str
+            Trigger name.
+        template : dict
+            Template for the trigger.
         **kwargs : dict
-            Keyword arguments passed to Run builder.
+            Keyword arguments passed to trigger builder.
 
         Returns
         -------
@@ -487,17 +492,30 @@ class ExecutableEntity(VersionedEntity):
         task_kind = entity_factory.get_task_kind_from_action(self.kind, action)
         task = self._get_or_create_task(task_kind)
         task_string = task._get_task_string()
+        exec_string = self._get_executable_string()
 
         # Get run validator for building trigger template
         run_kind = entity_factory.get_run_kind_from_action(self.kind, action)
         run_validator: SpecValidator = entity_factory.get_spec_validator(run_kind)
+
         # Override kwargs
         kwargs["project"] = self.project
         kwargs["kind"] = trigger_kind
         kwargs["name"] = trigger_name
-        kwargs[self.ENTITY_TYPE] = self._get_executable_string()
+
+        # Template handling
+        if template is None:
+            template = {}
+        if not isinstance(template, dict):
+            raise EntityError("Template must be a dictionary")
+
+        template["task"] = task_string
+        template[self.ENTITY_TYPE] = exec_string
+        template = run_validator(**template).to_dict()
+
+        kwargs[self.ENTITY_TYPE] = exec_string
         kwargs["task"] = task_string
-        kwargs["template"] = run_validator(**kwargs).to_dict()
+        kwargs["template"] = template
 
         # Create object instance
         trigger: Trigger = entity_factory.build_entity_from_params(**kwargs)

{digitalhub-0.14.1b0 → digitalhub-0.14.3}/digitalhub/entities/builders.py

@@ -10,6 +10,7 @@ from digitalhub.entities.dataitem.table.builder import DataitemTableBuilder
 from digitalhub.entities.model.mlflow.builder import ModelModelBuilder
 from digitalhub.entities.project._base.builder import ProjectProjectBuilder
 from digitalhub.entities.secret._base.builder import SecretSecretBuilder
+from digitalhub.entities.trigger.lifecycle.builder import TriggerLifecycleBuilder
 from digitalhub.entities.trigger.scheduler.builder import TriggerSchedulerBuilder
 
 entity_builders: tuple = (
@@ -20,6 +21,7 @@ entity_builders: tuple = (
     (DataitemTableBuilder.ENTITY_KIND, DataitemTableBuilder),
     (ModelModelBuilder.ENTITY_KIND, ModelModelBuilder),
     (TriggerSchedulerBuilder.ENTITY_KIND, TriggerSchedulerBuilder),
+    (TriggerLifecycleBuilder.ENTITY_KIND, TriggerLifecycleBuilder),
 )
 
 ##############################

{digitalhub-0.14.1b0 → digitalhub-0.14.3}/digitalhub/entities/project/crud.py

@@ -6,7 +6,7 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.entities._commons.enums import EntityTypes
+from digitalhub.entities._commons.enums import EntityKinds, EntityTypes
 from digitalhub.entities._processors.processors import base_processor, context_processor
 from digitalhub.entities.project.utils import setup_project
 from digitalhub.utils.exceptions import BackendError
@@ -24,7 +24,7 @@ def new_project(
     description: str | None = None,
     labels: list[str] | None = None,
     config: dict | None = None,
-    context: str | None = None,
+    source: str | None = None,
     setup_kwargs: dict | None = None,
 ) -> Project:
     """
@@ -40,7 +40,7 @@ def new_project(
         List of labels.
     config : dict
         DHCore environment configuration.
-    context : str
+    source : str
         The context local folder of the project.
     setup_kwargs : dict
         Setup keyword arguments passed to setup_project() function.
@@ -54,15 +54,15 @@ def new_project(
     --------
     >>> obj = new_project("my-project")
     """
-    if context is None:
-        context = "./"
+    if source is None:
+        source = "./"
     obj = base_processor.create_project_entity(
         name=name,
-        kind=EntityTypes.PROJECT.value,
+        kind=EntityKinds.PROJECT_PROJECT.value,
         description=description,
         labels=labels,
         config=config,
-        context=context,
+        source=source,
     )
     return setup_project(obj, setup_kwargs)
 
@@ -211,7 +211,7 @@ def get_or_create_project(
             labels=labels,
             config=config,
             setup_kwargs=setup_kwargs,
-            context=context,
+            source=context,
         )
 
 

{digitalhub-0.14.1b0 → digitalhub-0.14.3}/digitalhub/entities/secret/crud.py

@@ -6,7 +6,7 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.entities._commons.enums import EntityTypes
+from digitalhub.entities._commons.enums import EntityKinds, EntityTypes
 from digitalhub.entities._commons.utils import is_valid_key
 from digitalhub.entities._processors.processors import context_processor
 from digitalhub.utils.exceptions import EntityNotExistsError
@@ -66,7 +66,7 @@ def new_secret(
     obj: Secret = context_processor.create_context_entity(
         project=project,
         name=name,
-        kind="secret",
+        kind=EntityKinds.SECRET_SECRET.value,
         uuid=uuid,
         description=description,
         labels=labels,

{digitalhub-0.14.1b0 → digitalhub-0.14.3}/digitalhub/entities/trigger/crud.py

@@ -41,6 +41,12 @@ def new_trigger(
         Object name.
     kind : str
         Kind the object.
+    task : str
+        Task string.
+    function : str
+        Function string.
+    workflow : str
+        Workflow string.
     uuid : str
         ID of the object.
     description : str
@@ -63,18 +69,31 @@ 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 workflow is None:
+        if function is None:
+            raise ValueError("Workflow or function must be provided")
+        executable_type = "function"
+        executable = function
+    else:
+        executable_type = "workflow"
+        executable = workflow
+
+    # Prepare kwargs
     if kwargs is None:
         kwargs = {}
+    kwargs["task"] = task
+    kwargs[executable_type] = executable
+
+    # Template handling
     if template is None:
         template = {}
+    if not isinstance(template, dict):
+        raise ValueError("Template must be a dictionary")
     template["task"] = task
-    if workflow is not None:
-        template["workflow"] = workflow
-    if function is not None:
-        template["function"] = function
+    template[executable_type] = executable
+    template["local_execution"] = False
     kwargs["template"] = template
+
     return context_processor.create_context_entity(
         project=project,
         name=name,

{digitalhub-0.14.1b0 → digitalhub-0.14.3}/digitalhub/entities/workflow/crud.py

@@ -289,7 +289,6 @@ def delete_workflow(
     entity_id: str | None = None,
     delete_all_versions: bool = False,
     cascade: bool = True,
-    **kwargs,
 ) -> dict:
     """
     Delete object from backend.
@@ -307,8 +306,6 @@ def delete_workflow(
         If True, use entity name instead of entity key as identifier.
     cascade : bool
         Cascade delete.
-    **kwargs : dict
-        Parameters to pass to the API call.
 
     Returns
     -------

{digitalhub-0.14.1b0 → digitalhub-0.14.3}/digitalhub/stores/client/configurator.py

@@ -136,7 +136,7 @@ class ClientConfigurator:
         # Therefore, we change the origin to file, where the refresh token is written.
         # We also try to fetch the PAT from both env and file
         if self._auth_type == AuthType.EXCHANGE.value:
-            self.refresh_credentials(retry=True)
+            self.refresh_credentials()
 
     def refreshable_auth_types(self) -> bool:
         """
@@ -189,6 +189,9 @@ class ClientConfigurator:
         """
         Refresh authentication tokens using OAuth2 flows.
         """
+        if not self.refreshable_auth_types():
+            raise ClientError(f"Auth type {self._auth_type} does not support refresh.")
+
         # Get credentials and configuration
         creds = configurator.get_config_creds()
 
@@ -220,9 +223,6 @@ class ClientConfigurator:
         creds : dict
             Available credential values.
         """
-        if not self.refreshable_auth_types():
-            raise ClientError(f"Auth type {self._auth_type} does not support refresh.")
-
         if (client_id := creds.get(ConfigurationVars.DHCORE_CLIENT_ID.value)) is None:
             raise ClientError("Client id not set.")
 

{digitalhub-0.14.1b0 → digitalhub-0.14.3}/pyproject.toml

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