PyPI - deriva-ml - Versions diffs - 1.14.40__tar.gz → 1.14.42__tar.gz - Mend

@@ -76,7 +76,7 @@ class DerivaMLRunNotebookCLI(BaseCLI):
     def main(self):
         """Parse arguments and set up execution environment."""
         args = self.parse_cli()
-        notebook_file = args.notebook_file
+        notebook_file: Path = args.notebook_file
         parameter_file = args.file
         # args.parameter is now a list of [KEY, VALUE] lists
@@ -115,11 +115,11 @@ class DerivaMLRunNotebookCLI(BaseCLI):
                 print(f"  {param}:{value}")
             self.run_notebook(notebook_file.resolve(), parameters, kernel=args.kernel[0], log=args.log_output)
-    def run_notebook(self, notebook_file, parameters, kernel=None, log=False):
+    def run_notebook(self, notebook_file: Path, parameters, kernel=None, log=False):
         url, checksum = Workflow.get_url_and_checksum(Path(notebook_file))
         os.environ["DERIVA_ML_WORKFLOW_URL"] = url
         os.environ["DERIVA_ML_WORKFLOW_CHECKSUM"] = checksum
-        os.environ["DERIVA_ML_NOTEBOOK_PATH"] = notebook_file
+        os.environ["DERIVA_ML_NOTEBOOK_PATH"] = notebook_file.as_posix()
         with tempfile.TemporaryDirectory() as tmpdirname:
             notebook_output = Path(tmpdirname) / Path(notebook_file).name

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

@@ -121,7 +121,7 @@ class Workflow(BaseModel):
         if "DERIVA_ML_WORKFLOW_URL" in os.environ:
             self.url = os.environ["DERIVA_ML_WORKFLOW_URL"]
             self.checksum = os.environ["DERIVA_ML_WORKFLOW_CHECKSUM"]
-            self.git_root = Workflow._get_git_root(Path(os.environ["DERIVA_ML_NOTEBOOK_PATHL"]))
+            self.git_root = Workflow._get_git_root(Path(os.environ["DERIVA_ML_NOTEBOOK_PATH"]))
             self.is_notebook = True
         if not self.url:
@@ -322,10 +322,8 @@ class Workflow(BaseModel):
                 # 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:
+            elif (not filename.exists()) and "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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deriva-ml
-Version: 1.14.40
+Version: 1.14.42
 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.40__tar.gz → 1.14.42__tar.gz