deriva-ml 1.12.0__tar.gz → 1.12.1__tar.gz

{deriva_ml-1.12.0/src/deriva_ml.egg-info → deriva_ml-1.12.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deriva-ml
-Version: 1.12.0
+Version: 1.12.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.12.0 → deriva_ml-1.12.1}/src/deriva_ml/deriva_ml_base.py

@@ -193,11 +193,7 @@ class DerivaML(Dataset):
             pass
 
     def _check_nbstrip_status(self) -> None:
-        """Figure out if you are running in a Jupyter notebook
-
-        Returns:
-            A Path to the notebook file that is currently being executed.
-        """
+        """Check to see if nbstrip is installed"""
         try:
             if subprocess.run(
                 ["nbstripout", "--is-installed"],

{deriva_ml-1.12.0 → deriva_ml-1.12.1}/src/deriva_ml/execution.py

@@ -651,6 +651,7 @@ class Execution:
             ]  # Peel off the schema from the asset table
             asset_exe = self._model.find_association(asset_table_name, "Execution")
             asset_exe_path = pb.schemas[asset_exe.schema.name].tables[asset_exe.name]
+
             asset_exe_path.insert(
                 [
                     {
@@ -706,7 +707,7 @@ class Execution:
         """Return a pathlib Path to the directory in which to place files for the specified execution_asset type.
 
         Given the name of an asset table, and a file name, register the file for upload, and return a path to that
-        file in the upload directory.  In addition to the filename, additioal asset metadata and file asset types may
+        file in the upload directory.  In addition to the filename, additional asset metadata and file asset types may
         be specified.
 
         This routine has three modes, depending on if file_name refers to an existing file.  If it doesn't, a path

{deriva_ml-1.12.0 → deriva_ml-1.12.1}/src/deriva_ml/upload.py

@@ -212,6 +212,7 @@ def asset_table_upload_spec(model: DerivaModel, asset_table: str | Table):
         }
         | {c: f"{{{c}}}" for c in metadata_columns},
         "file_pattern": asset_path,  # Sets schema, asset_table, file_name, file_ext
+        "asset_type": "file",
         "target_table": [schema, asset_table.name],
         "checksum_types": ["sha256", "md5"],
         "hatrac_options": {"versioned_urls": True},
@@ -244,7 +245,7 @@ def bulk_upload_configuration(model: DerivaModel) -> dict[str, Any]:
                     "Length": "{file_size}",
                     "Filename": "{file_name}",
                 },
-                "asset_type": "fetch",
+                "asset_type": "file",
                 "target_table": ["{schema}", "{asset_table}"],
                 "file_pattern": asset_path_regex
                 + "/"

{deriva_ml-1.12.0 → deriva_ml-1.12.1/src/deriva_ml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deriva-ml
-Version: 1.12.0
+Version: 1.12.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