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

digitalhub/entities/model/sklearn/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.sklearn.spec import ModelSpecSklearn
+    from digitalhub.entities.model.sklearn.status import ModelStatusSklearn
+
+
+class ModelSklearn(Model):
+    """
+    ModelSklearn class.
+    """
+
+    def __init__(
+        self,
+        project: str,
+        name: str,
+        uuid: str,
+        kind: str,
+        metadata: Metadata,
+        spec: ModelSpecSklearn,
+        status: ModelStatusSklearn,
+        user: str | None = None,
+    ) -> None:
+        super().__init__(project, name, uuid, kind, metadata, spec, status, user)
+
+        self.spec: ModelSpecSklearn
+        self.status: ModelStatusSklearn

digitalhub/entities/model/sklearn/spec.py

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

digitalhub/entities/model/sklearn/status.py

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

digitalhub/entities/project/builder.py

@@ -4,7 +4,7 @@ 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.project.entity import Project
+from digitalhub.entities.project.project.entity import Project
 
 
 def project_from_parameters(

digitalhub/entities/project/crud.py

@@ -7,13 +7,13 @@ from pathlib import Path
 from digitalhub.client.builder import build_client, get_client
 from digitalhub.context.builder import delete_context
 from digitalhub.entities._base.crud import delete_entity_api_base, read_entity_api_base, update_entity_api_base
-from digitalhub.entities.entity_types import EntityTypes
 from digitalhub.entities.project.builder import project_from_dict, project_from_parameters
+from digitalhub.entities.utils.entity_types import EntityTypes
 from digitalhub.utils.exceptions import BackendError, EntityError
 from digitalhub.utils.io_utils import read_yaml
 
 if typing.TYPE_CHECKING:
-    from digitalhub.entities.project.entity import Project
+    from digitalhub.entities.project.project.entity import Project
 
 
 ENTITY_TYPE = EntityTypes.PROJECT.value

digitalhub/entities/project/{entity.py → project/entity.py}

@@ -12,7 +12,7 @@ from digitalhub.entities._base.crud import (
     read_entity_api_ctx,
     update_entity_api_base,
 )
-from digitalhub.entities._base.entity.base import Entity
+from digitalhub.entities._base.entity.entity import Entity
 from digitalhub.entities._builders.metadata import build_metadata
 from digitalhub.entities._builders.name import build_name
 from digitalhub.entities._builders.spec import build_spec
@@ -39,7 +39,6 @@ from digitalhub.entities.dataitem.crud import (
     new_dataitem,
     update_dataitem,
 )
-from digitalhub.entities.entity_types import EntityTypes
 from digitalhub.entities.function.crud import (
     delete_function,
     function_from_dict,
@@ -71,6 +70,7 @@ from digitalhub.entities.secret.crud import (
     new_secret,
     update_secret,
 )
+from digitalhub.entities.utils.entity_types import EntityTypes
 from digitalhub.entities.workflow.crud import (
     delete_workflow,
     get_workflow,
@@ -87,16 +87,16 @@ from digitalhub.utils.io_utils import write_yaml
 from digitalhub.utils.uri_utils import map_uri_scheme
 
 if typing.TYPE_CHECKING:
-    from digitalhub.entities._base.metadata import Metadata
-    from digitalhub.entities.artifact.entity._base import Artifact
-    from digitalhub.entities.dataitem.entity._base import Dataitem
-    from digitalhub.entities.function.entity import Function
-    from digitalhub.entities.model.entity._base import Model
-    from digitalhub.entities.project.spec import ProjectSpec
-    from digitalhub.entities.project.status import ProjectStatus
-    from digitalhub.entities.run.entity import Run
-    from digitalhub.entities.secret.entity import Secret
-    from digitalhub.entities.workflow.entity import Workflow
+    from digitalhub.entities._base.entity.metadata import Metadata
+    from digitalhub.entities.artifact._base.entity import Artifact
+    from digitalhub.entities.dataitem._base.entity import Dataitem
+    from digitalhub.entities.function._base.entity import Function
+    from digitalhub.entities.model._base.entity import Model
+    from digitalhub.entities.project.project.spec import ProjectSpec
+    from digitalhub.entities.project.project.status import ProjectStatus
+    from digitalhub.entities.run._base.entity import Run
+    from digitalhub.entities.secret.secret.entity import Secret
+    from digitalhub.entities.workflow._base.entity import Workflow
 
 
 ARTIFACTS = EntityTypes.ARTIFACT.value + "s"

digitalhub/entities/project/{spec.py → project/spec.py}

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
-from digitalhub.entities._base.spec.base import Spec, SpecParams
+from digitalhub.entities._base.entity.spec import Spec, SpecValidator
 
 
 class ProjectSpec(Spec):
     """
-    Project specification.
+    ProjectSpec specifications.
     """
 
     def __init__(
@@ -26,9 +26,9 @@ class ProjectSpec(Spec):
         self.models = models if models is not None else []
 
 
-class ProjectParams(SpecParams):
+class ProjectValidator(SpecValidator):
     """
-    Parameters model for project.
+    ProjectValidator validator.
     """
 
     context: str = None

digitalhub/entities/project/project/status.py

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

digitalhub/entities/registries.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from digitalhub.entities.entity_types import EntityTypes
+from digitalhub.entities.utils.entity_types import EntityTypes
 from digitalhub.registry.registry import registry
 from digitalhub.registry.utils import create_info
 
@@ -10,14 +10,14 @@ root = "digitalhub.entities"
 # Projects
 entity_type = EntityTypes.PROJECT.value
 prefix = entity_type.capitalize()
-project_info = create_info(root, entity_type, prefix)
+project_info = create_info(root, entity_type, "project", prefix)
 registry.register("project", project_info)
 
 
 # Secrets
 entity_type = EntityTypes.SECRET.value
 prefix = entity_type.capitalize()
-secret_info = create_info(root, entity_type, prefix)
+secret_info = create_info(root, entity_type, "secret", prefix)
 registry.register("secret", secret_info)
 
 
@@ -26,7 +26,7 @@ entity_type = EntityTypes.ARTIFACT.value
 for i in ["artifact"]:
     prefix = entity_type.capitalize()
     suffix = i.capitalize()
-    artifact_info = create_info(root, entity_type, prefix, suffix)
+    artifact_info = create_info(root, entity_type, i, prefix, suffix)
     registry.register(i, artifact_info)
 
 
@@ -35,7 +35,7 @@ entity_type = EntityTypes.DATAITEM.value
 for i in ["dataitem", "table"]:
     prefix = entity_type.capitalize()
     suffix = i.capitalize()
-    dataitem_info = create_info(root, entity_type, prefix, suffix)
+    dataitem_info = create_info(root, entity_type, i, prefix, suffix)
     registry.register(i, dataitem_info)
 
 
@@ -44,5 +44,5 @@ entity_type = EntityTypes.MODEL.value
 for i in ["model", "mlflow", "sklearn", "huggingface"]:
     prefix = entity_type.capitalize()
     suffix = i.capitalize()
-    model_info = create_info(root, entity_type, prefix, suffix)
+    model_info = create_info(root, entity_type, i, prefix, suffix)
     registry.register(i, model_info)

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

@@ -14,21 +14,21 @@ from digitalhub.entities._base.crud import (
     resume_api,
     stop_api,
 )
-from digitalhub.entities._base.entity.unversioned import UnversionedEntity
-from digitalhub.entities._base.state import State
+from digitalhub.entities._base.unversioned.entity import UnversionedEntity
 from digitalhub.entities._builders.spec import build_spec
 from digitalhub.entities._builders.status import build_status
-from digitalhub.entities.entity_types import EntityTypes
+from digitalhub.entities.utils.entity_types import EntityTypes
+from digitalhub.entities.utils.state import State
 from digitalhub.registry.registry import registry
 from digitalhub.runtimes.builder import build_runtime
 from digitalhub.utils.exceptions import EntityError
 from digitalhub.utils.logger import LOGGER
 
 if typing.TYPE_CHECKING:
-    from digitalhub.entities._base.entity.material import MaterialEntity
-    from digitalhub.entities._base.metadata import Metadata
-    from digitalhub.entities.run.spec import RunSpec
-    from digitalhub.entities.run.status import RunStatus
+    from digitalhub.entities._base.entity.metadata import Metadata
+    from digitalhub.entities._base.material.entity import MaterialEntity
+    from digitalhub.entities.run._base.spec import RunSpec
+    from digitalhub.entities.run._base.status import RunStatus
     from digitalhub.runtimes.base import Runtime
 
 

digitalhub/entities/run/{spec.py → _base/spec.py}

@@ -2,16 +2,16 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.entities._base.spec.base import Spec, SpecParams
+from digitalhub.entities._base.entity.spec import Spec, SpecValidator
 from digitalhub.entities.artifact.crud import get_artifact
 from digitalhub.entities.dataitem.crud import get_dataitem
-from digitalhub.entities.entity_types import EntityTypes
 from digitalhub.entities.model.crud import get_model
-from digitalhub.entities.task.models import K8s
-from digitalhub.entities.utils import parse_entity_key
+from digitalhub.entities.task._base.models import K8s
+from digitalhub.entities.utils.entity_types import EntityTypes
+from digitalhub.entities.utils.utils import parse_entity_key
 
 if typing.TYPE_CHECKING:
-    from digitalhub.entities._base.entity.base import Entity
+    from digitalhub.entities._base.entity.entity import Entity
 
 
 ENTITY_FUNC = {
@@ -22,7 +22,7 @@ ENTITY_FUNC = {
 
 
 class RunSpec(Spec):
-    """Run specification."""
+    """RunSpec specifications."""
 
     def __init__(
         self,
@@ -138,9 +138,9 @@ class RunSpec(Spec):
         return ENTITY_FUNC[entity_type](key)
 
 
-class RunParams(SpecParams, K8s):
+class RunValidator(SpecValidator, K8s):
     """
-    Run parameters.
+    RunValidator validator.
     """
 
     function: str = None

digitalhub/entities/run/{status.py → _base/status.py}

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
-from digitalhub.entities._base.status.base import Status
+from digitalhub.entities._base.entity.status import Status
 from digitalhub.entities.artifact.crud import get_artifact
 from digitalhub.entities.dataitem.crud import get_dataitem
-from digitalhub.entities.entity_types import EntityTypes
 from digitalhub.entities.model.crud import get_model
-from digitalhub.entities.utils import parse_entity_key
+from digitalhub.entities.utils.entity_types import EntityTypes
+from digitalhub.entities.utils.utils import parse_entity_key
 
 ENTITY_FUNC = {
     EntityTypes.ARTIFACT.value: get_artifact,
@@ -16,7 +16,7 @@ ENTITY_FUNC = {
 
 class RunStatus(Status):
     """
-    Status class for run entities.
+    RunStatus status.
     """
 
     def __init__(

digitalhub/entities/run/builder.py

@@ -4,7 +4,7 @@ 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.entities.run.entity import Run
+from digitalhub.entities.run._base.entity import Run
 
 
 def run_from_parameters(

digitalhub/entities/run/crud.py

@@ -4,13 +4,13 @@ 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
-from digitalhub.entities.entity_types import EntityTypes
 from digitalhub.entities.run.builder import run_from_dict, run_from_parameters
+from digitalhub.entities.utils.entity_types import EntityTypes
 from digitalhub.utils.exceptions import EntityAlreadyExistsError, EntityError
 from digitalhub.utils.io_utils import read_yaml
 
 if typing.TYPE_CHECKING:
-    from digitalhub.entities.run.entity import Run
+    from digitalhub.entities.run._base.entity import Run
 
 
 ENTITY_TYPE = EntityTypes.RUN.value

digitalhub/entities/secret/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.secret.entity import Secret
+from digitalhub.entities.secret.secret.entity import Secret
 
 
 def secret_from_parameters(

digitalhub/entities/secret/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.secret.builder import secret_from_dict, secret_from_parameters
-from digitalhub.utils.exceptions import EntityAlreadyExistsError
+from digitalhub.entities.utils.entity_types import EntityTypes
+from digitalhub.utils.exceptions import EntityAlreadyExistsError, EntityNotExistsError
 from digitalhub.utils.io_utils import read_yaml
 
 if typing.TYPE_CHECKING:
-    from digitalhub.entities.secret.entity import Secret
+    from digitalhub.entities.secret.secret.entity import Secret
 
 
 ENTITY_TYPE = EntityTypes.SECRET.value
@@ -119,6 +119,14 @@ def get_secret(
     >>>                  project="my-project",
     >>>                  entity_id="my-secret-id")
     """
+    if not identifier.startswith("store://"):
+        secrets = list_secrets(project=project, **kwargs)
+        for secret in secrets:
+            if secret.name == identifier:
+                return secret
+        else:
+            raise EntityNotExistsError(f"Secret {identifier} not found.")
+
     obj = read_entity_api_ctx(
         identifier,
         ENTITY_TYPE,

digitalhub/entities/secret/{entity.py → secret/entity.py}

@@ -3,13 +3,13 @@ from __future__ import annotations
 import typing
 
 from digitalhub.entities._base.crud import get_data_api, set_data_api
-from digitalhub.entities._base.entity.versioned import VersionedEntity
-from digitalhub.entities.entity_types import EntityTypes
+from digitalhub.entities._base.versioned.entity import VersionedEntity
+from digitalhub.entities.utils.entity_types import EntityTypes
 
 if typing.TYPE_CHECKING:
-    from digitalhub.entities._base.metadata import Metadata
-    from digitalhub.entities.secret.spec import SecretSpec
-    from digitalhub.entities.secret.status import SecretStatus
+    from digitalhub.entities._base.entity.metadata import Metadata
+    from digitalhub.entities.secret.secret.spec import SecretSpec
+    from digitalhub.entities.secret.secret.status import SecretStatus
 
 
 class Secret(VersionedEntity):
@@ -70,4 +70,5 @@ class Secret(VersionedEntity):
             raise NotImplementedError("read_secret() is not implemented for local projects.")
 
         params = {"keys": self.name}
-        return get_data_api(self.project, self.ENTITY_TYPE, params=params)
+        data = get_data_api(self.project, self.ENTITY_TYPE, params=params)
+        return data[self.name]

digitalhub/entities/secret/{spec.py → secret/spec.py}

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
-from digitalhub.entities._base.spec.base import Spec, SpecParams
+from digitalhub.entities._base.entity.spec import Spec, SpecValidator
 
 
 class SecretSpec(Spec):
     """
-    Secret specifications.
+    SecretSpec specifications.
     """
 
     def __init__(self, path: str | None = None, provider: str | None = None, **kwargs) -> None:
@@ -23,9 +23,9 @@ class SecretSpec(Spec):
         self.provider = provider
 
 
-class SecretParams(SpecParams):
+class SecretValidator(SpecValidator):
     """
-    Secret parameters.
+    SecretValidator validator.
     """
 
     path: str = None

digitalhub/entities/secret/secret/status.py

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

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

@@ -2,15 +2,15 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.entities._base.entity.unversioned import UnversionedEntity
-from digitalhub.entities.entity_types import EntityTypes
+from digitalhub.entities._base.unversioned.entity import UnversionedEntity
 from digitalhub.entities.run.crud import delete_run, get_run, new_run, run_from_parameters
+from digitalhub.entities.utils.entity_types import EntityTypes
 
 if typing.TYPE_CHECKING:
-    from digitalhub.entities._base.metadata import Metadata
-    from digitalhub.entities.run.entity import Run
-    from digitalhub.entities.task.spec import TaskSpec
-    from digitalhub.entities.task.status import TaskStatus
+    from digitalhub.entities._base.entity.metadata import Metadata
+    from digitalhub.entities.run._base.entity import Run
+    from digitalhub.entities.task._base.spec import TaskSpec
+    from digitalhub.entities.task._base.status import TaskStatus
 
 
 class Task(UnversionedEntity):

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

@@ -197,3 +197,12 @@ class K8s(BaseModel):
 
     profile: str = None
     """Profile template."""
+
+
+class CorePort(BaseModel):
+    """
+    Port mapper model.
+    """
+
+    port: int
+    target_port: int

digitalhub/entities/task/{spec.py → _base/spec.py}

@@ -1,17 +1,19 @@
 from __future__ import annotations
 
-from digitalhub.entities._base.spec.base import Spec, SpecParams
-from digitalhub.entities.task.models import K8s
+from digitalhub.entities._base.entity.spec import Spec, SpecValidator
+from digitalhub.entities.task._base.models import K8s
 
 
 class TaskSpec(Spec):
-    """Task specification."""
+    """TaskSpec specifications."""
 
     def __init__(self, function: str) -> None:
         self.function = function
 
 
 class TaskSpecK8s(TaskSpec):
+    """TaskSpecK8s specifications."""
+
     def __init__(
         self,
         function: str,
@@ -36,16 +38,16 @@ class TaskSpecK8s(TaskSpec):
         self.profile = profile
 
 
-class TaskParams(SpecParams):
+class TaskValidator(SpecValidator):
     """
-    Base task model.
+    TaskValidator validator.
     """
 
     function: str
     """Function string."""
 
 
-class TaskParamsK8s(TaskParams, K8s):
+class TaskValidatorK8s(TaskValidator, K8s):
     """
-    Kubernetes task model.
+    TaskValidatorK8s validator.
     """

digitalhub/entities/task/_base/status.py

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

digitalhub/entities/task/builder.py

@@ -4,7 +4,7 @@ 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.entities.task.entity import Task
+from digitalhub.entities.task._base.entity import Task
 
 
 def task_from_parameters(

digitalhub/entities/task/crud.py

@@ -4,13 +4,13 @@ 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
-from digitalhub.entities.entity_types import EntityTypes
 from digitalhub.entities.task.builder import task_from_dict, task_from_parameters
+from digitalhub.entities.utils.entity_types import EntityTypes
 from digitalhub.utils.exceptions import EntityAlreadyExistsError, EntityError
 from digitalhub.utils.io_utils import read_yaml
 
 if typing.TYPE_CHECKING:
-    from digitalhub.entities.task.entity import Task
+    from digitalhub.entities.task._base.entity import Task
 
 
 ENTITY_TYPE = EntityTypes.TASK.value

digitalhub/entities/{utils.py → utils/utils.py}

@@ -2,9 +2,9 @@ from __future__ import annotations
 
 from pathlib import Path
 
-from digitalhub.entities.entity_types import EntityTypes
-from digitalhub.utils.env_utils import get_s3_bucket
+from digitalhub.entities.utils.entity_types import EntityTypes
 from digitalhub.utils.file_utils import get_file_mime_type
+from digitalhub.utils.s3_utils import get_s3_bucket
 from digitalhub.utils.uri_utils import check_local_path
 
 

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

@@ -2,16 +2,16 @@ from __future__ import annotations
 
 import typing
 
-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.run.entity import Run
-    from digitalhub.entities.workflow.spec import WorkflowSpec
-    from digitalhub.entities.workflow.status import WorkflowStatus
+    from digitalhub.entities._base.entity.metadata import Metadata
+    from digitalhub.entities.run._base.entity import Run
+    from digitalhub.entities.workflow._base.spec import WorkflowSpec
+    from digitalhub.entities.workflow._base.status import WorkflowStatus
 
 
 class Workflow(ExecutableEntity):

digitalhub/entities/workflow/_base/spec.py

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

digitalhub/entities/workflow/_base/status.py

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