lamin_cli 0.13.0__tar.gz → 0.13.1__tar.gz

{lamin_cli-0.13.0 → lamin_cli-0.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lamin_cli
-Version: 0.13.0
+Version: 0.13.1
 Summary: Lamin CLI.
 Author-email: Lamin Labs <open-source@lamin.ai>
 Description-Content-Type: text/markdown

lamin_cli-0.13.1/lamin_cli/__init__.py

@@ -0,0 +1,3 @@
+"""Lamin CLI."""
+
+__version__ = "0.13.1"

lamin_cli-0.13.1/tests/scripts/run-track-and-finish.py

@@ -0,0 +1,14 @@
+import lamindb as ln
+
+ln.settings.transform.stem_uid = "VFYCIuaw2GsX"
+ln.settings.transform.version = "1"
+
+if __name__ == "__main__":
+    # we're using new_run here to mock the notebook situation
+    # and cover the look up of an existing run in the tests
+    # new_run = True is trivial
+    ln.track(new_run=False)
+
+    print("hello!")
+
+    ln.finish()

{lamin_cli-0.13.0 → lamin_cli-0.13.1}/tests/test_multi_process.py

@@ -6,7 +6,7 @@ scripts_dir = Path(__file__).parent.resolve() / "scripts"
 
 
 def run_script():
-    filepath = scripts_dir / "initialized-no-git-sync.py"
+    filepath = scripts_dir / "merely-import-lamindb.py"
     result = subprocess.run(
         f"python {filepath}",
         shell=True,

{lamin_cli-0.13.0 → lamin_cli-0.13.1}/tests/test_save_notebooks.py

@@ -3,6 +3,7 @@ import subprocess
 from pathlib import Path
 import nbproject_test
 import pytest
+from nbproject.dev import read_notebook, write_notebook
 from nbclient.exceptions import CellExecutionError
 import lamindb as ln
 
@@ -99,23 +100,26 @@ def test_save_consecutive():
     assert transform is not None
     assert transform.latest_report.path.exists()
     assert transform.latest_run.report.path == transform.latest_report.path
-    print(transform.source_code.path.read_text())
     assert transform.source_code.hash == "5nc_HMjPvT9n26OWrjq6uQ"
     assert transform.latest_run.environment.path.exists()
     assert transform.source_code.path.exists()
 
-    # now, assume the user modifies the notebook and saves
-    # it without changing stem uid or version
-    # outside of tests, this triggers a dialogue
-    # within tests, it automatically overwrites the source
-    from nbproject.dev import read_notebook, write_notebook
-
+    # now, assume the user modifies the notebook
     nb = read_notebook(notebook_path)
     # simulate editing the notebook (here, duplicate last cell)
     new_cell = nb.cells[-1].copy()
     new_cell["execution_count"] += 1
     nb.cells.append(new_cell)
     write_notebook(nb, notebook_path)
+
+    # try re-running - it fails
+    with pytest.raises(CellExecutionError) as error:
+        nbproject_test.execute_notebooks(notebook_path, print_outputs=True)
+    print(error.exconly())
+    assert "UpdateTransformSettings" in error.exconly()
+
+    # try re-saving - it works but will issue an interactive warning dialogue
+    # that clarifies that the user is about to re-save the notebook
     result = subprocess.run(
         f"lamin save {notebook_path}",
         shell=True,
@@ -124,10 +128,8 @@ def test_save_consecutive():
     )
     assert result.returncode == 0
     assert "saved transform" in result.stdout.decode()
-
-    # now, the source code should be overwritten
-    transform = ln.Transform.filter(uid="hlsFXswrJjtt5zKv").one_or_none()
-    assert transform is not None
+    # the source code is overwritten with the edits, reflected in a new hash
+    transform = ln.Transform.get("hlsFXswrJjtt5zKv")
     assert transform.latest_report.path.exists()
     assert transform.latest_run.report.path == transform.latest_report.path
     assert transform.source_code.hash == "ocLybD0Hv_L3NhhXgTyQcw"

{lamin_cli-0.13.0 → lamin_cli-0.13.1}/tests/test_save_scripts.py

@@ -11,10 +11,9 @@ scripts_dir = Path(__file__).parent.resolve() / "scripts"
 def test_run_save_cache():
     env = os.environ
     env["LAMIN_TESTING"] = "true"
+    filepath = scripts_dir / "run-track-and-finish-sync-git.py"
 
-    filepath = scripts_dir / "initialized.py"
     # attempt to save the script without it yet being run
-    # lamin save sub/lamin-cli/tests/scripts/initialized.py
     result = subprocess.run(
         f"lamin save {filepath}",
         shell=True,
@@ -34,6 +33,7 @@ def test_run_save_cache():
     print(result.stderr.decode())
     assert result.returncode == 0
     assert "saved: Transform" in result.stdout.decode()
+    assert "m5uCHTTpJnjQ5zKv" in result.stdout.decode()
     assert "saved: Run" in result.stdout.decode()
 
     transform = ln.Transform.get("m5uCHTTpJnjQ")
@@ -51,6 +51,46 @@ def test_run_save_cache():
     print(result.stdout.decode())
     print(result.stderr.decode())
     assert result.returncode == 0
+    assert "loaded: Transform" in result.stdout.decode()
+    assert "m5uCHTTpJnjQ5zKv" in result.stdout.decode()
+    assert "loaded: Run" in result.stdout.decode()
+
+    # edit the script
+    content = filepath.read_text() + "\n # edited"
+    filepath.write_text(content)
+
+    # re-run the script
+    result = subprocess.run(
+        f"python {filepath}",
+        shell=True,
+        capture_output=True,
+        env=env,
+    )
+    print(result.stdout.decode())
+    print(result.stderr.decode())
+    assert result.returncode == 1
+    assert "Did not find blob hash" in result.stderr.decode()
+
+    # edit the script to remove the git integration
+    content = filepath.read_text()
+    content_lines = content.split("\n")
+    content_lines.remove(
+        'ln.settings.sync_git_repo = "https://github.com/laminlabs/lamin-cli"'
+    )
+    content = "\n".join(content_lines)
+    filepath.write_text(content)
+
+    # re-run the script
+    result = subprocess.run(
+        f"python {filepath}",
+        shell=True,
+        capture_output=True,
+        env=env,
+    )
+    print(result.stdout.decode())
+    print(result.stderr.decode())
+    assert result.returncode == 1
+    assert "Please update your transform settings as follows" in result.stderr.decode()
 
     # try to get the the source code via command line
     result = subprocess.run(

lamin_cli-0.13.0/lamin_cli/__init__.py

@@ -1,3 +0,0 @@
-"""Lamin CLI."""
-
-__version__ = "0.13.0"