lamin_cli 0.21.1__py2.py3-none-any.whl → 0.21.2__py2.py3-none-any.whl

lamin_cli/__init__.py

@@ -1,3 +1,3 @@
 """Lamin CLI."""
 
-__version__ = "0.21.1"
+__version__ = "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.1.dist-info → lamin_cli-0.21.2.dist-info}/METADATA

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

{lamin_cli-0.21.1.dist-info → lamin_cli-0.21.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
-lamin_cli/__init__.py,sha256=lljJkx69zUlYm79zTDbj6jGfXkWLw-knntxyv90iKYo,41
+lamin_cli/__init__.py,sha256=D9ZqVWghrDM7UnzjFVK02QJtFo2-b1fIFi-UFzCy57o,41
 lamin_cli/__main__.py,sha256=-QAfgrYKcPjl0qkiWr8Tfm5wRaaZ99rW2atjIBnBn9Y,9900
 lamin_cli/_cache.py,sha256=kW8rqlMwQeOngm9uq2gjzPVl3EBrwh6W2F2AvyBFABY,799
 lamin_cli/_load.py,sha256=n0_qHTCXsZQIUy87rVdPvT89fx60N-KZgn_dL8nsvEA,5523
 lamin_cli/_migration.py,sha256=xTbad6aDUwuK0QvWCmDW3f8-xaqwisS-Cqf-LbD1WRI,1071
-lamin_cli/_save.py,sha256=eId1DYClPEt_pxccjzp6EYpevp3rIBRPXC3DETKPxOQ,6395
+lamin_cli/_save.py,sha256=X5Rn1rmvtoKz10oZXWWDK3XmNchFhruQ_is-sE8Q-BM,6575
 lamin_cli/_settings.py,sha256=iS37mcQUHKRWxi2sHnAojEI6sWk3w232qwG-GeY2_Qc,1141
-lamin_cli-0.21.1.dist-info/entry_points.txt,sha256=Qms85i9cZPlu-U7RnVZhFsF7vJ9gaLZUFkCjcGcXTpg,49
-lamin_cli-0.21.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-lamin_cli-0.21.1.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
-lamin_cli-0.21.1.dist-info/METADATA,sha256=nv8TDrc0Oil2x5gTke8kteSRn4RbRJUe8R5yjGPt2O4,375
-lamin_cli-0.21.1.dist-info/RECORD,,
+lamin_cli-0.21.2.dist-info/entry_points.txt,sha256=Qms85i9cZPlu-U7RnVZhFsF7vJ9gaLZUFkCjcGcXTpg,49
+lamin_cli-0.21.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+lamin_cli-0.21.2.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+lamin_cli-0.21.2.dist-info/METADATA,sha256=sIANi10MCyiZTGXmC3Dip39i47q5hdPydeXhPL_-__s,375
+lamin_cli-0.21.2.dist-info/RECORD,,