lamin_cli 0.16.0__tar.gz → 0.16.2__tar.gz

{lamin_cli-0.16.0 → lamin_cli-0.16.2}/PKG-INFO

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

lamin_cli-0.16.2/lamin_cli/__init__.py

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

{lamin_cli-0.16.0 → lamin_cli-0.16.2}/lamin_cli/__main__.py

@@ -5,6 +5,7 @@ from collections import OrderedDict
 import inspect
 from importlib.metadata import PackageNotFoundError, version
 from typing import Optional, Mapping
+from functools import wraps
 
 # https://github.com/ewels/rich-click/issues/19
 # Otherwise rich-click takes over the formatting.
@@ -60,12 +61,18 @@ else:
         ]
     }
 
-    lamin_group_decorator = click.rich_config(
-        help_config=click.RichHelpConfiguration(
-            command_groups=COMMAND_GROUPS,
-            style_commands_table_column_width_ratio=(1, 13),
+    def lamin_group_decorator(f):
+        @click.rich_config(
+            help_config=click.RichHelpConfiguration(
+                command_groups=COMMAND_GROUPS,
+                style_commands_table_column_width_ratio=(1, 13),
+            )
         )
-    )(click.group())
+        @click.group()
+        @wraps(f)
+        def wrapper(*args, **kwargs):
+            return f(*args, **kwargs)
+        return wrapper
 
 
 from click import Command, Context

{lamin_cli-0.16.0 → lamin_cli-0.16.2}/lamin_cli/_save.py

@@ -6,17 +6,21 @@ from lamin_utils import logger
 import re
 
 
-def get_stem_uid_and_version_from_file(file_path: Path) -> tuple[str, str]:
+def get_stem_uid_and_version_from_file(
+    file_path: Path,
+) -> tuple[str | None, str | None, str | None]:
     # line-by-line matching might be faster, but let's go with this for now
     with open(file_path) as file:
         content = file.read()
 
     if file_path.suffix == ".py":
+        uid_pattern = re.compile(r'\.context\.uid\s*=\s*["\']([^"\']+)["\']')
         stem_uid_pattern = re.compile(
             r'\.transform\.stem_uid\s*=\s*["\']([^"\']+)["\']'
         )
         version_pattern = re.compile(r'\.transform\.version\s*=\s*["\']([^"\']+)["\']')
     elif file_path.suffix == ".ipynb":
+        uid_pattern = re.compile(r'\.context\.uid\s*=\s*\\["\']([^"\']+)\\["\']')
         stem_uid_pattern = re.compile(
             r'\.transform\.stem_uid\s*=\s*\\["\']([^"\']+)\\["\']'
         )
@@ -27,20 +31,22 @@ def get_stem_uid_and_version_from_file(file_path: Path) -> tuple[str, str]:
         raise ValueError("Only .py and .ipynb files are supported.")
 
     # Search for matches in the entire file content
+    uid_match = uid_pattern.search(content)
     stem_uid_match = stem_uid_pattern.search(content)
     version_match = version_pattern.search(content)
 
     # Extract values if matches are found
+    uid = uid_match.group(1) if uid_match else None
     stem_uid = stem_uid_match.group(1) if stem_uid_match else None
     version = version_match.group(1) if version_match else None
 
-    if stem_uid is None or version is None:
+    if uid is None and (stem_uid is None or version is None):
         raise SystemExit(
-            "ln.settings.transform.stem_uid and ln.settings.transform.version aren't"
-            f" set in {file_path}\nCall ln.track() and copy/paste the output into the"
-            " notebook"
+            "ln.context.uid isn't"
+            f" set in {file_path}\nCall ln.context.track() and copy/paste the output"
+            " into the notebook"
         )
-    return stem_uid, version
+    return uid, stem_uid, version
 
 
 def save_from_filepath_cli(
@@ -55,7 +61,7 @@ def save_from_filepath_cli(
     ln_setup.settings.auto_connect = True
 
     import lamindb as ln
-    from lamindb._finish import save_run_context_core
+    from lamindb._finish import save_context_core
 
     ln_setup.settings.auto_connect = auto_connect_state
 
@@ -75,17 +81,22 @@ def save_from_filepath_cli(
         return None
     else:
         # consider notebooks & scripts a transform
-        stem_uid, transform_version = get_stem_uid_and_version_from_file(filepath)
-        # the corresponding transform family in the transform table
-        transform_family = ln.Transform.filter(uid__startswith=stem_uid).all()
-        if len(transform_family) == 0:
-            logger.error(
-                f"Did not find stem uid '{stem_uid}'"
-                " in Transform registry. Did you run ln.track()?"
-            )
-            return "not-tracked-in-transform-registry"
-        # the specific version
-        transform = transform_family.filter(version=transform_version).one()
+        uid, stem_uid, transform_version = get_stem_uid_and_version_from_file(filepath)
+        if uid is not None:
+            transform = ln.Transform.filter(uid=uid).one_or_none()
+            if transform is None:
+                logger.error(
+                    f"Did not find uid '{uid}'"
+                    " in Transform registry. Did you run ln.context.track()?"
+                )
+                return "not-tracked-in-transform-registry"
+            # refactor this, save_context_core should not depend on transform_family
+            transform_family = transform.versions
+        else:
+            # the corresponding transform family in the transform table
+            transform_family = ln.Transform.filter(uid__startswith=stem_uid).all()
+            # the specific version
+            transform = transform_family.filter(version=transform_version).one()
         # latest run of this transform by user
         run = ln.Run.filter(transform=transform).order_by("-started_at").first()
         if run.created_by.id != ln_setup.settings.user.id:
@@ -95,7 +106,7 @@ def save_from_filepath_cli(
             )
             if response != "y":
                 return "aborted-save-notebook-created-by-different-user"
-        return save_run_context_core(
+        return save_context_core(
             run=run,
             transform=transform,
             filepath=filepath,

{lamin_cli-0.16.0 → lamin_cli-0.16.2}/tests/notebooks/with-title-and-initialized-consecutive.ipynb

@@ -66,9 +66,8 @@
     }
    ],
    "source": [
-    "ln.settings.transform.stem_uid = \"hlsFXswrJjtt\"\n",
-    "ln.settings.transform.version = \"1\"\n",
-    "ln.track()"
+    "ln.context.uid = \"hlsFXswrJjtt0000\"\n",
+    "ln.context.track()"
    ]
   },
   {

{lamin_cli-0.16.0 → lamin_cli-0.16.2}/tests/notebooks/with-title-and-initialized-non-consecutive.ipynb

@@ -67,7 +67,7 @@
       "source": [
         "ln.settings.transform.stem_uid = \"HDMGkxN9rgFA\"\n",
         "ln.settings.transform.version = \"1\"\n",
-        "ln.track()"
+        "ln.context.track()"
       ]
     }
   ],

{lamin_cli-0.16.0 → lamin_cli-0.16.2}/tests/scripts/run-track-and-finish-sync-git.py

@@ -1,16 +1,15 @@
 import lamindb as ln
 
 ln.settings.sync_git_repo = "https://github.com/laminlabs/lamin-cli"
-ln.settings.transform.stem_uid = "m5uCHTTpJnjQ"
-ln.settings.transform.version = "1"
-ln.settings.transform.name = "My good script"
+ln.context.uid = "m5uCHTTpJnjQ0000"
+ln.context.name = "My good script"
 
 
 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)
+    ln.context.track(new_run=False)
 
     print("hello!")
 

{lamin_cli-0.16.0 → lamin_cli-0.16.2}/tests/scripts/run-track-and-finish.py

@@ -1,14 +1,13 @@
 import lamindb as ln
 
-ln.settings.transform.stem_uid = "VFYCIuaw2GsX"
-ln.settings.transform.version = "1"
-ln.settings.transform.name = "My good script 2"
+ln.context.uid = "VFYCIuaw2GsX0000"
+ln.context.name = "My good script 2"
 
 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)
+    ln.context.track(new_run=False)
 
     print("hello!")
 

{lamin_cli-0.16.0 → lamin_cli-0.16.2}/tests/test_save_notebooks.py

@@ -21,7 +21,7 @@ def test_save_not_initialized():
     )
     assert result.returncode == 1
     assert (
-        "Call ln.track() and copy/paste the output into the notebook"
+        "Call ln.context.track() and copy/paste the output into the notebook"
         in result.stderr.decode()
     )
 
@@ -62,10 +62,10 @@ def test_save_consecutive():
     env = os.environ
     env["LAMIN_TESTING"] = "true"
 
-    transform = ln.Transform.filter(uid="hlsFXswrJjtt5zKv").one_or_none()
+    transform = ln.Transform.filter(uid="hlsFXswrJjtt0000").one_or_none()
     assert transform is None
 
-    # let's try to save a notebook for which `ln.track()` was never run
+    # let's try to save a notebook for which `ln.context.track()` was never run
     result = subprocess.run(
         f"lamin save {notebook_path}",
         shell=True,
@@ -73,13 +73,13 @@ def test_save_consecutive():
         env=env,
     )
     assert result.returncode == 1
-    assert "Did not find stem uid 'hlsFXswrJjtt'" in result.stdout.decode()
+    assert "Did not find uid 'hlsFXswrJjtt0000'" in result.stdout.decode()
 
-    # now, let's re-run this notebook so that ln.track() is actually run
+    # now, let's re-run this notebook so that ln.context.track() is actually run
     nbproject_test.execute_notebooks(notebook_path, print_outputs=True)
 
     # now, there is a transform record, but we're missing all artifacts
-    transform = ln.Transform.filter(uid="hlsFXswrJjtt5zKv").one_or_none()
+    transform = ln.Transform.filter(uid="hlsFXswrJjtt0000").one_or_none()
     assert transform is not None
     assert transform.latest_run.report is None
     assert transform._source_code_artifact is None
@@ -95,11 +95,11 @@ def test_save_consecutive():
     assert result.returncode == 0
 
     # now, we have the associated artifacts
-    transform = ln.Transform.filter(uid="hlsFXswrJjtt5zKv").one_or_none()
+    transform = ln.Transform.filter(uid="hlsFXswrJjtt0000").one_or_none()
     assert transform is not None
     assert transform.latest_run.report.path.exists()
     assert transform.latest_run.report.path == transform.latest_run.report.path
-    assert transform._source_code_artifact.hash == "5nc_HMjPvT9n26OWrjq6uQ"
+    assert transform._source_code_artifact.hash == "EQrdZpS-fPaz5MKk_g02AA"
     assert transform.latest_run.environment.path.exists()
     assert transform._source_code_artifact.path.exists()
 
@@ -114,8 +114,8 @@ def test_save_consecutive():
     # 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()
+    # print(error.exconly())
+    assert "UpdateContext" 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
@@ -127,29 +127,30 @@ def test_save_consecutive():
     )
     assert result.returncode == 0
     # the source code is overwritten with the edits, reflected in a new hash
-    transform = ln.Transform.get("hlsFXswrJjtt5zKv")
+    transform = ln.Transform.get("hlsFXswrJjtt0000")
     assert transform.latest_run.report.path.exists()
     assert transform.latest_run.report.path == transform.latest_run.report.path
-    assert transform._source_code_artifact.hash == "ocLybD0Hv_L3NhhXgTyQcw"
+    assert transform._source_code_artifact.hash == "DMVEHVQqmY3ektOg2KtKKA"
     assert transform.latest_run.environment.path.exists()
     assert transform._source_code_artifact.path.exists()
 
     # get the the source code via command line
     result = subprocess.run(
         "lamin get"
-        f" https://lamin.ai/{ln.setup.settings.user.handle}/laminci-unit-tests/transform/hlsFXswrJjtt5zKv",  # noqa
+        f" https://lamin.ai/{ln.setup.settings.user.handle}/laminci-unit-tests/transform/hlsFXswrJjtt0000",  # noqa
         shell=True,
         capture_output=True,
     )
-    print(result.stderr.decode())
+    # print(result.stderr.decode())
     assert result.returncode == 0
 
     # now, assume the user renames the notebook
     new_path = notebook_path.with_name("new_name.ipynb")
     os.system(f"cp {notebook_path} {new_path}")
 
-    # upon re-running it, the user is asked whether it's still the same notebook
+    # upon re-running it, the user is asked to create a new stem uid
     with pytest.raises(CellExecutionError) as error:
         nbproject_test.execute_notebooks(new_path, print_outputs=True)
 
-    assert "Please update your transform settings as follows" in error.exconly()
+    print(error.exconly())
+    assert "Notebook filename changed." in error.exconly()

{lamin_cli-0.16.0 → lamin_cli-0.16.2}/tests/test_save_scripts.py

@@ -19,9 +19,9 @@ def test_run_save_cache():
         shell=True,
         capture_output=True,
     )
-    print(result.stderr.decode())
+    # print(result.stdout.decode())
     assert result.returncode == 1
-    assert "Did you run ln.track()" in result.stdout.decode()
+    assert "Did you run ln.context.track()?" in result.stdout.decode()
 
     # run the script
     result = subprocess.run(
@@ -29,15 +29,15 @@ def test_run_save_cache():
         shell=True,
         capture_output=True,
     )
-    print(result.stdout.decode())
-    print(result.stderr.decode())
+    # print(result.stdout.decode())
+    # 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()
+    assert "created Transform" in result.stdout.decode()
+    assert "m5uCHTTpJnjQ0000" in result.stdout.decode()
+    assert "created Run" in result.stdout.decode()
 
     transform = ln.Transform.get("m5uCHTTpJnjQ")
-    assert transform._source_code_artifact.hash == "T1zmmTJyeEpBxjaHcHcZdg"
+    assert transform._source_code_artifact.hash == "Cwk0OPOyUH5nzTiU2ISlDQ"
     assert transform.latest_run.environment.path.exists()
     assert transform._source_code_artifact.path.exists()
 
@@ -48,12 +48,12 @@ def test_run_save_cache():
         capture_output=True,
         env=env,
     )
-    print(result.stdout.decode())
-    print(result.stderr.decode())
+    # 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()
+    assert "loaded Transform" in result.stdout.decode()
+    assert "m5uCHTTpJnjQ0000" in result.stdout.decode()
+    assert "loaded Run" in result.stdout.decode()
     assert "source code is already saved" in result.stdout.decode()
 
     # you can re-save the script
@@ -63,8 +63,8 @@ def test_run_save_cache():
         capture_output=True,
         env=env,
     )
-    print(result.stdout.decode())
-    print(result.stderr.decode())
+    # print(result.stdout.decode())
+    # print(result.stderr.decode())
     assert result.returncode == 0
     assert "source code is already saved" in result.stdout.decode()
     assert "run.environment is already saved" in result.stdout.decode()
@@ -73,15 +73,15 @@ def test_run_save_cache():
     content = filepath.read_text() + "\n # edited"
     filepath.write_text(content)
 
-    # re-run the script
+    # re-run the script without commiting
     result = subprocess.run(
         f"python {filepath}",
         shell=True,
         capture_output=True,
         env=env,
     )
-    print(result.stdout.decode())
-    print(result.stderr.decode())
+    # print(result.stdout.decode())
+    # print(result.stderr.decode())
     assert result.returncode == 1
     assert "Did not find blob hash" in result.stderr.decode()
 
@@ -101,15 +101,15 @@ def test_run_save_cache():
         capture_output=True,
         env=env,
     )
-    print(result.stdout.decode())
-    print(result.stderr.decode())
+    # print(result.stdout.decode())
+    # print(result.stderr.decode())
     assert result.returncode == 1
-    assert "Please update your transform settings as follows" in result.stderr.decode()
+    assert "Source code changed, bump version by setting" in result.stderr.decode()
 
     # try to get the the source code via command line
     result = subprocess.run(
         "lamin get"
-        f" https://lamin.ai/{settings.user.handle}/laminci-unit-tests/transform/m5uCHTTpJnjQ5zKv",  # noqa
+        f" https://lamin.ai/{settings.user.handle}/laminci-unit-tests/transform/m5uCHTTpJnjQ0000",  # noqa
         shell=True,
         capture_output=True,
     )

lamin_cli-0.16.0/lamin_cli/__init__.py

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