Error conditions for 'llm similar', refs #190

llm/cli.py

@@ -1028,12 +1028,20 @@ def similar(collection, id, input, content, number, database):
     if not db["embeddings"].exists():
         raise click.ClickException("No embeddings table found in database")
 
-    collection_obj = Collection(db, collection)
-    if not collection_obj.exists():
+    collection_exists = False
+    try:
+        collection_obj = Collection(db, collection)
+        collection_exists = collection_obj.exists()
+    except ValueError:
+        collection_exists = False
+    if not collection_exists:
         raise click.ClickException("Collection does not exist")
 
     if id:
-        results = collection_obj.similar_by_id(id, number)
+        try:
+            results = collection_obj.similar_by_id(id, number)
+        except ValueError:
+            raise click.ClickException("ID not found in collection")
     else:
         if not content:
             if not input:

llm/embeddings.py

@@ -39,6 +39,8 @@ def model(self) -> EmbeddingModel:
         if self._model:
             return self._model
         try:
+            if not self._model_id:
+                raise ValueError("No model_id specified")
             self._model = llm.get_embedding_model(self._model_id)
         except llm.UnknownModelError:
             raise ValueError("No model_id specified and no model found with that name")

tests/conftest.py

@@ -1,4 +1,5 @@
 import pytest
+import sqlite_utils
 import llm
 from llm.plugins import pm
 
@@ -16,6 +17,14 @@ def user_path(tmpdir):
     return dir
 
 
+@pytest.fixture
+def user_path_with_embeddings(user_path):
+    path = str(user_path / "embeddings.db")
+    db = sqlite_utils.Database(path)
+    collection = llm.Collection(db, "demo", model_id="embed-demo")
+    collection.embed("1", "hello world")
+
+
 @pytest.fixture
 def templates_path(user_path):
     dir = user_path / "templates"

tests/test_embed_cli.py

@@ -103,3 +103,18 @@ def test_embed_store(user_path):
             ]
         else:
             assert result2.output == "items: embed-demo\n  1 embedding\n"
+
+
+@pytest.mark.parametrize(
+    "args,expected_error",
+    (
+        ([], "Missing argument 'COLLECTION'"),
+        (["badcollection", "-c", "content"], "Collection does not exist"),
+        (["demo", "2"], "ID not found in collection"),
+    ),
+)
+def test_similar_errors(args, expected_error, user_path_with_embeddings):
+    runner = CliRunner()
+    result = runner.invoke(cli, ["similar"] + args, catch_exceptions=False)
+    assert result.exit_code != 0
+    assert expected_error in result.output