deriva-ml 1.17.0__tar.gz → 1.17.2__tar.gz

{deriva_ml-1.17.0 → deriva_ml-1.17.2}/PKG-INFO

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

{deriva_ml-1.17.0 → deriva_ml-1.17.2}/pyproject.toml

@@ -80,13 +80,10 @@ pre_commit_hooks = []
 post_commit_hooks = []
 
 [tool.pytest]
-mock_use_standalone_module = true
-
-[tool.pytest.ini_options]
 testpaths = ["tests"]
 python_files = ["test_*.py"]
 #addopts = "-v --cov=deriva_ml --cov-report=term-missing  --import-mode=importlib"
-addopts = "-v  --import-mode=importlib"
+addopts = ["-v", "--import-mode=importlib"]
 
 
 [tool.ruff]

{deriva_ml-1.17.0 → deriva_ml-1.17.2}/src/deriva_ml/dataset/aux_classes.py

@@ -3,7 +3,7 @@ THis module defines the DataSet class with is used to manipulate n
 """
 
 from enum import Enum
-from typing import Any, Optional, SupportsInt, overload
+from typing import Any, Optional, SupportsInt
 
 from hydra_zen import hydrated_dataclass
 from pydantic import (
@@ -43,9 +43,6 @@ class DatasetVersion(Version):
         replace(major, minor, patch): Replace the major and minor versions
     """
 
-    @overload
-    def __init__(self, version: str): ...
-    @overload
     def __init__(self, major: SupportsInt, minor: SupportsInt = 0, patch: SupportsInt = 0):
         """Initialize a DatasetVersion object.
 
@@ -54,21 +51,6 @@ class DatasetVersion(Version):
             minor: Minor version number.  Used to indicate additional members added, or change in member values.
             patch: Patch number of the dataset.  Used to indicate minor clean-up and edits
         """
-        ...
-
-    def __init__(self, *args):
-        """Initialize a DatasetVersion object.
-
-        Args:
-            major: Major version number. Used to indicate schema changes.
-            minor: Minor version number.  Used to indicate additional members added, or change in member values.
-            patch: Patch number of the dataset.  Used to indicate minor clean-up and edits
-        """
-        if len(args) == 1 and isinstance(args[0], str):
-            v = Version.parse(args[0])
-            major, minor, patch = v.major, v.minor, v.patch
-        else:
-            major, minor, patch = args
         super().__init__(major, minor, patch)
 
     def to_dict(self) -> dict[str, Any]:
@@ -123,12 +105,16 @@ class DatasetHistory(BaseModel):
     dataset_rid: RID
     version_rid: RID
     execution_rid: Optional[RID] = None
-    description: str = ""
-    minid: Optional[str] = None
-    snapshot: Optional[str] = None
+    description: str | None = ""
+    minid: str | None = None
+    snapshot: str | None = None
 
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
+    @field_validator("description", mode="after")
+    def _default_description(cls, v) -> str:
+        return v or ""
+
 
 class DatasetMinid(BaseModel):
     """Represent information about a MINID that refers to a dataset

{deriva_ml-1.17.0 → deriva_ml-1.17.2}/src/deriva_ml/execution/execution.py

@@ -1100,7 +1100,7 @@ class Execution:
             description: Description of the files.
 
         Returns:
-            RID: Dataset RID that identifes newly added files. Will be nested to mirror origioanl directory structure
+            RID: Dataset RID that identifies newly added files. Will be nested to mirror original directory structure
             of the files.
 
         Raises:

{deriva_ml-1.17.0 → deriva_ml-1.17.2}/src/deriva_ml.egg-info/PKG-INFO

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

{deriva_ml-1.17.0 → deriva_ml-1.17.2}/tests/core/test_file.py

@@ -6,7 +6,8 @@ from tempfile import TemporaryDirectory
 import pytest
 from deriva.core.datapath import DataPathException
 
-from deriva_ml import DerivaML, DerivaMLInvalidTerm, ExecutionConfiguration, FileSpec, MLVocab
+from deriva_ml import DerivaML, DerivaMLInvalidTerm, FileSpec, MLVocab
+from deriva_ml.execution import ExecutionConfiguration
 
 FILE_COUNT = 5