digitalhub 0.14.0b5__py3-none-any.whl → 0.14.9__py3-none-any.whl

digitalhub/__init__.py

@@ -95,8 +95,8 @@ from digitalhub.entities.workflow.crud import (
     new_workflow,
     update_workflow,
 )
-from digitalhub.stores.client.dhcore.utils import refresh_token, set_dhcore_env
-from digitalhub.stores.credentials.api import get_current_profile, set_current_profile
+from digitalhub.stores.client.utils import get_credentials_and_config, refresh_token
+from digitalhub.stores.configurator.api import get_current_profile, set_current_profile
 from digitalhub.utils.store_utils import get_s3_client, get_sql_engine
 
 try:

digitalhub/context/api.py

@@ -7,6 +7,11 @@ from __future__ import annotations
 import typing
 
 from digitalhub.context.builder import context_builder
+from digitalhub.entities._commons.enums import EntityTypes
+from digitalhub.factory.entity import entity_factory
+from digitalhub.stores.client.builder import get_client
+from digitalhub.stores.client.enums import ApiCategories, BackendOperations
+from digitalhub.utils.exceptions import ContextError, EntityNotExistsError
 
 if typing.TYPE_CHECKING:
     from digitalhub.context.context import Context
@@ -24,7 +29,7 @@ def build_context(project: Project, overwrite: bool = False) -> Context:
     ----------
     project : Project
         The project object used to build the context.
-    overwrite : bool, optional
+    overwrite : bool
         If True, overwrites existing context if it exists. Default is False.
 
     Returns
@@ -49,20 +54,52 @@ def get_context(project: str) -> Context:
     Context
         The context for the given project name.
     """
-    return context_builder.get(project)
+    try:
+        return context_builder.get(project)
+    except ContextError:
+        try:
+            return get_context_from_remote(project)
+        except EntityNotExistsError as e:
+            raise ContextError(f"Context '{project}' not found remotely nor locally.") from e
 
 
-def delete_context(project: str) -> None:
+def get_context_from_remote(project: str) -> Context:
     """
-    Delete the context for a given project name.
+    Fetch project context from remote backend and create local context.
+
 
     Parameters
     ----------
     project : str
-        Project name.
+        The name of the project to fetch from remote.
 
     Returns
     -------
-    None
+    Context
+        The context instance created from the remote project data.
+    """
+    try:
+        client = get_client()
+        api = client.build_api(
+            ApiCategories.BASE.value,
+            BackendOperations.READ.value,
+            entity_type=EntityTypes.PROJECT.value,
+            entity_name=project,
+        )
+        obj = client.read_object(api)
+        entity_factory.build_entity_from_dict(obj)
+        return context_builder.get(project)
+    except EntityNotExistsError:
+        raise ContextError(f"Project '{project}' not found.")
+
+
+def delete_context(project: str) -> None:
+    """
+    Delete the context for a given project name.
+
+    Parameters
+    ----------
+    project : str
+        Project name.
     """
     context_builder.remove(project)

digitalhub/context/builder.py

@@ -38,7 +38,7 @@ class ContextBuilder:
         ----------
         project : Project
             The project instance to create a context for.
-        overwrite : bool, optional
+        overwrite : bool
             If True, overwrites existing context if project name already exists. Default is False.
 
         Returns

digitalhub/context/context.py

@@ -10,12 +10,12 @@ from pathlib import Path
 
 from digitalhub.entities._commons.enums import EntityTypes
 from digitalhub.runtimes.enums import RuntimeEnvVar
-from digitalhub.stores.client._base.enums import ApiCategories, BackendOperations
+from digitalhub.stores.client.enums import ApiCategories, BackendOperations
 from digitalhub.utils.exceptions import BackendError
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities.project._base.entity import Project
-    from digitalhub.stores.client._base.client import Client
+    from digitalhub.stores.client.client import Client
 
 
 class Context:
@@ -33,8 +33,6 @@ class Context:
         The client instance (local or remote) associated with the project.
     config : dict
         Project configuration profile.
-    local : bool
-        Whether the client is local or remote.
     root : Path
         The local context project path.
     is_running : bool
@@ -47,8 +45,7 @@ class Context:
         self.name: str = project.name
         self.client: Client = project._client
         self.config: dict = project.spec.config
-        self.local: bool = project._client.is_local()
-        self.root: Path = Path(project.spec.context)
+        self.root: Path = Path(project.spec.source)
         self.root.mkdir(parents=True, exist_ok=True)
 
         self.is_running: bool = False

digitalhub/entities/_base/context/entity.py

@@ -9,7 +9,6 @@ import typing
 from digitalhub.context.api import get_context
 from digitalhub.entities._base.entity.entity import Entity
 from digitalhub.entities._processors.processors import context_processor
-from digitalhub.utils.generic_utils import get_timestamp
 from digitalhub.utils.io_utils import write_yaml
 
 if typing.TYPE_CHECKING:
@@ -81,8 +80,6 @@ class ContextEntity(Entity):
         ContextEntity
             Entity updated.
         """
-        if self._context().local:
-            self.metadata.updated = self.metadata.updated = get_timestamp()
         new_obj = context_processor.update_context_entity(self.project, self.ENTITY_TYPE, self.id, self.to_dict())
         self._update_attributes(new_obj)
         return self

digitalhub/entities/_base/executable/entity.py

@@ -462,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:
         """
@@ -473,10 +474,14 @@ 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
         -------
@@ -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()
+        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 = 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/entities/_base/material/entity.py

@@ -56,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 = []
 
@@ -222,7 +222,7 @@ class MaterialEntity(VersionedEntity):
         """
         Get files info from backend.
         """
-        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

@@ -21,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:

digitalhub/entities/_commons/enums.py

@@ -32,6 +32,7 @@ class Relationship(Enum):
     PRODUCEDBY = "produced_by"
     CONSUMES = "consumes"
     RUN_OF = "run_of"
+    STEP_OF = "step_of"
 
 
 class State(Enum):

digitalhub/entities/_commons/utils.py

@@ -33,6 +33,25 @@ def is_valid_key(key: str) -> bool:
     return bool(re.fullmatch(KEY_PATTERN_WITH_ID, key) or re.fullmatch(KEY_PATTERN_NO_ID, key))
 
 
+def sanitize_unversioned_key(key: str) -> str:
+    """
+    Sanitize an unversioned entity key (from name:id to id).
+
+    Parameters
+    ----------
+    key : str
+        The unversioned entity key.
+
+    Returns
+    -------
+    str
+        The sanitized entity key with version.
+    """
+    splt = key.split("/")[2:]
+    ent_id = splt[-1].split(":")[0]
+    return "store://" + "/".join(splt[:-1] + [ent_id])
+
+
 def parse_entity_key(key: str) -> tuple[str, str, str, str | None, str]:
     """
     Parse an entity key into its constituent components.

digitalhub/entities/_processors/base/crud.py

@@ -8,12 +8,12 @@ import typing
 
 from digitalhub.context.api import delete_context
 from digitalhub.factory.entity import entity_factory
-from digitalhub.stores.client._base.enums import ApiCategories, BackendOperations
-from digitalhub.stores.client.api import get_client
+from digitalhub.stores.client.builder import get_client
+from digitalhub.stores.client.enums import ApiCategories, BackendOperations
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities.project._base.entity import Project
-    from digitalhub.stores.client._base.client import Client
+    from digitalhub.stores.client.client import Client
 
 
 class BaseEntityCRUDProcessor:
@@ -69,17 +69,15 @@ class BaseEntityCRUDProcessor:
         Create a project entity in the backend.
 
         Creates a new project either from an existing entity object or
-        by building one from the provided parameters. Handles both
-        local and remote backend creation.
+        by building one from the provided parameters.
 
         Parameters
         ----------
-        _entity : Project, optional
+        _entity : Project
             An existing project entity object to create. If None,
             a new entity will be built from kwargs.
         **kwargs : dict
-            Parameters for entity creation, including 'local' flag
-            and entity-specific parameters.
+            Parameters for entity creation.
 
         Returns
         -------
@@ -90,10 +88,9 @@ class BaseEntityCRUDProcessor:
             client = _entity._client
             obj = _entity
         else:
-            client = get_client(kwargs.get("local"))
+            client = get_client()
             obj = entity_factory.build_entity_from_params(**kwargs)
         ent = self._create_base_entity(client, obj.ENTITY_TYPE, obj.to_dict())
-        ent["local"] = client.is_local()
         return entity_factory.build_entity_from_dict(ent)
 
     def _read_base_entity(
@@ -160,9 +157,8 @@ class BaseEntityCRUDProcessor:
         Project
             The project entity object populated with backend data.
         """
-        client = get_client(kwargs.pop("local", False))
+        client = get_client()
         obj = self._read_base_entity(client, entity_type, entity_name, **kwargs)
-        obj["local"] = client.is_local()
         return entity_factory.build_entity_from_dict(obj)
 
     def _list_base_entities(
@@ -215,19 +211,17 @@ class BaseEntityCRUDProcessor:
         entity_type : str
             The type of entities to list (typically 'project').
         **kwargs : dict
-            Additional parameters including 'local' flag and
-            API call parameters for filtering or pagination.
+            Additional parameters.
 
         Returns
         -------
         list[Project]
             List of project entity objects.
         """
-        client = get_client(kwargs.pop("local", False))
+        client = get_client()
         objs = self._list_base_entities(client, entity_type, **kwargs)
         entities = []
         for obj in objs:
-            obj["local"] = client.is_local()
             ent = entity_factory.build_entity_from_dict(obj)
             entities.append(ent)
         return entities
@@ -294,17 +288,15 @@ class BaseEntityCRUDProcessor:
         entity_dict : dict
             The updated project data dictionary.
         **kwargs : dict
-            Additional parameters including 'local' flag and
-            API call parameters.
+            Additional parameters.
 
         Returns
         -------
         Project
             The updated project entity object.
         """
-        client = get_client(kwargs.pop("local", False))
+        client = get_client()
         obj = self._update_base_entity(client, entity_type, entity_name, entity_dict, **kwargs)
-        obj["local"] = client.is_local()
         return entity_factory.build_entity_from_dict(obj)
 
     def _delete_base_entity(
@@ -360,7 +352,7 @@ class BaseEntityCRUDProcessor:
         Delete a project entity from the backend.
 
         Deletes a project from the backend and optionally cleans up
-        the associated context. Handles both local and remote backends.
+        the associated context.
 
         Parameters
         ----------
@@ -371,8 +363,7 @@ class BaseEntityCRUDProcessor:
         entity_name : str
             The name identifier of the project to delete.
         **kwargs : dict
-            Additional parameters including 'local' flag, 'clean_context'
-            flag (default True), and API call parameters.
+            Additional parameters including 'clean_context'.
 
         Returns
         -------
@@ -381,7 +372,7 @@ class BaseEntityCRUDProcessor:
         """
         if kwargs.pop("clean_context", True):
             delete_context(entity_name)
-        client = get_client(kwargs.pop("local", False))
+        client = get_client()
         return self._delete_base_entity(
             client,
             entity_type,

digitalhub/entities/_processors/base/import_export.py

@@ -8,11 +8,11 @@ import typing
 from warnings import warn
 
 from digitalhub.factory.entity import entity_factory
-from digitalhub.stores.client.api import get_client
 from digitalhub.utils.exceptions import EntityAlreadyExistsError, EntityError, EntityNotExistsError
 from digitalhub.utils.io_utils import read_yaml
 
 if typing.TYPE_CHECKING:
+    from digitalhub.entities._processors.base.crud import BaseEntityCRUDProcessor
     from digitalhub.entities.project._base.entity import Project
 
 
@@ -26,7 +26,7 @@ class BaseEntityImportExportProcessor:
 
     def import_project_entity(
         self,
-        crud_processor,
+        crud_processor: BaseEntityCRUDProcessor,
         file: str,
         **kwargs,
     ) -> Project:
@@ -56,10 +56,8 @@ class BaseEntityImportExportProcessor:
         EntityError
             If the project already exists in the backend.
         """
-        client = get_client(kwargs.pop("local", False))
         obj: dict = read_yaml(file)
         obj["status"] = {}
-        obj["local"] = client.is_local()
         ent: Project = entity_factory.build_entity_from_dict(obj)
         reset_id = kwargs.pop("reset_id", False)
 
@@ -81,7 +79,7 @@ class BaseEntityImportExportProcessor:
 
     def load_project_entity(
         self,
-        crud_processor,
+        crud_processor: BaseEntityCRUDProcessor,
         file: str,
         **kwargs,
     ) -> Project:
@@ -106,9 +104,7 @@ class BaseEntityImportExportProcessor:
         Project
             The loaded and updated project entity.
         """
-        client = get_client(kwargs.pop("local", False))
         obj: dict = read_yaml(file)
-        obj["local"] = client.is_local()
         ent: Project = entity_factory.build_entity_from_dict(obj)
 
         try:

digitalhub/entities/_processors/base/processor.py

@@ -49,7 +49,7 @@ class BaseEntityOperationsProcessor:
 
         Parameters
         ----------
-        _entity : Project, optional
+        _entity : Project
             An existing project entity object to create. If None,
             a new entity will be built from kwargs.
         **kwargs : dict
@@ -212,7 +212,7 @@ class BaseEntityOperationsProcessor:
         EntityError
             If the project already exists in the backend.
         """
-        return self.import_export_processor.import_project_entity(file, **kwargs)
+        return self.import_export_processor.import_project_entity(self.crud_processor, file, **kwargs)
 
     def load_project_entity(
         self,
@@ -238,7 +238,7 @@ class BaseEntityOperationsProcessor:
         Project
             The loaded and updated project entity.
         """
-        return self.import_export_processor.load_project_entity(file, **kwargs)
+        return self.import_export_processor.load_project_entity(self.crud_processor, file, **kwargs)
 
     ##############################
     # Base entity operations
@@ -247,7 +247,6 @@ class BaseEntityOperationsProcessor:
     def build_project_key(
         self,
         entity_id: str,
-        **kwargs,
     ) -> str:
         """
         Build a storage key for a project entity.
@@ -259,15 +258,13 @@ class BaseEntityOperationsProcessor:
         ----------
         entity_id : str
             The unique identifier of the project entity.
-        **kwargs : dict
-            Additional parameters including 'local' flag.
 
         Returns
         -------
         str
             The constructed project entity key string.
         """
-        return self.special_ops_processor.build_project_key(entity_id, **kwargs)
+        return self.special_ops_processor.build_project_key(entity_id)
 
     def share_project_entity(
         self,

digitalhub/entities/_processors/base/special_ops.py

@@ -6,8 +6,8 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.stores.client._base.enums import ApiCategories, BackendOperations
-from digitalhub.stores.client.api import get_client
+from digitalhub.stores.client.builder import get_client
+from digitalhub.stores.client.enums import ApiCategories, BackendOperations
 
 if typing.TYPE_CHECKING:
     pass
@@ -24,7 +24,6 @@ class BaseEntitySpecialOpsProcessor:
     def build_project_key(
         self,
         entity_id: str,
-        **kwargs,
     ) -> str:
         """
         Build a storage key for a project entity.
@@ -36,16 +35,13 @@ class BaseEntitySpecialOpsProcessor:
         ----------
         entity_id : str
             The unique identifier of the project entity.
-        **kwargs : dict
-            Additional parameters including 'local' flag.
 
         Returns
         -------
         str
             The constructed project entity key string.
         """
-        client = get_client(kwargs.pop("local", False))
-        return client.build_key(ApiCategories.BASE.value, entity_id)
+        return get_client().build_key(ApiCategories.BASE.value, entity_id)
 
     def share_project_entity(
         self,
@@ -77,7 +73,7 @@ class BaseEntitySpecialOpsProcessor:
         ValueError
             If trying to unshare from a user who doesn't have access.
         """
-        client = get_client(kwargs.pop("local", False))
+        client = get_client()
         api = client.build_api(
             ApiCategories.BASE.value,
             BackendOperations.SHARE.value,