lamin_cli 1.8.0__py2.py3-none-any.whl → 1.8.1__py2.py3-none-any.whl

lamin_cli/__init__.py

@@ -5,7 +5,7 @@ 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.8.0"
+__version__ = "1.8.1"
 
 from lamindb_setup import disconnect, logout
 from lamindb_setup._connect_instance import _connect_cli as connect

lamin_cli/__main__.py

@@ -424,13 +424,15 @@ def save(path: str, key: str, description: str, stem_uid: str, project: str, spa
 
 
 @main.command()
+@click.argument("entity", type=str, default=None, required=False)
 @click.option("--key", type=str, default=None, help="The key of an artifact or transform.")
 @click.option("--uid", type=str, default=None, help="The uid of an artifact or transform.")
 @click.option("--project", type=str, default=None, help="A valid project name or uid.")
 @click.option("--features", multiple=True, help="Feature annotations. Supports: feature=value, feature=val1,val2, or feature=\"val1\",\"val2\"")
-@click.option("--registry", type=str, default=None, help="Either 'artifact' or 'transform'. If not passed, chooses based on key suffix.")
-def annotate(key: str, uid: str, project: str, registry: str, features: tuple):
-    """Annotate an artifact or a transform.
+def annotate(entity: str | None, key: str, uid: str, project: str, features: tuple):
+    """Annotate an artifact or transform.
+
+    Entity is either 'artifact' or 'transform'. If not passed, chooses based on key suffix.
 
     You can annotate with projects and valid features & values. For example,
 
@@ -445,11 +447,17 @@ def annotate(key: str, uid: str, project: str, registry: str, features: tuple):
     from lamin_cli._annotate import _parse_features_list
     from lamin_cli._save import infer_registry_from_path
 
-    if registry is None:
+    # once we enable passing the URL as entity, then we don't need to throw this error
+    if not ln.setup.settings._instance_exists:
+        raise click.ClickException("Not connected to an instance. Please run: lamin connect account/name")
+
+    if entity is None:
         if key is not None:
             registry = infer_registry_from_path(key)
         else:
             registry = "artifact"
+    else:
+        registry = entity
     if registry == "artifact":
         model = ln.Artifact
     else:
@@ -459,7 +467,7 @@ def annotate(key: str, uid: str, project: str, registry: str, features: tuple):
     if key is not None:
         artifact = model.get(key=key)
     elif uid is not None:
-        artifact = model.get(uid=uid)
+        artifact = model.get(uid)  # do not use uid=uid, because then no truncated uids would work
     else:
         raise ln.errors.InvalidArgument("Either --key or --uid must be provided")
 

lamin_cli/_save.py

@@ -104,12 +104,14 @@ def save(
             raise ln.errors.InvalidArgument(
                 f"Project '{project}' not found, either create it with `ln.Project(name='...').save()` or fix typos."
             )
+    space_record = None
     if space is not None:
         space_record = ln.Space.filter(ln.Q(name=space) | ln.Q(uid=space)).one_or_none()
         if space_record is None:
             raise ln.errors.InvalidArgument(
                 f"Space '{space}' not found, either create it on LaminHub or fix typos."
             )
+    branch_record = None
     if branch is not None:
         branch_record = ln.Branch.filter(
             ln.Q(name=branch) | ln.Q(uid=branch)
@@ -141,12 +143,14 @@ def save(
             logger.error("Please pass a key or description via --key or --description")
             return "missing-key-or-description"
 
-        artifact = ln.Artifact(path, key=key, description=description, revises=revises)
-        if space is not None:
-            artifact.space = space_record
-        if branch is not None:
-            artifact.branch = branch_record
-        artifact.save()
+        artifact = ln.Artifact(
+            path,
+            key=key,
+            description=description,
+            revises=revises,
+            branch=branch_record,
+            space=space_record,
+        ).save()
         logger.important(f"saved: {artifact}")
         logger.important(f"storage path: {artifact.path}")
         if artifact.storage.type == "s3":

{lamin_cli-1.8.0.dist-info → lamin_cli-1.8.1.dist-info}/METADATA

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

{lamin_cli-1.8.0.dist-info → lamin_cli-1.8.1.dist-info}/RECORD

@@ -1,17 +1,17 @@
-lamin_cli/__init__.py,sha256=QIcp3UIsllYnrOYOy9UKJ5cXdfJ8bmQ8LVUdODwUg80,563
-lamin_cli/__main__.py,sha256=TjUJFtQAoBop9WnMLDKsXdEiQsfDBhOLxXRKBbu8j6k,18732
+lamin_cli/__init__.py,sha256=4B9Apq4lWC216t-9IPkVf5khYyACn27JfUtlRahDXpg,563
+lamin_cli/__main__.py,sha256=OKlIhmvdf5InYTEfh9bO4pT7nYA1vYqB44MFw_Rz_uA,19093
 lamin_cli/_annotate.py,sha256=ZD76__K-mQt7UpYqyM1I2lKCs-DraTmnkjsByIHmD-g,1839
 lamin_cli/_cache.py,sha256=oplwE8AcS_9PYptQUZxff2qTIdNFS81clGPkJNWk098,800
 lamin_cli/_delete.py,sha256=dxItUgf7At247iYGLagmJ2Ccp5nAWgodPL7c7zfZQ_0,1420
 lamin_cli/_load.py,sha256=OgTGqZQtoJ0GYOhuJihz-izt0F4jM4U_nSX_vhPoukg,7698
 lamin_cli/_migration.py,sha256=XUl_L9_3pTTk5jJoBiqbzf0Bd2LdKKtHa1zPZ4Rla5c,1267
-lamin_cli/_save.py,sha256=PE0UCGw2DxzSjEv6ckZIaO2BQK6JWQN4ih6fLY64JIk,11498
+lamin_cli/_save.py,sha256=IM0iKOhINIaoX_lGJ9QeUOI56idyB1nN4Et8XBGP-u8,11508
 lamin_cli/_settings.py,sha256=mTnwU5zfBGwt9x6RrhFpi4f0DeyEfI02YWs96x_JYWw,2672
 lamin_cli/urls.py,sha256=gc72s4SpaAQA8J50CtCIWlr49DWOSL_a6OM9lXfPouM,367
 lamin_cli/compute/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lamin_cli/compute/modal.py,sha256=QnR7GyyvWWWkLnou95HxS9xxSQfw1k-SiefM_qRVnU0,6010
-lamin_cli-1.8.0.dist-info/entry_points.txt,sha256=Qms85i9cZPlu-U7RnVZhFsF7vJ9gaLZUFkCjcGcXTpg,49
-lamin_cli-1.8.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-lamin_cli-1.8.0.dist-info/WHEEL,sha256=ssQ84EZ5gH1pCOujd3iW7HClo_O_aDaClUbX4B8bjKY,100
-lamin_cli-1.8.0.dist-info/METADATA,sha256=iBekqxAT65m34wU51Cl7XzNp6LrIZJR3f_jRlcJRClA,337
-lamin_cli-1.8.0.dist-info/RECORD,,
+lamin_cli-1.8.1.dist-info/entry_points.txt,sha256=Qms85i9cZPlu-U7RnVZhFsF7vJ9gaLZUFkCjcGcXTpg,49
+lamin_cli-1.8.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+lamin_cli-1.8.1.dist-info/WHEEL,sha256=ssQ84EZ5gH1pCOujd3iW7HClo_O_aDaClUbX4B8bjKY,100
+lamin_cli-1.8.1.dist-info/METADATA,sha256=0PwK3EvQkEQGWQnYogB_1EQBraLSvIKbNNkN9A0gtz4,337
+lamin_cli-1.8.1.dist-info/RECORD,,