digitalhub 0.14.0b6__py3-none-any.whl → 0.14.1__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
-from digitalhub.stores.credentials.api import get_current_profile, set_current_profile
+from digitalhub.stores.client.utils import 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
@@ -49,7 +54,43 @@ 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 get_context_from_remote(project: str) -> Context:
+    """
+    Fetch project context from remote backend and create local context.
+
+
+    Parameters
+    ----------
+    project : str
+        The name of the project to fetch from remote.
+
+    Returns
+    -------
+    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:

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/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/_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,8 +69,7 @@ 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
         ----------
@@ -78,8 +77,7 @@ class BaseEntityCRUDProcessor:
             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,7 +8,6 @@ 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
 
@@ -57,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)
 
@@ -107,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

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

digitalhub/entities/_processors/context/crud.py

@@ -8,12 +8,12 @@ import typing
 
 from digitalhub.entities._commons.utils import is_valid_key, sanitize_unversioned_key
 from digitalhub.entities._processors.utils import (
+    get_context,
     get_context_from_identifier,
-    get_context_from_project,
     parse_identifier,
 )
 from digitalhub.factory.entity import entity_factory
-from digitalhub.stores.client._base.enums import ApiCategories, BackendOperations
+from digitalhub.stores.client.enums import ApiCategories, BackendOperations
 
 if typing.TYPE_CHECKING:
     from digitalhub.context.context import Context
@@ -93,7 +93,7 @@ class ContextEntityCRUDProcessor:
             context = _entity._context()
             obj = _entity
         else:
-            context = get_context_from_project(kwargs["project"])
+            context = get_context(kwargs["project"])
             obj: ContextEntity = entity_factory.build_entity_from_params(**kwargs)
         new_obj = self._create_context_entity(context, obj.ENTITY_TYPE, obj.to_dict())
         return entity_factory.build_entity_from_dict(new_obj)
@@ -423,7 +423,7 @@ class ContextEntityCRUDProcessor:
         list[ContextEntity]
             List of context entity objects (latest versions only).
         """
-        context = get_context_from_project(project)
+        context = get_context(project)
         objs = self._list_context_entities(context, entity_type, **kwargs)
         objects = []
         for o in objs:
@@ -507,7 +507,7 @@ class ContextEntityCRUDProcessor:
         ContextEntity
             The updated context entity object.
         """
-        context = get_context_from_project(project)
+        context = get_context(project)
         obj = self._update_context_entity(
             context,
             entity_type,

digitalhub/entities/_processors/context/import_export.py

@@ -7,7 +7,7 @@ from __future__ import annotations
 import typing
 
 from digitalhub.entities._constructors.uuid import build_uuid
-from digitalhub.entities._processors.utils import get_context_from_identifier, get_context_from_project
+from digitalhub.entities._processors.utils import get_context, get_context_from_identifier
 from digitalhub.factory.entity import entity_factory
 from digitalhub.utils.exceptions import EntityAlreadyExistsError, EntityError, EntityNotExistsError
 from digitalhub.utils.io_utils import read_yaml
@@ -75,7 +75,7 @@ class ContextEntityImportExportProcessor:
         if context is None:
             context = dict_obj["project"]
 
-        ctx = get_context_from_project(context)
+        ctx = get_context(context)
         obj = entity_factory.build_entity_from_dict(dict_obj)
         if reset_id:
             new_id = build_uuid()
@@ -147,7 +147,7 @@ class ContextEntityImportExportProcessor:
         if context is None:
             context = exec_dict["project"]
 
-        ctx = get_context_from_project(context)
+        ctx = get_context(context)
         obj: ExecutableEntity = entity_factory.build_entity_from_dict(exec_dict)
 
         if reset_id:
@@ -190,7 +190,7 @@ class ContextEntityImportExportProcessor:
             The loaded and updated context entity.
         """
         dict_obj: dict = read_yaml(file)
-        context = get_context_from_project(dict_obj["project"])
+        context = get_context(dict_obj["project"])
         obj: ContextEntity = entity_factory.build_entity_from_dict(dict_obj)
         try:
             crud_processor._update_context_entity(context, obj.ENTITY_TYPE, obj.id, obj.to_dict())
@@ -231,7 +231,7 @@ class ContextEntityImportExportProcessor:
             exec_dict = dict_obj
             tsk_dicts = []
 
-        context = get_context_from_project(exec_dict["project"])
+        context = get_context(exec_dict["project"])
         obj: ExecutableEntity = entity_factory.build_entity_from_dict(exec_dict)
 
         try:

digitalhub/entities/_processors/context/material.py

@@ -7,7 +7,7 @@ from __future__ import annotations
 import typing
 
 from digitalhub.entities._commons.enums import Relationship, State
-from digitalhub.entities._processors.utils import get_context_from_project
+from digitalhub.entities._processors.utils import get_context
 from digitalhub.factory.entity import entity_factory
 from digitalhub.utils.exceptions import EntityError
 from digitalhub.utils.types import SourcesOrListOfSources
@@ -59,7 +59,7 @@ class ContextEntityMaterialProcessor:
             If file upload fails during the process.
         """
         source: SourcesOrListOfSources = kwargs.pop("source")
-        context = get_context_from_project(kwargs["project"])
+        context = get_context(kwargs["project"])
         obj = entity_factory.build_entity_from_params(**kwargs)
         if context.is_running:
             obj.add_relationship(Relationship.PRODUCEDBY.value, context.get_run_ctx())

digitalhub/entities/_processors/context/special_ops.py

@@ -7,8 +7,8 @@ from __future__ import annotations
 import typing
 from typing import Any
 
-from digitalhub.entities._processors.utils import get_context_from_project
-from digitalhub.stores.client._base.enums import ApiCategories, BackendOperations
+from digitalhub.entities._processors.utils import get_context
+from digitalhub.stores.client.enums import ApiCategories, BackendOperations
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities._base.context.entity import ContextEntity
@@ -55,7 +55,7 @@ class ContextEntitySpecialOpsProcessor:
         str
             The constructed context entity key string.
         """
-        context = get_context_from_project(project)
+        context = get_context(project)
         return context.client.build_key(
             ApiCategories.CONTEXT.value,
             project=context.name,
@@ -91,7 +91,7 @@ class ContextEntitySpecialOpsProcessor:
         dict
             Secret data retrieved from the backend.
         """
-        context = get_context_from_project(project)
+        context = get_context(project)
         api = context.client.build_api(
             ApiCategories.CONTEXT.value,
             BackendOperations.DATA.value,
@@ -124,7 +124,7 @@ class ContextEntitySpecialOpsProcessor:
         **kwargs : dict
             Additional parameters to pass to the API call.
         """
-        context = get_context_from_project(project)
+        context = get_context(project)
         api = context.client.build_api(
             ApiCategories.CONTEXT.value,
             BackendOperations.DATA.value,
@@ -162,7 +162,7 @@ class ContextEntitySpecialOpsProcessor:
         dict
             Log data retrieved from the backend.
         """
-        context = get_context_from_project(project)
+        context = get_context(project)
         api = context.client.build_api(
             ApiCategories.CONTEXT.value,
             BackendOperations.LOGS.value,
@@ -196,7 +196,7 @@ class ContextEntitySpecialOpsProcessor:
         **kwargs : dict
             Additional parameters to pass to the API call.
         """
-        context = get_context_from_project(project)
+        context = get_context(project)
         api = context.client.build_api(
             ApiCategories.CONTEXT.value,
             BackendOperations.STOP.value,
@@ -230,7 +230,7 @@ class ContextEntitySpecialOpsProcessor:
         **kwargs : dict
             Additional parameters to pass to the API call.
         """
-        context = get_context_from_project(project)
+        context = get_context(project)
         api = context.client.build_api(
             ApiCategories.CONTEXT.value,
             BackendOperations.RESUME.value,
@@ -269,7 +269,7 @@ class ContextEntitySpecialOpsProcessor:
         list[dict]
             List of file information dictionaries from the backend.
         """
-        context = get_context_from_project(project)
+        context = get_context(project)
         api = context.client.build_api(
             ApiCategories.CONTEXT.value,
             BackendOperations.FILES.value,
@@ -303,7 +303,7 @@ class ContextEntitySpecialOpsProcessor:
         **kwargs : dict
             Parameters to pass to the API call.
         """
-        context = get_context_from_project(project)
+        context = get_context(project)
         api = context.client.build_api(
             ApiCategories.CONTEXT.value,
             BackendOperations.FILES.value,
@@ -347,7 +347,7 @@ class ContextEntitySpecialOpsProcessor:
         dict
             Dictionary containing metric data from the backend.
         """
-        context = get_context_from_project(project)
+        context = get_context(project)
         api = context.client.build_api(
             ApiCategories.CONTEXT.value,
             BackendOperations.METRICS.value,
@@ -390,7 +390,7 @@ class ContextEntitySpecialOpsProcessor:
         **kwargs : dict
             Additional parameters to pass to the API call.
         """
-        context = get_context_from_project(project)
+        context = get_context(project)
         api = context.client.build_api(
             ApiCategories.CONTEXT.value,
             BackendOperations.METRICS.value,
@@ -453,7 +453,7 @@ class ContextEntitySpecialOpsProcessor:
         list[ContextEntity]
             List of matching entity instances from the search.
         """
-        context = get_context_from_project(project)
+        context = get_context(project)
         kwargs = context.client.build_parameters(
             ApiCategories.CONTEXT.value,
             BackendOperations.SEARCH.value,