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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalhub
-Version: 0.14.2
+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.2.dist-info → digitalhub-0.14.3.dist-info}/RECORD

@@ -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
@@ -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
@@ -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.2.dist-info/METADATA,sha256=QgydhVI9VRHdV-uuO9RQhtPoYBuf5jN-Z9EJXfdpQYA,18127
-digitalhub-0.14.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-digitalhub-0.14.2.dist-info/licenses/AUTHORS,sha256=iDleK_2EAMmh0o8Te_E9mdXQCP4rBfFr9dW9d0-pCno,301
-digitalhub-0.14.2.dist-info/licenses/LICENSE,sha256=z3xQCHfGmTnigfoUe3uidW_GUSVeFBdos30w9VNTRec,11361
-digitalhub-0.14.2.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,,