lamin_cli 0.17.0__tar.gz → 0.17.1__tar.gz

{lamin_cli-0.17.0 → lamin_cli-0.17.1}/PKG-INFO

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

lamin_cli-0.17.1/lamin_cli/__init__.py

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

{lamin_cli-0.17.0 → lamin_cli-0.17.1}/lamin_cli/__main__.py

@@ -96,7 +96,7 @@ def main():
 
 
 @main.command()
-@click.argument("user", type=str)
+@click.argument("user", type=str, default=None, required=False)
 @click.option("--key", type=str, default=None, help="API key")
 def login(user: str, key: Optional[str]):
     """Log into LaminHub.
@@ -110,10 +110,26 @@ def login(user: str, key: Optional[str]):
     You'll find your API key in the top right corner under "Settings".
 
     After this, you can either use `lamin login myhandle` or `lamin login myemail@acme.com`
+
+    You can also use
+
+    ```
+    lamin login
+    ```
+
+    and type your beta API key in the terminal
     """
     from lamindb_setup._setup_user import login
 
-    return login(user, key=key)
+    if user is None:
+        if "LAMIN_API_KEY" in os.environ:
+            api_key = os.environ["LAMIN_API_KEY"]
+        else:
+            api_key = input("Your API key: ")
+    else:
+        api_key = None
+
+    return login(user, key=key, api_key=api_key)
 
 
 # fmt: off

lamin_cli-0.17.1/tests/test_cli.py

@@ -0,0 +1,42 @@
+import os
+from datetime import datetime, timedelta, timezone
+from lamindb_setup.core._hub_client import connect_hub_with_auth
+from lamindb_setup.core._hub_core import create_api_key
+
+
+def test_entrypoint():
+    exit_status = os.system("lamin --help")
+    assert exit_status == 0
+
+
+def test_cli_login():
+    exit_status = os.system("lamin login testuser1")
+    assert exit_status == 0
+
+    exit_status = os.system(
+        "lamin login testuser1 --key cEvcwMJFX4OwbsYVaMt2Os6GxxGgDUlBGILs2RyS"
+    )
+    assert exit_status == 0
+
+
+def test_cli_login_api_key():
+    expires_at = datetime.now(tz=timezone.utc) + timedelta(days=1)
+    api_key = create_api_key(
+        {
+            "expires_at": expires_at.strftime("%Y-%m-%d"),
+            "description": "test_cli_login_api_key",
+        }
+    )
+
+    exit_status = os.system(f"echo {api_key} | lamin login")
+    assert exit_status == 0
+
+    os.environ["LAMIN_API_KEY"] = api_key
+    exit_status = os.system("lamin login")
+    assert exit_status == 0
+
+    hub = connect_hub_with_auth()
+    hub.table("api_key").delete().eq("description", "test_cli_login_api_key").execute()
+    hub.auth.sign_out({"scope": "local"})
+
+    os.system("lamin login testuser1@lamin.ai")

{lamin_cli-0.17.0 → lamin_cli-0.17.1}/tests/test_save_notebooks.py

@@ -40,20 +40,22 @@ def test_save_non_consecutive():
         version="1",
         name="My test notebook (non-consecutive)",
         type="notebook",
-    )
-    transform.save()
-    run = ln.Run(transform=transform)
-    run.save()
-    result = subprocess.run(
-        f"lamin save {notebook_path}",  # noqa
+    ).save()
+    ln.Run(transform=transform).save()
+
+    process = subprocess.Popen(
+        f"lamin save {notebook_path}",
         shell=True,
-        capture_output=True,
         env=env,
+        stdin=subprocess.PIPE,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        text=True,
     )
-    print(result.stdout.decode())
-    print(result.stderr.decode())
-    assert result.returncode == 1
-    assert "were not run consecutively" in result.stdout.decode()
+    stdout, stderr = process.communicate("n")
+    assert "were not run consecutively" in stdout
+    assert "Do you still want to proceed with finishing?" in stdout
+    assert process.returncode == 1
 
 
 def test_save_consecutive():
@@ -134,29 +136,34 @@ print("my consecutive cell")
     assert transform.latest_run.environment.path.exists()
     assert transform._source_code_artifact is None
 
-    # now, assume the user modifies the notebook
+    # edit the notebook
     nb = read_notebook(notebook_path)
-    # simulate editing the notebook (here, duplicate last cell)
     new_cell = nb.cells[-1].copy()
     new_cell["execution_count"] += 1
-    nb.cells.append(new_cell)
+    nb.cells.append(new_cell)  # duplicate last cell
     write_notebook(nb, notebook_path)
 
-    # try re-running - it fails
+    # attempt re-running - it fails
     with pytest.raises(CellExecutionError) as error:
         nbproject_test.execute_notebooks(notebook_path, print_outputs=True)
     # print(error.exconly())
     assert "UpdateContext" in error.exconly()
 
-    # try re-saving - it works but will issue an interactive warning dialogue
-    # that clarifies that the user is about to re-save the notebook
-    result = subprocess.run(
+    # attempt re-saving - it works but the user needs to confirm overwriting
+    # source code and run report
+    process = subprocess.Popen(
         f"lamin save {notebook_path}",
         shell=True,
-        capture_output=True,
         env=env,
+        stdin=subprocess.PIPE,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        text=True,
     )
-    assert result.returncode == 0
+    stdout, stderr = process.communicate("y\ny")
+    assert "You are about to overwrite existing source code" in stdout
+    assert "You are about to overwrite an existing report" in stdout
+    assert process.returncode == 0
     # the source code is overwritten with the edits, reflected in a new hash
     transform = ln.Transform.get("hlsFXswrJjtt0000")
     assert transform.latest_run.report.path.exists()

lamin_cli-0.17.0/lamin_cli/__init__.py

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

lamin_cli-0.17.0/tests/test_cli.py

@@ -1,16 +0,0 @@
-import os
-
-
-def test_entrypoint():
-    exit_status = os.system("lamin --help")
-    assert exit_status == 0
-
-
-def test_login():
-    exit_status = os.system("lamin login testuser1")
-    assert exit_status == 0
-
-    exit_status = os.system(
-        "lamin login testuser1 --key cEvcwMJFX4OwbsYVaMt2Os6GxxGgDUlBGILs2RyS"
-    )
-    assert exit_status == 0