lamin_cli 0.16.0__py2.py3-none-any.whl → 0.16.2__py2.py3-none-any.whl

lamin_cli/__init__.py

@@ -1,3 +1,3 @@
 """Lamin CLI."""
 
-__version__ = "0.16.0"
+__version__ = "0.16.2"

lamin_cli/__main__.py

@@ -5,6 +5,7 @@ from collections import OrderedDict
 import inspect
 from importlib.metadata import PackageNotFoundError, version
 from typing import Optional, Mapping
+from functools import wraps
 
 # https://github.com/ewels/rich-click/issues/19
 # Otherwise rich-click takes over the formatting.
@@ -60,12 +61,18 @@ else:
         ]
     }
 
-    lamin_group_decorator = click.rich_config(
-        help_config=click.RichHelpConfiguration(
-            command_groups=COMMAND_GROUPS,
-            style_commands_table_column_width_ratio=(1, 13),
+    def lamin_group_decorator(f):
+        @click.rich_config(
+            help_config=click.RichHelpConfiguration(
+                command_groups=COMMAND_GROUPS,
+                style_commands_table_column_width_ratio=(1, 13),
+            )
         )
-    )(click.group())
+        @click.group()
+        @wraps(f)
+        def wrapper(*args, **kwargs):
+            return f(*args, **kwargs)
+        return wrapper
 
 
 from click import Command, Context

lamin_cli/_save.py

@@ -6,17 +6,21 @@ from lamin_utils import logger
 import re
 
 
-def get_stem_uid_and_version_from_file(file_path: Path) -> tuple[str, str]:
+def get_stem_uid_and_version_from_file(
+    file_path: Path,
+) -> tuple[str | None, str | None, str | None]:
     # line-by-line matching might be faster, but let's go with this for now
     with open(file_path) as file:
         content = file.read()
 
     if file_path.suffix == ".py":
+        uid_pattern = re.compile(r'\.context\.uid\s*=\s*["\']([^"\']+)["\']')
         stem_uid_pattern = re.compile(
             r'\.transform\.stem_uid\s*=\s*["\']([^"\']+)["\']'
         )
         version_pattern = re.compile(r'\.transform\.version\s*=\s*["\']([^"\']+)["\']')
     elif file_path.suffix == ".ipynb":
+        uid_pattern = re.compile(r'\.context\.uid\s*=\s*\\["\']([^"\']+)\\["\']')
         stem_uid_pattern = re.compile(
             r'\.transform\.stem_uid\s*=\s*\\["\']([^"\']+)\\["\']'
         )
@@ -27,20 +31,22 @@ def get_stem_uid_and_version_from_file(file_path: Path) -> tuple[str, str]:
         raise ValueError("Only .py and .ipynb files are supported.")
 
     # Search for matches in the entire file content
+    uid_match = uid_pattern.search(content)
     stem_uid_match = stem_uid_pattern.search(content)
     version_match = version_pattern.search(content)
 
     # 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 stem_uid is None or version is None:
+    if uid is None and (stem_uid is None or version is None):
         raise SystemExit(
-            "ln.settings.transform.stem_uid and ln.settings.transform.version aren't"
-            f" set in {file_path}\nCall ln.track() and copy/paste the output into the"
-            " notebook"
+            "ln.context.uid isn't"
+            f" set in {file_path}\nCall ln.context.track() and copy/paste the output"
+            " into the notebook"
         )
-    return stem_uid, version
+    return uid, stem_uid, version
 
 
 def save_from_filepath_cli(
@@ -55,7 +61,7 @@ def save_from_filepath_cli(
     ln_setup.settings.auto_connect = True
 
     import lamindb as ln
-    from lamindb._finish import save_run_context_core
+    from lamindb._finish import save_context_core
 
     ln_setup.settings.auto_connect = auto_connect_state
 
@@ -75,17 +81,22 @@ def save_from_filepath_cli(
         return None
     else:
         # consider notebooks & scripts a transform
-        stem_uid, transform_version = get_stem_uid_and_version_from_file(filepath)
-        # the corresponding transform family in the transform table
-        transform_family = ln.Transform.filter(uid__startswith=stem_uid).all()
-        if len(transform_family) == 0:
-            logger.error(
-                f"Did not find stem uid '{stem_uid}'"
-                " in Transform registry. Did you run ln.track()?"
-            )
-            return "not-tracked-in-transform-registry"
-        # the specific version
-        transform = transform_family.filter(version=transform_version).one()
+        uid, stem_uid, transform_version = get_stem_uid_and_version_from_file(filepath)
+        if uid is not None:
+            transform = ln.Transform.filter(uid=uid).one_or_none()
+            if transform is None:
+                logger.error(
+                    f"Did not find uid '{uid}'"
+                    " in Transform registry. Did you run ln.context.track()?"
+                )
+                return "not-tracked-in-transform-registry"
+            # refactor this, save_context_core should not depend on transform_family
+            transform_family = transform.versions
+        else:
+            # the corresponding transform family in the transform table
+            transform_family = ln.Transform.filter(uid__startswith=stem_uid).all()
+            # the specific version
+            transform = transform_family.filter(version=transform_version).one()
         # latest run of this transform by user
         run = ln.Run.filter(transform=transform).order_by("-started_at").first()
         if run.created_by.id != ln_setup.settings.user.id:
@@ -95,7 +106,7 @@ def save_from_filepath_cli(
             )
             if response != "y":
                 return "aborted-save-notebook-created-by-different-user"
-        return save_run_context_core(
+        return save_context_core(
             run=run,
             transform=transform,
             filepath=filepath,

{lamin_cli-0.16.0.dist-info → lamin_cli-0.16.2.dist-info}/METADATA

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

lamin_cli-0.16.2.dist-info/RECORD

@@ -0,0 +1,10 @@
+lamin_cli/__init__.py,sha256=crsjcR_B06Sik0bsq8ZMipKFmOk_AehyoD__l5IV20c,41
+lamin_cli/__main__.py,sha256=B2zUf8d7vcoCN-SuEo7dtlJg-waJgYyd-Y--ZZatP2E,7988
+lamin_cli/_cache.py,sha256=WMDUkJyATVdN8pMqgqw1DZLVym-CaBjCHEoRimI69LQ,813
+lamin_cli/_get.py,sha256=MXcR9PTW0FzY3uIPa-50SLCrtuRElxgDB3Vkfo-TFT0,1616
+lamin_cli/_migration.py,sha256=dULOvbpJ4VBiXuxPAM8jFGnBkh7pQGqE5eP-UC6uxWc,1055
+lamin_cli/_save.py,sha256=LP-5ykImaWDad2walTTU9wiWUHt8LyNmrxr3qedKu7Y,4830
+lamin_cli-0.16.2.dist-info/entry_points.txt,sha256=Qms85i9cZPlu-U7RnVZhFsF7vJ9gaLZUFkCjcGcXTpg,49
+lamin_cli-0.16.2.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+lamin_cli-0.16.2.dist-info/METADATA,sha256=i76L8XLfj-w-LpBmrw5ThHqyQILIrIg_BFcP90j3rTM,336
+lamin_cli-0.16.2.dist-info/RECORD,,

lamin_cli-0.16.0.dist-info/RECORD

@@ -1,10 +0,0 @@
-lamin_cli/__init__.py,sha256=ywCiO8sjaEgq6RmyOv4ubgOrE_UIXqs2_mGwLeaJtPU,41
-lamin_cli/__main__.py,sha256=kyK2tFuGbk-aR-25sO5Rta_pkzDknBkGyd7ElPYjaNU,7800
-lamin_cli/_cache.py,sha256=WMDUkJyATVdN8pMqgqw1DZLVym-CaBjCHEoRimI69LQ,813
-lamin_cli/_get.py,sha256=MXcR9PTW0FzY3uIPa-50SLCrtuRElxgDB3Vkfo-TFT0,1616
-lamin_cli/_migration.py,sha256=dULOvbpJ4VBiXuxPAM8jFGnBkh7pQGqE5eP-UC6uxWc,1055
-lamin_cli/_save.py,sha256=6mu6sAVcXsq4-XW-tzcVxUVh-Gv7e9EFkTyMmdrCGNw,4291
-lamin_cli-0.16.0.dist-info/entry_points.txt,sha256=Qms85i9cZPlu-U7RnVZhFsF7vJ9gaLZUFkCjcGcXTpg,49
-lamin_cli-0.16.0.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
-lamin_cli-0.16.0.dist-info/METADATA,sha256=HGnHx539zZLJNhpwcH3yO_aVkKtEPjGxI-4BET5Eh6k,336
-lamin_cli-0.16.0.dist-info/RECORD,,