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

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

@@ -6,7 +6,7 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.entities._commons.enums import EntityTypes
+from digitalhub.entities._commons.enums import EntityKinds, EntityTypes
 from digitalhub.entities._processors.processors import base_processor, context_processor
 from digitalhub.entities.project.utils import setup_project
 from digitalhub.utils.exceptions import BackendError
@@ -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,
+    source: 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
+    source : str
         The context local folder of the project.
     setup_kwargs : dict
         Setup keyword arguments passed to setup_project() function.
-    **kwargs : dict
-        Keyword arguments.
 
     Returns
     -------
@@ -60,24 +54,21 @@ def new_project(
     --------
     >>> obj = new_project("my-project")
     """
-    if context is None:
-        context = "./"
+    if source is None:
+        source = "./"
     obj = base_processor.create_project_entity(
         name=name,
-        kind="project",
+        kind=EntityKinds.PROJECT_PROJECT.value,
         description=description,
         labels=labels,
-        local=local,
         config=config,
-        context=context,
-        **kwargs,
+        source=source,
     )
     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(ENTITY_TYPE)
 
 
 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,
+            source=context,
         )
 
 
-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/secret/crud.py

@@ -6,7 +6,7 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.entities._commons.enums import EntityTypes
+from digitalhub.entities._commons.enums import EntityKinds, EntityTypes
 from digitalhub.entities._commons.utils import is_valid_key
 from digitalhub.entities._processors.processors import context_processor
 from digitalhub.utils.exceptions import EntityNotExistsError
@@ -66,7 +66,7 @@ def new_secret(
     obj: Secret = context_processor.create_context_entity(
         project=project,
         name=name,
-        kind="secret",
+        kind=EntityKinds.SECRET_SECRET.value,
         uuid=uuid,
         description=description,
         labels=labels,

digitalhub/entities/task/_base/models.py

@@ -18,6 +18,7 @@ class VolumeType(Enum):
     PERSISTENT_VOLUME_CLAIM = "persistent_volume_claim"
     EMPTY_DIR = "empty_dir"
     EPHEMERAL = "ephemeral"
+    SHARED_VOLUME = "shared_volume"
 
 
 class SpecEmptyDir(BaseModel):
@@ -46,6 +47,14 @@ class SpecEphemeral(BaseModel):
     size: Optional[str] = None
 
 
+class SharedVolumeSpec(BaseModel):
+    """
+    Shared volume spec model.
+    """
+
+    size: Optional[str] = None
+
+
 class Volume(BaseModel):
     """
     Volume model.
@@ -62,7 +71,7 @@ class Volume(BaseModel):
     mount_path: str
     """Volume mount path inside the container."""
 
-    spec: Optional[Union[SpecEmptyDir, SpecPVC, SpecEphemeral]] = None
+    spec: Optional[Union[SpecEmptyDir, SpecPVC, SpecEphemeral, SharedVolumeSpec]] = None
     """Volume spec."""
 
 
@@ -78,30 +87,18 @@ class NodeSelector(BaseModel):
     """Node selector value."""
 
 
-class ResourceItem(BaseModel):
-    """
-    Resource item model.
-    """
-
-    requests: str = Field(default=None, pattern=r"[\d]+|^([0-9])+([a-zA-Z])+$")
-    """Resource requests."""
-
-    limits: str = Field(default=None, pattern=r"[\d]+|^([0-9])+([a-zA-Z])+$")
-    """Resource limits."""
-
-
 class Resource(BaseModel):
     """
     Resource model.
     """
 
-    cpu: Optional[ResourceItem] = None
+    cpu: Optional[str] = Field(default=None, pattern=r"[\d]+|^([0-9])+([a-zA-Z])+$")
     """CPU resource model."""
 
-    mem: Optional[ResourceItem] = None
+    mem: Optional[str] = Field(default=None, pattern=r"[\d]+|^([0-9])+([a-zA-Z])+$")
     """Memory resource model."""
 
-    gpu: Optional[ResourceItem] = None
+    gpu: Optional[str] = Field(default=None, pattern=r"[\d]+|^([0-9])+([a-zA-Z])+$")
     """GPU resource model."""
 
 

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,
@@ -171,7 +190,7 @@ def list_triggers(
     state: 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]:
     """
@@ -195,7 +214,7 @@ def list_triggers(
         Creation date filter.
     updated : str
         Update date filter.
-    version : str
+    versions : str
         Object version, default is latest.
     task : str
         Task string filter.
@@ -219,7 +238,7 @@ def list_triggers(
         state=state,
         created=created,
         updated=updated,
-        version=version,
+        versions=versions,
         task=task,
     )
 

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/entities/workflow/crud.py

@@ -155,7 +155,7 @@ def list_workflows(
     state: str | None = None,
     created: str | None = None,
     updated: str | None = None,
-    version: str | None = None,
+    versions: str | None = None,
 ) -> list[Workflow]:
     """
     List all latest version objects from backend.
@@ -178,7 +178,7 @@ def list_workflows(
         Creation date filter.
     updated : str
         Update date filter.
-    version : str
+    versions : str
         Object version, default is latest.
 
     Returns
@@ -200,7 +200,7 @@ def list_workflows(
         state=state,
         created=created,
         updated=updated,
-        version=version,
+        versions=versions,
     )
 
 
@@ -289,7 +289,6 @@ def delete_workflow(
     entity_id: str | None = None,
     delete_all_versions: bool = False,
     cascade: bool = True,
-    **kwargs,
 ) -> dict:
     """
     Delete object from backend.
@@ -307,8 +306,6 @@ def delete_workflow(
         If True, use entity name instead of entity key as identifier.
     cascade : bool
         Cascade delete.
-    **kwargs : dict
-        Parameters to pass to the API call.
 
     Returns
     -------

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, optional
-            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()