deriva-ml 1.8.0__py3-none-any.whl → 1.8.1__py3-none-any.whl

deriva_ml/VERSION.py

@@ -1 +1 @@
-__version__ = "1.8.0"
+__version__ = "1.8.1"

deriva_ml/dataset.py

@@ -892,7 +892,7 @@ class Dataset:
                     config_file=spec_file,
                     output_dir=tmp_dir,
                     defer_download=True,
-                    timeout=(10, 300),
+                    timeout=(10, 610),
                     envars={"Dataset_RID": dataset.rid},
                 )
                 minid_page_url = exporter.export()[0]  # Get the MINID launch page

deriva_ml/dataset_aux_classes.py

@@ -187,6 +187,14 @@ class DatasetSpec(BaseModel):
 
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
+    @field_validator("version", mode="before")
+    @classmethod
+    def version_field_validator(cls, v: Any) -> Any:
+        if isinstance(v, dict):
+            return DatasetVersion(**v)
+        else:
+            return v
+
     @model_validator(mode="before")
     @classmethod
     def _check_bare_rid(cls, data: Any) -> dict[str, str | bool]:

deriva_ml/demo_catalog.py

@@ -294,6 +294,7 @@ def create_demo_catalog(
             project_name=project_name,
             logging_level=logging.WARN,
         )
+        working_dir = deriva_ml.working_dir
         dataset_table = deriva_ml.dataset_table
         dataset_table.annotations.update(
             Dataset(

deriva_ml/deriva_ml_base.py

@@ -115,10 +115,12 @@ class DerivaML(Dataset):
             if working_dir
             else Path.home() / "deriva-ml"
         ) / default_workdir
+
         self.working_dir.mkdir(parents=True, exist_ok=True)
         self.cache_dir = (
             Path(cache_dir) if cache_dir else Path.home() / "deriva-ml" / "cache"
         )
+
         self.cache_dir.mkdir(parents=True, exist_ok=True)
 
         # Initialize dataset class.

deriva_ml/execution_configuration.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
 import json
-from typing import Optional
+from typing import Optional, Any
 
 from pydantic import (
     BaseModel,
     conlist,
-    ConfigDict,
+    ConfigDict, field_validator,
 )
 from pathlib import Path
 

deriva_ml/test_functions.py

@@ -96,12 +96,12 @@ def execution_test(ml_instance):
         vc.workflow_type, "ML Demo", description="A ML Workflow that uses Deriva ML API"
     )
 
-    api_workflow = Workflow(
+    api_workflow = ml_instance.add_workflow(Workflow(
         name="Manual Workflow",
         url="https://github.com/informatics-isi-edu/deriva-ml/blob/main/docs/Notebooks/DerivaML%20Execution.ipynb",
         workflow_type="Manual Workflow",
         description="A manual operation",
-    )
+    ))
 
     manual_execution = ml_instance.create_execution(
         ExecutionConfiguration(description="Sample Execution", workflow=api_workflow)

{deriva_ml-1.8.0.dist-info → deriva_ml-1.8.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: deriva-ml
-Version: 1.8.0
+Version: 1.8.1
 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.8.0.dist-info → deriva_ml-1.8.1.dist-info}/RECORD

@@ -1,19 +1,19 @@
-deriva_ml/VERSION.py,sha256=Oc_xF94AMAHKZkZlB5rBt1iO0TXWFalg65MP4T2qt-A,22
+deriva_ml/VERSION.py,sha256=6cud5pVpwnMsz6fxZVA6qWcQVSpLQXd0ddN6ip-1M_8,22
 deriva_ml/__init__.py,sha256=0PHNB8gRDALLtaffRmU7wCUgWbRHVQZcjuPJxMLNEco,856
 deriva_ml/database_model.py,sha256=uhoyVyd8MQmY8J9ovCH8fjxhZDxxXNkdJyYdeyEGPXA,13898
-deriva_ml/dataset.py,sha256=b0FqUHKsaIKyyjq3O_P9lSP5I5aWAkEDp4nrQn3rzqw,55524
-deriva_ml/dataset_aux_classes.py,sha256=8cnhVTuaIS7NdxF34oKvzH3U1Rx9sc6jiTC6vOmAPF0,6313
+deriva_ml/dataset.py,sha256=f6eFgaTYjW-iZwqpVPZH9hSOmZP2C4_elkWhtLOjW9E,55524
+deriva_ml/dataset_aux_classes.py,sha256=YxjQnu2kS9kK_f8bGqhmgE6ty9GNeitCxfvReT9vaM0,6537
 deriva_ml/dataset_bag.py,sha256=e6IHv3saZUnZRfl0EjfnlV2NnmPeOagYYv3PuZqS1l0,11501
-deriva_ml/demo_catalog.py,sha256=eWUiQ1DMkMXFZEYqCGVlLJHOZd7uE5L6-Zr3kl8YUI0,11001
+deriva_ml/demo_catalog.py,sha256=xQPhFlflqwJskNQrQ-jdBSnGzBm2-aONBgcRxfsdNKM,11045
 deriva_ml/deriva_definitions.py,sha256=MGl29ogCzqrlRilMhSuR5tECo4NSHP4CLbJAXRtPH6E,8914
-deriva_ml/deriva_ml_base.py,sha256=GFz6SSjcwFt5KdJyWb7kcjr1srZjyQtanpdo81LlXCI,36441
+deriva_ml/deriva_ml_base.py,sha256=ShDZlG9F4XrGRUcUINT3bb_P_UdvV1FqSnnPsjGTCLU,36443
 deriva_ml/deriva_model.py,sha256=F5zDw-MDV55POAjKB6dorpa7P4KTSN9hjDCN4E9zB9A,11986
 deriva_ml/execution.py,sha256=UcXWY1W5Mt_Yzuayd3Pjd-lKzLlMV5QXZFcLvE6Lt0E,28390
-deriva_ml/execution_configuration.py,sha256=PeBB4ZOcZwwMeRpg0QR1sCKD2AwSYdpzIl_PcVllYc0,3678
+deriva_ml/execution_configuration.py,sha256=nMeaG1qYdIgu4BV5atSUlcL8VZ3O6ohGY5iBhtD_LQ4,3700
 deriva_ml/execution_environment.py,sha256=bCRKrCELDbGQDo7_FKfw7e8iMzVjSRZK3baKkqH5-_0,3264
 deriva_ml/feature.py,sha256=7e8WYPCfJSrGxJh9oUTduYSnB5ekybRhXa_0HIigS_w,5459
 deriva_ml/history.py,sha256=qTDLDs8Ow_6r7mDO0gZm0Fg81SWKOAgtCU5pzZoDRgM,2828
-deriva_ml/test_functions.py,sha256=stunfznC759qCrhUBVeymDNBikrfBhqe4pLTw8p6PzA,4370
+deriva_ml/test_functions.py,sha256=-eqLHjjCQCLBNAr1ofbZekNiCOfMISSACRxT_YHER8I,4396
 deriva_ml/upload.py,sha256=HCOChW6bALW_gt0sWUs_81bNPsb72TNs4o0FQsGSLM4,22222
 deriva_ml/build/lib/schema_setup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 deriva_ml/build/lib/schema_setup/alter_annotation.py,sha256=pkwk0WystN69JfAFK4iBJZAZVQKbRs-gN9IFYuS9rfg,1739
@@ -26,9 +26,9 @@ deriva_ml/schema_setup/annotations.py,sha256=Uogm9YkRtoKSdgfQlICqRywbCATppwBO-Xr
 deriva_ml/schema_setup/create_schema.py,sha256=jwziMWJPbjRgjiRBT-KtidnXI8YNEFO74A9fwfptjHY,10626
 deriva_ml/schema_setup/policy.json,sha256=77sf0Imy6CAQV0_VwwbA56_KROJ05WXsvT-Wjtkk538,1633
 deriva_ml/schema_setup/table_comments_utils.py,sha256=-2_ubEpoH7ViLVb-ZfW9wZbQ26DTKNgjkCABMzGu4i4,2140
-deriva_ml-1.8.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-deriva_ml-1.8.0.dist-info/METADATA,sha256=X_PTMVr4ZhOe7XBaEKWk2nPRpfvB3ayZIK5MRdPjQV8,556
-deriva_ml-1.8.0.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-deriva_ml-1.8.0.dist-info/entry_points.txt,sha256=ZiOvrYj022x544TQwi018ujeHRRDahNmwJnzn5ThacM,242
-deriva_ml-1.8.0.dist-info/top_level.txt,sha256=I1Q1dkH96cRghdsFRVqwpa2M7IqJpR2QPUNNc5-Bnpw,10
-deriva_ml-1.8.0.dist-info/RECORD,,
+deriva_ml-1.8.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+deriva_ml-1.8.1.dist-info/METADATA,sha256=wIwGjDbMrZ88z1y2ohD8vXJQliQLSPmKRoLO86l6c8c,556
+deriva_ml-1.8.1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+deriva_ml-1.8.1.dist-info/entry_points.txt,sha256=ZiOvrYj022x544TQwi018ujeHRRDahNmwJnzn5ThacM,242
+deriva_ml-1.8.1.dist-info/top_level.txt,sha256=I1Q1dkH96cRghdsFRVqwpa2M7IqJpR2QPUNNc5-Bnpw,10
+deriva_ml-1.8.1.dist-info/RECORD,,