digitalhub 0.13.0b3__py3-none-any.whl → 0.14.9__py3-none-any.whl

digitalhub/entities/_base/executable/entity.py

@@ -9,11 +9,11 @@ from abc import abstractmethod
 
 from digitalhub.entities._base.versioned.entity import VersionedEntity
 from digitalhub.entities._commons.enums import EntityTypes
-from digitalhub.entities._processors.context import context_processor
+from digitalhub.entities._processors.processors import context_processor
 from digitalhub.entities.run.crud import list_runs
 from digitalhub.entities.task.crud import delete_task, list_tasks
 from digitalhub.entities.trigger.crud import list_triggers
-from digitalhub.factory.factory import factory
+from digitalhub.factory.entity import entity_factory
 from digitalhub.utils.exceptions import EntityAlreadyExistsError, EntityError
 
 if typing.TYPE_CHECKING:
@@ -94,10 +94,6 @@ class ExecutableEntity(VersionedEntity):
         ----------
         tasks : list[dict]
             List of tasks to import.
-
-        Returns
-        -------
-        None
         """
         # Loop over tasks list, in the case where the function
         # is imported from local file.
@@ -109,7 +105,7 @@ class ExecutableEntity(VersionedEntity):
             # Create a new object from dictionary.
             # the form in which tasks are stored in function
             # status
-            task_obj: Task = factory.build_entity_from_dict(task)
+            task_obj: Task = entity_factory.build_entity_from_dict(task)
 
             # Try to save it in backend to been able to use
             # it for launching runs. In fact, tasks must be
@@ -149,7 +145,7 @@ class ExecutableEntity(VersionedEntity):
         kwargs["kind"] = kind
 
         # Create object instance
-        task: Task = factory.build_entity_from_params(**kwargs)
+        task: Task = entity_factory.build_entity_from_params(**kwargs)
         task.save()
 
         self._tasks[kind] = task
@@ -183,21 +179,62 @@ class ExecutableEntity(VersionedEntity):
             self._tasks[kind] = resp[0]
             return self._tasks[kind]
 
-    def list_task(self, **kwargs) -> list[Task]:
+    def list_task(
+        self,
+        q: str | None = None,
+        name: str | None = None,
+        kind: str | None = None,
+        user: str | None = None,
+        state: str | None = None,
+        created: str | None = None,
+        updated: str | None = None,
+    ) -> list[Task]:
         """
-        List tasks.
+        List tasks of the executable entity from backend.
 
         Parameters
         ----------
-        **kwargs : dict
-            Keyword arguments.
+        q : str
+            Query string to filter objects.
+        name : str
+            Object name.
+        kind : str
+            Kind of the object.
+        user : str
+            User that created the object.
+        state : str
+            Object state.
+        created : str
+            Creation date filter.
+        updated : str
+            Update date filter.
 
         Returns
         -------
-        list
-            List of tasks.
+        list[Task]
+            List of object instances.
         """
-        kwargs["params"] = {self.ENTITY_TYPE: self._get_executable_string()}
+        return self._list_tasks(
+            self.project,
+            q=q,
+            name=name,
+            kind=kind,
+            user=user,
+            state=state,
+            created=created,
+            updated=updated,
+        )
+
+    def _list_tasks(self, **kwargs) -> list[Task]:
+        """
+        List all tasks of the executable entity from backend.
+
+        Returns
+        -------
+        list[Task]
+            List of object instances.
+        """
+        kwargs[self.ENTITY_TYPE] = self._get_executable_string()
         return list_tasks(self.project, **kwargs)
 
     def update_task(self, kind: str, **kwargs) -> Task:
@@ -225,7 +262,7 @@ class ExecutableEntity(VersionedEntity):
         kwargs["uuid"] = self._tasks[kind].id
 
         # Update task
-        task: Task = factory.build_entity_from_params(**kwargs)
+        task: Task = entity_factory.build_entity_from_params(**kwargs)
         task.save(update=True)
         self._tasks[kind] = task
         return task
@@ -265,7 +302,7 @@ class ExecutableEntity(VersionedEntity):
             Response from backend.
         """
         params = {self.ENTITY_TYPE: self._get_executable_string(), "kind": kind}
-        return context_processor.list_context_entities(self.project, EntityTypes.TASK.value, params=params)
+        return context_processor.list_context_entities(self.project, EntityTypes.TASK.value, **params)
 
     def _check_task_in_backend(self, kind: str) -> bool:
         """
@@ -295,10 +332,6 @@ class ExecutableEntity(VersionedEntity):
         kind : str
             Kind the object.
 
-        Returns
-        -------
-        None
-
         Raises
         ------
         EntityError
@@ -316,10 +349,6 @@ class ExecutableEntity(VersionedEntity):
         kind : str
             Kind the object.
 
-        Returns
-        -------
-        None
-
         Raises
         ------
         EntityError
@@ -338,35 +367,21 @@ class ExecutableEntity(VersionedEntity):
         Create and execute a new run.
         """
 
-    def get_run(
-        self,
-        identifier: str,
-        **kwargs,
-    ) -> Run:
+    def get_run(self, identifier: str) -> Run:
         """
-        Get object from backend.
+        Get specific run object of the executable from backend.
 
         Parameters
         ----------
         identifier : str
             Entity key (store://...) or entity ID.
-        **kwargs : dict
-            Parameters to pass to the API call.
 
         Returns
         -------
         Run
             Object instance.
-
-        Examples
-        --------
-        Using entity key:
-        >>> obj = executable.get_run("store://my-secret-key")
-
-        Using entity ID:
-        >>> obj = executable.get_run("123")
         """
-        entities = self.list_runs(**kwargs)
+        entities = self._list_runs()
         for entity in entities:
             if getattr(entity.spec, self.ENTITY_TYPE) == self._get_executable_string():
                 if entity.id == identifier:
@@ -375,25 +390,69 @@ class ExecutableEntity(VersionedEntity):
                     return entity
         raise EntityError(f"Run '{identifier}' does not exist or does not belong to this executable.")
 
-    def list_runs(self, **kwargs) -> list[Run]:
+    def list_runs(
+        self,
+        q: str | None = None,
+        name: str | None = None,
+        kind: str | None = None,
+        user: str | None = None,
+        state: str | None = None,
+        created: str | None = None,
+        updated: str | None = None,
+        task: str | None = None,
+        action: str | None = None,
+    ) -> list[Run]:
         """
-        List all runs from backend.
+        List runs of the executable entity from backend.
 
         Parameters
         ----------
-        **kwargs : dict
-            Parameters to pass to the API call.
+        q : str
+            Query string to filter objects.
+        name : str
+            Object name.
+        kind : str
+            Kind of the object.
+        user : str
+            User that created the object.
+        state : str
+            Object state.
+        created : str
+            Creation date filter.
+        updated : str
+            Update date filter.
+        task : str
+            Task string filter.
+        action : str
+            Action name filter.
 
         Returns
         -------
         list[Run]
             List of object instances.
+        """
+        return self._list_runs(
+            q=q,
+            name=name,
+            kind=kind,
+            user=user,
+            state=state,
+            created=created,
+            updated=updated,
+            task=task,
+            action=action,
+        )
+
+    def _list_runs(self, **kwargs) -> list[Run]:
+        """
+        List all runs of the executable entity from backend.
 
-        Examples
-        --------
-        >>> objs = executable.list_runs()
+        Returns
+        -------
+        list[Run]
+            List of object instances.
         """
-        kwargs["params"] = {self.ENTITY_TYPE: self._get_executable_string()}
+        kwargs[self.ENTITY_TYPE] = self._get_executable_string()
         return list_runs(self.project, **kwargs)
 
     ##############################
@@ -403,8 +462,9 @@ class ExecutableEntity(VersionedEntity):
     def trigger(
         self,
         action: str,
-        trigger_kind: str,
-        trigger_name: str,
+        kind: str,
+        name: str,
+        template: dict | None = None,
         **kwargs,
     ) -> Trigger:
         """
@@ -414,42 +474,55 @@ class ExecutableEntity(VersionedEntity):
         ----------
         action : str
             Action to execute.
-        trigger_kind : str
+        kind : str
             Trigger kind.
+        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
         -------
-        Run
-            Run instance.
+        Trigger
+            Object instance.
         """
         # Get task
-        task_kind = factory.get_task_kind_from_action(self.kind, action)
+        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 = factory.get_run_kind(self.kind)
-        run_validator: SpecValidator = factory.get_spec_validator(run_kind)
+        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()
+        kwargs["kind"] = kind
+        kwargs["name"] = name
+
+        # 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 = factory.build_entity_from_params(**kwargs)
+        trigger: Trigger = entity_factory.build_entity_from_params(**kwargs)
         trigger.save()
         return trigger
 
-    def get_trigger(
-        self,
-        identifier: str,
-        **kwargs,
-    ) -> Trigger:
+    def get_trigger(self, identifier: str) -> Trigger:
         """
         Get object from backend.
 
@@ -457,23 +530,13 @@ class ExecutableEntity(VersionedEntity):
         ----------
         identifier : str
             Entity key (store://...) or entity ID.
-        **kwargs : dict
-            Parameters to pass to the API call.
 
         Returns
         -------
         Trigger
             Object instance.
-
-        Examples
-        --------
-        Using entity key:
-        >>> obj = executable.get_trigger("store://my-trigger-key")
-
-        Using entity ID:
-        >>> obj = executable.get_trigger("123")
         """
-        entities = self.list_triggers(**kwargs)
+        entities = self._list_triggers()
         for entity in entities:
             if getattr(entity.spec, self.ENTITY_TYPE) == self._get_executable_string():
                 if entity.id == identifier:
@@ -482,9 +545,58 @@ class ExecutableEntity(VersionedEntity):
                     return entity
         raise EntityError(f"Trigger '{identifier}' does not exist or does not belong to this executable.")
 
-    def list_triggers(self, **kwargs) -> list[Trigger]:
+    def list_triggers(
+        self,
+        q: str | None = None,
+        name: str | None = None,
+        kind: str | None = None,
+        user: str | None = None,
+        created: str | None = None,
+        updated: str | None = None,
+        versions: str | None = None,
+        task: str | None = None,
+    ) -> list[Trigger]:
+        """
+        List triggers of the executable entity from backend.
+
+        Parameters
+        ----------
+        q : str
+            Query string to filter objects.
+        name : str
+            Object name.
+        kind : str
+            Kind of the object.
+        user : str
+            User that created the object.
+        created : str
+            Creation date filter.
+        updated : str
+            Update date filter.
+        versions : str
+            Object version, default is latest.
+        task : str
+            Task string filter.
+
+        Returns
+        -------
+        list[Trigger]
+            List of object instances.
+        """
+        return self._list_triggers(
+            q=q,
+            name=name,
+            kind=kind,
+            user=user,
+            created=created,
+            updated=updated,
+            versions=versions,
+            task=task,
+        )
+
+    def _list_triggers(self, **kwargs) -> list[Trigger]:
         """
-        List all triggers from backend.
+        List triggers of the executable from backend.
 
         Parameters
         ----------
@@ -495,10 +607,6 @@ class ExecutableEntity(VersionedEntity):
         -------
         list[Trigger]
             List of object instances.
-
-        Examples
-        --------
-        >>> objs = executable.list_triggers()
         """
-        kwargs["params"] = {self.ENTITY_TYPE: self._get_executable_string()}
+        kwargs[self.ENTITY_TYPE] = self._get_executable_string()
         return list_triggers(self.project, **kwargs)

digitalhub/entities/_base/material/entity.py

@@ -7,8 +7,9 @@ from __future__ import annotations
 import typing
 from pathlib import Path
 
+from digitalhub.entities._base.material.utils import refresh_decorator
 from digitalhub.entities._base.versioned.entity import VersionedEntity
-from digitalhub.entities._processors.context import context_processor
+from digitalhub.entities._processors.processors import context_processor
 from digitalhub.stores.data.api import get_store
 from digitalhub.utils.types import SourcesOrListOfSources
 
@@ -55,7 +56,7 @@ class MaterialEntity(VersionedEntity):
         """
         # Evaluate files info list length
         files = None
-        if self.status.files is not None and len(self.status.files) > 5 and not self._context().local:
+        if self.status.files is not None and len(self.status.files) > 5:
             files = self.status.files
             self.status.files = []
 
@@ -72,6 +73,7 @@ class MaterialEntity(VersionedEntity):
     # I/O Methods
     ##############################
 
+    @refresh_decorator
     def as_file(self) -> list[str]:
         """
         Get object as file(s). It downloads the object from storage in
@@ -86,6 +88,7 @@ class MaterialEntity(VersionedEntity):
         dst = store._build_temp()
         return store.download(self.spec.path, dst=dst)
 
+    @refresh_decorator
     def download(
         self,
         destination: str | None = None,
@@ -130,6 +133,7 @@ class MaterialEntity(VersionedEntity):
 
         return store.download(self.spec.path, dst, overwrite=overwrite)
 
+    @refresh_decorator
     def upload(self, source: SourcesOrListOfSources) -> None:
         """
         Upload object from given local path to spec path destination.
@@ -142,20 +146,16 @@ class MaterialEntity(VersionedEntity):
         source : str | list[str]
             Local filepath, directory or list of filepaths.
 
-        Returns
-        -------
-        None
-
         Examples
         --------
         Upload a single file:
 
-        >>> entity.spec.path = 's3://bucket/data.csv'
-        >>> entity.upload('./data.csv')
+        >>> entity.spec.path = "s3://bucket/data.csv"
+        >>> entity.upload("./data.csv")
 
         Upload a folder:
-        >>> entity.spec.path = 's3://bucket/data/'
-        >>> entity.upload('./data')
+        >>> entity.spec.path = "s3://bucket/data/"
+        >>> entity.upload("./data")
         """
         # Get store and upload object
         store = get_store(self.spec.path)
@@ -177,10 +177,6 @@ class MaterialEntity(VersionedEntity):
         ----------
         files : list[dict]
             Files to add.
-
-        Returns
-        -------
-        None
         """
         available = 100 - len(self.status.files)
         if len(files) > available:
@@ -214,10 +210,6 @@ class MaterialEntity(VersionedEntity):
         ----------
         files_info : list[dict] | None
             Files info.
-
-        Returns
-        -------
-        None
         """
         if files_info is None:
             return
@@ -229,12 +221,8 @@ class MaterialEntity(VersionedEntity):
     def _get_files_info(self) -> None:
         """
         Get files info from backend.
-
-        Returns
-        -------
-        None
         """
-        if not self._context().local and not self.status.files:
+        if not self.status.files:
             files = context_processor.read_files_info(
                 project=self.project,
                 entity_type=self.ENTITY_TYPE,

digitalhub/entities/_base/material/utils.py

@@ -4,9 +4,11 @@
 
 from __future__ import annotations
 
+import typing
 from pathlib import Path
 
 from digitalhub.stores.data.api import get_default_store
+from digitalhub.utils.exceptions import BackendError
 from digitalhub.utils.file_utils import eval_zip_type
 from digitalhub.utils.uri_utils import has_local_scheme
 
@@ -19,10 +21,6 @@ def eval_local_source(source: str | list[str]) -> None:
     ----------
     source : str | list[str]
         Source(s).
-
-    Returns
-    -------
-    None
     """
     if isinstance(source, list):
         if not source:
@@ -108,3 +106,29 @@ def build_log_path_from_source(
         path += f"/{Path(source).name}"
 
     return path
+
+
+def refresh_decorator(fn: typing.Callable) -> typing.Callable:
+    """
+    Refresh decorator.
+
+    Parameters
+    ----------
+    fn : Callable
+        Function to decorate.
+
+    Returns
+    -------
+    Callable
+        Decorated function.
+    """
+
+    def wrapper(self, *args, **kwargs):
+        # Prevent rising error if entity is not yet created in backend
+        try:
+            self.refresh()
+        except BackendError:
+            pass
+        return fn(self, *args, **kwargs)
+
+    return wrapper