deriva-ml 1.17.0__py3-none-any.whl → 1.17.2__py3-none-any.whl

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/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.dist-info → deriva_ml-1.17.2.dist-info}/METADATA

@@ -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.dist-info → deriva_ml-1.17.2.dist-info}/RECORD

@@ -16,14 +16,14 @@ deriva_ml/core/ermrest.py,sha256=N0IJ3TE87jElaBChEIo5AFDTr0SIrb6F90yiimRfPr4,101
 deriva_ml/core/exceptions.py,sha256=4MZNPOyN-UMaGeY9sqJDVwh_iOmz1ntp4usSyCNqVMg,934
 deriva_ml/core/filespec.py,sha256=BQAAcRXfXq1lDcsKlokLOOXCBtEZpPgXxrFOIZYAgLg,4229
 deriva_ml/dataset/__init__.py,sha256=wTCQaWGfRYEiUoOOxerKSpkbl1T5YFhoCyemlxGTk8k,283
-deriva_ml/dataset/aux_classes.py,sha256=ojqe7gyK4KQVz_xfIillXS_HJ1PMsyr47pb2tFOXO_c,7855
+deriva_ml/dataset/aux_classes.py,sha256=e0D83IEDvsSIx79lKoCsD-CcIFmnoinNtzvpdMMQ80E,7291
 deriva_ml/dataset/dataset.py,sha256=d860WuCL0-Pz6TyRpGVzhpPWDMco01-I5LT4dZjYxsQ,64728
 deriva_ml/dataset/dataset_bag.py,sha256=ori3BuYVqfeHkVCjNSKuZh7oMdC6uufsszicpTPODiw,19944
 deriva_ml/dataset/history.py,sha256=FK5AYYz11p4E4FWMVg4r7UPWOD4eobrq3b3xMjWF59g,3197
 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=hNBfYnqXK4PmNS2wxbJ5oYzjDszjaiGHo8d3uxmIgPk,46210
+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/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-deriva_ml-1.17.0.dist-info/METADATA,sha256=gvz8ApFj8xylH1r4Nr-X_QiHChj6wRNJE7pLzI2sB8E,1272
-deriva_ml-1.17.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-deriva_ml-1.17.0.dist-info/entry_points.txt,sha256=XsHSbfp7S1cKMjHoPUdFIaFcp9lHXHS6CV1zb_MEXkg,463
-deriva_ml-1.17.0.dist-info/top_level.txt,sha256=I1Q1dkH96cRghdsFRVqwpa2M7IqJpR2QPUNNc5-Bnpw,10
-deriva_ml-1.17.0.dist-info/RECORD,,
+deriva_ml-1.17.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+deriva_ml-1.17.2.dist-info/METADATA,sha256=kBjucGR6nFW84qfxY8z34Xsz4XxMv9ljmFCoxFwwYA8,1272
+deriva_ml-1.17.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+deriva_ml-1.17.2.dist-info/entry_points.txt,sha256=XsHSbfp7S1cKMjHoPUdFIaFcp9lHXHS6CV1zb_MEXkg,463
+deriva_ml-1.17.2.dist-info/top_level.txt,sha256=I1Q1dkH96cRghdsFRVqwpa2M7IqJpR2QPUNNc5-Bnpw,10
+deriva_ml-1.17.2.dist-info/RECORD,,