lamin_cli 1.0.7__py2.py3-none-any.whl → 1.1.0__py2.py3-none-any.whl

lamin_cli/__init__.py

@@ -1,3 +1,3 @@
 """Lamin CLI."""
 
-__version__ = "1.0.7"
+__version__ = "1.1.0"

lamin_cli/__main__.py

@@ -1,12 +1,16 @@
 from __future__ import annotations
+
+import inspect
 import os
 import sys
+import warnings
 from collections import OrderedDict
-import inspect
-from importlib.metadata import PackageNotFoundError, version
-from typing import Optional, Mapping
 from functools import wraps
-import warnings
+from importlib.metadata import PackageNotFoundError, version
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from collections.abc import Mapping
 
 # https://github.com/ewels/rich-click/issues/19
 # Otherwise rich-click takes over the formatting.
@@ -18,11 +22,11 @@ if os.environ.get("NO_RICH"):
 
         def __init__(
             self,
-            name: Optional[str] = None,
-            commands: Optional[Mapping[str, click.Command]] = None,
+            name: str | None = None,
+            commands: Mapping[str, click.Command] | None = None,
             **kwargs,
         ):
-            super(OrderedGroup, self).__init__(name, commands, **kwargs)
+            super().__init__(name, commands, **kwargs)
             self.commands = commands or OrderedDict()
 
         def list_commands(self, ctx: click.Context) -> Mapping[str, click.Command]:
@@ -77,12 +81,14 @@ else:
         return wrapper
 
 
-from click import Command, Context
 from lamindb_setup._silence_loggers import silence_loggers
 
-from lamin_cli._settings import settings
 from lamin_cli._cache import cache
 from lamin_cli._migration import migrate
+from lamin_cli._settings import settings
+
+if TYPE_CHECKING:
+    from click import Command, Context
 
 try:
     lamindb_version = version("lamindb")
@@ -100,7 +106,7 @@ def main():
 @main.command()
 @click.argument("user", type=str, default=None, required=False)
 @click.option("--key", type=str, default=None, help="The legacy API key.")
-def login(user: str, key: Optional[str]):
+def login(user: str, key: str | None):
     """Log into LaminHub.
 
     `lamin login` prompts for your API key unless you set it via environment variable `LAMIN_API_KEY`.
@@ -142,24 +148,25 @@ def schema_to_modules_callback(ctx, param, value):
             "The --schema option is deprecated and will be removed in a future version."
             " Please use --modules instead.",
             DeprecationWarning,
+            stacklevel=2,
         )
     return value
 
 
 # fmt: off
 @main.command()
-@click.option("--storage", type=str, help="Local directory, s3://bucket_name, gs://bucket_name.")  # noqa: E501
-@click.option("--db", type=str, default=None, help="Postgres database connection URL, do not pass for SQLite.")  # noqa: E501
-@click.option("--modules", type=str, default=None, help="Comma-separated string of modules.")  # noqa: E501
+@click.option("--storage", type=str, help="Local directory, s3://bucket_name, gs://bucket_name.")
+@click.option("--db", type=str, default=None, help="Postgres database connection URL, do not pass for SQLite.")
+@click.option("--modules", type=str, default=None, help="Comma-separated string of schema modules.")
 @click.option("--name", type=str, default=None, help="The instance name.")
-@click.option("--schema", type=str, default=None, help="[DEPRECATED] Use --modules instead.", callback=schema_to_modules_callback)  # noqa: E501
+@click.option("--schema", type=str, default=None, help="[DEPRECATED] Use --modules instead.", callback=schema_to_modules_callback)
 # fmt: on
 def init(
     storage: str,
-    db: Optional[str],
-    modules: Optional[str],
-    name: Optional[str],
-    schema: Optional[str],
+    db: str | None,
+    modules: str | None,
+    name: str | None,
+    schema: str | None,
 ):
     """Init an instance."""
     from lamindb_setup._init_instance import init as init_
@@ -182,7 +189,8 @@ def connect(instance: str):
     {attr}`~lamindb.setup.core.SetupSettings.auto_connect` to `True` so that you
     auto-connect in a Python session upon importing `lamindb`.
     """
-    from lamindb_setup import settings as settings_, connect as connect_
+    from lamindb_setup import connect as connect_
+    from lamindb_setup import settings as settings_
 
     settings_.auto_connect = True
     return connect_(instance, _reload_lamindb=False)
@@ -217,7 +225,7 @@ def info(schema: bool):
 # fmt: off
 @main.command()
 @click.argument("instance", type=str, default=None)
-@click.option("--force", is_flag=True, default=False, help="Do not ask for confirmation.")  # noqa: E501
+@click.option("--force", is_flag=True, default=False, help="Do not ask for confirmation.")
 # fmt: on
 def delete(instance: str, force: bool = False):
     """Delete an entity.
@@ -236,7 +244,7 @@ def delete(instance: str, force: bool = False):
 @click.option(
     "--with-env", is_flag=True, help="Also return the environment for a tranform."
 )
-def load(entity: str, uid: str = None, key: str = None, with_env: bool = False):
+def load(entity: str, uid: str | None = None, key: str | None = None, with_env: bool = False):
     """Load a file or folder.
 
     Pass a URL, `artifact`, or `transform`. For example:
@@ -252,7 +260,8 @@ def load(entity: str, uid: str = None, key: str = None, with_env: bool = False):
     """
     is_slug = entity.count("/") == 1
     if is_slug:
-        from lamindb_setup import settings as settings_, connect
+        from lamindb_setup import connect
+        from lamindb_setup import settings as settings_
 
         # can decide whether we want to actually deprecate
         # click.echo(
@@ -273,7 +282,7 @@ def load(entity: str, uid: str = None, key: str = None, with_env: bool = False):
 @click.option(
     "--with-env", is_flag=True, help="Also return the environment for a tranform."
 )
-def get(entity: str, uid: str = None, key: str = None, with_env: bool = False):
+def get(entity: str, uid: str | None = None, key: str | None = None, with_env: bool = False):
     """Query metadata about an entity.
 
     Currently only works for artifact & transform and behaves like `lamin load`.
@@ -315,7 +324,7 @@ def _generate_help():
     out: dict[str, dict[str, str | None]] = {}
 
     def recursive_help(
-        cmd: Command, parent: Optional[Context] = None, name: tuple[str, ...] = ()
+        cmd: Command, parent: Context | None = None, name: tuple[str, ...] = ()
     ):
         ctx = click.Context(cmd, info_name=cmd.name, parent=parent)
         assert cmd.name

lamin_cli/_cache.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import os
 
 if os.environ.get("NO_RICH"):

lamin_cli/_load.py

@@ -1,12 +1,13 @@
 from __future__ import annotations
-from typing import Tuple
-from lamin_utils import logger
-import shutil
+
 import re
+import shutil
 from pathlib import Path
 
+from lamin_utils import logger
 
-def decompose_url(url: str) -> Tuple[str, str, str]:
+
+def decompose_url(url: str) -> tuple[str, str, str]:
     assert "transform" in url or "artifact" in url
     for entity in ["transform", "artifact"]:
         if entity in url:
@@ -16,7 +17,9 @@ def decompose_url(url: str) -> Tuple[str, str, str]:
     return instance_slug, entity, uid
 
 
-def load(entity: str, uid: str = None, key: str = None, with_env: bool = False):
+def load(
+    entity: str, uid: str | None = None, key: str | None = None, with_env: bool = False
+):
     import lamindb_setup as ln_setup
 
     if entity.startswith("https://") and "lamin" in entity:
@@ -42,11 +45,13 @@ def load(entity: str, uid: str = None, key: str = None, with_env: bool = False):
                 new_content = transform.source_code.replace(
                     "# # transform.name", f"# # {transform.description}"
                 )
-            elif transform.source_code.startswith("# %% [markdown]\n#\n"):
-                new_content = transform.source_code.replace(
-                    "# %% [markdown]\n#\n",
-                    f"# %% [markdown]\n# # {transform.description}\n",
-                )
+            elif transform.source_code.startswith("# %% [markdown]"):
+                source_code_split = transform.source_code.split("\n")
+                if source_code_split[1] == "#":
+                    source_code_split[1] = f"# # {transform.description}"
+                new_content = "\n".join(source_code_split)
+            else:
+                new_content = transform.source_code
         else:  # R notebook
             # Pattern to match title only within YAML header section
             title_pattern = r'^---\n.*?title:\s*"([^"]*)".*?---'

lamin_cli/_migration.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import os
 from typing import Optional
 
@@ -34,9 +35,9 @@ def deploy():
 @click.option("--end-number", type=str, default=None)
 @click.option("--start-number", type=str, default=None)
 def squash(
-    package_name: Optional[str],
-    end_number: Optional[str],
-    start_number: Optional[str],
+    package_name: str | None,
+    end_number: str | None,
+    start_number: str | None,
 ):
     """Squash migrations."""
     from lamindb_setup._migrate import migrate

lamin_cli/_save.py

@@ -1,8 +1,10 @@
 from __future__ import annotations
+
+import re
+import sys
 from pathlib import Path
-from typing import Union
+
 from lamin_utils import logger
-import re
 
 
 def parse_uid_from_code(content: str, suffix: str) -> str | None:
@@ -41,7 +43,7 @@ def parse_uid_from_code(content: str, suffix: str) -> str | None:
 
 
 def save_from_filepath_cli(
-    filepath: Union[str, Path],
+    filepath: str | Path,
     key: str | None,
     description: str | None,
     registry: str | None,
@@ -57,13 +59,16 @@ def save_from_filepath_cli(
     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
 
     suffixes_transform = {
-        "py": set([".py", ".ipynb"]),
-        "R": set([".R", ".qmd", ".Rmd"]),
+        "py": {".py", ".ipynb"},
+        "R": {".R", ".qmd", ".Rmd"},
     }
 
     if filepath.suffix in {".qmd", ".Rmd"}:
@@ -80,8 +85,8 @@ def save_from_filepath_cli(
             and filepath.with_suffix(".nb.html").exists()
         ):
             raise SystemExit(
-                f'Please delete one of\n - {filepath.with_suffix(".html")}\n -'
-                f' {filepath.with_suffix(".nb.html")}'
+                f"Please delete one of\n - {filepath.with_suffix('.html')}\n -"
+                f" {filepath.with_suffix('.nb.html')}"
             )
 
     if registry is None:

lamin_cli/_settings.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import os
 
 if os.environ.get("NO_RICH"):

{lamin_cli-1.0.7.dist-info → lamin_cli-1.1.0.dist-info}/METADATA

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

lamin_cli-1.1.0.dist-info/RECORD

@@ -0,0 +1,12 @@
+lamin_cli/__init__.py,sha256=UV55rBrtkCqAG7s-dBM8P0bBJbmz8LGqaj801UwAnps,40
+lamin_cli/__main__.py,sha256=qxmIIzZBt90N8VNgcGd96CNaLl7hj_mfJ719jLzqFLU,10613
+lamin_cli/_cache.py,sha256=oplwE8AcS_9PYptQUZxff2qTIdNFS81clGPkJNWk098,800
+lamin_cli/_load.py,sha256=6pHzBrG6Zbs4aw631cDo28C5XeKwuJxa-LPXxV3Uwm8,6911
+lamin_cli/_migration.py,sha256=xQi6mwnpBzY5wcv1-TJhveD7a3XJIlpiYx6Z3AJ1NF0,1063
+lamin_cli/_save.py,sha256=bt873beNgog5naWITjPb61cjy00aeEtIv9lwqQttRGI,5908
+lamin_cli/_settings.py,sha256=O2tecCf5EIZu98ima4DTJujo4KuywckOLgw8c-Ke3dY,1142
+lamin_cli-1.1.0.dist-info/entry_points.txt,sha256=Qms85i9cZPlu-U7RnVZhFsF7vJ9gaLZUFkCjcGcXTpg,49
+lamin_cli-1.1.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+lamin_cli-1.1.0.dist-info/WHEEL,sha256=ssQ84EZ5gH1pCOujd3iW7HClo_O_aDaClUbX4B8bjKY,100
+lamin_cli-1.1.0.dist-info/METADATA,sha256=nV4-YhAA3afoijViSF5Un_FZrLWPToCAqUctmHE-tAc,337
+lamin_cli-1.1.0.dist-info/RECORD,,

lamin_cli-1.0.7.dist-info/RECORD

@@ -1,12 +0,0 @@
-lamin_cli/__init__.py,sha256=At34nwmlcGUb1vGmsRLVLk2f_sJhCINkEHKoIbl8lHc,40
-lamin_cli/__main__.py,sha256=nmGl8kj9iC1ohjy6JTJc00ZAAkzAWAHVLk5AMFrJDXU,10523
-lamin_cli/_cache.py,sha256=kW8rqlMwQeOngm9uq2gjzPVl3EBrwh6W2F2AvyBFABY,799
-lamin_cli/_load.py,sha256=fOA2lxEWp2l4oOwr_Y7XXDLqbIs9ivF6kBXU7I1eNww,6792
-lamin_cli/_migration.py,sha256=KH0aVRs72ej6ieyM49JaQw1SbT8z24H2heTFnWFcgy4,1071
-lamin_cli/_save.py,sha256=gig2BNgE0RfWXTVzv8Y1QJ5UA5fRS1xE5en6Dx0EwX8,5872
-lamin_cli/_settings.py,sha256=iS37mcQUHKRWxi2sHnAojEI6sWk3w232qwG-GeY2_Qc,1141
-lamin_cli-1.0.7.dist-info/entry_points.txt,sha256=Qms85i9cZPlu-U7RnVZhFsF7vJ9gaLZUFkCjcGcXTpg,49
-lamin_cli-1.0.7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-lamin_cli-1.0.7.dist-info/WHEEL,sha256=ssQ84EZ5gH1pCOujd3iW7HClo_O_aDaClUbX4B8bjKY,100
-lamin_cli-1.0.7.dist-info/METADATA,sha256=h1HDG-taHw9WZ9fR-g2KcqioTwkKIPwxhm2JxclLOD0,337
-lamin_cli-1.0.7.dist-info/RECORD,,