deriva-ml 1.17.3__py3-none-any.whl → 1.17.4__py3-none-any.whl

deriva_ml/execution/execution.py

@@ -254,6 +254,7 @@ class Execution:
 
         # Make sure we have a good workflow.
         if isinstance(self.configuration.workflow, Workflow):
+            self._ml_object.lookup_term(MLVocab.workflow_type, configuration.workflow.workflow_type)
             self.workflow_rid = (
                 self._ml_object.add_workflow(self.configuration.workflow) if not self._dry_run else DRY_RUN_RID
             )

deriva_ml/execution/execution_configuration.py

@@ -22,14 +22,13 @@ Typical usage example:
 
 from __future__ import annotations
 
-from dataclasses import dataclass
 import json
 import sys
+from dataclasses import dataclass
 from pathlib import Path
-from typing import Any
 
 from hydra_zen import builds
-from pydantic import BaseModel, ConfigDict, Field, field_validator
+from pydantic import BaseModel, ConfigDict, Field
 
 from deriva_ml.core.definitions import RID
 from deriva_ml.dataset.aux_classes import DatasetSpec
@@ -74,26 +73,13 @@ class ExecutionConfiguration(BaseModel):
 
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
-  #  @field_validator("datasets", mode="before")
-  #  @classmethod
-  #  def validate_datasets(cls, value: Any) -> Any:
-  #      if isinstance(value, DatasetList):
-  #          config_list: DatasetList = value
-  #          value = config_list.datasets
-  #      return value
-
-    @field_validator("workflow", mode="before")
-    @classmethod
-    def validate_workflow(cls, value: Any) -> Any:
-        """Validates workflow specification.
-
-        Args:
-            value: Workflow value to validate (RID or Workflow object).
-
-        Returns:
-            RID | Workflow: Validated workflow specification.
-        """
-        return value
+    #  @field_validator("datasets", mode="before")
+    #  @classmethod
+    #  def validate_datasets(cls, value: Any) -> Any:
+    #      if isinstance(value, DatasetList):
+    #          config_list: DatasetList = value
+    #          value = config_list.datasets
+    #      return value
 
     @staticmethod
     def load_configuration(path: Path) -> ExecutionConfiguration:
@@ -151,8 +137,5 @@ class AssetRID(str):
         obj.description = description
         return obj
 
-AssetRIDConfig = builds(AssetRID, populate_full_signature=True)
-
-
-
 
+AssetRIDConfig = builds(AssetRID, populate_full_signature=True)

deriva_ml/execution/workflow.py

@@ -9,7 +9,6 @@ from typing import Any
 import requests
 from pydantic import BaseModel, PrivateAttr, model_validator
 from requests import RequestException
-from setuptools_scm import get_version
 
 from deriva_ml.core.definitions import RID
 from deriva_ml.core.exceptions import DerivaMLException
@@ -130,12 +129,7 @@ class Workflow(BaseModel):
             self.url, self.checksum = Workflow.get_url_and_checksum(path)
             self.git_root = Workflow._get_git_root(path)
 
-        self.version = get_version(
-            root=str(self.git_root or Path.cwd()),
-            search_parent_directories=True,
-            # Optional but recommended: provide a safe fallback when tags are absent
-            fallback_version="0.0",
-        )
+        self.version = Workflow.get_dynamic_version(root=str(self.git_root or Path.cwd()))
 
         self._logger = logging.getLogger("deriva_ml")
         return self
@@ -389,3 +383,22 @@ class Workflow(BaseModel):
         sha = result.stdout.strip()
         url = f"{github_url}/blob/{sha}/{executable_path.relative_to(repo_root)}"
         return url, is_dirty
+
+    @staticmethod
+    def get_dynamic_version(root: str | os.PathLike | None = None) -> str:
+        """
+        Return a dynamic version string based on VCS state (setuptools_scm),
+        including dirty/uncommitted changes if configured.
+
+        Works under uv / Python 3.10+ by forcing setuptools to use stdlib distutils.
+        """
+        # Ensure setuptools doesn't try to override stdlib distutils
+        os.environ.setdefault("SETUPTOOLS_USE_DISTUTILS", "stdlib")
+
+        from setuptools_scm import get_version  # imported *after* env var is set
+
+        if root is None:
+            # Adjust this to point at your repo root if needed
+            root = Path(__file__).resolve().parents[1]
+
+        return get_version(root=root)

{deriva_ml-1.17.3.dist-info → deriva_ml-1.17.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deriva-ml
-Version: 1.17.3
+Version: 1.17.4
 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.17.3.dist-info → deriva_ml-1.17.4.dist-info}/RECORD

@@ -23,9 +23,9 @@ deriva_ml/dataset/history.py,sha256=FK5AYYz11p4E4FWMVg4r7UPWOD4eobrq3b3xMjWF59g,
 deriva_ml/dataset/upload.py,sha256=n1aXSbOx1hghCDxuF8yf03jZmOLMueXL-rSnQMrfHq0,16535
 deriva_ml/execution/__init__.py,sha256=5kKpPwQbxhmRn7Npz7DpavuCxYwCQaDdl4-6z62hbds,705
 deriva_ml/execution/environment.py,sha256=B7nywqxFTRUWgyu8n7rFoKcVC9on422kjeFG2FPQfvg,9302
-deriva_ml/execution/execution.py,sha256=Gwrj2ICOH6ZsysM1aHCofBD_AwPgqjDemffHzY300tg,46210
-deriva_ml/execution/execution_configuration.py,sha256=RT0x9n0uyJgEsrLCUTu16nAUJN7X-XLDvfezln0PTDQ,5775
-deriva_ml/execution/workflow.py,sha256=rTlspICp2Q6prUwPCeukjhO64rbcJivcFs4zH60B16U,13906
+deriva_ml/execution/execution.py,sha256=pso488INQ9eZx_VO6XHv4N6e3CwclOtgTEDE-qyGnNg,46311
+deriva_ml/execution/execution_configuration.py,sha256=lftW9tAzpCiQw83vLT0IG5JjlL4K6Q-qHjkhVquh8-E,5384
+deriva_ml/execution/workflow.py,sha256=80mFNRd-4H_DOJUT00aO4k9OFYSj1UOQBJTGm_kTlf8,14439
 deriva_ml/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 deriva_ml/model/catalog.py,sha256=O6_Ll4Uxg6DyxoBXT9P9CPTt9jx1guVTeX1L3KW1A5c,19645
 deriva_ml/model/database.py,sha256=BG5FSisl9tWTBnf5k9dNnijOIDyCUDeRhN_inkmIqTw,31132
@@ -37,9 +37,9 @@ deriva_ml/schema/create_schema.py,sha256=9qK9_8SRQT-DwcEwTGSkhi3j2NaoH5EVgthvV2k
 deriva_ml/schema/deriva-ml-reference.json,sha256=AEOMIgwKO3dNMMWHb0lxaXyamvfAEbUPh8qw0aAtsUQ,242460
 deriva_ml/schema/policy.json,sha256=5ykB8nnZFl-oCHzlAwppCFKJHWJFIkYognUMVEanfY8,1826
 deriva_ml/schema/table_comments_utils.py,sha256=4flCqnZAaqg_uSZ9I18pNUWAZoLfmMCXbmI5uERY5vM,2007
-deriva_ml-1.17.3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-deriva_ml-1.17.3.dist-info/METADATA,sha256=_-xDLOnjctq5V0U60iduW-vrjo5j4pGaAsY0eyEUQX8,1272
-deriva_ml-1.17.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-deriva_ml-1.17.3.dist-info/entry_points.txt,sha256=XsHSbfp7S1cKMjHoPUdFIaFcp9lHXHS6CV1zb_MEXkg,463
-deriva_ml-1.17.3.dist-info/top_level.txt,sha256=I1Q1dkH96cRghdsFRVqwpa2M7IqJpR2QPUNNc5-Bnpw,10
-deriva_ml-1.17.3.dist-info/RECORD,,
+deriva_ml-1.17.4.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+deriva_ml-1.17.4.dist-info/METADATA,sha256=rCfFB1SBVMXGd4aNxpgelYzZQjyxg6HnB4idrmV3tKo,1272
+deriva_ml-1.17.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+deriva_ml-1.17.4.dist-info/entry_points.txt,sha256=XsHSbfp7S1cKMjHoPUdFIaFcp9lHXHS6CV1zb_MEXkg,463
+deriva_ml-1.17.4.dist-info/top_level.txt,sha256=I1Q1dkH96cRghdsFRVqwpa2M7IqJpR2QPUNNc5-Bnpw,10
+deriva_ml-1.17.4.dist-info/RECORD,,