digitalhub 0.8.0b7__py3-none-any.whl → 0.8.0b10__py3-none-any.whl

digitalhub/entities/_base/entity/entity.py

@@ -69,7 +69,7 @@ class Entity(Base, metaclass=ABCMeta):
         -------
         None
         """
-        new_obj = build_entity_from_dict(self.kind, obj)
+        new_obj = build_entity_from_dict(obj)
         self.metadata = new_obj.metadata
         self.spec = new_obj.spec
         self.status = new_obj.status

digitalhub/entities/_base/executable/entity.py

@@ -2,11 +2,12 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.entities._base.crud import list_entity_api_ctx
+from digitalhub.entities._base.api_utils import list_entity_api_ctx
 from digitalhub.entities._base.versioned.entity import VersionedEntity
 from digitalhub.entities.run.crud import delete_run, get_run, list_runs
-from digitalhub.entities.task.crud import delete_task, task_from_dict, task_from_parameters
+from digitalhub.entities.task.crud import delete_task
 from digitalhub.entities.utils.entity_types import EntityTypes
+from digitalhub.factory.api import build_entity_from_dict, build_entity_from_params
 from digitalhub.utils.exceptions import EntityAlreadyExistsError, EntityError
 
 if typing.TYPE_CHECKING:
@@ -101,7 +102,7 @@ class ExecutableEntity(VersionedEntity):
             # Create a new object from dictionary.
             # the form in which tasks are stored in function
             # status
-            task_obj = task_from_dict(task)
+            task_obj = build_entity_from_dict(task)
 
             # Try to save it in backend to been able to use
             # it for launching runs. In fact, tasks must be
@@ -144,7 +145,7 @@ class ExecutableEntity(VersionedEntity):
         kwargs["kind"] = task_kind
 
         # Create object instance
-        task = task_from_parameters(**kwargs)
+        task = build_entity_from_params(**kwargs)
         task.save()
 
         self._tasks[task_kind] = task
@@ -175,7 +176,7 @@ class ExecutableEntity(VersionedEntity):
             resp = self._get_task_from_backend(kind)
             if not resp:
                 raise EntityError(f"Task {kind} is not created")
-            self._tasks[kind] = task_from_dict(resp[0])
+            self._tasks[kind] = build_entity_from_dict(resp[0])
             return self._tasks[kind]
 
     def update_task(self, kind: str, **kwargs) -> Task:
@@ -206,7 +207,7 @@ class ExecutableEntity(VersionedEntity):
         kwargs["uuid"] = self._tasks[kind].id
 
         # Update task
-        task = task_from_parameters(**kwargs)
+        task = build_entity_from_params(**kwargs)
         task.save(update=True)
         self._tasks[kind] = task
         return task

digitalhub/entities/_base/material/entity.py

@@ -3,9 +3,9 @@ from __future__ import annotations
 import typing
 from pathlib import Path
 
-from digitalhub.entities._base.crud import files_info_get_api, files_info_put_api
+from digitalhub.entities._base.api_utils import files_info_get_api, files_info_put_api
 from digitalhub.entities._base.versioned.entity import VersionedEntity
-from digitalhub.stores.builder import get_store
+from digitalhub.stores.api import get_store
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities._base.entity.metadata import Metadata

digitalhub/entities/artifact/crud.py

@@ -2,19 +2,18 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.context.builder import check_context
 from digitalhub.entities._base.crud import (
-    delete_entity_api_ctx,
-    list_entity_api_ctx,
-    read_entity_api_ctx,
-    read_entity_api_ctx_versions,
+    delete_entity,
+    get_material_entity,
+    get_material_entity_versions,
+    import_context_entity,
+    list_material_entities,
+    new_context_entity,
 )
 from digitalhub.entities._base.entity._constructors.uuid import build_uuid
-from digitalhub.entities.artifact.builder import artifact_from_dict, artifact_from_parameters
+from digitalhub.entities.artifact._base.entity import Artifact
 from digitalhub.entities.utils.entity_types import EntityTypes
 from digitalhub.entities.utils.utils import build_log_path_from_source, eval_local_source
-from digitalhub.utils.exceptions import EntityAlreadyExistsError
-from digitalhub.utils.io_utils import read_yaml
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities.artifact._base.entity import Artifact
@@ -70,8 +69,7 @@ def new_artifact(
     >>>                    kind="artifact",
     >>>                    path="s3://my-bucket/my-key")
     """
-    check_context(project)
-    obj = artifact_from_parameters(
+    return new_context_entity(
         project=project,
         name=name,
         kind=kind,
@@ -82,8 +80,6 @@ def new_artifact(
         path=path,
         **kwargs,
     )
-    obj.save()
-    return obj
 
 
 def log_artifact(
@@ -171,16 +167,13 @@ def get_artifact(
     >>>                    project="my-project",
     >>>                    entity_id="my-artifact-id")
     """
-    obj = read_entity_api_ctx(
-        identifier,
-        ENTITY_TYPE,
+    return get_material_entity(
+        identifier=identifier,
+        entity_type=ENTITY_TYPE,
         project=project,
         entity_id=entity_id,
         **kwargs,
     )
-    entity = artifact_from_dict(obj)
-    entity._get_files_info()
-    return entity
 
 
 def get_artifact_versions(
@@ -214,18 +207,12 @@ def get_artifact_versions(
     >>> obj = get_artifact_versions("my-artifact-name"
     >>>                             project="my-project")
     """
-    objs = read_entity_api_ctx_versions(
-        identifier,
+    return get_material_entity_versions(
+        identifier=identifier,
         entity_type=ENTITY_TYPE,
         project=project,
         **kwargs,
     )
-    objects = []
-    for o in objs:
-        entity = artifact_from_dict(o)
-        entity._get_files_info()
-        objects.append(entity)
-    return objects
 
 
 def list_artifacts(project: str, **kwargs) -> list[Artifact]:
@@ -248,17 +235,11 @@ def list_artifacts(project: str, **kwargs) -> list[Artifact]:
     --------
     >>> objs = list_artifacts(project="my-project")
     """
-    objs = list_entity_api_ctx(
+    return list_material_entities(
         project=project,
         entity_type=ENTITY_TYPE,
         **kwargs,
     )
-    objects = []
-    for o in objs:
-        entity = artifact_from_dict(o)
-        entity._get_files_info()
-        objects.append(entity)
-    return objects
 
 
 def import_artifact(file: str) -> Artifact:
@@ -279,14 +260,7 @@ def import_artifact(file: str) -> Artifact:
     --------
     >>> obj = import_artifact("my-artifact.yaml")
     """
-    dict_obj: dict = read_yaml(file)
-    obj = artifact_from_dict(dict_obj)
-    try:
-        obj.save()
-    except EntityAlreadyExistsError:
-        pass
-    finally:
-        return obj
+    return import_context_entity(file)
 
 
 def update_artifact(entity: Artifact) -> Artifact:
@@ -348,7 +322,7 @@ def delete_artifact(
     >>>                  project="my-project",
     >>>                  delete_all_versions=True)
     """
-    return delete_entity_api_ctx(
+    return delete_entity(
         identifier=identifier,
         entity_type=ENTITY_TYPE,
         project=project,

digitalhub/entities/dataitem/crud.py

@@ -5,22 +5,21 @@ from pathlib import Path
 from typing import Any
 from urllib.parse import urlparse
 
-from digitalhub.context.builder import check_context
 from digitalhub.entities._base.crud import (
-    delete_entity_api_ctx,
-    list_entity_api_ctx,
-    read_entity_api_ctx,
-    read_entity_api_ctx_versions,
+    delete_entity,
+    get_material_entity,
+    get_material_entity_versions,
+    import_context_entity,
+    list_material_entities,
+    new_context_entity,
 )
 from digitalhub.entities._base.entity._constructors.uuid import build_uuid
-from digitalhub.entities.dataitem.builder import dataitem_from_dict, dataitem_from_parameters
 from digitalhub.entities.utils.entity_types import EntityTypes
 from digitalhub.entities.utils.utils import build_log_path_from_filename, build_log_path_from_source, eval_local_source
-from digitalhub.readers.builder import get_reader_by_object
-from digitalhub.stores.builder import get_store
-from digitalhub.utils.exceptions import EntityAlreadyExistsError
+from digitalhub.factory.api import build_entity_from_params
+from digitalhub.readers.api import get_reader_by_object
+from digitalhub.stores.api import get_store
 from digitalhub.utils.generic_utils import slugify_string
-from digitalhub.utils.io_utils import read_yaml
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities.dataitem._base.entity import Dataitem
@@ -76,8 +75,7 @@ def new_dataitem(
     >>>                    kind="dataitem",
     >>>                    path="s3://my-bucket/my-key")
     """
-    check_context(project)
-    obj = dataitem_from_parameters(
+    return new_context_entity(
         project=project,
         name=name,
         kind=kind,
@@ -88,8 +86,6 @@ def new_dataitem(
         path=path,
         **kwargs,
     )
-    obj.save()
-    return obj
 
 
 def log_dataitem(
@@ -160,7 +156,7 @@ def log_dataitem(
             slug = slugify_string(name) + f".{extension}"
             path = build_log_path_from_filename(project, ENTITY_TYPE, name, uuid, slug)
 
-        obj = dataitem_from_parameters(project=project, name=name, kind=kind, path=path, **kwargs)
+        obj = build_entity_from_params(project=project, name=name, kind=kind, path=path, **kwargs)
         if kind == "table":
             dst = obj.write_df(df=data, extension=extension)
             reader = get_reader_by_object(data)
@@ -211,16 +207,13 @@ def get_dataitem(
     >>>                    project="my-project",
     >>>                    entity_id="my-dataitem-id")
     """
-    obj = read_entity_api_ctx(
-        identifier,
-        ENTITY_TYPE,
+    return get_material_entity(
+        identifier=identifier,
+        entity_type=ENTITY_TYPE,
         project=project,
         entity_id=entity_id,
         **kwargs,
     )
-    entity = dataitem_from_dict(obj)
-    entity._get_files_info()
-    return entity
 
 
 def get_dataitem_versions(
@@ -254,18 +247,12 @@ def get_dataitem_versions(
     >>> objs = get_dataitem_versions("my-dataitem-name",
     >>>                              project="my-project")
     """
-    objs = read_entity_api_ctx_versions(
-        identifier,
+    return get_material_entity_versions(
+        identifier=identifier,
         entity_type=ENTITY_TYPE,
         project=project,
         **kwargs,
     )
-    objects = []
-    for o in objs:
-        entity = dataitem_from_dict(o)
-        entity._get_files_info()
-        objects.append(entity)
-    return objects
 
 
 def list_dataitems(project: str, **kwargs) -> list[Dataitem]:
@@ -288,17 +275,11 @@ def list_dataitems(project: str, **kwargs) -> list[Dataitem]:
     --------
     >>> objs = list_dataitems(project="my-project")
     """
-    objs = list_entity_api_ctx(
+    return list_material_entities(
         project=project,
         entity_type=ENTITY_TYPE,
         **kwargs,
     )
-    objects = []
-    for o in objs:
-        entity = dataitem_from_dict(o)
-        entity._get_files_info()
-        objects.append(entity)
-    return objects
 
 
 def import_dataitem(file: str) -> Dataitem:
@@ -319,14 +300,7 @@ def import_dataitem(file: str) -> Dataitem:
     --------
     >>> obj = import_dataitem("my-dataitem.yaml")
     """
-    dict_obj: dict = read_yaml(file)
-    obj = dataitem_from_dict(dict_obj)
-    try:
-        obj.save()
-    except EntityAlreadyExistsError:
-        pass
-    finally:
-        return obj
+    return import_context_entity(file)
 
 
 def update_dataitem(entity: Dataitem) -> Dataitem:
@@ -388,7 +362,7 @@ def delete_dataitem(
     >>>                       project="my-project",
     >>>                       delete_all_versions=True)
     """
-    return delete_entity_api_ctx(
+    return delete_entity(
         identifier=identifier,
         entity_type=ENTITY_TYPE,
         project=project,

digitalhub/entities/dataitem/table/entity.py

@@ -5,7 +5,7 @@ import typing
 from pathlib import Path
 from typing import Any
 
-from digitalhub.datastores.builder import get_datastore
+from digitalhub.datastores.api import get_datastore
 from digitalhub.entities.dataitem._base.entity import Dataitem
 from digitalhub.utils.uri_utils import check_local_path
 

digitalhub/entities/function/crud.py

@@ -2,17 +2,15 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.context.builder import check_context
 from digitalhub.entities._base.crud import (
-    delete_entity_api_ctx,
-    list_entity_api_ctx,
-    read_entity_api_ctx,
-    read_entity_api_ctx_versions,
+    delete_entity,
+    get_context_entity_versions,
+    get_versioned_entity,
+    import_executable_entity,
+    list_context_entities,
+    new_context_entity,
 )
-from digitalhub.entities.function.builder import function_from_dict, function_from_parameters
 from digitalhub.entities.utils.entity_types import EntityTypes
-from digitalhub.utils.exceptions import EntityAlreadyExistsError
-from digitalhub.utils.io_utils import read_yaml
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities.function._base.entity import Function
@@ -65,8 +63,7 @@ def new_function(
     >>>                    code_src="function.py",
     >>>                    handler="function-handler")
     """
-    check_context(project)
-    obj = function_from_parameters(
+    return new_context_entity(
         project=project,
         name=name,
         kind=kind,
@@ -76,8 +73,6 @@ def new_function(
         embedded=embedded,
         **kwargs,
     )
-    obj.save()
-    return obj
 
 
 def get_function(
@@ -115,14 +110,13 @@ def get_function(
     >>>                    project="my-project",
     >>>                    entity_id="my-function-id")
     """
-    obj = read_entity_api_ctx(
+    return get_versioned_entity(
         identifier,
-        ENTITY_TYPE,
+        entity_type=ENTITY_TYPE,
         project=project,
         entity_id=entity_id,
         **kwargs,
     )
-    return function_from_dict(obj)
 
 
 def get_function_versions(
@@ -156,13 +150,12 @@ def get_function_versions(
     >>> obj = get_function_versions("my-function-name"
     >>>                             project="my-project")
     """
-    obj = read_entity_api_ctx_versions(
+    return get_context_entity_versions(
         identifier,
         entity_type=ENTITY_TYPE,
         project=project,
         **kwargs,
     )
-    return [function_from_dict(o) for o in obj]
 
 
 def list_functions(project: str, **kwargs) -> list[Function]:
@@ -185,12 +178,11 @@ def list_functions(project: str, **kwargs) -> list[Function]:
     --------
     >>> objs = list_functions(project="my-project")
     """
-    objs = list_entity_api_ctx(
+    return list_context_entities(
         project=project,
         entity_type=ENTITY_TYPE,
         **kwargs,
     )
-    return [function_from_dict(obj) for obj in objs]
 
 
 def import_function(file: str) -> Function:
@@ -211,25 +203,7 @@ def import_function(file: str) -> Function:
     --------
     >>> obj = import_function("my-function.yaml")
     """
-    dict_obj: dict | list[dict] = read_yaml(file)
-    if isinstance(dict_obj, list):
-        fnc_dict = dict_obj[0]
-        tsk_dicts = dict_obj[1:]
-    else:
-        fnc_dict = dict_obj
-        tsk_dicts = []
-
-    check_context(fnc_dict.get("project"))
-    obj = function_from_dict(fnc_dict)
-
-    obj.import_tasks(tsk_dicts)
-
-    try:
-        obj.save()
-    except EntityAlreadyExistsError:
-        pass
-    finally:
-        return obj
+    return import_executable_entity(file)
 
 
 def update_function(entity: Function) -> Function:
@@ -294,7 +268,7 @@ def delete_function(
     >>>                       project="my-project",
     >>>                       delete_all_versions=True)
     """
-    return delete_entity_api_ctx(
+    return delete_entity(
         identifier=identifier,
         entity_type=ENTITY_TYPE,
         project=project,

digitalhub/entities/model/crud.py

@@ -2,19 +2,17 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.context.builder import check_context
 from digitalhub.entities._base.crud import (
-    delete_entity_api_ctx,
-    list_entity_api_ctx,
-    read_entity_api_ctx,
-    read_entity_api_ctx_versions,
+    delete_entity,
+    get_material_entity,
+    get_material_entity_versions,
+    import_context_entity,
+    list_material_entities,
+    new_context_entity,
 )
 from digitalhub.entities._base.entity._constructors.uuid import build_uuid
-from digitalhub.entities.model.builder import model_from_dict, model_from_parameters
 from digitalhub.entities.utils.entity_types import EntityTypes
 from digitalhub.entities.utils.utils import build_log_path_from_source, eval_local_source
-from digitalhub.utils.exceptions import EntityAlreadyExistsError
-from digitalhub.utils.io_utils import read_yaml
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities.model._base.entity import Model
@@ -70,8 +68,7 @@ def new_model(
     >>>                    kind="model",
     >>>                    path="s3://my-bucket/my-key")
     """
-    check_context(project)
-    obj = model_from_parameters(
+    return new_context_entity(
         project=project,
         name=name,
         kind=kind,
@@ -82,8 +79,6 @@ def new_model(
         path=path,
         **kwargs,
     )
-    obj.save()
-    return obj
 
 
 def log_model(
@@ -171,16 +166,13 @@ def get_model(
     >>>                 project="my-project",
     >>>                 entity_id="my-model-id")
     """
-    obj = read_entity_api_ctx(
-        identifier,
-        ENTITY_TYPE,
+    return get_material_entity(
+        identifier=identifier,
+        entity_type=ENTITY_TYPE,
         project=project,
         entity_id=entity_id,
         **kwargs,
     )
-    entity = model_from_dict(obj)
-    entity._get_files_info()
-    return entity
 
 
 def get_model_versions(
@@ -214,18 +206,12 @@ def get_model_versions(
     >>> objs = get_model_versions("my-model-name",
     >>>                           project="my-project")
     """
-    objs = read_entity_api_ctx_versions(
-        identifier,
+    return get_material_entity_versions(
+        identifier=identifier,
         entity_type=ENTITY_TYPE,
         project=project,
         **kwargs,
     )
-    objects = []
-    for o in objs:
-        entity = model_from_dict(o)
-        entity._get_files_info()
-        objects.append(entity)
-    return objects
 
 
 def list_models(project: str, **kwargs) -> list[Model]:
@@ -248,17 +234,11 @@ def list_models(project: str, **kwargs) -> list[Model]:
     --------
     >>> objs = list_models(project="my-project")
     """
-    objs = list_entity_api_ctx(
+    return list_material_entities(
         project=project,
         entity_type=ENTITY_TYPE,
         **kwargs,
     )
-    objects = []
-    for o in objs:
-        entity = model_from_dict(o)
-        entity._get_files_info()
-        objects.append(entity)
-    return objects
 
 
 def import_model(file: str) -> Model:
@@ -279,14 +259,7 @@ def import_model(file: str) -> Model:
     --------
     >>> obj = import_model("my-model.yaml")
     """
-    dict_obj: dict = read_yaml(file)
-    obj = model_from_dict(dict_obj)
-    try:
-        obj.save()
-    except EntityAlreadyExistsError:
-        pass
-    finally:
-        return obj
+    return import_context_entity(file)
 
 
 def update_model(entity: Model) -> Model:
@@ -348,7 +321,7 @@ def delete_model(
     >>>                    project="my-project",
     >>>                    delete_all_versions=True)
     """
-    return delete_entity_api_ctx(
+    return delete_entity(
         identifier=identifier,
         entity_type=ENTITY_TYPE,
         project=project,