lamin_cli 0.20.1__tar.gz → 0.21.1__tar.gz

{lamin_cli-0.20.1 → lamin_cli-0.21.1}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: lamin_cli
-Version: 0.20.1
+Version: 0.21.1
 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.1/lamin_cli/__init__.py

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

{lamin_cli-0.20.1 → lamin_cli-0.21.1}/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 → lamin_cli-0.21.1}/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.1/tests/scripts/run-track.R

@@ -0,0 +1,20 @@
+library(reticulate)
+
+# Import lamindb
+ln <- import("lamindb")
+
+ln$track("EPnfDtJz8qbE0000", path="run-track.R")   # <-- unique id for the script, script path
+
+# Create a sample R dataframe
+r_df <- data.frame(
+  id = 1:5,
+  value = c(10.5, 20.3, 15.7, 25.1, 30.2),
+  category = c("A", "B", "A", "C", "B")
+)
+
+# Save the dataframe as RDS
+storage_path <- "example_data.rds"
+saveRDS(r_df, storage_path)
+
+ln$Artifact(storage_path, description="Example dataframe")$save()  # save an artifact
+ln$finish()  # mark the script run as finished

lamin_cli-0.21.1/tests/scripts/run-track.qmd

@@ -0,0 +1,3 @@
+# dummy qmd file
+
+ln$track("HPnfDtJz8qbE0000", path="run-track.R")   # <-- unique id for the script, script path

{lamin_cli-0.20.1 → lamin_cli-0.21.1}/tests/test_save_notebooks.py

@@ -36,7 +36,7 @@ def test_save_non_consecutive():
 
     # here, we're mimicking a non-consecutive run
     transform = ln.Transform(
-        uid="HDMGkxN9rgFA",
+        uid="HDMGkxN9rgFA0000",
         version="1",
         name="My test notebook (non-consecutive)",
         type="notebook",

lamin_cli-0.21.1/tests/test_save_r_code.py

@@ -0,0 +1,73 @@
+from pathlib import Path
+import subprocess
+import os
+import lamindb as ln
+
+scripts_dir = Path(__file__).parent.resolve() / "scripts"
+
+
+def test_run_save_cache():
+    env = os.environ
+    env["LAMIN_TESTING"] = "true"
+    filepath = scripts_dir / "run-track.R"
+
+    transform = ln.Transform(
+        uid="EPnfDtJz8qbE0000", name="run-track.R", key="run-track.R", type="script"
+    ).save()
+    ln.Run(transform=transform).save()
+
+    assert transform.source_code is None
+
+    result = subprocess.run(
+        f"lamin save {filepath}",
+        shell=True,
+        capture_output=True,
+    )
+    # print(result.stdout.decode())
+    # print(result.stderr.decode())
+    assert result.returncode == 0
+    assert "on uid 'EPnfDtJz8qbE0000'" in result.stdout.decode()
+
+    transform = ln.Transform.get("EPnfDtJz8qbE0000")
+    assert transform.source_code is not None
+
+    # now test a .qmd file (.Rmd adheres to same principles)
+    filepath = scripts_dir / "run-track.qmd"
+
+    transform = ln.Transform(
+        uid="HPnfDtJz8qbE0000",
+        name="run-track.qmd",
+        key="run-track.qmd",
+        type="notebook",
+    ).save()
+    ln.Run(transform=transform).save()
+
+    assert transform.source_code is None
+    assert transform.latest_run.report is None
+
+    result = subprocess.run(
+        f"lamin save {filepath}",
+        shell=True,
+        capture_output=True,
+    )
+    # print(result.stdout.decode())
+    # print(result.stderr.decode())
+    assert result.returncode == 1
+    assert "Please export your" in result.stderr.decode()
+
+    filepath.with_suffix(".html").write_text("dummy html")
+
+    result = subprocess.run(
+        f"lamin save {filepath}",
+        shell=True,
+        capture_output=True,
+    )
+    print(result.stdout.decode())
+    print(result.stderr.decode())
+    assert result.returncode == 0
+
+    transform = ln.Transform.get("HPnfDtJz8qbE0000")
+    assert transform.source_code is not None
+    assert transform.latest_run.report is not None
+
+    filepath.with_suffix(".html").unlink()

lamin_cli-0.20.1/lamin_cli/__init__.py

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