Hopiu/llm
1
0
Fork 0
mirror of https://github.com/Hopiu/llm.git synced 2026-04-20 05:01:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for llm logs -q plus -m bug, closes #515

Browse source
This commit is contained in:
Simon Willison 2024-06-16 14:35:23 -07:00
parent 68df9721de
commit 964f4d9934
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
llm/cli.py
View file

@ -716,7 +716,8 @@ def logs_list(
if conversation_id:
where_bits.append("responses.conversation_id = :conversation_id")
if where_bits:
sql_format["extra_where"] = " where " + " and ".join(where_bits)
where_ = " and " if query else " where "
sql_format["extra_where"] = where_ + " and ".join(where_bits)
final_sql = sql.format(**sql_format)
rows = list(

15
tests/test_llm.py
View file

@ -146,16 +146,19 @@ def test_logs_filtered(user_path, model):
@pytest.mark.parametrize(
"query,expected",
"query,extra_args,expected",
(
# With no search term order should be by datetime
("", ["doc1", "doc2", "doc3"]),
("", [], ["doc1", "doc2", "doc3"]),
# With a search it's order by rank instead
("llama", ["doc1", "doc3"]),
("alpaca", ["doc2"]),
("llama", [], ["doc1", "doc3"]),
("alpaca", [], ["doc2"]),
# Model filter should work too
("llama", ["-m", "davinci"], ["doc1", "doc3"]),
("llama", ["-m", "davinci2"], []),
),
)
def test_logs_search(user_path, query, expected):
def test_logs_search(user_path, query, extra_args, expected):
log_path = str(user_path / "logs.db")
db = sqlite_utils.Database(log_path)
migrate(db)
@ -175,7 +178,7 @@ def test_logs_search(user_path, query, expected):
_insert("doc2", "alpaca")
_insert("doc3", "llama llama")
runner = CliRunner()
result = runner.invoke(cli, ["logs", "list", "-q", query, "--json"])
result = runner.invoke(cli, ["logs", "list", "-q", query, "--json"] + extra_args)
assert result.exit_code == 0
records = json.loads(result.output.strip())
assert [record["id"] for record in records] == expected