digitalhub 0.8.1__py3-none-any.whl → 0.9.0__py3-none-any.whl

digitalhub/entities/artifact/_base/builder.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import typing
 
 from digitalhub.entities._base.versioned.builder import VersionedBuilder
-from digitalhub.entities.utils.entity_types import EntityTypes
+from digitalhub.entities._commons.enums import EntityTypes
 from digitalhub.utils.exceptions import EntityError
 
 if typing.TYPE_CHECKING:

digitalhub/entities/artifact/_base/entity.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import typing
 
 from digitalhub.entities._base.material.entity import MaterialEntity
-from digitalhub.entities.utils.entity_types import EntityTypes
+from digitalhub.entities._commons.enums import EntityTypes
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities._base.entity.metadata import Metadata

digitalhub/entities/artifact/artifact/builder.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from digitalhub.entities._commons.enums import EntityKinds
 from digitalhub.entities.artifact._base.builder import ArtifactBuilder
 from digitalhub.entities.artifact.artifact.entity import ArtifactArtifact
 from digitalhub.entities.artifact.artifact.spec import ArtifactSpecArtifact, ArtifactValidatorArtifact
@@ -15,4 +16,4 @@ class ArtifactArtifactBuilder(ArtifactBuilder):
     ENTITY_SPEC_CLASS = ArtifactSpecArtifact
     ENTITY_SPEC_VALIDATOR = ArtifactValidatorArtifact
     ENTITY_STATUS_CLASS = ArtifactStatusArtifact
-    ENTITY_KIND = "artifact"
+    ENTITY_KIND = EntityKinds.ARTIFACT_ARTIFACT.value

digitalhub/entities/artifact/crud.py

@@ -2,18 +2,10 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.entities._base.crud import (
-    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._commons.enums import EntityTypes
+from digitalhub.entities._operations.processor import processor
 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.entities.artifact.utils import eval_source, process_kwargs
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities.artifact._base.entity import Artifact
@@ -69,7 +61,7 @@ def new_artifact(
     >>>                    kind="artifact",
     >>>                    path="s3://my-bucket/my-key")
     """
-    return new_context_entity(
+    return processor.create_context_entity(
         project=project,
         name=name,
         kind=kind,
@@ -120,16 +112,15 @@ def log_artifact(
     >>>                    kind="artifact",
     >>>                    source="./local-path")
     """
-    eval_local_source(source)
-
-    if path is None:
-        uuid = build_uuid()
-        kwargs["uuid"] = uuid
-        path = build_log_path_from_source(project, ENTITY_TYPE, name, uuid, source)
-
-    obj = new_artifact(project=project, name=name, kind=kind, path=path, **kwargs)
-    obj.upload(source)
-    return obj
+    eval_source(source)
+    kwargs = process_kwargs(project, name, source=source, path=path, **kwargs)
+    return processor.log_material_entity(
+        source=source,
+        project=project,
+        name=name,
+        kind=kind,
+        **kwargs,
+    )
 
 
 def get_artifact(
@@ -167,7 +158,7 @@ def get_artifact(
     >>>                    project="my-project",
     >>>                    entity_id="my-artifact-id")
     """
-    return get_material_entity(
+    return processor.read_material_entity(
         identifier=identifier,
         entity_type=ENTITY_TYPE,
         project=project,
@@ -207,7 +198,7 @@ def get_artifact_versions(
     >>> obj = get_artifact_versions("my-artifact-name"
     >>>                             project="my-project")
     """
-    return get_material_entity_versions(
+    return processor.read_material_entity_versions(
         identifier=identifier,
         entity_type=ENTITY_TYPE,
         project=project,
@@ -235,7 +226,7 @@ def list_artifacts(project: str, **kwargs) -> list[Artifact]:
     --------
     >>> objs = list_artifacts(project="my-project")
     """
-    return list_material_entities(
+    return processor.list_material_entities(
         project=project,
         entity_type=ENTITY_TYPE,
         **kwargs,
@@ -244,7 +235,7 @@ def list_artifacts(project: str, **kwargs) -> list[Artifact]:
 
 def import_artifact(file: str) -> Artifact:
     """
-    Import object from a YAML file.
+    Import object from a YAML file and create a new object into the backend.
 
     Parameters
     ----------
@@ -260,7 +251,28 @@ def import_artifact(file: str) -> Artifact:
     --------
     >>> obj = import_artifact("my-artifact.yaml")
     """
-    return import_context_entity(file)
+    return processor.import_context_entity(file)
+
+
+def load_artifact(file: str) -> Artifact:
+    """
+    Load object from a YAML file and update an existing object into the backend.
+
+    Parameters
+    ----------
+    file : str
+        Path to YAML file.
+
+    Returns
+    -------
+    Artifact
+        Object instance.
+
+    Examples
+    --------
+    >>> obj = load_artifact("my-artifact.yaml")
+    """
+    return processor.load_context_entity(file)
 
 
 def update_artifact(entity: Artifact) -> Artifact:
@@ -281,7 +293,12 @@ def update_artifact(entity: Artifact) -> Artifact:
     --------
     >>> obj = update_artifact(obj)
     """
-    return entity.save(update=True)
+    return processor.update_context_entity(
+        project=entity.project,
+        entity_type=entity.ENTITY_TYPE,
+        entity_id=entity.id,
+        entity_dict=entity.to_dict(),
+    )
 
 
 def delete_artifact(
@@ -322,7 +339,7 @@ def delete_artifact(
     >>>                  project="my-project",
     >>>                  delete_all_versions=True)
     """
-    return delete_entity(
+    return processor.delete_context_entity(
         identifier=identifier,
         entity_type=ENTITY_TYPE,
         project=project,

digitalhub/entities/artifact/utils.py

@@ -0,0 +1,62 @@
+from __future__ import annotations
+
+from typing import Any
+
+from digitalhub.entities._base.entity._constructors.uuid import build_uuid
+from digitalhub.entities._base.material.utils import build_log_path_from_source, eval_local_source
+from digitalhub.entities._commons.enums import EntityTypes
+
+
+def eval_source(
+    source: str | list[str] | None = None,
+) -> Any:
+    """
+    Evaluate if source is local.
+
+    Parameters
+    ----------
+    source : str | list[str]
+        Source(s).
+
+    Returns
+    -------
+    None
+    """
+    return eval_local_source(source)
+
+
+def process_kwargs(
+    project: str,
+    name: str,
+    source: str | list[str],
+    path: str | None = None,
+    **kwargs,
+) -> dict:
+    """
+    Process spec kwargs.
+
+    Parameters
+    ----------
+    project : str
+        Project name.
+    name : str
+        Object name.
+    source : str
+        Source(s).
+    path : str
+        Destination path of the entity. If not provided, it's generated.
+    **kwargs : dict
+        Spec parameters.
+
+    Returns
+    -------
+    dict
+        Kwargs updated.
+    """
+    if path is None:
+        uuid = build_uuid()
+        kwargs["uuid"] = uuid
+        kwargs["path"] = build_log_path_from_source(project, EntityTypes.MODEL.value, name, uuid, source)
+    else:
+        kwargs["path"] = path
+    return kwargs

digitalhub/entities/dataitem/_base/builder.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import typing
 
 from digitalhub.entities._base.versioned.builder import VersionedBuilder
-from digitalhub.entities.utils.entity_types import EntityTypes
+from digitalhub.entities._commons.enums import EntityTypes
 from digitalhub.utils.exceptions import EntityError
 
 if typing.TYPE_CHECKING:

digitalhub/entities/dataitem/_base/entity.py

@@ -4,9 +4,10 @@ import typing
 from pathlib import Path
 
 from digitalhub.entities._base.material.entity import MaterialEntity
-from digitalhub.entities.utils.entity_types import EntityTypes
+from digitalhub.entities._commons.enums import EntityTypes
+from digitalhub.readers._commons.enums import Extensions
 from digitalhub.utils.exceptions import EntityError
-from digitalhub.utils.uri_utils import map_uri_scheme
+from digitalhub.utils.uri_utils import has_sql_scheme
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities._base.entity.metadata import Metadata
@@ -37,7 +38,7 @@ class Dataitem(MaterialEntity):
         self.status: DataitemStatus
 
     ##############################
-    #  Private helper methods
+    #  Helper methods
     ##############################
 
     @staticmethod
@@ -65,9 +66,8 @@ class Dataitem(MaterialEntity):
         if file_format is not None:
             return file_format
 
-        scheme = map_uri_scheme(path)
-        if scheme == "sql":
-            return "parquet"
+        if has_sql_scheme(path):
+            return Extensions.PARQUET.value
 
         ext = Path(path).suffix[1:]
         if ext is not None:

digitalhub/entities/dataitem/crud.py

@@ -1,25 +1,11 @@
 from __future__ import annotations
 
 import typing
-from pathlib import Path
 from typing import Any
-from urllib.parse import urlparse
-
-from digitalhub.entities._base.crud import (
-    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.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.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.entities._commons.enums import EntityTypes
+from digitalhub.entities._operations.processor import processor
+from digitalhub.entities.dataitem.utils import clean_tmp_path, eval_source, post_process, process_kwargs
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities.dataitem._base.entity import Dataitem
@@ -75,7 +61,7 @@ def new_dataitem(
     >>>                    kind="dataitem",
     >>>                    path="s3://my-bucket/my-key")
     """
-    return new_context_entity(
+    return processor.create_context_entity(
         project=project,
         name=name,
         kind=kind,
@@ -94,7 +80,6 @@ def log_dataitem(
     kind: str,
     source: list[str] | str | None = None,
     data: Any | None = None,
-    extension: str | None = None,
     path: str | None = None,
     **kwargs,
 ) -> Dataitem:
@@ -113,8 +98,6 @@ def log_dataitem(
         Dataitem location on local path.
     data : Any
         Dataframe to log. Alternative to source.
-    extension : str
-        Extension of the output dataframe.
     path : str
         Destination path of the dataitem. If not provided, it's generated.
     **kwargs : dict
@@ -132,43 +115,18 @@ def log_dataitem(
     >>>                    kind="table",
     >>>                    data=df)
     """
-    if (source is None) == (data is None):
-        raise ValueError("You must provide source or data.")
-
-    # Case where source is provided
-    if source is not None:
-        eval_local_source(source)
-
-        if path is None:
-            uuid = build_uuid()
-            kwargs["uuid"] = uuid
-            path = build_log_path_from_source(project, ENTITY_TYPE, name, uuid, source)
-
-        obj = new_dataitem(project=project, name=name, kind=kind, path=path, **kwargs)
-        obj.upload(source)
-
-    # Case where data is provided
-    else:
-        extension = extension if extension is not None else "parquet"
-        if path is None:
-            uuid = build_uuid()
-            kwargs["uuid"] = uuid
-            slug = slugify_string(name) + f".{extension}"
-            path = build_log_path_from_filename(project, ENTITY_TYPE, name, uuid, slug)
-
-        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)
-            obj.spec.schema = reader.get_schema(data)
-            obj.status.preview = reader.get_preview(data)
-            store = get_store(obj.spec.path)
-            src = Path(urlparse(obj.spec.path).path).name
-            paths = [(dst, src)]
-            infos = store.get_file_info(paths)
-            obj.status.add_files_info(infos)
-        obj.save()
-
+    source = eval_source(source, data, kind, name, project)
+    kwargs = process_kwargs(project, name, kind, source=source, data=data, path=path, **kwargs)
+    obj = processor.log_material_entity(
+        source=source,
+        project=project,
+        name=name,
+        kind=kind,
+        **kwargs,
+    )
+    if data is not None:
+        obj = post_process(obj, data)
+        clean_tmp_path(source)
     return obj
 
 
@@ -207,7 +165,7 @@ def get_dataitem(
     >>>                    project="my-project",
     >>>                    entity_id="my-dataitem-id")
     """
-    return get_material_entity(
+    return processor.read_material_entity(
         identifier=identifier,
         entity_type=ENTITY_TYPE,
         project=project,
@@ -247,7 +205,7 @@ def get_dataitem_versions(
     >>> objs = get_dataitem_versions("my-dataitem-name",
     >>>                              project="my-project")
     """
-    return get_material_entity_versions(
+    return processor.read_material_entity_versions(
         identifier=identifier,
         entity_type=ENTITY_TYPE,
         project=project,
@@ -275,7 +233,7 @@ def list_dataitems(project: str, **kwargs) -> list[Dataitem]:
     --------
     >>> objs = list_dataitems(project="my-project")
     """
-    return list_material_entities(
+    return processor.list_material_entities(
         project=project,
         entity_type=ENTITY_TYPE,
         **kwargs,
@@ -284,7 +242,7 @@ def list_dataitems(project: str, **kwargs) -> list[Dataitem]:
 
 def import_dataitem(file: str) -> Dataitem:
     """
-    Import object from a YAML file.
+    Import object from a YAML file and create a new object into the backend.
 
     Parameters
     ----------
@@ -300,7 +258,28 @@ def import_dataitem(file: str) -> Dataitem:
     --------
     >>> obj = import_dataitem("my-dataitem.yaml")
     """
-    return import_context_entity(file)
+    return processor.import_context_entity(file)
+
+
+def load_dataitem(file: str) -> Dataitem:
+    """
+    Load object from a YAML file and update an existing object into the backend.
+
+    Parameters
+    ----------
+    file : str
+        Path to YAML file.
+
+    Returns
+    -------
+    Dataitem
+        Object instance.
+
+    Examples
+    --------
+    >>> obj = load_dataitem("my-dataitem.yaml")
+    """
+    return processor.load_context_entity(file)
 
 
 def update_dataitem(entity: Dataitem) -> Dataitem:
@@ -321,7 +300,12 @@ def update_dataitem(entity: Dataitem) -> Dataitem:
     --------
     >>> obj = update_dataitem(obj)
     """
-    return entity.save(update=True)
+    return processor.update_context_entity(
+        project=entity.project,
+        entity_type=entity.ENTITY_TYPE,
+        entity_id=entity.id,
+        entity_dict=entity.to_dict(),
+    )
 
 
 def delete_dataitem(
@@ -362,7 +346,7 @@ def delete_dataitem(
     >>>                       project="my-project",
     >>>                       delete_all_versions=True)
     """
-    return delete_entity(
+    return processor.delete_context_entity(
         identifier=identifier,
         entity_type=ENTITY_TYPE,
         project=project,

digitalhub/entities/dataitem/dataitem/builder.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from digitalhub.entities._commons.enums import EntityKinds
 from digitalhub.entities.dataitem._base.builder import DataitemBuilder
 from digitalhub.entities.dataitem.dataitem.entity import DataitemDataitem
 from digitalhub.entities.dataitem.dataitem.spec import DataitemSpecDataitem, DataitemValidatorDataitem
@@ -15,4 +16,4 @@ class DataitemDataitemBuilder(DataitemBuilder):
     ENTITY_SPEC_CLASS = DataitemSpecDataitem
     ENTITY_SPEC_VALIDATOR = DataitemValidatorDataitem
     ENTITY_STATUS_CLASS = DataitemStatusDataitem
-    ENTITY_KIND = "dataitem"
+    ENTITY_KIND = EntityKinds.DATAITEM_DATAITEM.value

digitalhub/entities/dataitem/iceberg/builder.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from digitalhub.entities._commons.enums import EntityKinds
 from digitalhub.entities.dataitem._base.builder import DataitemBuilder
 from digitalhub.entities.dataitem.iceberg.entity import DataitemIceberg
 from digitalhub.entities.dataitem.iceberg.spec import DataitemSpecIceberg, DataitemValidatorIceberg
@@ -15,4 +16,4 @@ class DataitemIcebergBuilder(DataitemBuilder):
     ENTITY_SPEC_CLASS = DataitemSpecIceberg
     ENTITY_SPEC_VALIDATOR = DataitemValidatorIceberg
     ENTITY_STATUS_CLASS = DataitemStatusIceberg
-    ENTITY_KIND = "iceberg"
+    ENTITY_KIND = EntityKinds.DATAITEM_ICEBERG.value

digitalhub/entities/dataitem/table/builder.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from digitalhub.entities._commons.enums import EntityKinds
 from digitalhub.entities.dataitem._base.builder import DataitemBuilder
 from digitalhub.entities.dataitem.table.entity import DataitemTable
 from digitalhub.entities.dataitem.table.spec import DataitemSpecTable, DataitemValidatorTable
@@ -15,4 +16,4 @@ class DataitemTableBuilder(DataitemBuilder):
     ENTITY_SPEC_CLASS = DataitemSpecTable
     ENTITY_SPEC_VALIDATOR = DataitemValidatorTable
     ENTITY_STATUS_CLASS = DataitemStatusTable
-    ENTITY_KIND = "table"
+    ENTITY_KIND = EntityKinds.DATAITEM_TABLE.value

digitalhub/entities/dataitem/table/entity.py

@@ -5,9 +5,9 @@ import typing
 from pathlib import Path
 from typing import Any
 
-from digitalhub.datastores.api import get_datastore
 from digitalhub.entities.dataitem._base.entity import Dataitem
-from digitalhub.utils.uri_utils import check_local_path
+from digitalhub.stores.api import get_store
+from digitalhub.utils.uri_utils import has_local_scheme
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities._base.entity.metadata import Metadata
@@ -69,10 +69,8 @@ class DataitemTable(Dataitem):
         Any
             DataFrame.
         """
-        if engine is None:
-            engine = "pandas"
         try:
-            if check_local_path(self.spec.path):
+            if has_local_scheme(self.spec.path):
                 tmp_dir = None
                 data_path = self.spec.path
             else:
@@ -87,9 +85,7 @@ class DataitemTable(Dataitem):
                 checker = data_path
 
             extension = self._get_extension(checker, file_format)
-            datastore = get_datastore("")
-
-            return datastore.read_df(data_path, extension, engine, **kwargs)
+            return get_store("").read_df(data_path, extension, engine, **kwargs)
 
         except Exception as e:
             raise e
@@ -123,8 +119,7 @@ class DataitemTable(Dataitem):
         str
             Path to the written dataframe.
         """
-        datastore = get_datastore(self.spec.path)
-        return datastore.write_df(df, self.spec.path, extension=extension, **kwargs)
+        return get_store(self.spec.path).write_df(df, self.spec.path, extension=extension, **kwargs)
 
     @staticmethod
     def _clean_tmp_path(pth: Path | None, clean: bool) -> None:

digitalhub/entities/dataitem/table/models.py

@@ -2,10 +2,10 @@ from __future__ import annotations
 
 from enum import Enum
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field
 
 
-class FieldType(str, Enum):
+class FieldType(Enum):
     """
     Field type enum.
     """
@@ -32,6 +32,8 @@ class TableSchemaFieldEntry(BaseModel):
     Table schema field entry model.
     """
 
+    model_config = ConfigDict(use_enum_values=True)
+
     name: str
     """Field name."""
 
@@ -50,9 +52,6 @@ class TableSchemaFieldEntry(BaseModel):
     description: str = None
     """Field description."""
 
-    class Config:
-        use_enum_values = True
-
 
 class TableSchema(BaseModel):
     """