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

test/local/CRUD/test_models.py

@@ -0,0 +1,95 @@
+"""
+Unit tests for the entity Models
+"""
+
+import digitalhub as dh
+from digitalhub.entities.model._base.entity import Model
+
+
+class TestModelCRUD:
+    def create_test_dicts(self):
+        names = ["test1", "test2", "test3", "test4"]
+        uuids = [
+            "d150bcca-bb64-451d-8455-dff862254b95",
+            "31acdd2d-0c41-428c-b68b-1b133da9e97b",
+            "b4a3dfdc-b917-44c4-9a29-613dcf734244",
+            "2618d9c4-cd61-440f-aebb-7e5761709f3b",
+        ]
+        paths = [
+            "./data/my_random_forest_model.pkl",
+            "s3://bucket/model.pkl",
+            "sql://database/schema/linear_regression_model.joblib",
+            "https://url.com/bert_base_uncased.pt",
+        ]
+        kind = ["model", "model", "model", "model"]
+
+        dicts = []
+        for i in range(len(names)):
+            dicts.append({"name": names[i], "uuid": uuids[i], "path": paths[i], "kind": kind[i]})
+
+        return dicts
+
+    def test_create_delete(self):
+        dicts = self.create_test_dicts()
+        p = dh.get_or_create_project("test", local=True)
+        # Create and delete models
+        for i in dicts:
+            d = dh.new_model(p.name, **i)
+            dh.delete_model(d.key)
+            d = dh.new_model(p.name, **i)
+            dh.delete_model(d.name, project=p.name, entity_id=d.id)
+            d = p.new_model(**i)
+            p.delete_model(d.key)
+        assert dh.list_models(p.name) == []
+        dh.delete_project("test", local=True, clean_context=True)
+
+    def test_list(self):
+        dicts = self.create_test_dicts()
+        p = dh.get_or_create_project("test", local=True)
+
+        assert dh.list_models(p.name) == []
+
+        for i in dicts:
+            dh.new_model(p.name, **i)
+
+        # List models
+        l_obj = dh.list_models(p.name)
+        assert isinstance(l_obj, list)
+        assert len(l_obj) == 4
+        for i in l_obj:
+            assert isinstance(i, Model)
+
+        # delete listed objects
+        for obj in l_obj:
+            dh.delete_model(obj.key)
+
+        assert len(dh.list_models(p.name)) == 0
+
+        dh.delete_project("test", clean_context=True, local=True)
+
+    def test_get(self):
+        dicts = self.create_test_dicts()
+        p = dh.get_or_create_project("test", local=True)
+
+        for i in dicts:
+            o1 = dh.new_model(p.name, **i)
+            assert isinstance(o1, Model)
+
+            # Get by name and id
+            o2 = dh.get_model(o1.name, project=p.name, entity_id=o1.id)
+            assert isinstance(o2, Model)
+            assert o1.id == o2.id
+
+            # Get by key
+            o3 = dh.get_model(o1.key)
+            assert isinstance(o3, Model)
+            assert o1.id == o3.id
+
+        # delete listed objects
+        l_obj = dh.list_models(p.name)
+        for obj in l_obj:
+            dh.delete_model(obj.key)
+
+        assert len(dh.list_models(p.name)) == 0
+
+        dh.delete_project("test", clean_context=True, local=True)

test/test_crud_functions.py

@@ -3,7 +3,7 @@ from copy import deepcopy
 import dotenv
 
 import digitalhub
-from digitalhub.entities.function.entity import Function
+from digitalhub.entities.function._base.entity import Function
 
 dotenv.load_dotenv()
 

test/test_crud_runs.py

@@ -1,7 +1,7 @@
 import dotenv
 
 import digitalhub
-from digitalhub.entities.run.entity import Run
+from digitalhub.entities.run._base.entity import Run
 
 dotenv.load_dotenv()
 

test/test_crud_tasks.py

@@ -1,7 +1,7 @@
 import dotenv
 
 import digitalhub
-from digitalhub.entities.task.entity import Task
+from digitalhub.entities.task._base.entity import Task
 
 dotenv.load_dotenv()
 

digitalhub/entities/_base/entity/unversioned.py

@@ -1,87 +0,0 @@
-from __future__ import annotations
-
-import typing
-
-from digitalhub.entities._base.entity.context import ContextEntity
-from digitalhub.entities._builders.metadata import build_metadata
-from digitalhub.entities._builders.spec import build_spec
-from digitalhub.entities._builders.status import build_status
-from digitalhub.entities._builders.uuid import build_uuid
-from digitalhub.utils.io_utils import write_yaml
-
-if typing.TYPE_CHECKING:
-    from digitalhub.entities._base.metadata import Metadata
-    from digitalhub.entities._base.spec.base import Spec
-    from digitalhub.entities._base.status.base import Status
-
-
-class UnversionedEntity(ContextEntity):
-    def __init__(
-        self,
-        project: str,
-        uuid: str,
-        kind: str,
-        metadata: Metadata,
-        spec: Spec,
-        status: Status,
-        user: str | None = None,
-    ) -> None:
-        super().__init__(project, kind, metadata, spec, status, user)
-        self.id = uuid
-        self.key = f"store://{project}/{self.ENTITY_TYPE}/{kind}/{uuid}"
-        self._obj_attr.extend(["id"])
-
-    def export(self, filename: str | None = None) -> str:
-        """
-        Export object as a YAML file.
-
-        Parameters
-        ----------
-        filename : str
-            Name of the export YAML file. If not specified, the default value is used.
-
-        Returns
-        -------
-        str
-            Exported file.
-        """
-        obj = self.to_dict()
-        if filename is None:
-            filename = f"{self.ENTITY_TYPE}-{self.id}.yml"
-        pth = self._context().root / filename
-        write_yaml(pth, obj)
-        return str(pth)
-
-    @staticmethod
-    def _parse_dict(obj: dict, validate: bool = True) -> dict:
-        """
-        Get dictionary and parse it to a valid entity dictionary.
-
-        Parameters
-        ----------
-        entity : str
-            Entity type.
-        obj : dict
-            Dictionary to parse.
-
-        Returns
-        -------
-        dict
-            A dictionary containing the attributes of the entity instance.
-        """
-        project = obj.get("project")
-        kind = obj.get("kind")
-        uuid = build_uuid(obj.get("id"))
-        metadata = build_metadata(kind, **obj.get("metadata", {}))
-        spec = build_spec(kind, validate=validate, **obj.get("spec", {}))
-        status = build_status(kind, **obj.get("status", {}))
-        user = obj.get("user")
-        return {
-            "project": project,
-            "uuid": uuid,
-            "kind": kind,
-            "metadata": metadata,
-            "spec": spec,
-            "status": status,
-            "user": user,
-        }

digitalhub/entities/_base/entity/versioned.py

@@ -1,94 +0,0 @@
-from __future__ import annotations
-
-import typing
-
-from digitalhub.entities._base.entity.context import ContextEntity
-from digitalhub.entities._builders.metadata import build_metadata
-from digitalhub.entities._builders.name import build_name
-from digitalhub.entities._builders.spec import build_spec
-from digitalhub.entities._builders.status import build_status
-from digitalhub.entities._builders.uuid import build_uuid
-from digitalhub.utils.io_utils import write_yaml
-
-if typing.TYPE_CHECKING:
-    from digitalhub.entities._base.metadata import Metadata
-    from digitalhub.entities._base.spec.base import Spec
-    from digitalhub.entities._base.status.base import Status
-
-
-class VersionedEntity(ContextEntity):
-    def __init__(
-        self,
-        project: str,
-        name: str,
-        uuid: str,
-        kind: str,
-        metadata: Metadata,
-        spec: Spec,
-        status: Status,
-        user: str | None = None,
-    ) -> None:
-        super().__init__(project, kind, metadata, spec, status, user)
-        self.name = name
-        self.id = uuid
-        self.key = f"store://{project}/{self.ENTITY_TYPE}/{kind}/{name}:{uuid}"
-
-        # Add attributes to be used in the to_dict method
-        self._obj_attr.extend(["name", "id"])
-
-    def export(self, filename: str | None = None) -> str:
-        """
-        Export object as a YAML file.
-
-        Parameters
-        ----------
-        filename : str
-            Name of the export YAML file. If not specified, the default value is used.
-
-        Returns
-        -------
-        str
-            Exported file.
-        """
-        obj = self.to_dict()
-        if filename is None:
-            filename = f"{self.ENTITY_TYPE}-{self.name}-{self.id}.yml"
-        pth = self._context().root / filename
-        write_yaml(pth, obj)
-        return str(pth)
-
-    @staticmethod
-    def _parse_dict(obj: dict, validate: bool = True) -> dict:
-        """
-        Get dictionary and parse it to a valid entity dictionary.
-
-        Parameters
-        ----------
-        entity : str
-            Entity type.
-        obj : dict
-            Dictionary to parse.
-
-        Returns
-        -------
-        dict
-            A dictionary containing the attributes of the entity instance.
-        """
-        project = obj.get("project")
-        kind = obj.get("kind")
-        name = build_name(obj.get("name"))
-        uuid = build_uuid(obj.get("id"))
-        metadata = build_metadata(kind, **obj.get("metadata", {}))
-        spec = build_spec(kind, validate=validate, **obj.get("spec", {}))
-        status = build_status(kind, **obj.get("status", {}))
-        user = obj.get("user")
-        return {
-            "project": project,
-            "name": name,
-            "uuid": uuid,
-            "kind": kind,
-            "metadata": metadata,
-            "spec": spec,
-            "status": status,
-            "user": user,
-        }

digitalhub/entities/artifact/entity/artifact.py

@@ -1,9 +0,0 @@
-from __future__ import annotations
-
-from digitalhub.entities.artifact.entity._base import Artifact
-
-
-class ArtifactArtifact(Artifact):
-    """
-    Artifact class.
-    """

digitalhub/entities/dataitem/entity/dataitem.py

@@ -1,9 +0,0 @@
-from __future__ import annotations
-
-from digitalhub.entities.dataitem.entity._base import Dataitem
-
-
-class DataitemDataitem(Dataitem):
-    """
-    Dataitem dataitem.
-    """

digitalhub/entities/dataitem/entity/iceberg.py

@@ -1,7 +0,0 @@
-from digitalhub.entities.dataitem.entity._base import Dataitem
-
-
-class DataitemIceberg(Dataitem):
-    """
-    Iceberg dataitem.
-    """

digitalhub/entities/dataitem/spec.py

@@ -1,61 +0,0 @@
-from __future__ import annotations
-
-from pydantic import Field
-
-from digitalhub.entities._base.spec.material import MaterialParams, MaterialSpec
-from digitalhub.entities.dataitem.models import TableSchema
-
-
-class DataitemSpec(MaterialSpec):
-    """
-    Dataitem specifications.
-    """
-
-
-class DataitemParams(MaterialParams):
-    """
-    Dataitem parameters.
-    """
-
-
-class DataitemSpecDataitem(DataitemSpec):
-    """
-    Dataitem dataitem specifications.
-    """
-
-
-class DataitemParamsDataitem(DataitemParams):
-    """
-    Dataitem dataitem parameters.
-    """
-
-
-class DataitemSpecTable(DataitemSpec):
-    """
-    Dataitem table specifications.
-    """
-
-    def __init__(self, path: str, schema: dict | None = None) -> None:
-        super().__init__(path)
-        self.schema = schema
-
-
-class DataitemParamsTable(DataitemParams):
-    """
-    Dataitem table parameters.
-    """
-
-    schema_: TableSchema = Field(default=None, alias="schema")
-    """The schema of the dataitem in table schema format."""
-
-
-class DataitemSpecIceberg(DataitemSpec):
-    """
-    Dataitem iceberg specifications.
-    """
-
-
-class DataitemParamsIceberg(DataitemParams):
-    """
-    Dataitem iceberg parameters.
-    """

digitalhub/entities/dataitem/status.py

@@ -1,38 +0,0 @@
-from __future__ import annotations
-
-from digitalhub.entities._base.status.material import MaterialStatus
-
-
-class DataitemStatus(MaterialStatus):
-    """
-    Status class for dataitem entities.
-    """
-
-    def __init__(
-        self,
-        state: str,
-        message: str | None = None,
-        files: list[dict] | None = None,
-        preview: dict | None = None,
-        **kwargs,
-    ) -> None:
-        super().__init__(state, message, files)
-        self.preview = preview
-
-
-class DataitemStatusDataitem(DataitemStatus):
-    """
-    Status class for dataitem dataitem entities.
-    """
-
-
-class DataitemStatusTable(DataitemStatus):
-    """
-    Status class for dataitem table entities.
-    """
-
-
-class DataitemStatusIceberg(DataitemStatus):
-    """
-    Status class for dataitem iceberg entities.
-    """

digitalhub/entities/function/spec.py

@@ -1,81 +0,0 @@
-from __future__ import annotations
-
-from digitalhub.entities._base.spec.base import Spec, SpecParams
-
-
-class FunctionSpec(Spec):
-    """
-    Specification for a Function.
-    """
-
-
-class FunctionParams(SpecParams):
-    """
-    Function parameters model.
-    """
-
-
-class SourceCodeStruct:
-    """
-    Source code struct.
-    """
-
-    def __init__(
-        self,
-        source: str | None = None,
-        handler: str | None = None,
-        code: str | None = None,
-        base64: str | None = None,
-        init_function: str | None = None,
-        lang: str | None = None,
-    ) -> None:
-        """
-        Constructor.
-
-        Parameters
-        ----------
-        source : str
-            Source reference.
-        handler : str
-            Function entrypoint.
-        code : str
-            Source code (plain).
-        base64 : str
-            Source code (base64 encoded).
-        init_function : str
-            Init function for remote execution.
-        lang : str
-            Source code language (hint).
-        """
-        self.source = source
-        self.handler = handler
-        self.code = code
-        self.base64 = base64
-        self.init_function = init_function
-        self.lang = lang
-
-    def to_dict(self) -> dict:
-        """
-        Convert to dictionary.
-
-        Returns
-        -------
-        dict
-            Dictionary representation of the object.
-        """
-        dict_ = {}
-        if self.source is not None:
-            dict_["source"] = self.source
-        if self.handler is not None:
-            dict_["handler"] = self.handler
-        if self.base64 is not None:
-            dict_["base64"] = self.base64
-        if self.init_function is not None:
-            dict_["init_function"] = self.init_function
-        if self.lang is not None:
-            dict_["lang"] = self.lang
-
-        return dict_
-
-    def __repr__(self) -> str:
-        return str(self.to_dict())

digitalhub/entities/function/status.py

@@ -1,9 +0,0 @@
-from __future__ import annotations
-
-from digitalhub.entities._base.status.base import Status
-
-
-class FunctionStatus(Status):
-    """
-    Status class for function entities.
-    """

digitalhub/entities/model/entity/huggingface.py

@@ -1,9 +0,0 @@
-from __future__ import annotations
-
-from digitalhub.entities.model.entity._base import Model
-
-
-class ModelHuggingface(Model):
-    """
-    Huggingface model.
-    """

digitalhub/entities/model/entity/model.py

@@ -1,9 +0,0 @@
-from __future__ import annotations
-
-from digitalhub.entities.model.entity._base import Model
-
-
-class ModelModel(Model):
-    """
-    Model model.
-    """

digitalhub/entities/model/entity/sklearn.py

@@ -1,9 +0,0 @@
-from __future__ import annotations
-
-from digitalhub.entities.model.entity._base import Model
-
-
-class ModelSklearn(Model):
-    """
-    SKLearn model.
-    """