digitalhub 0.14.1b0__py3-none-any.whl → 0.14.3__py3-none-any.whl

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/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/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/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/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/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/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.dist-info → digitalhub-0.14.3.dist-info}/METADATA

@@ -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.dist-info → digitalhub-0.14.3.dist-info}/RECORD

@@ -3,7 +3,7 @@ digitalhub/context/api.py,sha256=Z4ffAl79YTx-Xq8y6RICptLqbdJoWFcZZsEBdsAIAVc,283
 digitalhub/context/builder.py,sha256=pnOKvzRa6HIIYW86vhQ7W5aKcVb1yYERxwsA6TA8Wu0,2770
 digitalhub/context/context.py,sha256=eDZgZAJBtd3v267Xxt2lwM3WgBm9jtzbR6RoKUhu9V4,2995
 digitalhub/entities/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
-digitalhub/entities/builders.py,sha256=I-RVAFNgnZGmx7Dyz8_n7gfsG-BVgbgfraJal5NWipE,2054
+digitalhub/entities/builders.py,sha256=gnjE4qRUo-GiGEeA4HQ_YeRb_Wis65nDk_Vnyy5o3-I,2204
 digitalhub/entities/_base/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
 digitalhub/entities/_base/_base/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
 digitalhub/entities/_base/_base/entity.py,sha256=1OiJWY79VnlmMU4q6uaQA0g63bnFpBMFALg8dJ4M08g,1910
@@ -16,7 +16,7 @@ digitalhub/entities/_base/entity/metadata.py,sha256=iX_dwpABPh3EBPTJs5mtSrwnylw4
 digitalhub/entities/_base/entity/spec.py,sha256=nGlE8xgAZXT5zs1annWaPLvPRYaqxqzjjrhAhvNiQkA,1608
 digitalhub/entities/_base/entity/status.py,sha256=0txG13WDPJE-vRAUkJQYEHMsSzer6qTvTo7xqzbg66Y,1152
 digitalhub/entities/_base/executable/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
-digitalhub/entities/_base/executable/entity.py,sha256=vDqijNBE852lXDkjsun1eNa-jOWckhb-ADqJtAo-TpY,16013
+digitalhub/entities/_base/executable/entity.py,sha256=5WnO382DkC3QG6MJ0RXCK-Qj9NTqLY6baFHw8jY5nCQ,16515
 digitalhub/entities/_base/material/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
 digitalhub/entities/_base/material/entity.py,sha256=EgYQRpS0o8xsYh-3G7zG32dyjrBbU1vVImR3ZnEuNlQ,6658
 digitalhub/entities/_base/material/spec.py,sha256=7lF_Pv7zGJUAR2ixmmCt-UPnoASgOLxnb9yffqwBVp8,544
@@ -131,7 +131,7 @@ digitalhub/entities/model/sklearn/entity.py,sha256=PvjW0xMyLEPH3bO8FAOEdu1H1hp1r
 digitalhub/entities/model/sklearn/spec.py,sha256=AEoiRp2T46z8IrQ-BHx1rtd4b_yaEZJSQ_necKjkjjw,409
 digitalhub/entities/model/sklearn/status.py,sha256=YBf5joe8hJH59U92m0JKFlmLCRpNj0EyR3mA7DKiVrQ,295
 digitalhub/entities/project/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
-digitalhub/entities/project/crud.py,sha256=U_NnqOewPPaydbx2VJIsihmuwi-A-LYTsLNoC1AcznM,7236
+digitalhub/entities/project/crud.py,sha256=xWRBtCGb8_EIgl1UdMZljWnc5NJXHE2BPUN7-y56G5M,7250
 digitalhub/entities/project/utils.py,sha256=NP3VomFV84BEdgcbjBp4K70oPrVeuhTIu8GL8H8NGmY,1210
 digitalhub/entities/project/_base/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
 digitalhub/entities/project/_base/builder.py,sha256=i5loUneU7VdL3oAJOyWP3wl8Z_OJRrYzXcsw3_BrftY,3654
@@ -147,7 +147,7 @@ digitalhub/entities/run/_base/entity.py,sha256=r2RMhG1HB_mkiWeZD5OZDFkfqSnWU6ia_
 digitalhub/entities/run/_base/spec.py,sha256=n6S-hUBJDaHiqHqJCAdOzzAFpp0pvEa96PafND-HYdw,1830
 digitalhub/entities/run/_base/status.py,sha256=BFHUlvFJHXWNsawThd2WpfwisFBnzyTy5KVPAIJGeNM,638
 digitalhub/entities/secret/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
-digitalhub/entities/secret/crud.py,sha256=pBIzSH48U1dCcxyGZczyEmcQ6aXEFIAYHsLurZogR8A,7148
+digitalhub/entities/secret/crud.py,sha256=YIMpQ2J2klc3JZShB-pJYkguH2AXqSD-QLSqgsCxi_I,7184
 digitalhub/entities/secret/_base/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
 digitalhub/entities/secret/_base/builder.py,sha256=_jx7lgvbnFNpqbwT8-HYb5GNiNSg_KWA3Ngzz6l9bc4,2303
 digitalhub/entities/secret/_base/entity.py,sha256=1BLa2Ij03L5ilmS0FTwqrOhgi4ItiBnJoxzMmKHdIe0,1885
@@ -162,7 +162,7 @@ digitalhub/entities/task/_base/models.py,sha256=-7-bM8R-lRTqPkPint9Yw810-wLFkAk2
 digitalhub/entities/task/_base/spec.py,sha256=TQ7IXW_QnTGxFvVDk0M22DlaqMWm9Klq1Yk6LGBAhEM,2608
 digitalhub/entities/task/_base/status.py,sha256=9TazT1vKJT8NRvh__ymKJ89CUUcf7UhnLREcvudrFTU,270
 digitalhub/entities/trigger/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
-digitalhub/entities/trigger/crud.py,sha256=vcpdWgkInszxYIPLBkUfgneF0vTW4s7LaRqiRafYj1E,7904
+digitalhub/entities/trigger/crud.py,sha256=gIVWDdV3rpDh8g4jHHjV7n7XDwfWrxsQbvzWPwDgz0M,8341
 digitalhub/entities/trigger/_base/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
 digitalhub/entities/trigger/_base/builder.py,sha256=JhRVtp6JMue-05zr-bQ3gjm4Dh_g0bnBhzdJi6OR5Y0,1835
 digitalhub/entities/trigger/_base/entity.py,sha256=mhDFQ4JOndYU0lQJ4spKRR6pxuJU6G-6Cz639JtPRP8,1279
@@ -179,7 +179,7 @@ digitalhub/entities/trigger/scheduler/entity.py,sha256=05VLQK0np31QPu0Dwp8mpC2VR
 digitalhub/entities/trigger/scheduler/spec.py,sha256=xU6Oh1okj_toJmMyaAy7QufPxIw_QIuwQG6OizVgdm0,784
 digitalhub/entities/trigger/scheduler/status.py,sha256=uSyUnryssv70w-6k6F2qmrnd-OtuUwHarexjN7OconA,309
 digitalhub/entities/workflow/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
-digitalhub/entities/workflow/crud.py,sha256=NWp29W_YtGWT4Jp-rejojmQGruIOuqWskz7DHjOBlXI,7550
+digitalhub/entities/workflow/crud.py,sha256=pZ5_2bwi_868ez7hrblTTRJ-7rC-8uHzGPwGvFuZ-oQ,7472
 digitalhub/entities/workflow/_base/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
 digitalhub/entities/workflow/_base/builder.py,sha256=G0IyxVzHa_640vZiljTcCKF8hmfBQfrQsOj8QInU2Ok,2143
 digitalhub/entities/workflow/_base/entity.py,sha256=WAurCCWNUehHtzmMb651sNSpooeTt8_53YjK9pYK9eI,2425
@@ -200,7 +200,7 @@ digitalhub/stores/client/__init__.py,sha256=0NWCFXlcnb45II98tUAGtvXUNVMXsIbFePmo
 digitalhub/stores/client/api_builder.py,sha256=RrAVQRHzm0Z68hsH3TO8-VsR3_7X7y3maluCTO0aW98,4452
 digitalhub/stores/client/builder.py,sha256=y58cKn93t-2QQkyCocFPE_Zus34uNHOLNcCb9DIwdGo,872
 digitalhub/stores/client/client.py,sha256=cfMhMC_9atcKTWNockvBA8IsFNEoJqoyMNnireqqjaA,9566
-digitalhub/stores/client/configurator.py,sha256=_5vWMhmKleM2dFqBoRQAQdvZxKtzqJE3j3nATrDIuyQ,13504
+digitalhub/stores/client/configurator.py,sha256=UFf3WMSS_-qxE2vweEVNDaHUglp2TwXtyKAUHrv7Yl8,13494
 digitalhub/stores/client/enums.py,sha256=lCM5W3xOSPt1YarY1sqoNCHWfx_NKldgk3byTk9bJ8U,908
 digitalhub/stores/client/error_parser.py,sha256=lJNRC_rXA1pVpkF-g_lOp5TXOBsTpt6CArSRTVRswiY,4572
 digitalhub/stores/client/header_manager.py,sha256=iCDyy1G6ISGWG4r5ptluE0kVZaJgoCwjyjAVpLQFgDA,1774
@@ -253,8 +253,8 @@ digitalhub/utils/logger.py,sha256=hH3gGE35L8jRxrg8EPXGZZAK1OA5-CvWnayuBZzteBM,54
 digitalhub/utils/store_utils.py,sha256=Nuj5BzcAll-qIIgAgvp00S3yfV50NyWdTZEabJAqxDE,1013
 digitalhub/utils/types.py,sha256=orCxY43zXMJfKZsOj6FUR85u9wRBPJ0wdkzrBHTnVW8,217
 digitalhub/utils/uri_utils.py,sha256=Go787CxAOo2MMjFIEt8XssomtyV8vTdIrpyjSQK3gAM,4408
-digitalhub-0.14.1b0.dist-info/METADATA,sha256=cArPzm1L18EcZYTqsMhu03JddIn_VFRv2r-Sofoxioo,18129
-digitalhub-0.14.1b0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-digitalhub-0.14.1b0.dist-info/licenses/AUTHORS,sha256=iDleK_2EAMmh0o8Te_E9mdXQCP4rBfFr9dW9d0-pCno,301
-digitalhub-0.14.1b0.dist-info/licenses/LICENSE,sha256=z3xQCHfGmTnigfoUe3uidW_GUSVeFBdos30w9VNTRec,11361
-digitalhub-0.14.1b0.dist-info/RECORD,,
+digitalhub-0.14.3.dist-info/METADATA,sha256=JLlNWu_muIK8JRmS0ZMUUPTdTrii-G2VgNYRatzvrb8,18127
+digitalhub-0.14.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+digitalhub-0.14.3.dist-info/licenses/AUTHORS,sha256=iDleK_2EAMmh0o8Te_E9mdXQCP4rBfFr9dW9d0-pCno,301
+digitalhub-0.14.3.dist-info/licenses/LICENSE,sha256=z3xQCHfGmTnigfoUe3uidW_GUSVeFBdos30w9VNTRec,11361
+digitalhub-0.14.3.dist-info/RECORD,,