digitalhub 0.14.0b3__py3-none-any.whl → 0.14.0b4__py3-none-any.whl

digitalhub/entities/_processors/context/crud.py

@@ -6,13 +6,14 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.entities._commons.enums import ApiCategories, BackendOperations
+from digitalhub.entities._commons.utils import is_valid_key
 from digitalhub.entities._processors.utils import (
     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
 
 if typing.TYPE_CHECKING:
     from digitalhub.context.context import Context
@@ -141,7 +142,7 @@ class ContextEntityCRUDProcessor:
         )
 
         if entity_id is None:
-            kwargs["entity_name"] = entity_name
+            kwargs["name"] = entity_name
         kwargs = context.client.build_parameters(
             ApiCategories.CONTEXT.value,
             BackendOperations.READ.value,
@@ -243,8 +244,6 @@ class ContextEntityCRUDProcessor:
         UnversionedEntity
             The unversioned entity object populated with backend data.
         """
-        from digitalhub.entities._commons.utils import is_valid_key
-
         if not is_valid_key(identifier):
             entity_id = identifier
         else:
@@ -300,7 +299,7 @@ class ContextEntityCRUDProcessor:
         kwargs = context.client.build_parameters(
             ApiCategories.CONTEXT.value,
             BackendOperations.READ_ALL_VERSIONS.value,
-            entity_name=entity_name,
+            name=entity_name,
             **kwargs,
         )
 
@@ -384,6 +383,11 @@ class ContextEntityCRUDProcessor:
         list[dict]
             List of entity data dictionaries from the backend.
         """
+        kwargs = context.client.build_parameters(
+            ApiCategories.CONTEXT.value,
+            BackendOperations.LIST.value,
+            **kwargs,
+        )
         api = context.client.build_api(
             ApiCategories.CONTEXT.value,
             BackendOperations.LIST.value,
@@ -561,31 +565,27 @@ class ContextEntityCRUDProcessor:
         )
 
         delete_all_versions: bool = kwargs.pop("delete_all_versions", False)
+        if delete_all_versions:
+            op = BackendOperations.DELETE_ALL_VERSIONS.value
+            kwargs["name"] = entity_name
+        else:
+            if entity_id is None:
+                raise ValueError("If `delete_all_versions` is False, `entity_id` must be provided.")
+            op = BackendOperations.DELETE.value
+
         kwargs = context.client.build_parameters(
             ApiCategories.CONTEXT.value,
-            BackendOperations.DELETE.value,
-            entity_id=entity_id,
-            entity_name=entity_name,
-            cascade=kwargs.pop("cascade", None),
-            delete_all_versions=delete_all_versions,
+            op,
             **kwargs,
         )
 
-        if delete_all_versions:
-            api = context.client.build_api(
-                ApiCategories.CONTEXT.value,
-                BackendOperations.LIST.value,
-                project=context.name,
-                entity_type=entity_type,
-            )
-        else:
-            api = context.client.build_api(
-                ApiCategories.CONTEXT.value,
-                BackendOperations.DELETE.value,
-                project=context.name,
-                entity_type=entity_type,
-                entity_id=entity_id,
-            )
+        api = context.client.build_api(
+            ApiCategories.CONTEXT.value,
+            op,
+            project=context.name,
+            entity_type=entity_type,
+            entity_id=entity_id,
+        )
         return context.client.delete_object(api, **kwargs)
 
     def delete_context_entity(

digitalhub/entities/_processors/context/special_ops.py

@@ -7,8 +7,8 @@ from __future__ import annotations
 import typing
 from typing import Any
 
-from digitalhub.entities._commons.enums import ApiCategories, BackendOperations
 from digitalhub.entities._processors.utils import get_context_from_project
+from digitalhub.stores.client._base.enums import ApiCategories, BackendOperations
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities._base.context.entity import ContextEntity

digitalhub/entities/_processors/utils.py

@@ -7,9 +7,10 @@ from __future__ import annotations
 import typing
 
 from digitalhub.context.api import get_context
-from digitalhub.entities._commons.enums import ApiCategories, BackendOperations, EntityTypes
+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
 

digitalhub/entities/artifact/crud.py

@@ -132,7 +132,6 @@ def get_artifact(
     identifier: str,
     project: str | None = None,
     entity_id: str | None = None,
-    **kwargs,
 ) -> Artifact:
     """
     Get object from backend.
@@ -145,8 +144,6 @@ def get_artifact(
         Project name.
     entity_id : str
         Entity ID.
-    **kwargs : dict
-        Parameters to pass to the API call.
 
     Returns
     -------
@@ -168,14 +165,12 @@ def get_artifact(
         entity_type=ENTITY_TYPE,
         project=project,
         entity_id=entity_id,
-        **kwargs,
     )
 
 
 def get_artifact_versions(
     identifier: str,
     project: str | None = None,
-    **kwargs,
 ) -> list[Artifact]:
     """
     Get object versions from backend.
@@ -186,8 +181,6 @@ def get_artifact_versions(
         Entity key (store://...) or entity name.
     project : str
         Project name.
-    **kwargs : dict
-        Parameters to pass to the API call.
 
     Returns
     -------
@@ -207,11 +200,20 @@ def get_artifact_versions(
         identifier=identifier,
         entity_type=ENTITY_TYPE,
         project=project,
-        **kwargs,
     )
 
 
-def list_artifacts(project: str, **kwargs) -> list[Artifact]:
+def list_artifacts(
+    project: str,
+    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,
+    version: str | None = None,
+) -> list[Artifact]:
     """
     List all latest version objects from backend.
 
@@ -219,8 +221,22 @@ def list_artifacts(project: str, **kwargs) -> list[Artifact]:
     ----------
     project : str
         Project name.
-    **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.
+    version : str
+        Object version, default is latest.
 
     Returns
     -------
@@ -234,7 +250,14 @@ def list_artifacts(project: str, **kwargs) -> list[Artifact]:
     return context_processor.list_context_entities(
         project=project,
         entity_type=ENTITY_TYPE,
-        **kwargs,
+        q=q,
+        name=name,
+        kind=kind,
+        user=user,
+        state=state,
+        created=created,
+        updated=updated,
+        version=version,
     )
 
 
@@ -328,7 +351,6 @@ def delete_artifact(
     entity_id: str | None = None,
     delete_all_versions: bool = False,
     cascade: bool = True,
-    **kwargs,
 ) -> dict:
     """
     Delete object from backend.
@@ -342,11 +364,10 @@ def delete_artifact(
     entity_id : str
         Entity ID.
     delete_all_versions : bool
-        Delete all versions of the named entity. If True, use entity name instead of entity key as identifier.
+        Delete all versions of the named entity.
+        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
     -------
@@ -370,5 +391,4 @@ def delete_artifact(
         entity_id=entity_id,
         delete_all_versions=delete_all_versions,
         cascade=cascade,
-        **kwargs,
     )

digitalhub/entities/dataitem/crud.py

@@ -161,7 +161,6 @@ def get_dataitem(
     identifier: str,
     project: str | None = None,
     entity_id: str | None = None,
-    **kwargs,
 ) -> Dataitem:
     """
     Get object from backend.
@@ -174,8 +173,6 @@ def get_dataitem(
         Project name.
     entity_id : str
         Entity ID.
-    **kwargs : dict
-        Parameters to pass to the API call.
 
     Returns
     -------
@@ -197,14 +194,12 @@ def get_dataitem(
         entity_type=ENTITY_TYPE,
         project=project,
         entity_id=entity_id,
-        **kwargs,
     )
 
 
 def get_dataitem_versions(
     identifier: str,
     project: str | None = None,
-    **kwargs,
 ) -> list[Dataitem]:
     """
     Get object versions from backend.
@@ -215,8 +210,6 @@ def get_dataitem_versions(
         Entity key (store://...) or entity name.
     project : str
         Project name.
-    **kwargs : dict
-        Parameters to pass to the API call.
 
     Returns
     -------
@@ -236,11 +229,20 @@ def get_dataitem_versions(
         identifier=identifier,
         entity_type=ENTITY_TYPE,
         project=project,
-        **kwargs,
     )
 
 
-def list_dataitems(project: str, **kwargs) -> list[Dataitem]:
+def list_dataitems(
+    project: str,
+    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,
+    version: str | None = None,
+) -> list[Dataitem]:
     """
     List all latest version objects from backend.
 
@@ -248,8 +250,22 @@ def list_dataitems(project: str, **kwargs) -> list[Dataitem]:
     ----------
     project : str
         Project name.
-    **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.
+    version : str
+        Object version, default is latest.
 
     Returns
     -------
@@ -263,7 +279,14 @@ def list_dataitems(project: str, **kwargs) -> list[Dataitem]:
     return context_processor.list_context_entities(
         project=project,
         entity_type=ENTITY_TYPE,
-        **kwargs,
+        q=q,
+        name=name,
+        kind=kind,
+        user=user,
+        state=state,
+        created=created,
+        updated=updated,
+        version=version,
     )
 
 
@@ -371,7 +394,8 @@ def delete_dataitem(
     entity_id : str
         Entity ID.
     delete_all_versions : bool
-        Delete all versions of the named entity. If True, use entity name instead of entity key as identifier.
+        Delete all versions of the named entity.
+        If True, use entity name instead of entity key as identifier.
     cascade : bool
         Cascade delete.
     **kwargs : dict

digitalhub/entities/dataitem/table/entity.py

@@ -7,6 +7,7 @@ from __future__ import annotations
 import typing
 from typing import Any
 
+from digitalhub.entities._base.material.utils import refresh_decorator
 from digitalhub.entities.dataitem._base.entity import Dataitem
 from digitalhub.stores.data.api import get_store
 from digitalhub.utils.uri_utils import has_sql_scheme
@@ -63,6 +64,7 @@ class DataitemTable(Dataitem):
         self._query = query
         return self
 
+    @refresh_decorator
     def as_df(
         self,
         file_format: str | None = None,
@@ -105,6 +107,7 @@ class DataitemTable(Dataitem):
             **kwargs,
         )
 
+    @refresh_decorator
     def write_df(
         self,
         df: Any,

digitalhub/entities/function/crud.py

@@ -76,7 +76,6 @@ def get_function(
     identifier: str,
     project: str | None = None,
     entity_id: str | None = None,
-    **kwargs,
 ) -> Function:
     """
     Get object from backend.
@@ -89,8 +88,6 @@ def get_function(
         Project name.
     entity_id : str
         Entity ID.
-    **kwargs : dict
-        Parameters to pass to the API call.
 
     Returns
     -------
@@ -108,18 +105,16 @@ def get_function(
     >>>                    entity_id="my-function-id")
     """
     return context_processor.read_context_entity(
-        identifier,
+        identifier=identifier,
         entity_type=ENTITY_TYPE,
         project=project,
         entity_id=entity_id,
-        **kwargs,
     )
 
 
 def get_function_versions(
     identifier: str,
     project: str | None = None,
-    **kwargs,
 ) -> list[Function]:
     """
     Get object versions from backend.
@@ -130,8 +125,6 @@ def get_function_versions(
         Entity key (store://...) or entity name.
     project : str
         Project name.
-    **kwargs : dict
-        Parameters to pass to the API call.
 
     Returns
     -------
@@ -148,14 +141,23 @@ def get_function_versions(
     >>>                             project="my-project")
     """
     return context_processor.read_context_entity_versions(
-        identifier,
+        identifier=identifier,
         entity_type=ENTITY_TYPE,
         project=project,
-        **kwargs,
     )
 
 
-def list_functions(project: str, **kwargs) -> list[Function]:
+def list_functions(
+    project: str,
+    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,
+    version: str | None = None,
+) -> list[Function]:
     """
     List all latest version objects from backend.
 
@@ -163,8 +165,22 @@ def list_functions(project: str, **kwargs) -> list[Function]:
     ----------
     project : str
         Project name.
-    **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.
+    version : str
+        Object version, default is latest.
 
     Returns
     -------
@@ -178,7 +194,14 @@ def list_functions(project: str, **kwargs) -> list[Function]:
     return context_processor.list_context_entities(
         project=project,
         entity_type=ENTITY_TYPE,
-        **kwargs,
+        q=q,
+        name=name,
+        kind=kind,
+        user=user,
+        state=state,
+        created=created,
+        updated=updated,
+        version=version,
     )
 
 
@@ -267,7 +290,6 @@ def delete_function(
     entity_id: str | None = None,
     delete_all_versions: bool = False,
     cascade: bool = True,
-    **kwargs,
 ) -> dict:
     """
     Delete object from backend.
@@ -281,11 +303,10 @@ def delete_function(
     entity_id : str
         Entity ID.
     delete_all_versions : bool
-        Delete all versions of the named entity. If True, use entity name instead of entity key as identifier.
+        Delete all versions of the named entity.
+        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
     -------
@@ -309,5 +330,4 @@ def delete_function(
         entity_id=entity_id,
         delete_all_versions=delete_all_versions,
         cascade=cascade,
-        **kwargs,
     )

digitalhub/entities/model/crud.py

@@ -131,7 +131,6 @@ def get_model(
     identifier: str,
     project: str | None = None,
     entity_id: str | None = None,
-    **kwargs,
 ) -> Model:
     """
     Get object from backend.
@@ -144,8 +143,6 @@ def get_model(
         Project name.
     entity_id : str
         Entity ID.
-    **kwargs : dict
-        Parameters to pass to the API call.
 
     Returns
     -------
@@ -167,14 +164,12 @@ def get_model(
         entity_type=ENTITY_TYPE,
         project=project,
         entity_id=entity_id,
-        **kwargs,
     )
 
 
 def get_model_versions(
     identifier: str,
     project: str | None = None,
-    **kwargs,
 ) -> list[Model]:
     """
     Get object versions from backend.
@@ -185,8 +180,6 @@ def get_model_versions(
         Entity key (store://...) or entity name.
     project : str
         Project name.
-    **kwargs : dict
-        Parameters to pass to the API call.
 
     Returns
     -------
@@ -206,11 +199,20 @@ def get_model_versions(
         identifier=identifier,
         entity_type=ENTITY_TYPE,
         project=project,
-        **kwargs,
     )
 
 
-def list_models(project: str, **kwargs) -> list[Model]:
+def list_models(
+    project: str,
+    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,
+    version: str | None = None,
+) -> list[Model]:
     """
     List all latest version objects from backend.
 
@@ -218,8 +220,22 @@ def list_models(project: str, **kwargs) -> list[Model]:
     ----------
     project : str
         Project name.
-    **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.
+    version : str
+        Object version, default is latest.
 
     Returns
     -------
@@ -233,7 +249,14 @@ def list_models(project: str, **kwargs) -> list[Model]:
     return context_processor.list_context_entities(
         project=project,
         entity_type=ENTITY_TYPE,
-        **kwargs,
+        q=q,
+        name=name,
+        kind=kind,
+        user=user,
+        state=state,
+        created=created,
+        updated=updated,
+        version=version,
     )
 
 
@@ -327,7 +350,6 @@ def delete_model(
     entity_id: str | None = None,
     delete_all_versions: bool = False,
     cascade: bool = True,
-    **kwargs,
 ) -> dict:
     """
     Delete object from backend.
@@ -341,11 +363,10 @@ def delete_model(
     entity_id : str
         Entity ID.
     delete_all_versions : bool
-        Delete all versions of the named entity. If True, use entity name instead of entity key as identifier.
+        Delete all versions of the named entity.
+        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
     -------
@@ -369,5 +390,4 @@ def delete_model(
         entity_id=entity_id,
         delete_all_versions=delete_all_versions,
         cascade=cascade,
-        **kwargs,
     )

digitalhub/entities/project/_base/entity.py

@@ -2120,7 +2120,7 @@ class Project(Entity):
     def delete_run(
         self,
         identifier: str,
-        **kwargs,
+        entity_id: str,
     ) -> None:
         """
         Delete run from backend.
@@ -2128,9 +2128,9 @@ class Project(Entity):
         Parameters
         ----------
         identifier : str
-            Entity key (store://...) or entity ID.
-        **kwargs : dict
-            Parameters to pass to the API call.
+            Entity key (store://...) or entity name.
+        entity_id : str
+            Entity ID.
 
         Returns
         -------
@@ -2145,7 +2145,7 @@ class Project(Entity):
         delete_run(
             identifier=identifier,
             project=self.name,
-            **kwargs,
+            entity_id=entity_id,
         )
         self.refresh()