digitalhub 0.10.0b3__py3-none-any.whl → 0.10.0b5__py3-none-any.whl

digitalhub/entities/model/_base/spec.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing import Optional
+
 from digitalhub.entities._base.material.spec import MaterialSpec, MaterialValidator
 
 
@@ -15,7 +17,7 @@ class ModelSpec(MaterialSpec):
         algorithm: str | None = None,
         parameters: dict | None = None,
     ) -> None:
-        self.path = path
+        super().__init__(path)
         self.framework = framework
         self.algorithm = algorithm
         self.parameters = parameters
@@ -26,14 +28,11 @@ class ModelValidator(MaterialValidator):
     ModelValidator validator.
     """
 
-    path: str
-    """Path to the model."""
-
-    framework: str = None
+    framework: Optional[str] = None
     """Model framework (e.g. 'pytorch')."""
 
-    algorithm: str = None
+    algorithm: Optional[str] = None
     """Model algorithm (e.g. 'resnet')."""
 
-    parameters: dict = None
+    parameters: Optional[dict] = None
     """Model validator."""

digitalhub/entities/model/crud.py

@@ -5,6 +5,7 @@ import typing
 from digitalhub.entities._commons.enums import EntityTypes
 from digitalhub.entities._operations.processor import processor
 from digitalhub.entities.artifact.utils import eval_source, process_kwargs
+from digitalhub.utils.types import SourcesOrListOfSources
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities.model._base.entity import Model
@@ -77,7 +78,7 @@ def log_model(
     project: str,
     name: str,
     kind: str,
-    source: list[str] | str,
+    source: SourcesOrListOfSources,
     path: str | None = None,
     **kwargs,
 ) -> Model:
@@ -92,7 +93,7 @@ def log_model(
         Object name.
     kind : str
         Kind the object.
-    source : str
+    source : SourcesOrListOfSources
         Model location on local path.
     path : str
         Destination path of the model. If not provided, it's generated.

digitalhub/entities/model/huggingface/spec.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing import Optional
+
 from pydantic import Field
 
 from digitalhub.entities.model._base.spec import ModelSpec, ModelValidator
@@ -18,7 +20,7 @@ class ModelSpecHuggingface(ModelSpec):
         parameters: dict | None = None,
         base_model: str | None = None,
         model_id: str | None = None,
-        model_revision: str = None,
+        model_revision: str | None = None,
     ) -> None:
         super().__init__(path, framework, algorithm, parameters)
         self.base_model = base_model
@@ -31,7 +33,7 @@ class ModelValidatorHuggingface(ModelValidator):
     ModelValidatorHuggingface validator.
     """
 
-    base_model: str = None
+    base_model: Optional[str] = None
     """Base model."""
 
     placeholder_model_id: str = Field(default=None, alias="model_id")

digitalhub/entities/model/mlflow/spec.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing import Optional
+
 from pydantic import Field
 
 from digitalhub.entities.model._base.spec import ModelSpec, ModelValidator
@@ -20,7 +22,7 @@ class ModelSpecMlflow(ModelSpec):
         flavor: str | None = None,
         model_config: dict | None = None,
         input_datasets: list[Dataset] | None = None,
-        signature: Signature = None,
+        signature: Signature | None = None,
     ) -> None:
         super().__init__(path, framework, algorithm, parameters)
         self.flavor = flavor
@@ -34,14 +36,14 @@ class ModelValidatorMlflow(ModelValidator):
     ModelValidatorMlflow validator.
     """
 
-    flavor: str = None
+    flavor: Optional[str] = None
     """Mlflow model flavor."""
 
     placeholder_cfg_: dict = Field(default=None, alias="model_config")
     """Mlflow model config."""
 
-    input_datasets: list[Dataset] = None
+    input_datasets: Optional[list[Dataset]] = None
     """Mlflow input datasets."""
 
-    signature: Signature = None
+    signature: Optional[Signature] = None
     """Mlflow model signature."""

digitalhub/entities/project/_base/spec.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing import Optional
+
 from digitalhub.entities._base.entity.spec import Spec, SpecValidator
 
 
@@ -31,20 +33,20 @@ class ProjectValidator(SpecValidator):
     ProjectValidator validator.
     """
 
-    context: str = None
+    context: Optional[str] = None
     """The project's context."""
 
-    functions: list = None
+    functions: Optional[list] = None
     """List of project's functions."""
 
-    artifacts: list = None
+    artifacts: Optional[list] = None
     """List of project's artifacts."""
 
-    workflows: list = None
+    workflows: Optional[list] = None
     """List of project's workflows."""
 
-    dataitems: list = None
+    dataitems: Optional[list] = None
     """List of project's dataitems."""
 
-    models: list = None
+    models: Optional[list] = None
     """List of project's models."""

digitalhub/entities/project/crud.py

@@ -272,7 +272,7 @@ def update_project(entity: Project, **kwargs) -> Project:
         entity_type=entity.ENTITY_TYPE,
         entity_name=entity.name,
         entity_dict=entity.to_dict(),
-        local=entity.local,
+        local=entity._client.is_local(),
         **kwargs,
     )
 
@@ -283,7 +283,7 @@ def delete_project(
     clean_context: bool = True,
     local: bool = False,
     **kwargs,
-) -> list[dict]:
+) -> dict:
     """
     Delete a project.
 

digitalhub/entities/run/_base/spec.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing import Optional
+
 from digitalhub.entities._base.entity.spec import Spec, SpecValidator
 from digitalhub.entities.task._base.models import K8s
 
@@ -47,8 +49,8 @@ class RunValidator(SpecValidator, K8s):
     """
 
     # Task parameters
-    function: str = None
-    workflow: str = None
+    function: Optional[str] = None
+    workflow: Optional[str] = None
 
     # Run parameters
     task: str

digitalhub/entities/secret/_base/spec.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing import Optional
+
 from digitalhub.entities._base.entity.spec import Spec, SpecValidator
 
 
@@ -28,8 +30,8 @@ class SecretValidator(SpecValidator):
     SecretValidator validator.
     """
 
-    path: str = None
+    path: Optional[str] = None
     """Path to the secret."""
 
-    provider: str = None
+    provider: Optional[str] = None
     """Provider of the secret."""

digitalhub/entities/secret/crud.py

@@ -108,6 +108,8 @@ def get_secret(
     >>>                  entity_id="my-secret-id")
     """
     if not identifier.startswith("store://"):
+        if project is None:
+            raise ValueError("Project must be provided.")
         secrets = list_secrets(project=project, **kwargs)
         for secret in secrets:
             if secret.name == identifier:

digitalhub/entities/task/_base/models.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from enum import Enum
+from typing import Optional
 
 from pydantic import BaseModel, ConfigDict, Field
 
@@ -30,7 +31,7 @@ class Volume(BaseModel):
     mount_path: str
     """Volume mount path inside the container."""
 
-    spec: dict[str, str] = None
+    spec: Optional[dict[str, str]] = None
     """Volume spec."""
 
 
@@ -63,13 +64,13 @@ class Resource(BaseModel):
     Resource model.
     """
 
-    cpu: ResourceItem = None
+    cpu: Optional[ResourceItem] = None
     """CPU resource model."""
 
-    mem: ResourceItem = None
+    mem: Optional[ResourceItem] = None
     """Memory resource model."""
 
-    gpu: ResourceItem = None
+    gpu: Optional[ResourceItem] = None
     """GPU resource model."""
 
 
@@ -90,31 +91,31 @@ class Toleration(BaseModel):
     Toleration model.
     """
 
-    key: str = None
+    key: Optional[str] = None
     """Toleration key."""
 
-    operator: str = None
+    operator: Optional[str] = None
     """Toleration operator."""
 
-    value: str = None
+    value: Optional[str] = None
     """Toleration value."""
 
-    effect: str = None
+    effect: Optional[str] = None
     """Toleration effect."""
 
-    toleration_seconds: int = None
+    toleration_seconds: Optional[int] = None
     """Toleration seconds."""
 
 
 class V1NodeSelectorRequirement(BaseModel):
     key: str
     operator: str
-    values: list[str] = None
+    values: Optional[list[str]] = None
 
 
 class V1NodeSelectorTerm(BaseModel):
-    match_expressions: list[V1NodeSelectorRequirement] = None
-    match_fields: list[V1NodeSelectorRequirement] = None
+    match_expressions: Optional[list[V1NodeSelectorRequirement]] = None
+    match_fields: Optional[list[V1NodeSelectorRequirement]] = None
 
 
 class V1NodeSelector(BaseModel):
@@ -129,21 +130,21 @@ class V1PreferredSchedulingTerm(BaseModel):
 class V1LabelSelectorRequirement(BaseModel):
     key: str
     operator: str
-    values: list[str] = None
+    values: Optional[list[str]] = None
 
 
 class V1LabelSelector(BaseModel):
-    match_expressions: list[V1LabelSelectorRequirement] = None
-    match_labels: dict[str, str] = None
+    match_expressions: Optional[list[V1LabelSelectorRequirement]] = None
+    match_labels: Optional[dict[str, str]] = None
 
 
 class V1PodAffinityTerm(BaseModel):
-    label_selector: V1LabelSelector = None
-    match_label_keys: list[str] = None
-    mismatch_label_keys: list[str] = None
-    namespace_selector: V1LabelSelector = None
-    namespaces: list[str] = None
-    topology_key: str
+    label_selector: Optional[V1LabelSelector] = None
+    match_label_keys: Optional[list[str]] = None
+    mismatch_label_keys: Optional[list[str]] = None
+    namespace_selector: Optional[V1LabelSelector] = None
+    namespaces: Optional[list[str]] = None
+    topology_key: Optional[str] = None
 
 
 class V1WeightedPodAffinityTerm(BaseModel):
@@ -152,18 +153,18 @@ class V1WeightedPodAffinityTerm(BaseModel):
 
 
 class V1NodeAffinity(BaseModel):
-    preferred_during_scheduling_ignored_during_execution: list[V1PreferredSchedulingTerm] = None
-    required_during_scheduling_ignored_during_execution: V1NodeSelector = None
+    preferred_during_scheduling_ignored_during_execution: Optional[list[V1PreferredSchedulingTerm]] = None
+    required_during_scheduling_ignored_during_execution: Optional[V1NodeSelector] = None
 
 
 class V1PodAffinity(BaseModel):
-    preferred_during_scheduling_ignored_during_execution: list[V1WeightedPodAffinityTerm] = None
-    required_during_scheduling_ignored_during_execution: list[V1PodAffinityTerm] = None
+    preferred_during_scheduling_ignored_during_execution: Optional[list[V1WeightedPodAffinityTerm]] = None
+    required_during_scheduling_ignored_during_execution: Optional[list[V1PodAffinityTerm]] = None
 
 
 class V1PodAntiAffinity(BaseModel):
-    preferred_during_scheduling_ignored_during_execution: list[V1WeightedPodAffinityTerm] = None
-    required_during_scheduling_ignored_during_execution: list[V1PodAffinityTerm] = None
+    preferred_during_scheduling_ignored_during_execution: Optional[list[V1WeightedPodAffinityTerm]] = None
+    required_during_scheduling_ignored_during_execution: Optional[list[V1PodAffinityTerm]] = None
 
 
 class Affinity(BaseModel):
@@ -171,13 +172,13 @@ class Affinity(BaseModel):
     Affinity model.
     """
 
-    node_affinity: V1NodeAffinity = None
+    node_affinity: Optional[V1NodeAffinity] = None
     """Node affinity."""
 
-    pod_affinity: V1PodAffinity = None
+    pod_affinity: Optional[V1PodAffinity] = None
     """Pod affinity."""
 
-    pod_anti_affinity: V1PodAntiAffinity = None
+    pod_anti_affinity: Optional[V1PodAntiAffinity] = None
     """Pod anti affinity."""
 
 
@@ -186,34 +187,34 @@ class K8s(BaseModel):
     Kubernetes resource model.
     """
 
-    node_selector: list[NodeSelector] = None
+    node_selector: Optional[list[NodeSelector]] = None
     """Node selector."""
 
-    volumes: list[Volume] = None
+    volumes: Optional[list[Volume]] = None
     """List of volumes."""
 
-    resources: Resource = None
+    resources: Optional[Resource] = None
     """Resources restrictions."""
 
-    affinity: Affinity = None
+    affinity: Optional[Affinity] = None
     """Affinity."""
 
-    tolerations: list[Toleration] = None
+    tolerations: Optional[list[Toleration]] = None
     """Tolerations."""
 
-    envs: list[Env] = None
+    envs: Optional[list[Env]] = None
     """Env variables."""
 
-    secrets: list[str] = None
+    secrets: Optional[list[str]] = None
     """List of secret names."""
 
-    profile: str = None
+    profile: Optional[str] = None
     """Profile template."""
 
-    runtime_class: str = None
+    runtime_class: Optional[str] = None
     """Runtime class name."""
 
-    priority_class: str = None
+    priority_class: Optional[str] = None
     """Priority class."""
 
 

digitalhub/entities/task/_base/utils.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 
-def build_task_actions(kind_action_list: list[tuple[str, str]]) -> dict[str, str]:
+def build_task_actions(kind_action_list: list[tuple[str, str]]) -> list[dict[str, str]]:
     """
     Build task actions.
 
@@ -12,7 +12,7 @@ def build_task_actions(kind_action_list: list[tuple[str, str]]) -> dict[str, str
 
     Returns
     -------
-    dict[str, str]
+    list[dict[str, str]]
         Returns the task actions.
     """
     return [{"kind": kind, "action": action} for (kind, action) in kind_action_list]

digitalhub/factory/utils.py

@@ -25,10 +25,10 @@ def import_module(package: str) -> ModuleType:
     """
     try:
         return importlib.import_module(package)
-    except ModuleNotFoundError:
-        raise ModuleNotFoundError(f"Package {package} not found.")
+    except ModuleNotFoundError as e:
+        raise ModuleNotFoundError(f"Package {package} not found.") from e
     except Exception as e:
-        raise e
+        raise RuntimeError(f"An error occurred while importing {package}.") from e
 
 
 def list_runtimes() -> list[str]:
@@ -37,18 +37,18 @@ def list_runtimes() -> list[str]:
 
     Returns
     -------
-    list
+    list[str]
         List of installed runtimes names.
     """
     pattern = r"digitalhub_runtime_.*"
-    runtimes = []
+    runtimes: list[str] = []
     try:
         for _, name, _ in pkgutil.iter_modules():
             if re.match(pattern, name):
                 runtimes.append(name)
         return runtimes
-    except Exception:
-        raise RuntimeError("Error listing installed runtimes.")
+    except Exception as e:
+        raise RuntimeError("Error listing installed runtimes.") from e
 
 
 def register_runtimes_entities() -> None:
@@ -86,5 +86,5 @@ def register_entities() -> None:
         for entity_builder_tuple in entities_builders_list:
             kind, builder = entity_builder_tuple
             factory.add_entity_builder(kind, builder)
-    except Exception:
-        raise
+    except Exception as e:
+        raise RuntimeError("Error registering entities.") from e

digitalhub/readers/data/pandas/reader.py

@@ -10,7 +10,7 @@ from pandas.errors import ParserError
 
 from digitalhub.entities.dataitem.table.utils import check_preview_size, finalize_preview, prepare_data, prepare_preview
 from digitalhub.readers.data._base.reader import DataframeReader
-from digitalhub.readers.data.pandas.enums import Extensions
+from digitalhub.utils.enums import FileExtensions
 from digitalhub.utils.exceptions import ReaderError
 from digitalhub.utils.generic_utils import CustomJsonEncoder
 
@@ -42,17 +42,17 @@ class DataframeReaderPandas(DataframeReader):
         pd.DataFrame
             Pandas DataFrame.
         """
-        if extension == Extensions.CSV.value:
+        if extension == FileExtensions.CSV.value:
             return pd.read_csv(path_or_buffer, **kwargs)
-        if extension == Extensions.PARQUET.value:
+        if extension == FileExtensions.PARQUET.value:
             return pd.read_parquet(path_or_buffer, **kwargs)
-        if extension == Extensions.JSON.value:
+        if extension == FileExtensions.JSON.value:
             return pd.read_json(path_or_buffer, **kwargs)
-        if extension in (Extensions.EXCEL.value, Extensions.EXCEL_OLD.value):
+        if extension in (FileExtensions.EXCEL.value, FileExtensions.EXCEL_OLD.value):
             return pd.read_excel(path_or_buffer, **kwargs)
-        if extension in (Extensions.TXT.value, Extensions.FILE.value):
+        if extension in (FileExtensions.TXT.value, FileExtensions.FILE.value):
             try:
-                return self.read_df(path_or_buffer, Extensions.CSV.value, **kwargs)
+                return self.read_df(path_or_buffer, FileExtensions.CSV.value, **kwargs)
             except ParserError:
                 raise ReaderError(f"Unable to read from {path_or_buffer}.")
         else:
@@ -105,9 +105,9 @@ class DataframeReaderPandas(DataframeReader):
         -------
         None
         """
-        if extension == Extensions.CSV.value:
+        if extension == FileExtensions.CSV.value:
             return self.write_csv(df, dst, **kwargs)
-        if extension == Extensions.PARQUET.value:
+        if extension == FileExtensions.PARQUET.value:
             return self.write_parquet(df, dst, **kwargs)
         raise ReaderError(f"Unsupported extension '{extension}' for writing.")
 

digitalhub/stores/_base/store.py

@@ -8,6 +8,7 @@ from typing import Any
 
 from digitalhub.readers.data.api import get_reader_by_engine
 from digitalhub.utils.exceptions import StoreError
+from digitalhub.utils.types import SourcesOrListOfSources
 from digitalhub.utils.uri_utils import has_local_scheme
 
 if typing.TYPE_CHECKING:
@@ -36,7 +37,7 @@ class Store:
         """
 
     @abstractmethod
-    def upload(self, src: str | list[str], dst: str) -> list[tuple[str, str]]:
+    def upload(self, src: SourcesOrListOfSources, dst: str) -> list[tuple[str, str]]:
         """
         Method to upload artifact to storage.
         """
@@ -58,7 +59,7 @@ class Store:
     @abstractmethod
     def read_df(
         self,
-        path: str | list[str],
+        path: SourcesOrListOfSources,
         file_format: str | None = None,
         engine: str | None = None,
         **kwargs,
@@ -159,7 +160,7 @@ class Store:
 
         Parameters
         ----------
-        path : str
+        path : str | Path
             The path to build.
 
         Returns

digitalhub/stores/local/store.py

@@ -8,6 +8,7 @@ from digitalhub.readers.data.api import get_reader_by_object
 from digitalhub.stores._base.store import Store
 from digitalhub.utils.exceptions import StoreError
 from digitalhub.utils.file_utils import get_file_info_from_local
+from digitalhub.utils.types import SourcesOrListOfSources
 
 
 class LocalStore(Store):
@@ -51,7 +52,7 @@ class LocalStore(Store):
         """
         raise StoreError("Local store does not support download.")
 
-    def upload(self, src: str | list[str], dst: str) -> list[tuple[str, str]]:
+    def upload(self, src: SourcesOrListOfSources, dst: str) -> list[tuple[str, str]]:
         """
         Upload an artifact to storage.
 
@@ -88,7 +89,7 @@ class LocalStore(Store):
 
     def read_df(
         self,
-        path: str | list[str],
+        path: SourcesOrListOfSources,
         file_format: str | None = None,
         engine: str | None = None,
         **kwargs,
@@ -98,7 +99,7 @@ class LocalStore(Store):
 
         Parameters
         ----------
-        path : str | list[str]
+        path : SourcesOrListOfSources
             Path(s) to read DataFrame from.
         file_format : str
             Extension of the file.

digitalhub/stores/remote/store.py

@@ -7,6 +7,7 @@ import requests
 
 from digitalhub.stores._base.store import Store
 from digitalhub.utils.exceptions import StoreError
+from digitalhub.utils.types import SourcesOrListOfSources
 
 
 class RemoteStore(Store):
@@ -62,7 +63,7 @@ class RemoteStore(Store):
 
         return self._download_file(root, dst, overwrite)
 
-    def upload(self, src: str | list[str], dst: str) -> list[tuple[str, str]]:
+    def upload(self, src: SourcesOrListOfSources, dst: str) -> list[tuple[str, str]]:
         """
         Upload an artifact to storage.
 
@@ -99,7 +100,7 @@ class RemoteStore(Store):
 
     def read_df(
         self,
-        path: str | list[str],
+        path: SourcesOrListOfSources,
         file_format: str | None = None,
         engine: str | None = None,
         **kwargs,
@@ -109,7 +110,7 @@ class RemoteStore(Store):
 
         Parameters
         ----------
-        path : str | list[str]
+        path : SourcesOrListOfSources
             Path(s) to read DataFrame from.
         file_format : str
             Extension of the file.

digitalhub/stores/s3/configurator.py

@@ -61,7 +61,7 @@ class S3StoreConfigurator:
         dict
             The credentials.
         """
-        creds = configurator.get_all_cred()
+        creds = configurator.get_all_credentials()
         try:
             return {
                 "endpoint_url": creds[S3StoreEnv.ENDPOINT_URL.value],

digitalhub/stores/s3/enums.py

@@ -8,10 +8,10 @@ class S3StoreEnv(Enum):
     S3Store environment
     """
 
-    ENDPOINT_URL = "S3_ENDPOINT_URL"
-    ACCESS_KEY_ID = "AWS_ACCESS_KEY_ID"
-    SECRET_ACCESS_KEY = "AWS_SECRET_ACCESS_KEY"
-    SESSION_TOKEN = "AWS_SESSION_TOKEN"
-    BUCKET_NAME = "S3_BUCKET"
-    REGION = "S3_REGION"
-    SIGNATURE_VERSION = "S3_SIGNATURE_VERSION"
+    ENDPOINT_URL = "DHCORE_S3_ENDPOINT_URL"
+    ACCESS_KEY_ID = "DHCORE_AWS_ACCESS_KEY_ID"
+    SECRET_ACCESS_KEY = "DHCORE_AWS_SECRET_ACCESS_KEY"
+    SESSION_TOKEN = "DHCORE_AWS_SESSION_TOKEN"
+    BUCKET_NAME = "DHCORE_S3_BUCKET"
+    REGION = "DHCORE_S3_REGION"
+    SIGNATURE_VERSION = "DHCORE_S3_SIGNATURE_VERSION"