digitalhub 0.8.0__py3-none-any.whl → 0.8.0b0__py3-none-any.whl

digitalhub/__init__.py

@@ -1,82 +1,113 @@
-from digitalhub.entities.artifact.crud import (
+from digitalhub_core import (
     delete_artifact,
+    delete_function,
+    delete_project,
+    delete_run,
+    delete_secret,
+    delete_task,
+    delete_workflow,
     get_artifact,
     get_artifact_versions,
-    import_artifact,
-    list_artifacts,
-    log_artifact,
-    new_artifact,
-    update_artifact,
-)
-from digitalhub.entities.dataitem.crud import (
-    delete_dataitem,
-    get_dataitem,
-    get_dataitem_versions,
-    import_dataitem,
-    list_dataitems,
-    log_dataitem,
-    new_dataitem,
-    update_dataitem,
-)
-from digitalhub.entities.function.crud import (
-    delete_function,
     get_function,
     get_function_versions,
-    import_function,
-    list_functions,
-    new_function,
-    update_function,
-)
-from digitalhub.entities.model.crud import (
-    delete_model,
-    get_model,
-    get_model_versions,
-    import_model,
-    list_models,
-    log_model,
-    new_model,
-    update_model,
-)
-from digitalhub.entities.project.crud import (
-    delete_project,
-    get_or_create_project,
-    get_project,
-    import_project,
-    load_project,
-    new_project,
-    update_project,
-)
-from digitalhub.entities.run.crud import delete_run, get_run, import_run, list_runs, new_run, update_run
-from digitalhub.entities.secret.crud import (
-    delete_secret,
+    get_run,
     get_secret,
     get_secret_versions,
-    import_secret,
-    list_secrets,
-    new_secret,
-    update_secret,
-)
-from digitalhub.entities.task.crud import delete_task, get_task, import_task, list_tasks, new_task, update_task
-from digitalhub.entities.workflow.crud import (
-    delete_workflow,
+    get_task,
     get_workflow,
     get_workflow_versions,
+    import_artifact,
+    import_function,
+    import_run,
+    import_secret,
+    import_task,
     import_workflow,
+    list_artifacts,
+    list_functions,
+    list_runs,
+    list_secrets,
+    list_tasks,
     list_workflows,
+    log_artifact,
+    new_artifact,
+    new_function,
+    new_run,
+    new_secret,
+    new_task,
     new_workflow,
+    refresh_token,
+    set_dhcore_env,
+    set_store,
+    update_artifact,
+    update_function,
+    update_project,
+    update_run,
+    update_secret,
+    update_task,
     update_workflow,
 )
+from digitalhub_core.registry.utils import register_layer_entities, register_runtimes_entities
 
-try:
-    from digitalhub.entities.model.mlflow.utils import from_mlflow_run
-except ImportError:
-    ...
+_PROJECT_IMPORTED = False
 
-from digitalhub.client.dhcore.utils import refresh_token, set_dhcore_env
+if not _PROJECT_IMPORTED:
+    try:
+        from digitalhub_data import (
+            delete_dataitem,
+            get_dataitem,
+            get_dataitem_versions,
+            import_dataitem,
+            list_dataitems,
+            log_dataitem,
+            new_dataitem,
+            update_dataitem,
+        )
+        from digitalhub_ml import (
+            delete_model,
+            get_model,
+            get_model_versions,
+            get_or_create_project,
+            get_project,
+            import_model,
+            import_project,
+            list_models,
+            load_project,
+            log_model,
+            new_model,
+            new_project,
+            update_model,
+        )
 
-# Register entities into registry
-from digitalhub.factory.utils import register_entities, register_runtimes_entities
-from digitalhub.stores.api import set_store
+        _PROJECT_IMPORTED = True
+    except ImportError:
+        ...
+
+if not _PROJECT_IMPORTED:
+    try:
+        from digitalhub_data import (
+            delete_dataitem,
+            get_dataitem,
+            get_dataitem_versions,
+            get_or_create_project,
+            get_project,
+            import_dataitem,
+            import_project,
+            list_dataitems,
+            load_project,
+            log_dataitem,
+            new_dataitem,
+            new_project,
+            update_dataitem,
+        )
+
+        _PROJECT_IMPORTED = True
+    except ImportError:
+        ...
 
-register_entities()
+if not _PROJECT_IMPORTED:
+    from digitalhub_core import get_or_create_project, get_project, import_project, load_project, new_project
+
+
+# Register entities into registry
+register_layer_entities()
 register_runtimes_entities()

{digitalhub-0.8.0.dist-info → digitalhub-0.8.0b0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub
-Version: 0.8.0
+Version: 0.8.0b0
 Summary: Python SDK for Digitalhub
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
 License: Apache License
@@ -229,38 +229,22 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: boto3
-Requires-Dist: pydantic<2
-Requires-Dist: sqlalchemy<2
-Requires-Dist: pyarrow
-Requires-Dist: numpy<2
-Requires-Dist: requests
-Requires-Dist: PyYAML
-Requires-Dist: python-dotenv
-Requires-Dist: GitPython>=3
-Requires-Dist: psycopg2-binary
-Requires-Dist: python-slugify
-Provides-Extra: dev
-Requires-Dist: black; extra == "dev"
-Requires-Dist: pytest; extra == "dev"
-Requires-Dist: bumpver; extra == "dev"
-Requires-Dist: ruff; extra == "dev"
-Requires-Dist: moto; extra == "dev"
-Provides-Extra: docs
-Requires-Dist: Sphinx>=7; extra == "docs"
-Requires-Dist: pydata-sphinx-theme>=0.15; extra == "docs"
-Requires-Dist: numpydoc>=1.6; extra == "docs"
+Requires-Dist: digitalhub-core<0.9,>=0.8.0b
+Provides-Extra: all
+Requires-Dist: digitalhub-data<0.9,>=0.8.0b; extra == "all"
+Requires-Dist: digitalhub-ml<0.9,>=0.8.0b; extra == "all"
+Provides-Extra: data
+Requires-Dist: digitalhub-data<0.9,>=0.8.0b; extra == "data"
 Provides-Extra: full
-Requires-Dist: pandas<2.2,>=1.2; extra == "full"
-Requires-Dist: mlflow; extra == "full"
-Provides-Extra: mlflow
-Requires-Dist: mlflow; extra == "mlflow"
-Provides-Extra: pandas
-Requires-Dist: pandas<2.2,>=1.2; extra == "pandas"
+Requires-Dist: digitalhub-core[full]<0.9,>=0.8.0b; extra == "full"
+Requires-Dist: digitalhub-data[pandas]<0.9,>=0.8.0b; extra == "full"
+Requires-Dist: digitalhub-ml[mlflow]<0.9,>=0.8.0b; extra == "full"
+Provides-Extra: ml
+Requires-Dist: digitalhub-ml<0.9,>=0.8.0b; extra == "ml"
 
 # Digitalhub Library
 
 The Digitalhub SDK library is used to manage entities and executions in Digitalhub from Python.
 It comes with a suite of tools to help you manage your projects and executions. It exposes CRUD methods to create, read, update and delete entities, and objects methods to excute functions or workflows, collect or store execution results and data.
 
-A more detailed description of the library can be found in the [official documentation](https://scc-digitalhub.github.io/sdk-docs/).
+A more detailed description of the library can be found in the [official documentation](https://scc-digitalhub.github.io/docs/) of Digitalhub.

digitalhub-0.8.0b0.dist-info/RECORD

@@ -0,0 +1,14 @@
+digitalhub/__init__.py,sha256=vvMeyMD5146sLRNYs6EQuUiN5D4O8cO0XfS8r-W5OuM,2540
+test/test_crud_artifacts.py,sha256=CgPUAYRWurWWH1eRwGJp_6iiulGLy4bOPccvC3XqSCc,2489
+test/test_crud_dataitems.py,sha256=jj15NUUyAAfOCYZEfZOxEq9f5s2_T3dVdfJ7agL50tc,2489
+test/test_crud_functions.py,sha256=zihCaqWUps-Cm14BkCr5qHoOubeZPOn7TyKi49DSkE4,2768
+test/test_crud_runs.py,sha256=MIOgrgEa6gdwoS6rhdOkPderZcQrdZXMptCV0w3f6-k,2219
+test/test_crud_tasks.py,sha256=LLFf6teU64YF8m-gS02tyEoi_eHZmHw6OmO4yhe3Wqo,2110
+test/test_imports.py,sha256=W-YugO0rpJwvtWp57MXaXfEmE-f5iWuCiLY-n0ZU4z8,1271
+test/testkfp.py,sha256=01UpLKkVbwAQu4S1BMiddnnq5x1DStMlJtCoHzi9zq8,1060
+test/testkfp_pipeline.py,sha256=WceFrCp-avHI7PcwIvnv7Kgs2xK3oQqU6sjaonGamg8,622
+digitalhub-0.8.0b0.dist-info/LICENSE.txt,sha256=_yVOtnbW7Ss28mp058UEEc1X4Rgj8-kQBP_kj8_Sc88,11585
+digitalhub-0.8.0b0.dist-info/METADATA,sha256=eZulZbNOcPcv3r2TmQROJEw8W7hde6umDPuH_4m3Mp4,14957
+digitalhub-0.8.0b0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+digitalhub-0.8.0b0.dist-info/top_level.txt,sha256=ae9pDfCF27ZoaVAxuBKONMP0lm5P-N_I-e-no1WlvD8,16
+digitalhub-0.8.0b0.dist-info/RECORD,,

{digitalhub-0.8.0.dist-info → digitalhub-0.8.0b0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

test/test_crud_artifacts.py

@@ -0,0 +1,96 @@
+import shutil
+from copy import deepcopy
+
+import dotenv
+from digitalhub_core.entities.artifact.entity._base import Artifact
+
+import digitalhub as dh
+
+dotenv.load_dotenv()
+
+
+def main():
+    ctx = "./test-prg"
+    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/test.csv", "s3://bucket/key.csv", "sql://database/schema/table", "https://url.com/file.csv"]
+    kind = ["artifact", "artifact", "artifact", "artifact"]
+
+    dicts = []
+    for i in range(len(names)):
+        dicts.append({"name": names[i], "uuid": uuids[i], "path": paths[i], "kind": kind[i]})
+
+    dh.delete_project("test")
+
+    p = dh.get_or_create_project("test", context=ctx)
+
+    # Create and delete artifacts
+    for i in dicts:
+        d = dh.new_artifact(p.name, **i)
+        dh.delete_artifact(d.key)
+        d = dh.new_artifact(p.name, **i)
+        dh.delete_artifact(d.name, project=p.name, entity_id=d.id)
+        d = p.new_artifact(**i)
+        p.delete_artifact(d.key)
+
+    print("Done 1")
+
+    # Create multiple artifacts
+    for i in dicts:
+        dh.new_artifact(p.name, **i)
+
+        c = deepcopy(i)
+        c.pop("uuid")
+        dh.new_artifact(p.name, **c)
+        dh.new_artifact(p.name, **c)
+        dh.new_artifact(p.name, **c)
+        dh.new_artifact(p.name, **c)
+
+    # List artifacts
+    l_obj = dh.list_artifacts(p.name)
+    assert isinstance(l_obj, list)
+    assert len(l_obj) == 4
+    for i in l_obj:
+        assert isinstance(i, Artifact)
+
+    for a in l_obj:
+        dh.delete_artifact(a.key)
+
+    print("Done 2")
+
+    # Get artifacts test
+    for i in dicts:
+        o1 = dh.new_artifact(p.name, **i)
+        assert isinstance(o1, Artifact)
+
+        # Get by name and id
+        o2 = dh.get_artifact(o1.name, project=p.name, entity_id=o1.id)
+        assert isinstance(o2, Artifact)
+        assert o1.id == o2.id
+
+        # Get by key
+        o3 = dh.get_artifact(o1.key)
+        assert isinstance(o3, Artifact)
+        assert o1.id == o3.id
+
+    print("Done 3")
+
+    # Delete artifacts, all versions
+    for n in names:
+        dh.delete_artifact(n, project=p.name, delete_all_versions=True)
+    l_obj = dh.list_artifacts(p.name)
+    assert not l_obj
+
+    dh.delete_project("test")
+    shutil.rmtree(ctx)
+
+    print("Done 4")
+
+
+if __name__ == "__main__":
+    main()

test/test_crud_dataitems.py

@@ -0,0 +1,96 @@
+import shutil
+from copy import deepcopy
+
+import dotenv
+from digitalhub_data.entities.dataitem.entity._base import Dataitem
+
+import digitalhub as dh
+
+dotenv.load_dotenv()
+
+
+def main():
+    ctx = "./test-prg"
+    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/test.csv", "s3://bucket/key.csv", "sql://database/schema/table", "https://url.com/file.csv"]
+    kind = ["dataitem", "dataitem", "dataitem", "dataitem"]
+
+    dicts = []
+    for i in range(len(names)):
+        dicts.append({"name": names[i], "uuid": uuids[i], "path": paths[i], "kind": kind[i]})
+
+    dh.delete_project("test")
+
+    p = dh.get_or_create_project("test", context=ctx)
+
+    # Create and delete dataitems
+    for i in dicts:
+        d = dh.new_dataitem(p.name, **i)
+        dh.delete_dataitem(d.key)
+        d = dh.new_dataitem(p.name, **i)
+        dh.delete_dataitem(d.name, project=p.name, entity_id=d.id)
+        d = p.new_dataitem(**i)
+        p.delete_dataitem(d.key)
+
+    print("Done 1")
+
+    # Create multiple dataitems
+    for i in dicts:
+        dh.new_dataitem(p.name, **i)
+
+        c = deepcopy(i)
+        c.pop("uuid")
+        dh.new_dataitem(p.name, **c)
+        dh.new_dataitem(p.name, **c)
+        dh.new_dataitem(p.name, **c)
+        dh.new_dataitem(p.name, **c)
+
+    # List dataitems
+    l_obj = dh.list_dataitems(p.name)
+    assert isinstance(l_obj, list)
+    assert len(l_obj) == 4
+    for i in l_obj:
+        assert isinstance(i, Dataitem)
+
+    for a in l_obj:
+        dh.delete_dataitem(a.key)
+
+    print("Done 2")
+
+    # Get dataitems test
+    for i in dicts:
+        o1 = dh.new_dataitem(p.name, **i)
+        assert isinstance(o1, Dataitem)
+
+        # Get by name and id
+        o2 = dh.get_dataitem(o1.name, project=p.name, entity_id=o1.id)
+        assert isinstance(o2, Dataitem)
+        assert o1.id == o2.id
+
+        # Get by key
+        o3 = dh.get_dataitem(o1.key)
+        assert isinstance(o3, Dataitem)
+        assert o1.id == o3.id
+
+    print("Done 3")
+
+    # Delete dataitems, all versions
+    for n in names:
+        dh.delete_dataitem(n, project=p.name, delete_all_versions=True)
+    l_obj = dh.list_dataitems(p.name)
+    assert not l_obj
+
+    dh.delete_project("test")
+    shutil.rmtree(ctx)
+
+    print("Done 4")
+
+
+if __name__ == "__main__":
+    main()

test/test_crud_functions.py

@@ -1,9 +1,9 @@
 from copy import deepcopy
 
 import dotenv
+from digitalhub_core.entities.function.entity import Function
 
 import digitalhub
-from digitalhub.entities.function._base.entity import Function
 
 dotenv.load_dotenv()
 

test/test_crud_runs.py

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

test/test_crud_tasks.py

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

digitalhub/client/_base/client.py

@@ -1,56 +0,0 @@
-from __future__ import annotations
-
-from abc import abstractmethod
-
-
-class Client:
-    """
-    Base Client class interface.
-
-    The client is an interface that handles the CRUD of an object during
-    a session. It manages the creation, reading, updating, deleting and
-    listing of objects and comes into two subclasses: Local and DHCore.
-    """
-
-    @abstractmethod
-    def create_object(self, api: str, obj: dict, **kwargs) -> dict:
-        """
-        Create object method.
-        """
-
-    @abstractmethod
-    def read_object(self, api: str, **kwargs) -> dict:
-        """
-        Read object method.
-        """
-
-    @abstractmethod
-    def update_object(self, api: str, obj: dict, **kwargs) -> dict:
-        """
-        Update object method.
-        """
-
-    @abstractmethod
-    def delete_object(self, api: str, **kwargs) -> dict:
-        """
-        Delete object method.
-        """
-
-    @abstractmethod
-    def list_objects(self, api: str, **kwargs) -> dict:
-        """
-        List objects method.
-        """
-
-    @abstractmethod
-    def list_first_object(self, api: str, **kwargs) -> dict:
-        """
-        Read first object method.
-        """
-
-    @staticmethod
-    @abstractmethod
-    def is_local() -> bool:
-        """
-        Flag to check if client is local.
-        """

digitalhub/client/api.py

@@ -1,63 +0,0 @@
-from __future__ import annotations
-
-import typing
-
-from digitalhub.client.builder import client_builder
-
-if typing.TYPE_CHECKING:
-    from digitalhub.client._base.client import Client
-
-
-def check_client_exists(local: bool = False) -> bool:
-    """
-    Check if client exists.
-
-    Parameters
-    ----------
-    local : bool
-        Check client existence by local.
-
-    Returns
-    -------
-    bool
-        True if client exists, False otherwise.
-    """
-    if local:
-        return client_builder._local is not None
-    return client_builder._dhcore is not None
-
-
-def build_client(local: bool = False, config: dict | None = None) -> None:
-    """
-    Wrapper around ClientBuilder.build.
-
-    Parameters
-    ----------
-    local : bool
-        Whether to create a local client or not.
-    config : dict
-        DHCore environment configuration.
-
-    Returns
-    -------
-    Client
-        The client instance.
-    """
-    client_builder.build(local, config)
-
-
-def get_client(local: bool = False) -> Client:
-    """
-    Wrapper around ClientBuilder.build.
-
-    Parameters
-    ----------
-    local : bool
-        Whether to create a local client or not.
-
-    Returns
-    -------
-    Client
-        The client instance.
-    """
-    return client_builder.build(local)

digitalhub/client/builder.py

@@ -1,50 +0,0 @@
-from __future__ import annotations
-
-import typing
-
-from digitalhub.client.dhcore.client import ClientDHCore
-from digitalhub.client.local.client import ClientLocal
-
-if typing.TYPE_CHECKING:
-    from digitalhub.client._base.client import Client
-
-
-class ClientBuilder:
-    """
-    Client builder class.
-
-    This class is used to create two possible client instances:
-    Local and DHCore.
-    It saves the client instances in the class attributes using
-    singleton pattern.
-    """
-
-    def __init__(self) -> None:
-        self._local = None
-        self._dhcore = None
-
-    def build(self, local: bool = False, config: dict | None = None) -> Client:
-        """
-        Method to create a client instance.
-
-        Parameters
-        ----------
-        local : bool
-            Whether to create a local client or not.
-
-        Returns
-        -------
-        Client
-            Returns the client instance.
-        """
-        if local:
-            if self._local is None:
-                self._local = ClientLocal()
-            return self._local
-
-        if self._dhcore is None:
-            self._dhcore = ClientDHCore(config)
-        return self._dhcore
-
-
-client_builder = ClientBuilder()