digitalhub 0.14.2__tar.gz → 0.14.4__tar.gz

{digitalhub-0.14.2 → digitalhub-0.14.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalhub
-Version: 0.14.2
+Version: 0.14.4
 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.2 → digitalhub-0.14.4}/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)
@@ -535,7 +553,7 @@ class ExecutableEntity(VersionedEntity):
         user: str | None = None,
         created: str | None = None,
         updated: str | None = None,
-        version: str | None = None,
+        versions: str | None = None,
         task: str | None = None,
     ) -> list[Trigger]:
         """
@@ -555,7 +573,7 @@ class ExecutableEntity(VersionedEntity):
             Creation date filter.
         updated : str
             Update date filter.
-        version : str
+        versions : str
             Object version, default is latest.
         task : str
             Task string filter.
@@ -572,7 +590,7 @@ class ExecutableEntity(VersionedEntity):
             user=user,
             created=created,
             updated=updated,
-            version=version,
+            versions=versions,
             task=task,
         )
 

{digitalhub-0.14.2 → digitalhub-0.14.4}/digitalhub/entities/artifact/crud.py

@@ -212,7 +212,7 @@ def list_artifacts(
     state: str | None = None,
     created: str | None = None,
     updated: str | None = None,
-    version: str | None = None,
+    versions: str | None = None,
 ) -> list[Artifact]:
     """
     List all latest version objects from backend.
@@ -235,7 +235,7 @@ def list_artifacts(
         Creation date filter.
     updated : str
         Update date filter.
-    version : str
+    versions : str
         Object version, default is latest.
 
     Returns
@@ -257,7 +257,7 @@ def list_artifacts(
         state=state,
         created=created,
         updated=updated,
-        version=version,
+        versions=versions,
     )
 
 

{digitalhub-0.14.2 → digitalhub-0.14.4}/digitalhub/entities/dataitem/crud.py

@@ -241,7 +241,7 @@ def list_dataitems(
     state: str | None = None,
     created: str | None = None,
     updated: str | None = None,
-    version: str | None = None,
+    versions: str | None = None,
 ) -> list[Dataitem]:
     """
     List all latest version objects from backend.
@@ -264,7 +264,7 @@ def list_dataitems(
         Creation date filter.
     updated : str
         Update date filter.
-    version : str
+    versions : str
         Object version, default is latest.
 
     Returns
@@ -286,7 +286,7 @@ def list_dataitems(
         state=state,
         created=created,
         updated=updated,
-        version=version,
+        versions=versions,
     )
 
 

{digitalhub-0.14.2 → digitalhub-0.14.4}/digitalhub/entities/function/crud.py

@@ -156,7 +156,7 @@ def list_functions(
     state: str | None = None,
     created: str | None = None,
     updated: str | None = None,
-    version: str | None = None,
+    versions: str | None = None,
 ) -> list[Function]:
     """
     List all latest version objects from backend.
@@ -179,7 +179,7 @@ def list_functions(
         Creation date filter.
     updated : str
         Update date filter.
-    version : str
+    versions : str
         Object version, default is latest.
 
     Returns
@@ -201,7 +201,7 @@ def list_functions(
         state=state,
         created=created,
         updated=updated,
-        version=version,
+        versions=versions,
     )
 
 

{digitalhub-0.14.2 → digitalhub-0.14.4}/digitalhub/entities/model/crud.py

@@ -211,7 +211,7 @@ def list_models(
     state: str | None = None,
     created: str | None = None,
     updated: str | None = None,
-    version: str | None = None,
+    versions: str | None = None,
 ) -> list[Model]:
     """
     List all latest version objects from backend.
@@ -234,7 +234,7 @@ def list_models(
         Creation date filter.
     updated : str
         Update date filter.
-    version : str
+    versions : str
         Object version, default is latest.
 
     Returns
@@ -256,7 +256,7 @@ def list_models(
         state=state,
         created=created,
         updated=updated,
-        version=version,
+        versions=versions,
     )
 
 

{digitalhub-0.14.2 → digitalhub-0.14.4}/digitalhub/entities/project/_base/entity.py

@@ -595,7 +595,7 @@ class Project(Entity):
         state: str | None = None,
         created: str | None = None,
         updated: str | None = None,
-        version: str | None = None,
+        versions: str | None = None,
     ) -> list[Artifact]:
         """
         List all latest version objects from backend.
@@ -637,7 +637,7 @@ class Project(Entity):
             state=state,
             created=created,
             updated=updated,
-            version=version,
+            versions=versions,
         )
 
     def import_artifact(
@@ -924,7 +924,7 @@ class Project(Entity):
         state: str | None = None,
         created: str | None = None,
         updated: str | None = None,
-        version: str | None = None,
+        versions: str | None = None,
     ) -> list[Dataitem]:
         """
         List all latest version objects from backend.
@@ -966,7 +966,7 @@ class Project(Entity):
             state=state,
             created=created,
             updated=updated,
-            version=version,
+            versions=versions,
         )
 
     def import_dataitem(
@@ -1242,7 +1242,7 @@ class Project(Entity):
         state: str | None = None,
         created: str | None = None,
         updated: str | None = None,
-        version: str | None = None,
+        versions: str | None = None,
     ) -> list[Model]:
         """
         List all latest version objects from backend.
@@ -1284,7 +1284,7 @@ class Project(Entity):
             state=state,
             created=created,
             updated=updated,
-            version=version,
+            versions=versions,
         )
 
     def import_model(
@@ -1511,7 +1511,7 @@ class Project(Entity):
         state: str | None = None,
         created: str | None = None,
         updated: str | None = None,
-        version: str | None = None,
+        versions: str | None = None,
     ) -> list[Function]:
         """
         List all latest version objects from backend.
@@ -1553,7 +1553,7 @@ class Project(Entity):
             state=state,
             created=created,
             updated=updated,
-            version=version,
+            versions=versions,
         )
 
     def import_function(
@@ -1783,7 +1783,7 @@ class Project(Entity):
         state: str | None = None,
         created: str | None = None,
         updated: str | None = None,
-        version: str | None = None,
+        versions: str | None = None,
     ) -> list[Workflow]:
         """
         List all latest version objects from backend.
@@ -1825,7 +1825,7 @@ class Project(Entity):
             state=state,
             created=created,
             updated=updated,
-            version=version,
+            versions=versions,
         )
 
     def import_workflow(

{digitalhub-0.14.2 → digitalhub-0.14.4}/digitalhub/entities/project/crud.py

@@ -167,7 +167,7 @@ def list_projects() -> list[Project]:
     list
         List of objects.
     """
-    return base_processor.list_project_entities()
+    return base_processor.list_project_entities(ENTITY_TYPE)
 
 
 def get_or_create_project(

{digitalhub-0.14.2 → digitalhub-0.14.4}/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,
@@ -171,7 +190,7 @@ def list_triggers(
     state: str | None = None,
     created: str | None = None,
     updated: str | None = None,
-    version: str | None = None,
+    versions: str | None = None,
     task: str | None = None,
 ) -> list[Trigger]:
     """
@@ -195,7 +214,7 @@ def list_triggers(
         Creation date filter.
     updated : str
         Update date filter.
-    version : str
+    versions : str
         Object version, default is latest.
     task : str
         Task string filter.
@@ -219,7 +238,7 @@ def list_triggers(
         state=state,
         created=created,
         updated=updated,
-        version=version,
+        versions=versions,
         task=task,
     )
 

{digitalhub-0.14.2 → digitalhub-0.14.4}/digitalhub/entities/workflow/crud.py

@@ -155,7 +155,7 @@ def list_workflows(
     state: str | None = None,
     created: str | None = None,
     updated: str | None = None,
-    version: str | None = None,
+    versions: str | None = None,
 ) -> list[Workflow]:
     """
     List all latest version objects from backend.
@@ -178,7 +178,7 @@ def list_workflows(
         Creation date filter.
     updated : str
         Update date filter.
-    version : str
+    versions : str
         Object version, default is latest.
 
     Returns
@@ -200,7 +200,7 @@ def list_workflows(
         state=state,
         created=created,
         updated=updated,
-        version=version,
+        versions=versions,
     )
 
 

{digitalhub-0.14.2 → digitalhub-0.14.4}/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.2 → digitalhub-0.14.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "digitalhub"
-version = "0.14.2"
+version = "0.14.4"
 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.2"
+current_version = "0.14.4"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = false