lamin_cli 1.7.0__tar.gz → 1.7.2__tar.gz

{lamin_cli-1.7.0 → lamin_cli-1.7.2}/PKG-INFO

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

lamin_cli-1.7.2/lamin_cli/__init__.py

@@ -0,0 +1,12 @@
+"""Lamin CLI.
+
+This is the command line interface for interacting with LaminDB & LaminHub.
+
+The interface is defined in `__main__.py`. The root API here is used by LaminR to replicate the CLI functionality.
+"""
+
+__version__ = "1.7.2"
+
+from ._save import save
+
+__all__ = ["save"]

{lamin_cli-1.7.0 → lamin_cli-1.7.2}/lamin_cli/__main__.py

@@ -449,9 +449,9 @@ def save(path: str, key: str, description: str, stem_uid: str, project: str, spa
     other file types and folders as {class}`~lamindb.Artifact`. You can enforce saving a file as
     an {class}`~lamindb.Artifact` by passing `--registry artifact`.
     """
-    from lamin_cli._save import save_from_path_cli
+    from lamin_cli import save as save_
 
-    if save_from_path_cli(path=path, key=key, description=description, stem_uid=stem_uid, project=project, space=space, branch=branch, registry=registry) is not None:
+    if save_(path=path, key=key, description=description, stem_uid=stem_uid, project=project, space=space, branch=branch, registry=registry) is not None:
         sys.exit(1)
 
 

{lamin_cli-1.7.0 → lamin_cli-1.7.2}/lamin_cli/_save.py

@@ -71,7 +71,7 @@ def parse_title_r_notebook(content: str) -> str | None:
         return None
 
 
-def save_from_path_cli(
+def save(
     path: Path | str,
     key: str | None,
     description: str | None,
@@ -81,21 +81,9 @@ def save_from_path_cli(
     branch: str | None,
     registry: str | None,
 ) -> str | None:
-    import lamindb_setup as ln_setup
-    from lamindb_setup.core.upath import LocalPathClasses, UPath, create_path
-
-    # this will be gone once we get rid of lamin load or enable loading multiple
-    # instances sequentially
-    auto_connect_state = ln_setup.settings.auto_connect
-    ln_setup.settings.auto_connect = True
-
     import lamindb as ln
-
-    if not ln.setup.core.django.IS_SETUP:
-        sys.exit(-1)
     from lamindb._finish import save_context_core
-
-    ln_setup.settings.auto_connect = auto_connect_state
+    from lamindb_setup.core.upath import LocalPathClasses, UPath, create_path
 
     # this allows to have the correct treatment of credentials in case of cloud paths
     path = create_path(path)
@@ -166,8 +154,8 @@ def save_from_path_cli(
         if project is not None:
             artifact.projects.add(project_record)
             logger.important(f"labeled with project: {project_record.name}")
-        if ln_setup.settings.instance.is_remote:
-            slug = ln_setup.settings.instance.slug
+        if ln.setup.settings.instance.is_remote:
+            slug = ln.setup.settings.instance.slug
             logger.important(f"go to: https://lamin.ai/{slug}/artifact/{artifact.uid}")
         return None
 
@@ -280,7 +268,7 @@ def save_from_path_cli(
             logger.important(f"labeled with project: {project_record.name}")
         # latest run of this transform by user
         run = ln.Run.filter(transform=transform).order_by("-started_at").first()
-        if run is not None and run.created_by.id != ln_setup.settings.user.id:
+        if run is not None and run.created_by.id != ln.setup.settings.user.id:
             if os.getenv("LAMIN_TESTING") == "true":
                 response = "y"
             else:

{lamin_cli-1.7.0 → lamin_cli-1.7.2}/tests/core/test_save_annotate_files.py

@@ -41,7 +41,7 @@ def test_save_and_annotate_local_file():
     assert "labeled with project: test_project" in result.stdout.decode()
     assert result.returncode == 0
 
-    artifact = ln.Artifact.get(key="mytest")
+    artifact = ln.Artifact.get(key="mytest", branch=branch)
     assert artifact.branch == branch
     assert project in artifact.projects.all()
 
@@ -90,9 +90,9 @@ def test_save_and_annotate_local_file():
     ln.ULabel(name="DMSO", type=ml_split_type).save()
     ln.ULabel(name="IFNG", type=ml_split_type).save()
     ln.Feature(name="perturbation", dtype=ml_split_type).save()
-
+    # can't find by key here because the artifact is not in the main branch
     result = subprocess.run(
-        "lamin annotate --key mytest --project test_project --features perturbation=DMSO,IFNG",
+        f"lamin annotate --uid {artifact.uid} --project test_project --features perturbation=DMSO,IFNG",
         shell=True,
         capture_output=True,
     )
@@ -100,13 +100,13 @@ def test_save_and_annotate_local_file():
     print(result.stderr.decode())
     assert result.returncode == 0
 
-    artifact = ln.Artifact.get(key="mytest")
+    artifact = ln.Artifact.get(key="mytest", branch=branch)
     features = artifact.features.get_values()
     assert features["perturbation"] == {"DMSO", "IFNG"}
     assert project in artifact.projects.all()
-
+    # can't find by key here because the artifact is not in the main branch
     result = subprocess.run(
-        "lamin describe --key mytest",
+        f"lamin describe --uid {artifact.uid}",
         shell=True,
         capture_output=True,
     )

lamin_cli-1.7.0/lamin_cli/__init__.py

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