lamin_cli 0.20.1__py2.py3-none-any.whl → 0.21.0__py2.py3-none-any.whl

lamin_cli/__init__.py

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

lamin_cli/_save.py

@@ -27,28 +27,40 @@ def parse_uid_from_code(
         version_pattern = re.compile(
             r'\.transform\.version\s*=\s*\\["\']([^"\']+)\\["\']'
         )
+    elif suffix in {".R", ".qmd", ".Rmd"}:
+        track_pattern = re.compile(r'track\(\s*[\'"]([a-zA-Z0-9]{16})[\'"]')
+        uid_pattern = None
+        stem_uid_pattern = None
+        version_pattern = None
     else:
-        raise ValueError("Only .py and .ipynb files are supported.")
+        raise SystemExit(
+            "Only .py, .ipynb, .R, .qmd, .Rmd files are supported for saving"
+            " transforms."
+        )
 
     # Search for matches in the entire file content
     uid_match = track_pattern.search(content)
     uid = uid_match.group(1) if uid_match else None
-    if uid is None:
-        uid_match = uid_pattern.search(content)
-    stem_uid_match = stem_uid_pattern.search(content)
-    version_match = version_pattern.search(content)
+    stem_uid = None
+    version = None
 
-    # 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 uid_pattern is not None and uid is None:
+        uid_match = uid_pattern.search(content)
+        uid = uid_match.group(1) if uid_match else None
+    if stem_uid_pattern is not None:
+        stem_uid_match = stem_uid_pattern.search(content)
+        stem_uid = stem_uid_match.group(1) if stem_uid_match else None
+    if version_pattern is not None:
+        version_match = version_pattern.search(content)
+        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"
         raise SystemExit(
             "Cannot infer transform uid."
-            "\nCall `ln.track()` and copy/paste the output"
-            " into the notebook"
+            f"\nCall `ln.track()` and copy/paste the output into the {target}."
         )
+
     return uid, stem_uid, version
 
 
@@ -71,8 +83,27 @@ def save_from_filepath_cli(
 
     ln_setup.settings.auto_connect = auto_connect_state
 
+    suffixes_transform = {
+        "py": set([".py", ".ipynb"]),
+        "R": set([".R", ".qmd", ".Rmd"]),
+    }
+
+    if (
+        filepath.suffix in {".qmd", ".Rmd"}
+        and not filepath.with_suffix(".html").exists()
+    ):
+        raise SystemExit(
+            f"Please export your {filepath.suffix} file as an html file here"
+            f" {filepath.with_suffix('.html')}"
+        )
+
     if registry is None:
-        registry = "transform" if filepath.suffix in {".py", ".ipynb"} else "artifact"
+        registry = (
+            "transform"
+            if filepath.suffix
+            in suffixes_transform["py"].union(suffixes_transform["R"])
+            else "artifact"
+        )
 
     if registry == "artifact":
         ln.settings.creation.artifact_silence_missing_run_warning = True
@@ -107,16 +138,28 @@ def save_from_filepath_cli(
         run = ln.Run.filter(transform=transform).order_by("-started_at").first()
         if run.created_by.id != ln_setup.settings.user.id:
             response = input(
-                "You are trying to save a transform created by another user: Source and"
-                " report files will be tagged with *your* user id. Proceed? (y/n)"
+                "You are trying to save a transform created by another user: Source"
+                " and report files will be tagged with *your* user id. Proceed?"
+                " (y/n)"
             )
             if response != "y":
                 return "aborted-save-notebook-created-by-different-user"
-        return save_context_core(
+        return_code = save_context_core(
             run=run,
             transform=transform,
             filepath=filepath,
             from_cli=True,
         )
+        if filepath.suffix in {".qmd", ".Rmd"}:
+            report_file = ln.Artifact(
+                filepath.with_suffix(".html"),  # validated at the top that this exists
+                description=f"Report of run {run.uid}",
+                visibility=0,  # hidden file
+                run=False,
+            )
+            report_file.save(upload=True, print_progress=False)
+            run.report = report_file
+            run.save()
+        return return_code
     else:
         raise SystemExit("Allowed values for '--registry' are: 'artifact', 'transform'")

{lamin_cli-0.20.1.dist-info → lamin_cli-0.21.0.dist-info}/METADATA

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

{lamin_cli-0.20.1.dist-info → lamin_cli-0.21.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
-lamin_cli/__init__.py,sha256=HVih1qn54_G_9ZcoSrbo16To8-xgoO_4RtUTSZjF_hA,41
+lamin_cli/__init__.py,sha256=l58JBVXTnppQV3BQhZAl6MnYMXTuBJjdstE6eavYM0g,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=KpGB1ZeKyE0Of0PkCX8j2UPtj4FQPS5wwKIYUFkTeio,4962
+lamin_cli/_save.py,sha256=eId1DYClPEt_pxccjzp6EYpevp3rIBRPXC3DETKPxOQ,6395
 lamin_cli/_settings.py,sha256=iS37mcQUHKRWxi2sHnAojEI6sWk3w232qwG-GeY2_Qc,1141
-lamin_cli-0.20.1.dist-info/entry_points.txt,sha256=Qms85i9cZPlu-U7RnVZhFsF7vJ9gaLZUFkCjcGcXTpg,49
-lamin_cli-0.20.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-lamin_cli-0.20.1.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
-lamin_cli-0.20.1.dist-info/METADATA,sha256=g_clh20xzv1vVibZJ0iHnIgzSz-wOfdylzi2C36ucEw,375
-lamin_cli-0.20.1.dist-info/RECORD,,
+lamin_cli-0.21.0.dist-info/entry_points.txt,sha256=Qms85i9cZPlu-U7RnVZhFsF7vJ9gaLZUFkCjcGcXTpg,49
+lamin_cli-0.21.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+lamin_cli-0.21.0.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+lamin_cli-0.21.0.dist-info/METADATA,sha256=pjXGmeJ4QwXxAtpreQmCUVWM0V-TwUS8CUqXKwYrSvE,375
+lamin_cli-0.21.0.dist-info/RECORD,,