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

digitalhub/entities/dataitem/dataitem/spec.py

@@ -0,0 +1,15 @@
+from __future__ import annotations
+
+from digitalhub.entities.dataitem._base.spec import DataitemSpec, DataitemValidator
+
+
+class DataitemSpecDataitem(DataitemSpec):
+    """
+    DataitemSpecDataitem specifications.
+    """
+
+
+class DataitemValidatorDataitem(DataitemValidator):
+    """
+    DataitemValidatorDataitem validator.
+    """

digitalhub/entities/dataitem/dataitem/status.py

@@ -0,0 +1,9 @@
+from __future__ import annotations
+
+from digitalhub.entities.dataitem._base.status import DataitemStatus
+
+
+class DataitemStatusDataitem(DataitemStatus):
+    """
+    DataitemStatusDataitem status.
+    """

digitalhub/entities/dataitem/iceberg/entity.py

@@ -0,0 +1,32 @@
+from __future__ import annotations
+
+import typing
+
+from digitalhub.entities.dataitem._base.entity import Dataitem
+
+if typing.TYPE_CHECKING:
+    from digitalhub.entities._base.entity.metadata import Metadata
+    from digitalhub.entities.dataitem.iceberg.spec import DataitemSpecIceberg
+    from digitalhub.entities.dataitem.iceberg.status import DataitemStatusIceberg
+
+
+class DataitemIceberg(Dataitem):
+    """
+    DataitemIceberg class.
+    """
+
+    def __init__(
+        self,
+        project: str,
+        name: str,
+        uuid: str,
+        kind: str,
+        metadata: Metadata,
+        spec: DataitemSpecIceberg,
+        status: DataitemStatusIceberg,
+        user: str | None = None,
+    ) -> None:
+        super().__init__(project, name, uuid, kind, metadata, spec, status, user)
+
+        self.spec: DataitemSpecIceberg
+        self.status: DataitemStatusIceberg

digitalhub/entities/dataitem/iceberg/spec.py

@@ -0,0 +1,15 @@
+from __future__ import annotations
+
+from digitalhub.entities.dataitem._base.spec import DataitemSpec, DataitemValidator
+
+
+class DataitemSpecIceberg(DataitemSpec):
+    """
+    DataitemSpecIceberg specifications.
+    """
+
+
+class DataitemValidatorIceberg(DataitemValidator):
+    """
+    DataitemValidatorIceberg validator.
+    """

digitalhub/entities/dataitem/iceberg/status.py

@@ -0,0 +1,9 @@
+from __future__ import annotations
+
+from digitalhub.entities.dataitem._base.status import DataitemStatus
+
+
+class DataitemStatusIceberg(DataitemStatus):
+    """
+    DataitemStatusIceberg status.
+    """

digitalhub/entities/dataitem/{entity/table.py → table/entity.py}

@@ -1,20 +1,41 @@
 from __future__ import annotations
 
 import shutil
+import typing
 from pathlib import Path
 from typing import Any
 
 from digitalhub.datastores.builder import get_datastore
-from digitalhub.entities.dataitem.entity._base import Dataitem
+from digitalhub.entities.dataitem._base.entity import Dataitem
 from digitalhub.utils.uri_utils import check_local_path
 
+if typing.TYPE_CHECKING:
+    from digitalhub.entities._base.entity.metadata import Metadata
+    from digitalhub.entities.dataitem.table.spec import DataitemSpecTable
+    from digitalhub.entities.dataitem.table.status import DataitemStatusTable
 
-class DataitemTable(Dataitem):
 
+class DataitemTable(Dataitem):
     """
-    Table dataitem.
+    DataitemTable class.
     """
 
+    def __init__(
+        self,
+        project: str,
+        name: str,
+        uuid: str,
+        kind: str,
+        metadata: Metadata,
+        spec: DataitemSpecTable,
+        status: DataitemStatusTable,
+        user: str | None = None,
+    ) -> None:
+        super().__init__(project, name, uuid, kind, metadata, spec, status, user)
+
+        self.spec: DataitemSpecTable
+        self.status: DataitemStatusTable
+
     def as_df(
         self,
         file_format: str | None = None,

digitalhub/entities/dataitem/table/spec.py

@@ -0,0 +1,25 @@
+from __future__ import annotations
+
+from pydantic import Field
+
+from digitalhub.entities.dataitem._base.spec import DataitemSpec, DataitemValidator
+from digitalhub.entities.dataitem.table.models import TableSchema
+
+
+class DataitemSpecTable(DataitemSpec):
+    """
+    DataitemSpecTable specifications.
+    """
+
+    def __init__(self, path: str, schema: dict | None = None) -> None:
+        super().__init__(path)
+        self.schema = schema
+
+
+class DataitemValidatorTable(DataitemValidator):
+    """
+    DataitemValidatorTable validator.
+    """
+
+    schema_: TableSchema = Field(default=None, alias="schema")
+    """The schema of the dataitem in table schema format."""

digitalhub/entities/dataitem/table/status.py

@@ -0,0 +1,9 @@
+from __future__ import annotations
+
+from digitalhub.entities.dataitem._base.status import DataitemStatus
+
+
+class DataitemStatusTable(DataitemStatus):
+    """
+    DataitemStatusTable status.
+    """

digitalhub/entities/function/{entity.py → _base/entity.py}

@@ -3,16 +3,16 @@ from __future__ import annotations
 import typing
 from concurrent.futures import ThreadPoolExecutor
 
-from digitalhub.entities._base.entity.executable import ExecutableEntity
-from digitalhub.entities.entity_types import EntityTypes
+from digitalhub.entities._base.executable.entity import ExecutableEntity
+from digitalhub.entities.utils.entity_types import EntityTypes
 from digitalhub.runtimes.builder import get_kind_registry
 from digitalhub.utils.exceptions import BackendError
 
 if typing.TYPE_CHECKING:
-    from digitalhub.entities._base.metadata import Metadata
-    from digitalhub.entities.function.spec import FunctionSpec
-    from digitalhub.entities.function.status import FunctionStatus
-    from digitalhub.entities.run.entity import Run
+    from digitalhub.entities._base.entity.metadata import Metadata
+    from digitalhub.entities.function._base.spec import FunctionSpec
+    from digitalhub.entities.function._base.status import FunctionStatus
+    from digitalhub.entities.run._base.entity import Run
 
 
 class Function(ExecutableEntity):

digitalhub/entities/function/{models.py → _base/models.py}

@@ -94,7 +94,7 @@ class SourceCodeStruct:
         return str(self.to_dict())
 
 
-class SourceCodeParams(BaseModel):
+class SourceCodeValidator(BaseModel):
     """
     Source code params.
     """

digitalhub/entities/function/_base/spec.py

@@ -0,0 +1,15 @@
+from __future__ import annotations
+
+from digitalhub.entities._base.entity.spec import Spec, SpecValidator
+
+
+class FunctionSpec(Spec):
+    """
+    FunctionSpec specifications.
+    """
+
+
+class FunctionValidator(SpecValidator):
+    """
+    FunctionValidator validator.
+    """

digitalhub/entities/function/_base/status.py

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

digitalhub/entities/function/builder.py

@@ -5,7 +5,7 @@ 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.entities.function.entity import Function
+from digitalhub.entities.function._base.entity import Function
 
 
 def function_from_parameters(

digitalhub/entities/function/crud.py

@@ -9,13 +9,13 @@ from digitalhub.entities._base.crud import (
     read_entity_api_ctx,
     read_entity_api_ctx_versions,
 )
-from digitalhub.entities.entity_types import EntityTypes
 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.entity import Function
+    from digitalhub.entities.function._base.entity import Function
 
 ENTITY_TYPE = EntityTypes.FUNCTION.value
 

digitalhub/entities/model/{entity/_base.py → _base/entity.py}

@@ -2,13 +2,13 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.entities._base.entity.material import MaterialEntity
-from digitalhub.entities.entity_types import EntityTypes
+from digitalhub.entities._base.material.entity import MaterialEntity
+from digitalhub.entities.utils.entity_types import EntityTypes
 
 if typing.TYPE_CHECKING:
-    from digitalhub.entities._base.metadata import Metadata
-    from digitalhub.entities.model.spec import ModelSpec
-    from digitalhub.entities.model.status import ModelStatus
+    from digitalhub.entities._base.entity.metadata import Metadata
+    from digitalhub.entities.model._base.spec import ModelSpec
+    from digitalhub.entities.model._base.status import ModelStatus
 
 
 class Model(MaterialEntity):

digitalhub/entities/model/_base/spec.py

@@ -0,0 +1,49 @@
+from __future__ import annotations
+
+from digitalhub.entities._base.material.spec import MaterialSpec, MaterialValidator
+
+
+class ModelSpec(MaterialSpec):
+    """
+    ModelSpec specifications.
+    """
+
+    def __init__(
+        self,
+        path: str,
+        framework: str | None = None,
+        algorithm: str | None = None,
+        base_model: str | None = None,
+        parameters: dict | None = None,
+        metrics: dict | None = None,
+    ) -> None:
+        self.path = path
+        self.framework = framework
+        self.algorithm = algorithm
+        self.base_model = base_model
+        self.parameters = parameters
+        self.metrics = metrics
+
+
+class ModelValidator(MaterialValidator):
+    """
+    ModelValidator validator.
+    """
+
+    path: str
+    """Path to the model."""
+
+    framework: str = None
+    """Model framework (e.g. 'pytorch')."""
+
+    algorithm: str = None
+    """Model algorithm (e.g. 'resnet')."""
+
+    base_model: str = None
+    """Base model."""
+
+    parameters: dict = None
+    """Model validator."""
+
+    metrics: dict = None
+    """Model metrics."""

digitalhub/entities/model/_base/status.py

@@ -0,0 +1,9 @@
+from __future__ import annotations
+
+from digitalhub.entities._base.material.status import MaterialStatus
+
+
+class ModelStatus(MaterialStatus):
+    """
+    ModelStatus status.
+    """

digitalhub/entities/model/builder.py

@@ -10,32 +10,32 @@ from digitalhub.entities._builders.uuid import build_uuid
 from digitalhub.utils.exceptions import EntityError
 
 if typing.TYPE_CHECKING:
-    from digitalhub.entities.model.entity._base import Model
+    from digitalhub.entities.model._base.entity import Model
 
 # Manage class mapper
 cls_mapper = {}
 
 try:
-    from digitalhub.entities.model.entity.model import ModelModel
+    from digitalhub.entities.model.model.entity import ModelModel
 
     cls_mapper["model"] = ModelModel
 except ImportError:
     ...
 
 try:
-    from digitalhub.entities.model.entity.mlflow import ModelMlflow
+    from digitalhub.entities.model.mlflow.entity import ModelMlflow
 
     cls_mapper["mlflow"] = ModelMlflow
 except ImportError:
     ...
 try:
-    from digitalhub.entities.model.entity.sklearn import ModelSklearn
+    from digitalhub.entities.model.sklearn.entity import ModelSklearn
 
     cls_mapper["sklearn"] = ModelSklearn
 except ImportError:
     ...
 try:
-    from digitalhub.entities.model.entity.huggingface import ModelHuggingface
+    from digitalhub.entities.model.huggingface.entity import ModelHuggingface
 
     cls_mapper["huggingface"] = ModelHuggingface
 except ImportError:

digitalhub/entities/model/crud.py

@@ -10,14 +10,14 @@ from digitalhub.entities._base.crud import (
     read_entity_api_ctx_versions,
 )
 from digitalhub.entities._builders.uuid import build_uuid
-from digitalhub.entities.entity_types import EntityTypes
 from digitalhub.entities.model.builder import model_from_dict, model_from_parameters
-from digitalhub.entities.utils import build_log_path_from_source, eval_local_source
+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.entity._base import Model
+    from digitalhub.entities.model._base.entity import Model
 
 
 ENTITY_TYPE = EntityTypes.MODEL.value

digitalhub/entities/model/huggingface/entity.py

@@ -0,0 +1,32 @@
+from __future__ import annotations
+
+import typing
+
+from digitalhub.entities.model._base.entity import Model
+
+if typing.TYPE_CHECKING:
+    from digitalhub.entities._base.entity.metadata import Metadata
+    from digitalhub.entities.model.huggingface.spec import ModelSpecHuggingface
+    from digitalhub.entities.model.huggingface.status import ModelStatusHuggingface
+
+
+class ModelHuggingface(Model):
+    """
+    ModelHuggingface class.
+    """
+
+    def __init__(
+        self,
+        project: str,
+        name: str,
+        uuid: str,
+        kind: str,
+        metadata: Metadata,
+        spec: ModelSpecHuggingface,
+        status: ModelStatusHuggingface,
+        user: str | None = None,
+    ) -> None:
+        super().__init__(project, name, uuid, kind, metadata, spec, status, user)
+
+        self.spec: ModelSpecHuggingface
+        self.status: ModelStatusHuggingface

digitalhub/entities/model/huggingface/spec.py

@@ -0,0 +1,36 @@
+from __future__ import annotations
+
+from digitalhub.entities.model._base.spec import ModelSpec, ModelValidator
+
+
+class ModelSpecHuggingface(ModelSpec):
+    """
+    ModelSpecHuggingface specifications.
+    """
+
+    def __init__(
+        self,
+        path: str,
+        framework: str | None = None,
+        algorithm: str | None = None,
+        base_model: str | None = None,
+        parameters: dict | None = None,
+        metrics: dict | None = None,
+        model_id: str | None = None,
+        model_revision: str = None,
+    ) -> None:
+        super().__init__(path, framework, algorithm, base_model, parameters, metrics)
+        self.model_id = model_id
+        self.model_revision = model_revision
+
+
+class ModelValidatorHuggingface(ModelValidator):
+    """
+    ModelValidatorHuggingface validator.
+    """
+
+    model_id: str = None
+    """Huggingface model id. If not specified, the model is loaded from the model path."""
+
+    model_revision: str = None
+    """Huggingface model revision."""

digitalhub/entities/model/huggingface/status.py

@@ -0,0 +1,9 @@
+from __future__ import annotations
+
+from digitalhub.entities.model._base.status import ModelStatus
+
+
+class ModelStatusHuggingface(ModelStatus):
+    """
+    ModelStatusHuggingface status.
+    """

digitalhub/entities/model/mlflow/entity.py

@@ -0,0 +1,32 @@
+from __future__ import annotations
+
+import typing
+
+from digitalhub.entities.model._base.entity import Model
+
+if typing.TYPE_CHECKING:
+    from digitalhub.entities._base.entity.metadata import Metadata
+    from digitalhub.entities.model.mlflow.spec import ModelSpecMlflow
+    from digitalhub.entities.model.mlflow.status import ModelStatusMlflow
+
+
+class ModelMlflow(Model):
+    """
+    ModelMlflow class.
+    """
+
+    def __init__(
+        self,
+        project: str,
+        name: str,
+        uuid: str,
+        kind: str,
+        metadata: Metadata,
+        spec: ModelSpecMlflow,
+        status: ModelStatusMlflow,
+        user: str | None = None,
+    ) -> None:
+        super().__init__(project, name, uuid, kind, metadata, spec, status, user)
+
+        self.spec: ModelSpecMlflow
+        self.status: ModelStatusMlflow

digitalhub/entities/model/mlflow/spec.py

@@ -0,0 +1,44 @@
+from __future__ import annotations
+
+from digitalhub.entities.model._base.spec import ModelSpec, ModelValidator
+from digitalhub.entities.model.mlflow.models import Dataset, Signature
+
+
+class ModelSpecMlflow(ModelSpec):
+    """
+    ModelSpecMlflow specifications.
+    """
+
+    def __init__(
+        self,
+        path: str,
+        framework: str | None = None,
+        algorithm: str | None = None,
+        base_model: str | None = None,
+        parameters: dict | None = None,
+        metrics: dict | None = None,
+        flavor: str | None = None,
+        model_config: dict | None = None,
+        input_datasets: list[Dataset] | None = None,
+        signature: Signature = None,
+    ) -> None:
+        super().__init__(path, framework, algorithm, base_model, parameters, metrics)
+        self.flavor = flavor
+        self.model_config = model_config
+        self.input_datasets = input_datasets
+        self.signature = signature
+
+
+class ModelValidatorMlflow(ModelValidator):
+    """
+    ModelValidatorMlflow validator.
+    """
+
+    flavor: str = None
+    """Mlflow model flavor."""
+    model_config: dict = None
+    """Mlflow model config."""
+    input_datasets: list[Dataset] = None
+    """Mlflow input datasets."""
+    signature: Signature = None
+    """Mlflow model signature."""

digitalhub/entities/model/mlflow/status.py

@@ -0,0 +1,9 @@
+from __future__ import annotations
+
+from digitalhub.entities.model._base.status import ModelStatus
+
+
+class ModelStatusMlflow(ModelStatus):
+    """
+    ModelStatusMlflow status.
+    """

digitalhub/entities/model/{entity/mlflow.py → mlflow/utils.py}

@@ -1,17 +1,8 @@
-from __future__ import annotations
-
 from urllib.parse import urlparse
 
 import mlflow
 
-from digitalhub.entities.model.entity._base import Model
-from digitalhub.entities.model.models import Dataset, Signature
-
-
-class ModelMlflow(Model):
-    """
-    Mlflow model.
-    """
+from digitalhub.entities.model.mlflow.models import Dataset, Signature
 
 
 def from_mlflow_run(run_id: str) -> dict:

digitalhub/entities/model/model/entity.py

@@ -0,0 +1,32 @@
+from __future__ import annotations
+
+import typing
+
+from digitalhub.entities.model._base.entity import Model
+
+if typing.TYPE_CHECKING:
+    from digitalhub.entities._base.entity.metadata import Metadata
+    from digitalhub.entities.model.model.spec import ModelSpecModel
+    from digitalhub.entities.model.model.status import ModelStatusModel
+
+
+class ModelModel(Model):
+    """
+    ModelModel class.
+    """
+
+    def __init__(
+        self,
+        project: str,
+        name: str,
+        uuid: str,
+        kind: str,
+        metadata: Metadata,
+        spec: ModelSpecModel,
+        status: ModelStatusModel,
+        user: str | None = None,
+    ) -> None:
+        super().__init__(project, name, uuid, kind, metadata, spec, status, user)
+
+        self.spec: ModelSpecModel
+        self.status: ModelStatusModel

digitalhub/entities/model/model/spec.py

@@ -0,0 +1,15 @@
+from __future__ import annotations
+
+from digitalhub.entities.model._base.spec import ModelSpec, ModelValidator
+
+
+class ModelSpecModel(ModelSpec):
+    """
+    ModelSpecModel specifications.
+    """
+
+
+class ModelValidatorModel(ModelValidator):
+    """
+    ModelValidatorModel validator.
+    """

digitalhub/entities/model/model/status.py

@@ -0,0 +1,9 @@
+from __future__ import annotations
+
+from digitalhub.entities.model._base.status import ModelStatus
+
+
+class ModelStatusModel(ModelStatus):
+    """
+    ModelStatusModel status.
+    """