deriva-ml 1.8.0__tar.gz → 1.8.1__tar.gz

{deriva_ml-1.8.0/src/deriva_ml.egg-info → deriva_ml-1.8.1}/PKG-INFO

@@ -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.1/src/deriva_ml/VERSION.py

@@ -0,0 +1 @@
+__version__ = "1.8.1"

{deriva_ml-1.8.0 → deriva_ml-1.8.1}/src/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-1.8.0 → deriva_ml-1.8.1}/src/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-1.8.0 → deriva_ml-1.8.1}/src/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-1.8.0 → deriva_ml-1.8.1}/src/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-1.8.0 → deriva_ml-1.8.1}/src/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-1.8.0 → deriva_ml-1.8.1}/src/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 → deriva_ml-1.8.1/src/deriva_ml.egg-info}/PKG-INFO

@@ -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/src/deriva_ml/VERSION.py

@@ -1 +0,0 @@
-__version__ = "1.8.0"