deriva-ml 1.14.30__tar.gz → 1.14.32__tar.gz

{deriva_ml-1.14.30/src/deriva_ml.egg-info → deriva_ml-1.14.32}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: deriva-ml
-Version: 1.14.30
+Version: 1.14.32
 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
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: bump-my-version
 Requires-Dist: deriva~=1.7.10
 Requires-Dist: deepdiff
 Requires-Dist: pandas

{deriva_ml-1.14.30 → deriva_ml-1.14.32}/pyproject.toml

@@ -8,6 +8,7 @@ description = "Utilities to simplify use of Dervia and Pandas to create reproduc
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
+    "bump-my-version",
     "deriva~=1.7.10",
     "deepdiff",
     "pandas",
@@ -89,8 +90,8 @@ keywords = ["deriva-ml"]
 
 [dependency-groups]
 dev = [
-    "bump-my-version",
     "icecream>=2.1.4",
+    "ipykernel",
     "jupyter>=1.1.1",
     "mkdocs-jupyter",
     "mkdocstrings[python]",

{deriva_ml-1.14.30 → deriva_ml-1.14.32}/src/deriva_ml/execution/workflow.py

@@ -7,6 +7,7 @@ from pathlib import Path
 from typing import Any
 
 import requests
+from pydantic import BaseModel, PrivateAttr, model_validator
 from requests import RequestException
 
 from deriva_ml.core.definitions import RID
@@ -48,7 +49,7 @@ except ImportError:
         return get_connection_file()
 
 
-class Workflow:
+class Workflow(BaseModel):
     """Represents a computational workflow in DerivaML.
 
     A workflow defines a computational process or analysis pipeline. Each workflow has
@@ -75,17 +76,19 @@ class Workflow:
         ... )
     """
 
-    def __init__(
-        self,
-        name: str,
-        workflow_type: str,
-        description: str | None = None,
-        url: str | None = None,
-        version: str | None = None,
-        rid: RID | None = None,
-        checksum: str | None = None,
-        is_notebook: bool = False,
-    ):
+    name: str
+    workflow_type: str
+    description: str | None = None
+    url: str | None = None
+    version: str | None = None
+    rid: RID | None = None
+    checksum: str | None = None
+    is_notebook: bool = False
+
+    _logger: logging.Logger = PrivateAttr(default=10)
+
+    @model_validator(mode="after")
+    def setup_url_checksum(self) -> "Workflow":
         """Creates a workflow from the current execution context.
 
         Identifies the currently executing program (script or notebook) and creates
@@ -114,14 +117,6 @@ class Workflow:
             ...     description="Process sample data"
             ... )
         """
-        self.name = name
-        self.url = url
-        self.workflow_type = workflow_type
-        self.version = version
-        self.description = description
-        self.rid = rid
-        self.checksum = checksum
-        self.is_notebook = is_notebook
         """Initializes logging for the workflow."""
 
         # Check to see if execution file info is being passed in by calling program.
@@ -135,6 +130,7 @@ class Workflow:
             self.url, self.checksum = Workflow.get_url_and_checksum(path)
 
         self._logger = logging.getLogger("deriva_ml")
+        return self
 
     @staticmethod
     def get_url_and_checksum(executable_path: Path) -> tuple[str, str]:

{deriva_ml-1.14.30 → deriva_ml-1.14.32/src/deriva_ml.egg-info}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: deriva-ml
-Version: 1.14.30
+Version: 1.14.32
 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
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: bump-my-version
 Requires-Dist: deriva~=1.7.10
 Requires-Dist: deepdiff
 Requires-Dist: pandas

{deriva_ml-1.14.30 → deriva_ml-1.14.32}/src/deriva_ml.egg-info/requires.txt

@@ -1,3 +1,4 @@
+bump-my-version
 deriva~=1.7.10
 deepdiff
 pandas

{deriva_ml-1.14.30 → deriva_ml-1.14.32}/tests/execution/test_execution.py

@@ -2,7 +2,6 @@
 Tests for the execution module.
 """
 
-import json
 import subprocess
 from tempfile import TemporaryDirectory
 
@@ -61,7 +60,7 @@ class TestWorkflow:
         new_workflow = result.stdout.strip()
         assert new_workflow == workflow_rid
 
-    def test_workflow_creation_notebook(self, test_ml, tmp_path):
+    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")
@@ -69,10 +68,6 @@ class TestWorkflow:
         workflows = list(workflow_table.entities().fetch())
         assert 0 == len(workflows)
 
-        config_file = tmp_path / "config.json"
-        with config_file.open("w") as fp:
-            json.dump({"host": ml_instance.catalog.deriva_server.server, "catalog_id": ml_instance.catalog_id}, fp)
-
         print("Running notebook...")
         result = subprocess.run(
             [
@@ -87,14 +82,11 @@ class TestWorkflow:
             capture_output=True,
             text=True,
         )
-        print(result)
         workflows = list(workflow_table.entities().fetch())
         assert 1 == len(workflows)
         workflow_rid = workflows[0]["RID"]
         workflow_url = workflows[0]["URL"]
-
-        print(workflow_url)
-        print(workflow_rid)
+        assert workflow_url.endswith("workflow-test.ipynb")
 
 
 class TestExecution:

{deriva_ml-1.14.30 → deriva_ml-1.14.32}/tests/test_utils.py

@@ -42,7 +42,7 @@ class MLCatalog:
         pb = self.catalog.getPathBuilder()
         ml_path = pb.schemas["deriva-ml"]
         domain_path = pb.schemas[self.domain_schema]
-        for t in ["Dataset_Execution", "Dataset_Version", "Dataset_Dataset"]:
+        for t in ["Dataset_Execution", "Dataset_Version", "Dataset_Dataset", "Workflow", "Workflow_Execution"]:
             try:
                 ml_path.tables[t].path.delete()
             except DataPathException:

{deriva_ml-1.14.30 → deriva_ml-1.14.32}/uv.lock

@@ -22,13 +22,13 @@ name = "aiohttp"
 version = "3.12.15"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
-    { name = "aiohappyeyeballs", marker = "python_full_version >= '3.12'" },
-    { name = "aiosignal", marker = "python_full_version >= '3.12'" },
-    { name = "attrs", marker = "python_full_version >= '3.12'" },
-    { name = "frozenlist", marker = "python_full_version >= '3.12'" },
-    { name = "multidict", marker = "python_full_version >= '3.12'" },
-    { name = "propcache", marker = "python_full_version >= '3.12'" },
-    { name = "yarl", marker = "python_full_version >= '3.12'" },
+    { name = "aiohappyeyeballs", marker = "python_full_version >= '3.12' and python_full_version < '3.14'" },
+    { name = "aiosignal", marker = "python_full_version >= '3.12' and python_full_version < '3.14'" },
+    { name = "attrs", marker = "python_full_version >= '3.12' and python_full_version < '3.14'" },
+    { name = "frozenlist", marker = "python_full_version >= '3.12' and python_full_version < '3.14'" },
+    { name = "multidict", marker = "python_full_version >= '3.12' and python_full_version < '3.14'" },
+    { name = "propcache", marker = "python_full_version >= '3.12' and python_full_version < '3.14'" },
+    { name = "yarl", marker = "python_full_version >= '3.12' and python_full_version < '3.14'" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/9b/e7/d92a237d8802ca88483906c388f7c201bbe96cd80a165ffd0ac2f6a8d59f/aiohttp-3.12.15.tar.gz", hash = "sha256:4fc61385e9c98d72fcdf47e6dd81833f47b2f77c114c29cd64a361be57a763a2", size = 7823716, upload-time = "2025-07-29T05:52:32.215Z" }
 wheels = [
@@ -107,7 +107,7 @@ name = "aiosignal"
 version = "1.4.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
-    { name = "frozenlist", marker = "python_full_version >= '3.12'" },
+    { name = "frozenlist", marker = "python_full_version >= '3.12' and python_full_version < '3.14'" },
     { name = "typing-extensions", marker = "python_full_version == '3.12.*'" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/61/62/06741b579156360248d1ec624842ad0edf697050bbaf7c3e46394e106ad1/aiosignal-1.4.0.tar.gz", hash = "sha256:f47eecd9468083c2029cc99945502cb7708b082c232f9aca65da147157b251c7", size = 25007, upload-time = "2025-07-03T22:54:43.528Z" }
@@ -775,6 +775,7 @@ wheels = [
 name = "deriva-ml"
 source = { editable = "." }
 dependencies = [
+    { name = "bump-my-version" },
     { name = "deepdiff" },
     { name = "deriva" },
     { name = "nbstripout" },
@@ -790,8 +791,8 @@ dependencies = [
 
 [package.dev-dependencies]
 dev = [
-    { name = "bump-my-version" },
     { name = "icecream" },
+    { name = "ipykernel" },
     { name = "jupyter" },
     { name = "mkdocs-jupyter" },
     { name = "mkdocs-material" },
@@ -806,6 +807,7 @@ lint = [
 
 [package.metadata]
 requires-dist = [
+    { name = "bump-my-version" },
     { name = "deepdiff" },
     { name = "deriva", specifier = "~=1.7.10" },
     { name = "nbstripout" },
@@ -821,8 +823,8 @@ requires-dist = [
 
 [package.metadata.requires-dev]
 dev = [
-    { name = "bump-my-version" },
     { name = "icecream", specifier = ">=2.1.4" },
+    { name = "ipykernel" },
     { name = "jupyter", specifier = ">=1.1.1" },
     { name = "mkdocs-jupyter" },
     { name = "mkdocs-material" },
@@ -3605,9 +3607,9 @@ name = "yarl"
 version = "1.20.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
-    { name = "idna", marker = "python_full_version >= '3.12'" },
-    { name = "multidict", marker = "python_full_version >= '3.12'" },
-    { name = "propcache", marker = "python_full_version >= '3.12'" },
+    { name = "idna", marker = "python_full_version >= '3.12' and python_full_version < '3.14'" },
+    { name = "multidict", marker = "python_full_version >= '3.12' and python_full_version < '3.14'" },
+    { name = "propcache", marker = "python_full_version >= '3.12' and python_full_version < '3.14'" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/3c/fb/efaa23fa4e45537b827620f04cf8f3cd658b76642205162e072703a5b963/yarl-1.20.1.tar.gz", hash = "sha256:d017a4997ee50c91fd5466cef416231bb82177b93b029906cefc542ce14c35ac", size = 186428, upload-time = "2025-06-10T00:46:09.923Z" }
 wheels = [