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

digitalhub/entities/model/crud.py

@@ -7,7 +7,7 @@ from __future__ import annotations
 import typing
 
 from digitalhub.entities._commons.enums import EntityTypes
-from digitalhub.entities._processors.context import context_processor
+from digitalhub.entities._processors.processors import context_processor
 from digitalhub.entities.model.utils import eval_source, process_kwargs
 from digitalhub.utils.types import SourcesOrListOfSources
 
@@ -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
     -------
@@ -155,9 +152,7 @@ def get_model(
     Examples
     --------
     Using entity key:
-    >>> obj = get_model(
-    ...     "store://my-model-key"
-    ... )
+    >>> obj = get_model("store://my-model-key")
 
     Using entity name:
     >>> obj = get_model("my-model-name"
@@ -169,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.
@@ -187,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
     -------
@@ -198,9 +189,7 @@ def get_model_versions(
     Examples
     --------
     Using entity key:
-    >>> objs = get_model_versions(
-    ...     "store://my-model-key"
-    ... )
+    >>> objs = get_model_versions("store://my-model-key")
 
     Using entity name:
     >>> objs = get_model_versions("my-model-name",
@@ -210,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.
 
@@ -222,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
     -------
@@ -232,14 +244,19 @@ def list_models(project: str, **kwargs) -> list[Model]:
 
     Examples
     --------
-    >>> objs = list_models(
-    ...     project="my-project"
-    ... )
+    >>> objs = list_models(project="my-project")
     """
     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,
     )
 
 
@@ -270,9 +287,7 @@ def import_model(
 
     Examples
     --------
-    >>> obj = import_model(
-    ...     "my-model.yaml"
-    ... )
+    >>> obj = import_model("my-model.yaml")
     """
     return context_processor.import_context_entity(
         file,
@@ -298,9 +313,7 @@ def load_model(file: str) -> Model:
 
     Examples
     --------
-    >>> obj = load_model(
-    ...     "my-model.yaml"
-    ... )
+    >>> obj = load_model("my-model.yaml")
     """
     return context_processor.load_context_entity(file)
 
@@ -321,9 +334,7 @@ def update_model(entity: Model) -> Model:
 
     Examples
     --------
-    >>> obj = get_model(
-    ...     "store://my-model-key"
-    ... )
+    >>> obj = get_model("store://my-model-key")
     """
     return context_processor.update_context_entity(
         project=entity.project,
@@ -339,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.
@@ -353,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
     -------
@@ -367,9 +376,7 @@ def delete_model(
     Examples
     --------
     If delete_all_versions is False:
-    >>> obj = delete_model(
-    ...     "store://my-model-key"
-    ... )
+    >>> obj = delete_model("store://my-model-key")
 
     Otherwise:
     >>> obj = delete_model("my-model-name",
@@ -383,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

@@ -12,8 +12,7 @@ from digitalhub.context.api import build_context
 from digitalhub.entities._base.entity.entity import Entity
 from digitalhub.entities._commons.enums import EntityTypes
 from digitalhub.entities._constructors.uuid import build_uuid
-from digitalhub.entities._processors.base import base_processor
-from digitalhub.entities._processors.context import context_processor
+from digitalhub.entities._processors.processors import base_processor, context_processor
 from digitalhub.entities.artifact.crud import (
     delete_artifact,
     get_artifact,
@@ -299,10 +298,6 @@ class Project(Entity):
         ----------
         obj : dict
             Project object in dictionary format.
-
-        Returns
-        -------
-        None
         """
         entity_types = self._get_entity_types()
 
@@ -362,10 +357,6 @@ class Project(Entity):
         ----------
         obj : dict
             Project object in dictionary format.
-
-        Returns
-        -------
-        None
         """
         entity_types = self._get_entity_types()
 
@@ -563,9 +554,7 @@ class Project(Entity):
         Examples
         --------
         Using entity key:
-        >>> obj = project.get_artifact(
-        ...     "store://my-artifact-key"
-        ... )
+        >>> obj = project.get_artifact("store://my-artifact-key")
 
         Using entity name:
         >>> obj = project.get_artifact("my-artifact-name"
@@ -603,14 +592,10 @@ class Project(Entity):
         Examples
         --------
         Using entity key:
-        >>> obj = project.get_artifact_versions(
-        ...     "store://my-artifact-key"
-        ... )
+        >>> obj = project.get_artifact_versions("store://my-artifact-key")
 
         Using entity name:
-        >>> obj = project.get_artifact_versions(
-        ...     "my-artifact-name"
-        ... )
+        >>> obj = project.get_artifact_versions("my-artifact-name")
         """
         return get_artifact_versions(identifier, project=self.name, **kwargs)
 
@@ -659,9 +644,7 @@ class Project(Entity):
 
         Examples
         --------
-        >>> obj = project.import_artifact(
-        ...     "my-artifact.yaml"
-        ... )
+        >>> obj = project.import_artifact("my-artifact.yaml")
         """
         return import_artifact(file, key, reset_id, self.name)
 
@@ -681,9 +664,7 @@ class Project(Entity):
 
         Examples
         --------
-        >>> obj = project.update_artifact(
-        ...     obj
-        ... )
+        >>> obj = project.update_artifact(obj)
         """
         if entity.project != self.name:
             raise ValueError(f"Entity {entity.name} is not in project {self.name}.")
@@ -718,9 +699,7 @@ class Project(Entity):
         Examples
         --------
         If delete_all_versions is False:
-        >>> project.delete_artifact(
-        ...     "store://my-artifact-key"
-        ... )
+        >>> project.delete_artifact("store://my-artifact-key")
 
         Otherwise:
         >>> project.delete_artifact("my-artifact-name",
@@ -881,9 +860,7 @@ class Project(Entity):
         Examples
         --------
         Using entity key:
-        >>> obj = project.get_dataitem(
-        ...     "store://my-dataitem-key"
-        ... )
+        >>> obj = project.get_dataitem("store://my-dataitem-key")
 
         Using entity name:
         >>> obj = project.get_dataitem("my-dataitem-name"
@@ -921,14 +898,10 @@ class Project(Entity):
         Examples
         --------
         Using entity key:
-        >>> obj = project.get_dataitem_versions(
-        ...     "store://my-dataitem-key"
-        ... )
+        >>> obj = project.get_dataitem_versions("store://my-dataitem-key")
 
         Using entity name:
-        >>> obj = project.get_dataitem_versions(
-        ...     "my-dataitem-name"
-        ... )
+        >>> obj = project.get_dataitem_versions("my-dataitem-name")
         """
         return get_dataitem_versions(identifier, project=self.name, **kwargs)
 
@@ -977,9 +950,7 @@ class Project(Entity):
 
         Examples
         --------
-        >>> obj = project.import_dataitem(
-        ...     "my-dataitem.yaml"
-        ... )
+        >>> obj = project.import_dataitem("my-dataitem.yaml")
         """
         return import_dataitem(file, key, reset_id, self.name)
 
@@ -999,9 +970,7 @@ class Project(Entity):
 
         Examples
         --------
-        >>> obj = project.update_dataitem(
-        ...     obj
-        ... )
+        >>> obj = project.update_dataitem(obj)
         """
         if entity.project != self.name:
             raise ValueError(f"Entity {entity.name} is not in project {self.name}.")
@@ -1036,9 +1005,7 @@ class Project(Entity):
         Examples
         --------
         If delete_all_versions is False:
-        >>> project.delete_dataitem(
-        ...     "store://my-dataitem-key"
-        ... )
+        >>> project.delete_dataitem("store://my-dataitem-key")
 
         Otherwise:
         >>> project.delete_dataitem("my-dataitem-name",
@@ -1188,9 +1155,7 @@ class Project(Entity):
         Examples
         --------
         Using entity key:
-        >>> obj = project.get_model(
-        ...     "store://my-model-key"
-        ... )
+        >>> obj = project.get_model("store://my-model-key")
 
         Using entity name:
         >>> obj = project.get_model("my-model-name"
@@ -1228,14 +1193,10 @@ class Project(Entity):
         Examples
         --------
         Using entity key:
-        >>> obj = project.get_model_versions(
-        ...     "store://my-model-key"
-        ... )
+        >>> obj = project.get_model_versions("store://my-model-key")
 
         Using entity name:
-        >>> obj = project.get_model_versions(
-        ...     "my-model-name"
-        ... )
+        >>> obj = project.get_model_versions("my-model-name")
         """
         return get_model_versions(identifier, project=self.name, **kwargs)
 
@@ -1284,9 +1245,7 @@ class Project(Entity):
 
         Examples
         --------
-        >>> obj = project.import_model(
-        ...     "my-model.yaml"
-        ... )
+        >>> obj = project.import_model("my-model.yaml")
         """
         return import_model(file, key, reset_id, self.name)
 
@@ -1306,9 +1265,7 @@ class Project(Entity):
 
         Examples
         --------
-        >>> obj = project.update_model(
-        ...     obj
-        ... )
+        >>> obj = project.update_model(obj)
         """
         if entity.project != self.name:
             raise ValueError(f"Entity {entity.name} is not in project {self.name}.")
@@ -1343,9 +1300,7 @@ class Project(Entity):
         Examples
         --------
         If delete_all_versions is False:
-        >>> project.delete_model(
-        ...     "store://my-model-key"
-        ... )
+        >>> project.delete_model("store://my-model-key")
 
         Otherwise:
         >>> project.delete_model("my-model-name",
@@ -1446,9 +1401,7 @@ class Project(Entity):
         Examples
         --------
         Using entity key:
-        >>> obj = project.get_function(
-        ...     "store://my-function-key"
-        ... )
+        >>> obj = project.get_function("store://my-function-key")
 
         Using entity name:
         >>> obj = project.get_function("my-function-name"
@@ -1486,14 +1439,10 @@ class Project(Entity):
         Examples
         --------
         Using entity key:
-        >>> obj = project.get_function_versions(
-        ...     "store://my-function-key"
-        ... )
+        >>> obj = project.get_function_versions("store://my-function-key")
 
         Using entity name:
-        >>> obj = project.get_function_versions(
-        ...     "my-function-name"
-        ... )
+        >>> obj = project.get_function_versions("my-function-name")
         """
         return get_function_versions(identifier, project=self.name, **kwargs)
 
@@ -1542,9 +1491,7 @@ class Project(Entity):
 
         Examples
         --------
-        >>> obj = project.import_function(
-        ...     "my-function.yaml"
-        ... )
+        >>> obj = project.import_function("my-function.yaml")
         """
         return import_function(file, key, reset_id, self.name)
 
@@ -1564,9 +1511,7 @@ class Project(Entity):
 
         Examples
         --------
-        >>> obj = project.update_function(
-        ...     obj
-        ... )
+        >>> obj = project.update_function(obj)
         """
         if entity.project != self.name:
             raise ValueError(f"Entity {entity.name} is not in project {self.name}.")
@@ -1604,9 +1549,7 @@ class Project(Entity):
         Examples
         --------
         If delete_all_versions is False:
-        >>> project.delete_function(
-        ...     "store://my-function-key"
-        ... )
+        >>> project.delete_function("store://my-function-key")
 
         Otherwise:
         >>> project.delete_function("my-function-name",
@@ -1707,9 +1650,7 @@ class Project(Entity):
         Examples
         --------
         Using entity key:
-        >>> obj = project.get_workflow(
-        ...     "store://my-workflow-key"
-        ... )
+        >>> obj = project.get_workflow("store://my-workflow-key")
 
         Using entity name:
         >>> obj = project.get_workflow("my-workflow-name"
@@ -1747,14 +1688,10 @@ class Project(Entity):
         Examples
         --------
         Using entity key:
-        >>> obj = project.get_workflow_versions(
-        ...     "store://my-workflow-key"
-        ... )
+        >>> obj = project.get_workflow_versions("store://my-workflow-key")
 
         Using entity name:
-        >>> obj = project.get_workflow_versions(
-        ...     "my-workflow-name"
-        ... )
+        >>> obj = project.get_workflow_versions("my-workflow-name")
         """
         return get_workflow_versions(identifier, project=self.name, **kwargs)
 
@@ -1803,9 +1740,7 @@ class Project(Entity):
 
         Examples
         --------
-        >>> obj = project.import_workflow(
-        ...     "my-workflow.yaml"
-        ... )
+        >>> obj = project.import_workflow("my-workflow.yaml")
         """
         return import_workflow(file, key, reset_id, self.name)
 
@@ -1825,9 +1760,7 @@ class Project(Entity):
 
         Examples
         --------
-        >>> obj = project.update_workflow(
-        ...     obj
-        ... )
+        >>> obj = project.update_workflow(obj)
         """
         if entity.project != self.name:
             raise ValueError(f"Entity {entity.name} is not in project {self.name}.")
@@ -1865,9 +1798,7 @@ class Project(Entity):
         Examples
         --------
         If delete_all_versions is False:
-        >>> project.delete_workflow(
-        ...     "store://my-workflow-key"
-        ... )
+        >>> project.delete_workflow("store://my-workflow-key")
 
         Otherwise:
         >>> project.delete_workflow("my-workflow-name",
@@ -1966,9 +1897,7 @@ class Project(Entity):
         Examples
         --------
         Using entity key:
-        >>> obj = project.get_secret(
-        ...     "store://my-secret-key"
-        ... )
+        >>> obj = project.get_secret("store://my-secret-key")
 
         Using entity name:
         >>> obj = project.get_secret("my-secret-name"
@@ -2006,14 +1935,10 @@ class Project(Entity):
         Examples
         --------
         Using entity key:
-        >>> obj = project.get_secret_versions(
-        ...     "store://my-secret-key"
-        ... )
+        >>> obj = project.get_secret_versions("store://my-secret-key")
 
         Using entity name:
-        >>> obj = project.get_secret_versions(
-        ...     "my-secret-name"
-        ... )
+        >>> obj = project.get_secret_versions("my-secret-name")
         """
         return get_secret_versions(identifier, project=self.name, **kwargs)
 
@@ -2062,9 +1987,7 @@ class Project(Entity):
 
         Examples
         --------
-        >>> obj = project.import_secret(
-        ...     "my-secret.yaml"
-        ... )
+        >>> obj = project.import_secret("my-secret.yaml")
         """
         return import_secret(file, key, reset_id, self.name)
 
@@ -2084,9 +2007,7 @@ class Project(Entity):
 
         Examples
         --------
-        >>> obj = project.update_secret(
-        ...     obj
-        ... )
+        >>> obj = project.update_secret(obj)
         """
         if entity.project != self.name:
             raise ValueError(f"Entity {entity.name} is not in project {self.name}.")
@@ -2121,9 +2042,7 @@ class Project(Entity):
         Examples
         --------
         If delete_all_versions is False:
-        >>> project.delete_secret(
-        ...     "store://my-secret-key"
-        ... )
+        >>> project.delete_secret("store://my-secret-key")
 
         Otherwise:
         >>> project.delete_secret("my-secret-name",
@@ -2165,16 +2084,10 @@ class Project(Entity):
         Examples
         --------
         Using entity key:
-        >>> obj = project.get_run(
-        ...     "store://my-secret-key"
-        ... )
+        >>> obj = project.get_run("store://my-secret-key")
 
         Using entity ID:
-        >>> obj = (
-        ...     project.get_run(
-        ...         "123"
-        ...     )
-        ... )
+        >>> obj = project.get_run("123")
         """
         obj = get_run(
             identifier=identifier,
@@ -2207,7 +2120,7 @@ class Project(Entity):
     def delete_run(
         self,
         identifier: str,
-        **kwargs,
+        entity_id: str,
     ) -> None:
         """
         Delete run from backend.
@@ -2215,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
         -------
@@ -2226,15 +2139,13 @@ class Project(Entity):
 
         Examples
         --------
-        >>> project.delete_run(
-        ...     "store://my-run-key"
-        ... )
+        >>> project.delete_run("store://my-run-key")
 
         """
         delete_run(
             identifier=identifier,
             project=self.name,
-            **kwargs,
+            entity_id=entity_id,
         )
         self.refresh()