digitalhub 0.13.0b3__py3-none-any.whl → 0.14.9__py3-none-any.whl

digitalhub/entities/model/crud.py

@@ -7,8 +7,8 @@ from __future__ import annotations
 import typing
 
 from digitalhub.entities._commons.enums import EntityTypes
-from digitalhub.entities._processors.context import context_processor
-from digitalhub.entities.artifact.utils import eval_source, process_kwargs
+from digitalhub.entities._processors.processors import context_processor
+from digitalhub.entities.model.utils import eval_source, process_kwargs
 from digitalhub.utils.types import SourcesOrListOfSources
 
 if typing.TYPE_CHECKING:
@@ -131,7 +131,6 @@ def get_model(
     identifier: str,
     project: str | None = None,
     entity_id: str | None = None,
-    **kwargs,
 ) -> Model:
     """
     Get object from backend.
@@ -144,8 +143,6 @@ def get_model(
         Project name.
     entity_id : str
         Entity ID.
-    **kwargs : dict
-        Parameters to pass to the API call.
 
     Returns
     -------
@@ -167,14 +164,12 @@ def get_model(
         entity_type=ENTITY_TYPE,
         project=project,
         entity_id=entity_id,
-        **kwargs,
     )
 
 
 def get_model_versions(
     identifier: str,
     project: str | None = None,
-    **kwargs,
 ) -> list[Model]:
     """
     Get object versions from backend.
@@ -185,8 +180,6 @@ def get_model_versions(
         Entity key (store://...) or entity name.
     project : str
         Project name.
-    **kwargs : dict
-        Parameters to pass to the API call.
 
     Returns
     -------
@@ -206,11 +199,20 @@ def get_model_versions(
         identifier=identifier,
         entity_type=ENTITY_TYPE,
         project=project,
-        **kwargs,
     )
 
 
-def list_models(project: str, **kwargs) -> list[Model]:
+def list_models(
+    project: str,
+    q: str | None = None,
+    name: str | None = None,
+    kind: str | None = None,
+    user: str | None = None,
+    state: str | None = None,
+    created: str | None = None,
+    updated: str | None = None,
+    versions: str | None = None,
+) -> list[Model]:
     """
     List all latest version objects from backend.
 
@@ -218,8 +220,22 @@ def list_models(project: str, **kwargs) -> list[Model]:
     ----------
     project : str
         Project name.
-    **kwargs : dict
-        Parameters to pass to the API call.
+    q : str
+        Query string to filter objects.
+    name : str
+        Object name.
+    kind : str
+        Kind of the object.
+    user : str
+        User that created the object.
+    state : str
+        Object state.
+    created : str
+        Creation date filter.
+    updated : str
+        Update date filter.
+    versions : str
+        Object version, default is latest.
 
     Returns
     -------
@@ -233,18 +249,36 @@ def list_models(project: str, **kwargs) -> list[Model]:
     return context_processor.list_context_entities(
         project=project,
         entity_type=ENTITY_TYPE,
-        **kwargs,
+        q=q,
+        name=name,
+        kind=kind,
+        user=user,
+        state=state,
+        created=created,
+        updated=updated,
+        versions=versions,
     )
 
 
-def import_model(file: str) -> Model:
+def import_model(
+    file: str | None = None,
+    key: str | None = None,
+    reset_id: bool = False,
+    context: str | None = None,
+) -> Model:
     """
-    Import object from a YAML file and create a new object into the backend.
+    Import an object from a YAML file or from a storage key.
 
     Parameters
     ----------
     file : str
-        Path to YAML file.
+        Path to the YAML file.
+    key : str
+        Entity key (store://...).
+    reset_id : bool
+        Flag to determine if the ID of executable entities should be reset.
+    context : str
+        Project name to use for context resolution.
 
     Returns
     -------
@@ -255,7 +289,12 @@ def import_model(file: str) -> Model:
     --------
     >>> obj = import_model("my-model.yaml")
     """
-    return context_processor.import_context_entity(file)
+    return context_processor.import_context_entity(
+        file,
+        key,
+        reset_id,
+        context,
+    )
 
 
 def load_model(file: str) -> Model:
@@ -311,7 +350,6 @@ def delete_model(
     entity_id: str | None = None,
     delete_all_versions: bool = False,
     cascade: bool = True,
-    **kwargs,
 ) -> dict:
     """
     Delete object from backend.
@@ -325,11 +363,10 @@ def delete_model(
     entity_id : str
         Entity ID.
     delete_all_versions : bool
-        Delete all versions of the named entity. If True, use entity name instead of entity key as identifier.
+        Delete all versions of the named entity.
+        If True, use entity name instead of entity key as identifier.
     cascade : bool
         Cascade delete.
-    **kwargs : dict
-        Parameters to pass to the API call.
 
     Returns
     -------
@@ -353,5 +390,4 @@ def delete_model(
         entity_id=entity_id,
         delete_all_versions=delete_all_versions,
         cascade=cascade,
-        **kwargs,
     )

digitalhub/entities/model/mlflow/utils.py

@@ -53,10 +53,13 @@ def from_mlflow_run(run_id: str) -> dict:
     # Extract spec
     data = run.data
     parameters = data.params
-    source_path = urlparse(run.info.artifact_uri).path
+    source_path = urlparse(run.info.artifact_uri).path + "/model"
     model_uri = f"runs:/{run_id}/model"
     model = mlflow.pyfunc.load_model(model_uri=model_uri)
-    model_config = model.model_config
+    try:
+        model_config = model.model_config
+    except Exception:
+        model_config = {}
     flavor = None
     for f in model.metadata.flavors:
         if f != "python_function":
@@ -64,27 +67,33 @@ def from_mlflow_run(run_id: str) -> dict:
             break
 
     # Extract signature
-    mlflow_signature = model.metadata.signature
-    signature = Signature(
-        inputs=mlflow_signature.inputs.to_json() if mlflow_signature.inputs else None,
-        outputs=mlflow_signature.outputs.to_json() if mlflow_signature.outputs else None,
-        params=mlflow_signature.params.to_json() if mlflow_signature.params else None,
-    ).to_dict()
+    try:
+        mlflow_signature = model.metadata.signature
+        signature = Signature(
+            inputs=mlflow_signature.inputs.to_json() if mlflow_signature.inputs else None,
+            outputs=mlflow_signature.outputs.to_json() if mlflow_signature.outputs else None,
+            params=mlflow_signature.params.to_json() if mlflow_signature.params else None,
+        ).to_dict()
+    except Exception:
+        signature = None
 
     # Extract datasets
     datasets = []
-    if run.inputs and run.inputs.dataset_inputs:
-        datasets = [
-            Dataset(
-                name=d.dataset.name,
-                digest=d.dataset.digest,
-                profile=d.dataset.profile,
-                dataset_schema=d.dataset.schema,
-                source=d.dataset.source,
-                source_type=d.dataset.source_type,
-            ).to_dict()
-            for d in run.inputs.dataset_inputs
-        ]
+    try:
+        if run.inputs and run.inputs.dataset_inputs:
+            datasets = [
+                Dataset(
+                    name=d.dataset.name,
+                    digest=d.dataset.digest,
+                    profile=d.dataset.profile,
+                    dataset_schema=d.dataset.schema,
+                    source=d.dataset.source,
+                    source_type=d.dataset.source_type,
+                ).to_dict()
+                for d in run.inputs.dataset_inputs
+            ]
+    except Exception:
+        datasets = []
 
     # Create model params
     model_params = {}

digitalhub/entities/model/utils.py

@@ -6,25 +6,32 @@ 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
+from digitalhub.entities._constructors.uuid import build_uuid
 
 
 def eval_source(
     source: str | list[str] | None = None,
 ) -> Any:
     """
-    Evaluate if source is local.
+    Evaluate whether the source is local or remote.
+
+    Determines if the provided source(s) reference local files or
+    remote resources. This evaluation affects how the model
+    will be processed and stored.
 
     Parameters
     ----------
-    source : str | list[str]
-        Source(s).
+    source : str, list[str], or None
+        The source specification(s) to evaluate. Can be a single
+        source string, a list of source strings, or None.
 
     Returns
     -------
-    None
+    Any
+        The result of the local source evaluation, indicating
+        whether the source is local or remote.
     """
     return eval_local_source(source)
 
@@ -37,25 +44,33 @@ def process_kwargs(
     **kwargs,
 ) -> dict:
     """
-    Process spec kwargs.
+    Process and enhance specification parameters for model creation.
+
+    Processes the keyword arguments for model specification, handling
+    path generation and UUID assignment. If no path is provided, generates
+    a unique path based on project, entity type, name, and source.
 
     Parameters
     ----------
     project : str
-        Project name.
+        The name of the project containing the model.
     name : str
-        Object name.
-    source : str
-        Source(s).
+        The name of the model entity.
+    source : str or list[str]
+        The source specification(s) for the model content.
+        Can be a single source or multiple sources.
     path : str
-        Destination path of the entity. If not provided, it's generated.
+        The destination path for the model entity.
+        If None, a path will be automatically generated.
     **kwargs : dict
-        Spec parameters.
+        Additional specification parameters to be processed
+        and passed to the model creation.
 
     Returns
     -------
     dict
-        Kwargs updated.
+        The updated kwargs dictionary with processed path
+        and UUID information included.
     """
     if path is None:
         uuid = build_uuid()

digitalhub/entities/project/_base/builder.py

@@ -29,7 +29,6 @@ class ProjectProjectBuilder(EntityBuilder):
         kind: str,
         description: str | None = None,
         labels: list[str] | None = None,
-        local: bool = False,
         config: dict | None = None,
         context: str | None = None,
         **kwargs,
@@ -47,8 +46,6 @@ class ProjectProjectBuilder(EntityBuilder):
             Description of the object (human readable).
         labels : list[str]
             List of labels.
-        local : bool
-            If True, use local backend, if False use DHCore backend. Default to False.
         config : dict
             DHCore environment configuration.
         context : str
@@ -80,7 +77,6 @@ class ProjectProjectBuilder(EntityBuilder):
             metadata=metadata,
             spec=spec,
             status=status,
-            local=local,
         )
 
     def from_dict(self, obj: dict, validate: bool = True) -> Project:
@@ -120,7 +116,6 @@ class ProjectProjectBuilder(EntityBuilder):
         """
         name = self.build_name(obj.get("name"))
         kind = obj.get("kind")
-        local = obj.get("local", False)
         metadata = self.build_metadata(**obj.get("metadata", {}))
         spec = self.build_spec(validate=validate, **obj.get("spec", {}))
         status = self.build_status(**obj.get("status", {}))
@@ -132,5 +127,4 @@ class ProjectProjectBuilder(EntityBuilder):
             "spec": spec,
             "status": status,
             "user": user,
-            "local": local,
         }