lamin_cli 0.21.0__tar.gz → 0.21.2__tar.gz

{lamin_cli-0.21.0 → lamin_cli-0.21.2}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: lamin_cli
-Version: 0.21.0
+Version: 0.21.2
 Summary: Lamin CLI.
 Author-email: Lamin Labs <open-source@lamin.ai>
 Description-Content-Type: text/markdown
-Requires-Dist: lamindb_setup==0.80.0
+Requires-Dist: lamindb_setup==0.81.0
 Requires-Dist: rich-click>=1.7
 Project-URL: Home, https://github.com/laminlabs/lamin-cli
 

lamin_cli-0.21.2/lamin_cli/__init__.py

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

{lamin_cli-0.21.0 → lamin_cli-0.21.2}/lamin_cli/_save.py

@@ -10,7 +10,10 @@ def parse_uid_from_code(
     content: str, suffix: str
 ) -> tuple[str | None, str | None, str | None]:
     if suffix == ".py":
-        track_pattern = re.compile(r'ln\.track\(\s*(?:uid\s*=\s*)?["\']([^"\']+)["\']')
+        track_pattern = re.compile(
+            r'ln\.track\(\s*(?:transform\s*=\s*)?(["\'])([a-zA-Z0-9]{16})\1'
+        )
+        # backward compat
         uid_pattern = re.compile(r'\.context\.uid\s*=\s*["\']([^"\']+)["\']')
         stem_uid_pattern = re.compile(
             r'\.transform\.stem_uid\s*=\s*["\']([^"\']+)["\']'
@@ -18,8 +21,9 @@ def parse_uid_from_code(
         version_pattern = re.compile(r'\.transform\.version\s*=\s*["\']([^"\']+)["\']')
     elif suffix == ".ipynb":
         track_pattern = re.compile(
-            r'ln\.track\(\s*(?:uid\s*=\s*)?\\["\']([^"\']+)\\["\']'
+            r'ln\.track\(\s*(?:transform\s*=\s*)?(?:\\"|\')([a-zA-Z0-9]{16})(?:\\"|\')'
         )
+        # backward compat
         uid_pattern = re.compile(r'\.context\.uid\s*=\s*\\["\']([^"\']+)\\["\']')
         stem_uid_pattern = re.compile(
             r'\.transform\.stem_uid\s*=\s*\\["\']([^"\']+)\\["\']'
@@ -28,7 +32,9 @@ def parse_uid_from_code(
             r'\.transform\.version\s*=\s*\\["\']([^"\']+)\\["\']'
         )
     elif suffix in {".R", ".qmd", ".Rmd"}:
-        track_pattern = re.compile(r'track\(\s*[\'"]([a-zA-Z0-9]{16})[\'"]')
+        track_pattern = re.compile(
+            r'track\(\s*(?:transform\s*=\s*)?([\'"])([a-zA-Z0-9]{16})\1'
+        )
         uid_pattern = None
         stem_uid_pattern = None
         version_pattern = None
@@ -40,7 +46,8 @@ def parse_uid_from_code(
 
     # Search for matches in the entire file content
     uid_match = track_pattern.search(content)
-    uid = uid_match.group(1) if uid_match else None
+    group_index = 1 if suffix == ".ipynb" else 2
+    uid = uid_match.group(group_index) if uid_match else None
     stem_uid = None
     version = None
 
@@ -55,10 +62,9 @@ def parse_uid_from_code(
         version = version_match.group(1) if version_match else None
 
     if uid is None and (stem_uid is None or version is None):
-        target = "script" if suffix == ".py" else "notebook"
+        target = "script" if suffix in {".py", ".R"} else "notebook"
         raise SystemExit(
-            "Cannot infer transform uid."
-            f"\nCall `ln.track()` and copy/paste the output into the {target}."
+            f"Cannot infer transform uid. Did you run `ln.track()` in your {target}?"
         )
 
     return uid, stem_uid, version

{lamin_cli-0.21.0 → lamin_cli-0.21.2}/pyproject.toml

@@ -10,7 +10,7 @@ dynamic = ["version", "description"]
 dependencies = [
     # lamindb-setup is only pinned here
     # NOT in lamindb
-    "lamindb_setup==0.80.0",
+    "lamindb_setup==0.81.0",
     "rich-click>=1.7",
 ]
 

lamin_cli-0.21.2/tests/test_parse_uid_from_code.py

@@ -0,0 +1,122 @@
+import pytest
+from lamin_cli._save import parse_uid_from_code
+
+
+def test_python_track_pattern():
+    valid_cases = [
+        # Basic cases with 16 character requirement
+        ('ln.track("abcd123456789xyz")', "abcd123456789xyz"),
+        ("ln.track('abcd123456789xyz')", "abcd123456789xyz"),
+        # With transform parameter
+        ('ln.track(transform="abcd123456789xyz")', "abcd123456789xyz"),
+        ("ln.track(transform='abcd123456789xyz')", "abcd123456789xyz"),
+        # With whitespace variations
+        ('ln.track( "abcd123456789xyz" )', "abcd123456789xyz"),
+        ('ln.track(    transform ="abcd123456789xyz")', "abcd123456789xyz"),
+        ('ln.track(\n    "abcd123456789xyz"\n)', "abcd123456789xyz"),
+    ]
+
+    invalid_cases = [
+        # Mismatched quotes
+        "ln.track(\"abcd123456789xyz')",
+        "ln.track('abcd123456789xyz\")",
+        # Wrong length
+        'ln.track("abc123")',  # Too short
+        'ln.track("abcd123456789xyz0")',  # Too long
+        # Invalid characters
+        'ln.track("abcd-123456789xyz")',  # Contains hyphen
+        'ln.track("abcd_123456789xyz")',  # Contains underscore
+        'ln.track("abcd!123456789xyz")',  # Contains special character
+        # Old uid parameter
+        'ln.track(uid="abcd123456789xyz")',
+    ]
+
+    # Test valid cases
+    for content, expected_uid in valid_cases:
+        uid, _, _ = parse_uid_from_code(content, ".py")
+        assert uid == expected_uid, f"Failed for valid content: {content}"
+
+    # Test invalid cases
+    for content in invalid_cases:
+        with pytest.raises(SystemExit):
+            uid, _, _ = parse_uid_from_code(content, ".py")
+
+
+def test_jupyter_track_pattern():
+    valid_cases = [
+        # Basic cases
+        (r"ln.track(\"abcd123456789xyz\")", "abcd123456789xyz"),
+        ("ln.track('abcd123456789xyz')", "abcd123456789xyz"),
+        # With transform parameter
+        (r"ln.track(transform=\"abcd123456789xyz\")", "abcd123456789xyz"),
+        ("ln.track(transform='abcd123456789xyz')", "abcd123456789xyz"),
+        # With whitespace variations
+        (r"ln.track( \"abcd123456789xyz\" )", "abcd123456789xyz"),
+        (r"ln.track(    transform =\"abcd123456789xyz\")", "abcd123456789xyz"),
+    ]
+
+    invalid_cases = [
+        # Mismatched quotes
+        r"ln.track(\"abcd123456789xyz')",
+        # Wrong length
+        r"ln.track(\"abc123\")",  # Too short
+        r"ln.track(\"abcd123456789xyz0\")",  # Too long
+        # Invalid characters
+        r"ln.track(\"abcd-123456789xyz\")",  # Contains hyphen
+        r"ln.track(\"abcd_123456789xyz\")",  # Contains underscore
+        # Old uid parameter
+        r"ln.track(uid=\"abcd123456789xyz\")",
+    ]
+
+    # Test valid cases
+    for content, expected_uid in valid_cases:
+        uid, _, _ = parse_uid_from_code(content, ".ipynb")
+        assert uid == expected_uid, f"Failed for valid content: {content}"
+
+    # Test invalid cases
+    for content in invalid_cases:
+        print(content)
+        with pytest.raises(SystemExit):
+            uid, _, _ = parse_uid_from_code(content, ".py")
+
+
+def test_edge_cases():
+    test_cases = [
+        # Multiple track calls (should match first valid one)
+        (
+            'ln.track("abcd123456789xyz")\nln.track("efgh123456789xyz")',
+            "abcd123456789xyz",
+            ".py",
+        ),
+        # Comments in code -- this will fail
+        # ('# ln.track("abcd123456789xyz")\nln.track("real123456789xyz")', "real123456789xyz", ".py"),
+        # Mixed valid and invalid cases
+        (
+            'ln.track("invalid")\nln.track("abcd123456789xyz")',
+            "abcd123456789xyz",
+            ".py",
+        ),
+    ]
+
+    for content, expected_uid, suffix in test_cases:
+        print(content)
+        uid, _, _ = parse_uid_from_code(content, suffix)
+        assert uid == expected_uid, f"Failed for content: {content}"
+
+
+def test_r_track_pattern():
+    suffixes = [".R", ".qmd", ".Rmd"]
+
+    valid_cases = [
+        # Basic cases with 16 character requirement
+        ('track("abcd123456789xyz")', "abcd123456789xyz"),
+        ("track('abcd123456789xyz')", "abcd123456789xyz"),
+    ]
+
+    # Test valid cases across all R-related suffixes
+    for suffix in suffixes:
+        for content, expected_uid in valid_cases:
+            uid, _, _ = parse_uid_from_code(content, suffix)
+            assert (
+                uid == expected_uid
+            ), f"Failed for valid content with {suffix}: {content}"

{lamin_cli-0.21.0 → lamin_cli-0.21.2}/tests/test_save_notebooks.py

@@ -22,7 +22,7 @@ def test_save_not_initialized():
     )
     assert result.returncode == 1
     assert (
-        "Call `ln.track()` and copy/paste the output into the notebook"
+        "Cannot infer transform uid. Did you run `ln.track()` in your notebook?"
         in result.stderr.decode()
     )
 

lamin_cli-0.21.0/lamin_cli/__init__.py

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