deriva-ml 1.14.28__tar.gz → 1.14.29__tar.gz

{deriva_ml-1.14.28/src/deriva_ml.egg-info → deriva_ml-1.14.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deriva-ml
-Version: 1.14.28
+Version: 1.14.29
 Summary: Utilities to simplify use of Dervia and Pandas to create reproducable ML pipelines
 Author-email: ISRD <isrd-dev@isi.edu>
 Requires-Python: >=3.10

{deriva_ml-1.14.28 → deriva_ml-1.14.29}/src/deriva_ml/execution/workflow.py

@@ -386,7 +386,7 @@ class Workflow(BaseModel):
         """Get SHA-1 hash of latest commit of the file in the repository"""
 
         result = subprocess.run(
-            ["git", "log", "-n", "1", "--pretty=format:%H--", executable_path],
+            ["git", "log", "-n", "1", "--pretty=format:%H", executable_path],
             cwd=repo_root,
             capture_output=True,
             text=True,

{deriva_ml-1.14.28 → deriva_ml-1.14.29/src/deriva_ml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deriva-ml
-Version: 1.14.28
+Version: 1.14.29
 Summary: Utilities to simplify use of Dervia and Pandas to create reproducable ML pipelines
 Author-email: ISRD <isrd-dev@isi.edu>
 Requires-Python: >=3.10

{deriva_ml-1.14.28 → deriva_ml-1.14.29}/src/deriva_ml.egg-info/SOURCES.txt

@@ -98,8 +98,8 @@ tests/dataset/test_datasets.py
 tests/dataset/test_download.py
 tests/execution/__init__.py
 tests/execution/test_execution.py
-tests/execution/workflow-script.py
-tests/execution/workflow_test.ipynb
+tests/execution/workflow-test.ipynb
+tests/execution/workflow-test.py
 tests/feature/test_features.py
 tests/model/__init__.py
 tests/model/test_database.py

{deriva_ml-1.14.28 → deriva_ml-1.14.29}/tests/execution/test_execution.py

@@ -23,11 +23,11 @@ class TestWorkflow:
         ml_instance = test_ml
         ml_instance.add_term(vc.asset_type, "Test Model", description="Model for our Test workflow")
         ml_instance.add_term(vc.workflow_type, "Test Workflow", description="A ML Workflow that uses Deriva ML API")
-        print("Running workflow-script.py ...")
+        print("Running workflow-test.py ...")
         result = subprocess.run(
             [
                 "python",
-                "execution/workflow-script.py",
+                "execution/workflow-test.py",
                 ml_instance.catalog.deriva_server.server,
                 ml_instance.catalog_id,
             ],
@@ -45,19 +45,24 @@ class TestWorkflow:
         print("checksum", checksum)
         print("is_notebook", is_notebook)
         assert is_notebook == "False"
-        assert url.endswith("workflow-script.py")
+        assert url.endswith("workflow-test.py")
 
     def test_workflow_creation_notebook(self, test_ml):
         ml_instance = test_ml
         ml_instance.add_term(vc.asset_type, "Test Model", description="Model for our Test workflow")
         ml_instance.add_term(vc.workflow_type, "Test Workflow", description="A ML Workflow that uses Deriva ML API")
-        print("Running workflow-script.py ...")
+        print("Running notebook...")
         result = subprocess.run(
-            ["runnotebook", "execution/workflow-script.ipnb", "localhost", ml_instance.catalog_id],
+            [
+                "deriva-ml-run-notebook",
+                "execution/workflow-test.ipnb",
+                "--host",
+                "localhost",
+            ],
             capture_output=True,
             text=True,
         )
-        print(result.stdout)
+        print(result)
         m = re.match(".*url='(?P<url>.*?)'", result.stdout)
         url = m["url"]
         m = re.match(".*checksum='(?P<checksum>.*?)'", result.stdout)
@@ -68,7 +73,7 @@ class TestWorkflow:
         print("checksum", checksum)
         print("is_notebook", is_notebook)
         assert is_notebook == "False"
-        assert url.endswith("workflow-script.py")
+        assert url.endswith("workflow-test.py")
 
 
 class TestExecution: