lamin_cli 0.17.3__tar.gz → 0.17.5__tar.gz

{lamin_cli-0.17.3 → lamin_cli-0.17.5}/PKG-INFO

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

lamin_cli-0.17.5/lamin_cli/__init__.py

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

{lamin_cli-0.17.3 → lamin_cli-0.17.5}/lamin_cli/__main__.py

@@ -152,14 +152,10 @@ def init(storage: str, db: Optional[str], schema: Optional[str], name: Optional[
 
 # fmt: off
 @main.command()
-@click.argument("instance", type=str, default=None)
-@click.option("--db", type=str, default=None, help="Update database URL.")  # noqa: E501
-@click.option("--storage", type=str, default=None, help="Update storage while loading.")
+@click.argument("instance", type=str, default=None, required=False)
 @click.option("--unload", is_flag=True, help="Unload the current instance.")
 # fmt: on
-def load(
-    instance: Optional[str], db: Optional[str], storage: Optional[str], unload: bool
-):
+def load(instance: Optional[str], unload: bool):
     """Load an instance for auto-connection.
 
     Pass a slug (`account/name`) or URL
@@ -175,7 +171,7 @@ def load(
         from lamindb_setup import settings, connect
 
         settings.auto_connect = True
-        return connect(slug=instance, db=db, storage=storage)
+        return connect(slug=instance)
 
 
 @main.command()
@@ -237,11 +233,12 @@ def get(entity: str, uid: str = None, key: str = None, with_env: bool = False):
 )
 @click.option("--key", type=str, default=None)
 @click.option("--description", type=str, default=None)
-def save(filepath: str, key: str, description: str):
+@click.option("--registry", type=str, default=None)
+def save(filepath: str, key: str, description: str, registry: str):
     """Save file or folder."""
     from lamin_cli._save import save_from_filepath_cli
 
-    if save_from_filepath_cli(filepath, key, description) is not None:
+    if save_from_filepath_cli(filepath, key, description, registry) is not None:
         sys.exit(1)
 
 

{lamin_cli-0.17.3 → lamin_cli-0.17.5}/lamin_cli/_save.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 from pathlib import Path
-from typing import Optional, Union
+from typing import Union
 import lamindb_setup as ln_setup
 from lamin_utils import logger
 import re
@@ -50,8 +50,11 @@ def get_stem_uid_and_version_from_file(
 
 
 def save_from_filepath_cli(
-    filepath: Union[str, Path], key: Optional[str], description: Optional[str]
-) -> Optional[str]:
+    filepath: Union[str, Path],
+    key: str | None,
+    description: str | None,
+    registry: str | None,
+) -> str | None:
     if not isinstance(filepath, Path):
         filepath = Path(filepath)
 
@@ -65,21 +68,24 @@ def save_from_filepath_cli(
 
     ln_setup.settings.auto_connect = auto_connect_state
 
-    if filepath.suffix not in {".py", ".ipynb"}:
+    if registry is None:
+        registry = "transform" if filepath.suffix in {".py", ".ipynb"} else "artifact"
+
+    if registry == "artifact":
+        ln.settings.creation.artifact_silence_missing_run_warning = True
         if key is None and description is None:
             logger.error("Please pass a key or description via --key or --description")
             return "missing-key-or-description"
-        artifact = ln.Artifact(filepath, key=key, description=description)
-        artifact.save()
-        slug = ln_setup.settings.instance.slug
+        artifact = ln.Artifact(filepath, key=key, description=description).save()
         logger.important(f"saved: {artifact}")
         logger.important(f"storage path: {artifact.path}")
-        if ln_setup.settings.instance.is_remote:
-            logger.important(f"go to: https://lamin.ai/{slug}/artifact/{artifact.uid}")
         if ln_setup.settings.storage.type == "s3":
             logger.important(f"storage url: {artifact.path.to_url()}")
+        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
-    else:
+    elif registry == "transform":
         # consider notebooks & scripts a transform
         uid, stem_uid, transform_version = get_stem_uid_and_version_from_file(filepath)
         if uid is not None:
@@ -109,3 +115,5 @@ def save_from_filepath_cli(
             filepath=filepath,
             from_cli=True,
         )
+    else:
+        raise SystemExit("Allowed values for '--registry' are: 'artifact', 'transform'")

lamin_cli-0.17.5/tests/test_save_files.py

@@ -0,0 +1,60 @@
+import subprocess
+from pathlib import Path
+
+test_file = Path(__file__).parent.parent.resolve() / ".gitignore"
+
+
+def test_save_file():
+    filepath = test_file
+
+    # neither key nor description
+    result = subprocess.run(
+        f"lamin save {filepath}",
+        shell=True,
+        capture_output=True,
+    )
+    print(result.stdout.decode())
+    print(result.stderr.decode())
+    assert (
+        "Please pass a key or description via --key or --description"
+        in result.stdout.decode()
+    )
+    assert result.returncode == 1
+
+    result = subprocess.run(
+        f"lamin save {filepath} --key mytest",
+        shell=True,
+        capture_output=True,
+    )
+    print(result.stdout.decode())
+    print(result.stderr.decode())
+    assert "key='mytest'" in result.stdout.decode()
+    assert "storage path:" in result.stdout.decode()
+    assert result.returncode == 0
+
+    # test passing the registry and saving the same file
+    result = subprocess.run(
+        f"lamin save {filepath} --key mytest --registry artifact",
+        shell=True,
+        capture_output=True,
+    )
+    print(result.stdout.decode())
+    print(result.stderr.decode())
+    assert "returning existing artifact with same hash" in result.stdout.decode()
+    assert "key='mytest'" in result.stdout.decode()
+    assert "storage path:" in result.stdout.decode()
+    assert result.returncode == 0
+
+    # test invalid registry param
+    result = subprocess.run(
+        f"lamin save {filepath} --key mytest --registry invalid",
+        shell=True,
+        capture_output=True,
+    )
+    print(result.stdout.decode())
+    print(result.stderr.decode())
+    assert (
+        "Allowed values for '--registry' are: 'artifact', 'transform'"
+        in result.stderr.decode()
+    )
+    assert result.returncode == 1

lamin_cli-0.17.3/lamin_cli/__init__.py

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

lamin_cli-0.17.3/tests/test_save_files.py

@@ -1,33 +0,0 @@
-import subprocess
-from pathlib import Path
-
-test_file = Path(__file__).parent.parent.resolve() / ".gitignore"
-
-
-def test_save_file():
-    filepath = test_file
-
-    # neither key nor description
-    result = subprocess.run(
-        f"lamin save {filepath}",
-        shell=True,
-        capture_output=True,
-    )
-    print(result.stdout.decode())
-    print(result.stderr.decode())
-    assert (
-        "Please pass a key or description via --key or --description"
-        in result.stdout.decode()
-    )
-    assert result.returncode == 1
-
-    result = subprocess.run(
-        f"lamin save {filepath} --key mytest",
-        shell=True,
-        capture_output=True,
-    )
-    print(result.stdout.decode())
-    print(result.stderr.decode())
-    assert "key='mytest'" in result.stdout.decode()
-    assert "storage path:" in result.stdout.decode()
-    assert result.returncode == 0