digitalhub 0.6.0b10__py3-none-any.whl → 0.7.0__py3-none-any.whl

digitalhub/__init__.py

@@ -35,7 +35,7 @@ from digitalhub_core import (
     new_secret,
     new_task,
     new_workflow,
-    set_dhub_env,
+    set_dhcore_env,
     set_store,
     update_artifact,
     update_function,

{digitalhub-0.6.0b10.dist-info → digitalhub-0.7.0.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: digitalhub
-Version: 0.6.0b10
-Summary: Python SDK for DigitalHub
+Version: 0.7.0
+Summary: Python SDK for Digitalhub
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
 License: Apache License
                                 Version 2.0, January 2004
@@ -228,14 +228,18 @@ Classifier: Programming Language :: Python :: 3.10
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: digitalhub-core >=0.6.0b
+Requires-Dist: digitalhub-core<0.8,>=0.7.0b
 Provides-Extra: all
-Requires-Dist: digitalhub-data >=0.6.0b ; extra == 'all'
-Requires-Dist: digitalhub-ml >=0.6.0b ; extra == 'all'
+Requires-Dist: digitalhub-data<0.8,>=0.7.0b; extra == "all"
+Requires-Dist: digitalhub-ml<0.8,>=0.7.0b; extra == "all"
 Provides-Extra: data
-Requires-Dist: digitalhub-data >=0.6.0b ; extra == 'data'
+Requires-Dist: digitalhub-data<0.8,>=0.7.0b; extra == "data"
+Provides-Extra: full
+Requires-Dist: digitalhub-core[full]<0.8,>=0.7.0b; extra == "full"
+Requires-Dist: digitalhub-data[pandas]<0.8,>=0.7.0b; extra == "full"
+Requires-Dist: digitalhub-ml[mlflow]<0.8,>=0.7.0b; extra == "full"
 Provides-Extra: ml
-Requires-Dist: digitalhub-ml >=0.6.0b ; extra == 'ml'
+Requires-Dist: digitalhub-ml<0.8,>=0.7.0b; extra == "ml"
 
 # Digitalhub Library
 

digitalhub-0.7.0.dist-info/RECORD

@@ -0,0 +1,14 @@
+digitalhub/__init__.py,sha256=E26WFuMyA9djIFxYhvgtkoHcix2OmcM7XkzjxVMoEaM,2521
+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.7.0.dist-info/LICENSE.txt,sha256=_yVOtnbW7Ss28mp058UEEc1X4Rgj8-kQBP_kj8_Sc88,11585
+digitalhub-0.7.0.dist-info/METADATA,sha256=wQIjmkGXe0nlBsnMMuW2jHfJFwrjqWEbDwkCks7ZDF0,14904
+digitalhub-0.7.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+digitalhub-0.7.0.dist-info/top_level.txt,sha256=ae9pDfCF27ZoaVAxuBKONMP0lm5P-N_I-e-no1WlvD8,16
+digitalhub-0.7.0.dist-info/RECORD,,

{digitalhub-0.6.0b10.dist-info → digitalhub-0.7.0.dist-info}/WHEEL

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

test/test_crud_artifacts.py

@@ -1,91 +1,96 @@
+import shutil
 from copy import deepcopy
 
 import dotenv
-from digitalhub_core.entities.artifacts.entity import Artifact
+from digitalhub_core.entities.artifact.entity._base import Artifact
 
-import digitalhub
+import digitalhub as dh
 
 dotenv.load_dotenv()
 
 
-names = ["test1", "test2", "test3", "test4"]
-uuids = [
-    "12a01efa-o44f-4991-b153-9a3c358b7bb0",
-    "8e367f52-25bb-4df1-b9c9-a58045b377a0",
-    "1678f9ab-a2e0-48ff-870a-2384o3fa1334",
-    "adb746dd-4e81-4ff8-82de-4916624o17dc",
-]
-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]})
-
-
-digitalhub.delete_project("test")
-
-p = digitalhub.get_or_create_project("test")
-
-# Create and delete artifacts
-for i in dicts:
-    d = digitalhub.new_artifact(p.name, **i)
-    digitalhub.delete_artifact(p.name, entity_id=d.id)
-    d = digitalhub.new_artifact(p.name, **i)
-    digitalhub.delete_artifact(p.name, entity_name=d.name)
-    d = p.new_artifact(**i)
-    p.delete_artifact(entity_id=d.id)
-
-# Create multiple artifacts
-for i in dicts:
-    digitalhub.new_artifact(p.name, **i)
-
-    c = deepcopy(i)
-    c.pop("uuid")
-    digitalhub.new_artifact(p.name, **c)
-    digitalhub.new_artifact(p.name, **c)
-    digitalhub.new_artifact(p.name, **c)
-    digitalhub.new_artifact(p.name, **c)
-
-
-# List artifacts
-l_obj = digitalhub.list_artifacts(p.name)
-assert isinstance(l_obj, list)
-assert len(l_obj) == 4
-for i in l_obj:
-    assert isinstance(i, dict)
-
-for uuid in uuids:
-    digitalhub.delete_artifact(p.name, entity_id=uuid)
-
-# Get artifacts test
-for i in dicts:
-    o1 = digitalhub.new_artifact(p.name, **i)
-    assert isinstance(o1, Artifact)
-
-    # Get by id
-    o2 = digitalhub.get_artifact(p.name, entity_id=o1.id)
-    assert isinstance(o2, Artifact)
-    assert o1.id == o2.id
-
-    # Get by name
-    o3 = digitalhub.get_artifact(p.name, entity_name=o1.name)
-    assert isinstance(o3, Artifact)
-    assert o1.id == o3.id
-
-    # Get by name as latest
-    c = deepcopy(i)
-    c.pop("uuid")
-    o4 = digitalhub.new_artifact(p.name, **c)
-    o5 = digitalhub.get_artifact(p.name, entity_name=o1.name)
-    assert isinstance(o5, Artifact)
-    assert (o5.id != o1.id) and (o5.name == o1.name) and (o5.id == o4.id)
-
-
-# Delete artifacts, all versions
-for n in names:
-    digitalhub.delete_artifact(p.name, entity_name=n, delete_all_versions=True)
-l_obj = digitalhub.list_artifacts(p.name)
-assert not l_obj
-
-digitalhub.delete_project("test")
+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

@@ -1,90 +1,96 @@
+import shutil
 from copy import deepcopy
 
 import dotenv
-from digitalhub_data.entities.dataitems.entity._base import Dataitem
+from digitalhub_data.entities.dataitem.entity._base import Dataitem
 
-import digitalhub
+import digitalhub as dh
 
 dotenv.load_dotenv()
 
-names = ["test1", "test2", "test3", "test4"]
-uuids = [
-    "12a01efa-o44f-4991-b153-9a3c358b7bb0",
-    "8e367f52-25bb-4df1-b9c9-a58045b377a0",
-    "1678f9ab-a2e0-48ff-870a-2384o3fa1334",
-    "adb746dd-4e81-4ff8-82de-4916624o17dc",
-]
-paths = ["./data/test.csv", "s3://bucket/key.csv", "sql://database/schema/table", "https://url.com/file.csv"]
-kind = ["table", "table", "table", "table"]
-
-dicts = []
-for i in range(len(names)):
-    dicts.append({"name": names[i], "uuid": uuids[i], "path": paths[i], "kind": kind[i]})
-
-
-digitalhub.delete_project("test")
-
-p = digitalhub.get_or_create_project("test")
-
-# Create and delete dataitems
-for i in dicts:
-    d = digitalhub.new_dataitem(p.name, **i)
-    digitalhub.delete_dataitem(p.name, entity_id=d.id)
-    d = digitalhub.new_dataitem(p.name, **i)
-    digitalhub.delete_dataitem(p.name, entity_name=d.name)
-    d = p.new_dataitem(**i)
-    p.delete_dataitem(entity_id=d.id)
-
-# Create multiple dataitems
-for i in dicts:
-    digitalhub.new_dataitem(p.name, **i)
-
-    c = deepcopy(i)
-    c.pop("uuid")
-    digitalhub.new_dataitem(p.name, **c)
-    digitalhub.new_dataitem(p.name, **c)
-    digitalhub.new_dataitem(p.name, **c)
-    digitalhub.new_dataitem(p.name, **c)
-
-
-# List dataitems
-l_obj = digitalhub.list_dataitems(p.name)
-assert isinstance(l_obj, list)
-assert len(l_obj) == 4
-for i in l_obj:
-    assert isinstance(i, dict)
-
-for uuid in uuids:
-    digitalhub.delete_dataitem(p.name, entity_id=uuid)
-
-# Get dataitems test
-for i in dicts:
-    o1 = digitalhub.new_dataitem(p.name, **i)
-    assert isinstance(o1, Dataitem)
-
-    # Get by id
-    o2 = digitalhub.get_dataitem(p.name, entity_id=o1.id)
-    assert isinstance(o2, Dataitem)
-    assert o1.id == o2.id
-
-    # Get by name
-    o3 = digitalhub.get_dataitem(p.name, entity_name=o1.name)
-    assert isinstance(o3, Dataitem)
-    assert o1.id == o3.id
-
-    # Get by name as latest
-    c = deepcopy(i)
-    c.pop("uuid")
-    o4 = digitalhub.new_dataitem(p.name, **c)
-    o5 = digitalhub.get_dataitem(p.name, entity_name=o1.name)
-    assert isinstance(o5, Dataitem)
-    assert (o5.id != o1.id) and (o5.name == o1.name) and (o5.id == o4.id)
-
-
-# Delete dataitems, all versions
-for n in names:
-    digitalhub.delete_dataitem(p.name, entity_name=n, delete_all_versions=True)
-l_obj = digitalhub.list_dataitems(p.name)
-assert not l_obj
-
-digitalhub.delete_project("test")
+
+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,7 +1,7 @@
 from copy import deepcopy
 
 import dotenv
-from digitalhub_core.entities.functions.entity import Function
+from digitalhub_core.entities.function.entity import Function
 
 import digitalhub
 

test/test_crud_runs.py

@@ -1,5 +1,5 @@
 import dotenv
-from digitalhub_core.entities.runs.entity import Run
+from digitalhub_core.entities.run.entity import Run
 
 import digitalhub
 

test/test_crud_tasks.py

@@ -1,5 +1,5 @@
 import dotenv
-from digitalhub_core.entities.tasks.entity import Task
+from digitalhub_core.entities.task.entity import Task
 
 import digitalhub
 

test/test_imports.py

@@ -54,7 +54,7 @@ METHODS = [
     "delete_workflow",
     "delete_dataitem",
     "delete_model",
-    "set_dhub_env",
+    "set_dhcore_env",
     "set_store",
     "load_project",
     "get_or_create_project",

test/testkfp.py

@@ -8,8 +8,8 @@ def _is_finished(state: str):
     return state == "COMPLETED" or state == "ERROR" or state == "STOPPED"
 
 
-os.environ["DIGITALHUB_CORE_ENDPOINT"] = "http://localhost:8080/"
-os.environ["DIGITALHUB_CORE_WORKFLOW_IMAGE"] = "localhost:5000/dhcoreworkflow9:latest"
+os.environ["DHCORE_ENDPOINT"] = "http://localhost:8080/"
+os.environ["DHCORE_WORKFLOW_IMAGE"] = "localhost:5000/dhcoreworkflow9:latest"
 os.environ["KFP_ENDPOINT"] = "http://localhost:8888/"
 
 # Get or create project

digitalhub-0.6.0b10.dist-info/RECORD

@@ -1,14 +0,0 @@
-digitalhub/__init__.py,sha256=-cfIAC3MzPffMfYGAe-hwsAmGNLacyzCbTg9-xNSDQI,2519
-test/test_crud_artifacts.py,sha256=yjlY_Bx99LPtMh15ufqFVU3KdogkmMjbbIGFkyVg25I,2511
-test/test_crud_dataitems.py,sha256=-xAQ4UxSBqWPwsSLDSqy0EXp8uElymh-MAak3NqnOcs,2504
-test/test_crud_functions.py,sha256=gYIBpPTE0spTVoM8li2N64nCa4zSTgh2CRu0FReWsEg,2769
-test/test_crud_runs.py,sha256=s8LG1SpsQe4pisFGmq-hlHiJr3RQcXsfjggRKtLGCCA,2220
-test/test_crud_tasks.py,sha256=XhSTj0hQNwJ61MbdSczYKMXYUIf_e6alwls9TnIpEiY,2111
-test/test_imports.py,sha256=2Uuo-pa0HgA-qASl1ZpUj6tVze8_2PlmBapuyvDgLDQ,1269
-test/testkfp.py,sha256=JnJkFGRhFAP7DdBVGQEduisNGyR1Eek8SgbK_4wYdF4,1078
-test/testkfp_pipeline.py,sha256=WceFrCp-avHI7PcwIvnv7Kgs2xK3oQqU6sjaonGamg8,622
-digitalhub-0.6.0b10.dist-info/LICENSE.txt,sha256=_yVOtnbW7Ss28mp058UEEc1X4Rgj8-kQBP_kj8_Sc88,11585
-digitalhub-0.6.0b10.dist-info/METADATA,sha256=pDkQNj5iSlVzuPTtVoxdLgUPTAFHXzmFpBbnglOi8nk,14667
-digitalhub-0.6.0b10.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-digitalhub-0.6.0b10.dist-info/top_level.txt,sha256=ae9pDfCF27ZoaVAxuBKONMP0lm5P-N_I-e-no1WlvD8,16
-digitalhub-0.6.0b10.dist-info/RECORD,,