digitalhub 0.14.0b7__py3-none-any.whl → 0.14.1b0__py3-none-any.whl

digitalhub/entities/_processors/utils.py

@@ -7,16 +7,11 @@ from __future__ import annotations
 import typing
 
 from digitalhub.context.api import get_context
-from digitalhub.entities._commons.enums import EntityTypes
 from digitalhub.entities._commons.utils import get_project_from_key, is_valid_key, parse_entity_key
-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.utils.exceptions import ContextError, EntityError, EntityNotExistsError
+from digitalhub.utils.exceptions import EntityError
 
 if typing.TYPE_CHECKING:
     from digitalhub.context.context import Context
-    from digitalhub.stores.client._base.client import Client
 
 
 def parse_identifier(
@@ -100,108 +95,4 @@ def get_context_from_identifier(
     else:
         project = get_project_from_key(identifier)
 
-    return get_context_from_project(project)
-
-
-def get_context_from_project(
-    project: str,
-) -> Context:
-    """
-    Retrieve context for a project, fetching from remote if necessary.
-
-    Attempts to get the project context from the local cache first.
-    If the project is not found locally, tries to fetch it from the
-    remote backend and create the context.
-
-    Parameters
-    ----------
-    project : str
-        The name of the project to get context for.
-
-    Returns
-    -------
-    Context
-        The context instance for the specified project.
-
-    Raises
-    ------
-    ContextError
-        If the project cannot be found locally or remotely.
-    """
-    try:
-        return get_context(project)
-    except ContextError:
-        return get_context_from_remote(project)
-
-
-def get_context_from_remote(
-    project: str,
-) -> Context:
-    """
-    Fetch project context from remote backend and create local context.
-
-    Retrieves project information from the remote backend, builds the
-    project entity locally, and returns the corresponding context.
-    Used when a project is not available in the local context cache.
-
-    Parameters
-    ----------
-    project : str
-        The name of the project to fetch from remote.
-
-    Returns
-    -------
-    Context
-        The context instance created from the remote project data.
-
-    Raises
-    ------
-    ContextError
-        If the project is not found on the remote backend.
-    """
-    try:
-        client = get_client()
-        obj = _read_base_entity(client, EntityTypes.PROJECT.value, project)
-        entity_factory.build_entity_from_dict(obj)
-        return get_context(project)
-    except EntityNotExistsError:
-        raise ContextError(f"Project '{project}' not found.")
-
-
-def _read_base_entity(
-    client: Client,
-    entity_type: str,
-    entity_name: str,
-    **kwargs,
-) -> dict:
-    """
-    Read entity data from the backend API.
-
-    Internal utility function that performs a base-level entity read
-    operation through the client API. Builds the appropriate API
-    endpoint and retrieves the entity data as a dictionary.
-
-    Parameters
-    ----------
-    client : Client
-        The client instance to use for the API request.
-    entity_type : str
-        The type of entity to read (e.g., 'project', 'function').
-    entity_name : str
-        The name identifier of the entity to retrieve.
-    **kwargs : dict
-        Additional parameters to pass to the API call, such as
-        version specifications or query filters.
-
-    Returns
-    -------
-    dict
-        Dictionary containing the entity data retrieved from the backend.
-    """
-    api = client.build_api(
-        ApiCategories.BASE.value,
-        BackendOperations.READ.value,
-        entity_type=entity_type,
-        entity_name=entity_name,
-    )
-    return client.read_object(api, **kwargs)
+    return get_context(project)

digitalhub/entities/function/_base/entity.py

@@ -10,7 +10,6 @@ from concurrent.futures import ThreadPoolExecutor
 from digitalhub.entities._base.executable.entity import ExecutableEntity
 from digitalhub.entities._commons.enums import EntityTypes, Relationship
 from digitalhub.factory.entity import entity_factory
-from digitalhub.utils.exceptions import BackendError
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities._base.entity.metadata import Metadata
@@ -91,8 +90,6 @@ class Function(ExecutableEntity):
 
         # If execution is done by DHCore backend, return the object
         if not local_execution:
-            if self._context().local:
-                raise BackendError("Cannot run remote function with local backend.")
             if wait:
                 return run.wait(log_info=log_info)
             return run

digitalhub/entities/project/_base/builder.py

@@ -29,7 +29,6 @@ class ProjectProjectBuilder(EntityBuilder):
         kind: str,
         description: str | None = None,
         labels: list[str] | None = None,
-        local: bool = False,
         config: dict | None = None,
         context: str | None = None,
         **kwargs,
@@ -47,8 +46,6 @@ class ProjectProjectBuilder(EntityBuilder):
             Description of the object (human readable).
         labels : list[str]
             List of labels.
-        local : bool
-            If True, use local backend, if False use DHCore backend. Default to False.
         config : dict
             DHCore environment configuration.
         context : str
@@ -80,7 +77,6 @@ class ProjectProjectBuilder(EntityBuilder):
             metadata=metadata,
             spec=spec,
             status=status,
-            local=local,
         )
 
     def from_dict(self, obj: dict, validate: bool = True) -> Project:
@@ -120,7 +116,6 @@ class ProjectProjectBuilder(EntityBuilder):
         """
         name = self.build_name(obj.get("name"))
         kind = obj.get("kind")
-        local = obj.get("local", False)
         metadata = self.build_metadata(**obj.get("metadata", {}))
         spec = self.build_spec(validate=validate, **obj.get("spec", {}))
         status = self.build_status(**obj.get("status", {}))
@@ -132,5 +127,4 @@ class ProjectProjectBuilder(EntityBuilder):
             "spec": spec,
             "status": status,
             "user": user,
-            "local": local,
         }

digitalhub/entities/project/_base/entity.py

@@ -72,9 +72,8 @@ from digitalhub.entities.workflow.crud import (
     update_workflow,
 )
 from digitalhub.factory.entity import entity_factory
-from digitalhub.stores.client.api import get_client
+from digitalhub.stores.client.builder import get_client
 from digitalhub.utils.exceptions import BackendError, EntityAlreadyExistsError, EntityError
-from digitalhub.utils.generic_utils import get_timestamp
 from digitalhub.utils.io_utils import write_yaml
 from digitalhub.utils.uri_utils import has_local_scheme
 
@@ -107,7 +106,6 @@ class Project(Entity):
         spec: ProjectSpec,
         status: ProjectStatus,
         user: str | None = None,
-        local: bool = False,
     ) -> None:
         super().__init__(kind, metadata, spec, status, user)
         self.spec: ProjectSpec
@@ -115,12 +113,12 @@ class Project(Entity):
 
         self.id = name
         self.name = name
-        self.key = base_processor.build_project_key(self.name, local=local)
+        self.key = base_processor.build_project_key(self.name)
 
         self._obj_attr.extend(["id", "name"])
 
         # Set client
-        self._client = get_client(local)
+        self._client = get_client()
 
         # Set context
         build_context(self)
@@ -144,13 +142,10 @@ class Project(Entity):
             Entity saved.
         """
         if update:
-            if self._client.is_local():
-                self.metadata.updated = get_timestamp()
             new_obj = base_processor.update_project_entity(
                 entity_type=self.ENTITY_TYPE,
                 entity_name=self.name,
                 entity_dict=self.to_dict(),
-                local=self._client.is_local(),
             )
         else:
             new_obj = base_processor.create_project_entity(_entity=self)
@@ -169,7 +164,6 @@ class Project(Entity):
         new_obj = base_processor.read_project_entity(
             entity_type=self.ENTITY_TYPE,
             entity_name=self.name,
-            local=self._client.is_local(),
         )
         self._update_attributes(new_obj)
         return self
@@ -241,7 +235,7 @@ class Project(Entity):
             Exported filepath.
         """
         obj = self._refresh_to_dict()
-        pth = Path(self.spec.context) / f"{self.ENTITY_TYPE}s-{self.name}.yaml"
+        pth = Path(self.spec.source) / f"{self.ENTITY_TYPE}s-{self.name}.yaml"
         obj = self._export_not_embedded(obj)
         write_yaml(pth, obj)
         return str(pth)
@@ -2346,7 +2340,6 @@ class Project(Entity):
             entity_name=self.name,
             user=user,
             unshare=False,
-            local=self._client.is_local(),
         )
 
     def unshare(self, user: str) -> None:
@@ -2366,5 +2359,4 @@ class Project(Entity):
             entity_name=self.name,
             user=user,
             unshare=True,
-            local=self._client.is_local(),
         )

digitalhub/entities/project/_base/spec.py

@@ -17,7 +17,7 @@ class ProjectSpec(Spec):
 
     def __init__(
         self,
-        context: str | None = None,
+        source: str | None = None,
         functions: list | None = None,
         artifacts: list | None = None,
         workflows: list | None = None,
@@ -26,7 +26,7 @@ class ProjectSpec(Spec):
         config: dict | None = None,
         **kwargs,
     ) -> None:
-        self.context = context if context is not None else "./"
+        self.source = source if source is not None else "./"
         self.functions = functions if functions is not None else []
         self.artifacts = artifacts if artifacts is not None else []
         self.workflows = workflows if workflows is not None else []
@@ -40,8 +40,8 @@ class ProjectValidator(SpecValidator):
     ProjectValidator validator.
     """
 
-    context: Optional[str] = None
-    """The project's context."""
+    source: Optional[str] = None
+    """The project's source."""
 
     functions: Optional[list] = None
     """List of project's functions."""

digitalhub/entities/project/crud.py

@@ -23,11 +23,9 @@ def new_project(
     name: str,
     description: str | None = None,
     labels: list[str] | None = None,
-    local: bool = False,
     config: dict | None = None,
     context: str | None = None,
     setup_kwargs: dict | None = None,
-    **kwargs,
 ) -> Project:
     """
     Create a new object.
@@ -40,16 +38,12 @@ def new_project(
         Description of the object (human readable).
     labels : list[str]
         List of labels.
-    local : bool
-        If True, use local backend, if False use DHCore backend. Default to False.
     config : dict
         DHCore environment configuration.
     context : str
         The context local folder of the project.
     setup_kwargs : dict
         Setup keyword arguments passed to setup_project() function.
-    **kwargs : dict
-        Keyword arguments.
 
     Returns
     -------
@@ -64,20 +58,17 @@ def new_project(
         context = "./"
     obj = base_processor.create_project_entity(
         name=name,
-        kind="project",
+        kind=EntityTypes.PROJECT.value,
         description=description,
         labels=labels,
-        local=local,
         config=config,
         context=context,
-        **kwargs,
     )
     return setup_project(obj, setup_kwargs)
 
 
 def get_project(
     name: str,
-    local: bool = False,
     setup_kwargs: dict | None = None,
 ) -> Project:
     """
@@ -87,8 +78,6 @@ def get_project(
     ----------
     name : str
         The Project name.
-    local : bool
-        Flag to determine if backend is local.
     setup_kwargs : dict
         Setup keyword arguments passed to setup_project() function.
 
@@ -104,14 +93,12 @@ def get_project(
     obj = base_processor.read_project_entity(
         entity_type=ENTITY_TYPE,
         entity_name=name,
-        local=local,
     )
     return setup_project(obj, setup_kwargs)
 
 
 def import_project(
     file: str,
-    local: bool = False,
     setup_kwargs: dict | None = None,
     reset_id: bool = False,
 ) -> Project:
@@ -122,8 +109,6 @@ def import_project(
     ----------
     file : str
         Path to YAML file.
-    local : bool
-        Flag to determine if backend is local.
     setup_kwargs : dict
         Setup keyword arguments passed to setup_project() function.
     reset_id : bool
@@ -140,7 +125,6 @@ def import_project(
     """
     obj = base_processor.import_project_entity(
         file=file,
-        local=local,
         reset_id=reset_id,
     )
     return setup_project(obj, setup_kwargs)
@@ -148,7 +132,6 @@ def import_project(
 
 def load_project(
     file: str,
-    local: bool = False,
     setup_kwargs: dict | None = None,
 ) -> Project:
     """
@@ -158,8 +141,6 @@ def load_project(
     ----------
     file : str
         Path to YAML file.
-    local : bool
-        Flag to determine if backend is local.
     setup_kwargs : dict
         Setup keyword arguments passed to setup_project() function.
 
@@ -172,34 +153,30 @@ def load_project(
     --------
     >>> obj = load_project("my-project.yaml")
     """
-    obj = base_processor.load_project_entity(file=file, local=local)
+    obj = base_processor.load_project_entity(file=file)
     return setup_project(obj, setup_kwargs)
 
 
-def list_projects(local: bool = False) -> list[Project]:
+def list_projects() -> list[Project]:
     """
     List projects in backend.
 
-    Parameters
-    ----------
-    local : bool
-        Flag to determine if backend is local.
 
     Returns
     -------
     list
         List of objects.
     """
-    return base_processor.list_project_entities(local=local)
+    return base_processor.list_project_entities()
 
 
 def get_or_create_project(
     name: str,
-    local: bool = False,
+    description: str | None = None,
+    labels: list[str] | None = None,
     config: dict | None = None,
     context: str | None = None,
     setup_kwargs: dict | None = None,
-    **kwargs,
 ) -> Project:
     """
     Try to get project. If not exists, create it.
@@ -208,8 +185,6 @@ def get_or_create_project(
     ----------
     name : str
         Project name.
-    local : bool
-        Flag to determine if backend is local.
     config : dict
         DHCore environment configuration.
     context : str
@@ -227,22 +202,20 @@ def get_or_create_project(
     try:
         return get_project(
             name,
-            local=local,
             setup_kwargs=setup_kwargs,
-            **kwargs,
         )
     except BackendError:
         return new_project(
             name,
-            local=local,
+            description=description,
+            labels=labels,
             config=config,
             setup_kwargs=setup_kwargs,
             context=context,
-            **kwargs,
         )
 
 
-def update_project(entity: Project, **kwargs) -> Project:
+def update_project(entity: Project) -> Project:
     """
     Update object. Note that object spec are immutable.
 
@@ -250,8 +223,6 @@ def update_project(entity: Project, **kwargs) -> Project:
     ----------
     entity : Project
         Object to update.
-    **kwargs : dict
-        Parameters to pass to the API call.
 
     Returns
     -------
@@ -266,8 +237,6 @@ def update_project(entity: Project, **kwargs) -> Project:
         entity_type=entity.ENTITY_TYPE,
         entity_name=entity.name,
         entity_dict=entity.to_dict(),
-        local=entity._client.is_local(),
-        **kwargs,
     )
 
 
@@ -275,7 +244,6 @@ def delete_project(
     name: str,
     cascade: bool = True,
     clean_context: bool = True,
-    local: bool = False,
 ) -> dict:
     """
     Delete a project.
@@ -288,8 +256,6 @@ def delete_project(
         Flag to determine if delete is cascading.
     clean_context : bool
         Flag to determine if context will be deleted.
-    local : bool
-        Flag to determine if backend is local.
 
     Returns
     -------
@@ -303,7 +269,6 @@ def delete_project(
     return base_processor.delete_project_entity(
         entity_type=ENTITY_TYPE,
         entity_name=name,
-        local=local,
         cascade=cascade,
         clean_context=clean_context,
     )

digitalhub/entities/project/utils.py

@@ -12,6 +12,10 @@ from digitalhub.utils.generic_utils import import_function
 if typing.TYPE_CHECKING:
     from digitalhub.entities.project._base.entity import Project
 
+CHECK_FILENAME = ".CHECK"
+SETUP_MODULE = "setup_project.py"
+SETUP_FUNCTION = "setup"
+
 
 def setup_project(project: Project, setup_kwargs: dict | None = None) -> Project:
     """
@@ -30,10 +34,10 @@ def setup_project(project: Project, setup_kwargs: dict | None = None) -> Project
         Set up project.
     """
     setup_kwargs = setup_kwargs if setup_kwargs is not None else {}
-    check_pth = Path(project.spec.context, ".CHECK")
-    setup_pth = Path(project.spec.context, "setup_project.py")
+    check_pth = Path(project.spec.source, CHECK_FILENAME)
+    setup_pth = Path(project.spec.source, SETUP_MODULE)
     if setup_pth.exists() and not check_pth.exists():
-        setup_fnc = import_function(setup_pth, "setup")
+        setup_fnc = import_function(setup_pth, SETUP_FUNCTION)
         project = setup_fnc(project, **setup_kwargs)
         check_pth.touch()
     return project

digitalhub/entities/workflow/_base/entity.py

@@ -9,7 +9,6 @@ import typing
 from digitalhub.entities._base.executable.entity import ExecutableEntity
 from digitalhub.entities._commons.enums import EntityTypes, Relationship
 from digitalhub.factory.entity import entity_factory
-from digitalhub.utils.exceptions import BackendError
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities._base.entity.metadata import Metadata
@@ -78,10 +77,6 @@ class Workflow(ExecutableEntity):
         # Create or update new task
         task = self._get_or_create_task(task_kind)
 
-        # Raise error if execution is not done by DHCore backend
-        if self._context().local:
-            raise BackendError("Cannot run workflow with local backend.")
-
         # Run task
         run = task.run(run_kind, save=False, local_execution=False, **kwargs)
 

digitalhub/stores/client/{dhcore/api_builder.py → api_builder.py}

@@ -4,15 +4,14 @@
 
 from __future__ import annotations
 
-from digitalhub.stores.client._base.api_builder import ClientApiBuilder
-from digitalhub.stores.client._base.enums import ApiCategories, BackendOperations
+from digitalhub.stores.client.enums import ApiCategories, BackendOperations
 from digitalhub.utils.exceptions import BackendError
 
 API_BASE = "/api/v1"
 API_CONTEXT = f"{API_BASE}/-"
 
 
-class ClientDHCoreApiBuilder(ClientApiBuilder):
+class ClientApiBuilder:
     """
     This class is used to build the API for the DHCore client.
     """

digitalhub/stores/client/builder.py

@@ -4,53 +4,41 @@
 
 from __future__ import annotations
 
-import typing
-
-from digitalhub.stores.client.dhcore.client import ClientDHCore
-from digitalhub.stores.client.local.client import ClientLocal
-
-if typing.TYPE_CHECKING:
-    pass
+from digitalhub.stores.client.client import Client
 
 
 class ClientBuilder:
     """
-    Client builder class.
-
-    This class is used to create two possible client instances:
-    Local and DHCore.
-    It saves the client instances in the class attributes using
-    singleton pattern.
+    Client builder class. Creates and returns client instance.
     """
 
     def __init__(self) -> None:
-        self._local = None
-        self._dhcore = None
+        self._client: Client = None
 
-    def build(self, local: bool = False, config: dict | None = None) -> ClientLocal | ClientDHCore:
+    def build(self) -> Client:
         """
         Method to create a client instance.
 
-        Parameters
-        ----------
-        local : bool, default False
-            Whether to create a local client or not.
-        config : dict
-            DHCore environment configuration.
-
         Returns
         -------
-        ClientLocal | ClientDHCore
+        Client
             Returns the client instance.
         """
-        if local:
-            if self._local is None:
-                self._local = ClientLocal()
-            return self._local
-
-        if self._dhcore is None:
-            self._dhcore = ClientDHCore(config)
-        return self._dhcore
+        if self._client is None:
+            self._client = Client()
+        return self._client
 
 
 client_builder = ClientBuilder()
+
+
+def get_client() -> Client:
+    """
+    Wrapper around ClientBuilder.build.
+
+    Returns
+    -------
+    Client
+        The client instance.
+    """
+    return client_builder.build()