deriva-ml 1.14.38__py3-none-any.whl → 1.14.39__py3-none-any.whl

deriva_ml/core/base.py

@@ -134,8 +134,10 @@ class DerivaML(Dataset):
                 this argument must be provided a value.
             ml_schema: Schema name for ML schema. Used if you have a non-standard configuration of deriva-ml.
             project_name: Project name. Defaults to name of domain schema.
-            cache_dir: Directory path for caching data downloaded from the Deriva server as bdbag.
-            working_dir: Directory path for storing data used by or generated by any computations.
+            cache_dir: Directory path for caching data downloaded from the Deriva server as bdbag. If not provided,
+                will default to working_dir.
+            working_dir: Directory path for storing data used by or generated by any computations. If no value is
+                provided, will default to  ${HOME}/deriva_ml
             use_minid: Use the MINID service when downloading dataset bags.
         """
         # Get or use provided credentials for server access

deriva_ml/execution/workflow.py

@@ -320,6 +320,11 @@ class Workflow(BaseModel):
             if not (filename.exists() or Workflow._in_repl()):
                 # Being called from the command line interpreter.
                 filename = Path.cwd() / Path("REPL")
+            # Get the caller's filename, which is two up the stack from here.
+            elif "PYTEST_CURRENT_TEST" in os.environ:
+                filename = Path.cwd() / Path("pytest")
+            else:
+                raise DerivaMLException("Looking for caller failed")  # Stack is too shallow
         return filename, is_notebook
 
     @staticmethod

deriva_ml/install_kernel.py

@@ -1,4 +1,3 @@
-# your_pkg/install_kernel.py
 import re
 import sys
 from argparse import ArgumentParser

deriva_ml/model/database.py

@@ -326,7 +326,7 @@ class DatabaseModel(DerivaModel, metaclass=DatabaseModelMeta):
         except ValueError:
             tname = table
             for sname in [self.domain_schema, self.ml_schema, "WWW"]:  # Be careful of File table.
-                if table in self.model.schemas[sname].tables:
+                if sname in self.model.schemas and table in self.model.schemas[sname].tables:
                     break
         try:
             _ = self.model.schemas[sname].tables[tname]

{deriva_ml-1.14.38.dist-info → deriva_ml-1.14.39.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deriva-ml
-Version: 1.14.38
+Version: 1.14.39
 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.14.38.dist-info → deriva_ml-1.14.39.dist-info}/RECORD

@@ -2,10 +2,10 @@ deriva_ml/__init__.py,sha256=_aMdxGG4mRTcXodLZLNpXqH8v5uqMbqFUryE9KqNSB8,1158
 deriva_ml/bump_version.py,sha256=KpHmkpEztly2QHYL4dyaIGdEMyP4F0D89rawyh5EDTs,3982
 deriva_ml/demo_catalog.py,sha256=JjPAIac_hKPh5krEhGJydjXquRnivi7kQoR8W4Khp-s,14928
 deriva_ml/feature.py,sha256=6-aphkxdKjWa9oPSGFWxHcwAc_8hmWj-7I4M178YG5Y,8470
-deriva_ml/install_kernel.py,sha256=KP1CLOp5eDd2MGWZCpVIIB1DeDH3rQdqW4rba2EYsA0,2194
+deriva_ml/install_kernel.py,sha256=b62XY0SLViYO_Zye5r1Pl9qhYZyu_fk4KAO8NS1pxgM,2165
 deriva_ml/run_notebook.py,sha256=XPZPtGDLv0Ej6dcqIwA1dx_ya1Z9kzsP7um473WtLpU,6519
 deriva_ml/core/__init__.py,sha256=V_i90pc5PB1F4UdOO6DZWzpEFaZDTaPRU-EzKXQ19eI,787
-deriva_ml/core/base.py,sha256=uG7xyVk12fXXWipusRmaBGplxbdlnN9sIOGAEHWD8i8,61090
+deriva_ml/core/base.py,sha256=5H0GEMlKXUVRXBYXJQ25kxdscB6uX1wIKSUAM_CBOhI,61228
 deriva_ml/core/constants.py,sha256=6wBJ8qMxe-dbCjRGrjUIX-RK0mTWrLDTeUpaVbLFoM8,888
 deriva_ml/core/definitions.py,sha256=uq_8uYFBVBVHS691Ri2kdQsN37z0GNYTaZskJIb_ocM,1385
 deriva_ml/core/enums.py,sha256=sSN4B4OynbB-AXwxRszoFr-KWIWIAfhVa06EzAEHwVc,7194
@@ -22,10 +22,10 @@ deriva_ml/execution/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 deriva_ml/execution/environment.py,sha256=B7nywqxFTRUWgyu8n7rFoKcVC9on422kjeFG2FPQfvg,9302
 deriva_ml/execution/execution.py,sha256=NJT4qzZvvBXAlh73NVM39VE-uinSVBu2mHtuZD35G1M,44591
 deriva_ml/execution/execution_configuration.py,sha256=Rw4VWkBCZN9yatvSKdTqEWTfu470lpcVKfHFR0uN0jI,6248
-deriva_ml/execution/workflow.py,sha256=-dX2Yyd9PWRO0Lcr-ji-e7KmlOShE795B5PvJKacz2Q,13293
+deriva_ml/execution/workflow.py,sha256=3GkmydZFk0zVPHdfiqIeJqNO73ocfUw22miB8tcado8,13591
 deriva_ml/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 deriva_ml/model/catalog.py,sha256=dzTBcRlqgEVkPY32AUax_iu75RgFiT4Pu5au7rmrv8k,14068
-deriva_ml/model/database.py,sha256=MlXQQFgFmGxZbRx-unRFoRttXwpJspV4v2AIgppttCU,14805
+deriva_ml/model/database.py,sha256=SBkYFf0qwbGmvL0Xtn_n5DCz4roGfrhuYrM8G69Cy9Y,14837
 deriva_ml/model/sql_mapper.py,sha256=_0QsJEVSgSPtxrWKSgjfPZCQ1aMVcjR_Tk2OxLhWEvY,1696
 deriva_ml/schema/__init__.py,sha256=yV-MfzCF3FA4OOz7mZwMM2q6-x1vgOJ057kUvikFF6E,130
 deriva_ml/schema/annotations.py,sha256=TuQ3vWFnK0160fRmtvsCkHx9qAcRa63MSyERB4x5a98,18197
@@ -34,9 +34,9 @@ deriva_ml/schema/create_schema.py,sha256=IrnSfN0ufS3M31MD8M6ZWyfJidKllLPqDFBUDAI
 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.14.38.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-deriva_ml-1.14.38.dist-info/METADATA,sha256=Z2qErsTtCIH_vjaNUxRurxmNeeY4ElkhbcdtjtGWAVM,1122
-deriva_ml-1.14.38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-deriva_ml-1.14.38.dist-info/entry_points.txt,sha256=XsHSbfp7S1cKMjHoPUdFIaFcp9lHXHS6CV1zb_MEXkg,463
-deriva_ml-1.14.38.dist-info/top_level.txt,sha256=I1Q1dkH96cRghdsFRVqwpa2M7IqJpR2QPUNNc5-Bnpw,10
-deriva_ml-1.14.38.dist-info/RECORD,,
+deriva_ml-1.14.39.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+deriva_ml-1.14.39.dist-info/METADATA,sha256=LvYoN3NRrXXEaNfFnTH9w6CPpCvFtrZ-kkh0iFLcE7Q,1122
+deriva_ml-1.14.39.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+deriva_ml-1.14.39.dist-info/entry_points.txt,sha256=XsHSbfp7S1cKMjHoPUdFIaFcp9lHXHS6CV1zb_MEXkg,463
+deriva_ml-1.14.39.dist-info/top_level.txt,sha256=I1Q1dkH96cRghdsFRVqwpa2M7IqJpR2QPUNNc5-Bnpw,10
+deriva_ml-1.14.39.dist-info/RECORD,,