llm logs cannot combine -q and -m options

[simonw]

This:

llm logs -q 'flourish' -m haiku

Threw this error:

Traceback (most recent call last):
  File "/opt/homebrew/bin/llm", line 8, in <module>
    sys.exit(cli())
             ^^^^^
  File "/opt/homebrew/Cellar/llm/0.14/libexec/lib/python3.12/site-packages/click/core.py", line 1157, in __call__
    return self.main(*args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/homebrew/Cellar/llm/0.14/libexec/lib/python3.12/site-packages/click/core.py", line 1078, in main
    rv = self.invoke(ctx)
         ^^^^^^^^^^^^^^^^
  File "/opt/homebrew/Cellar/llm/0.14/libexec/lib/python3.12/site-packages/click/core.py", line 1688, in invoke
    return _process_result(sub_ctx.command.invoke(sub_ctx))
                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/homebrew/Cellar/llm/0.14/libexec/lib/python3.12/site-packages/click/core.py", line 1688, in invoke
    return _process_result(sub_ctx.command.invoke(sub_ctx))
                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/homebrew/Cellar/llm/0.14/libexec/lib/python3.12/site-packages/click/core.py", line 1434, in invoke
    return ctx.invoke(self.callback, **ctx.params)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/homebrew/Cellar/llm/0.14/libexec/lib/python3.12/site-packages/click/core.py", line 783, in invoke
    return __callback(*args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/homebrew/Cellar/llm/0.14/libexec/lib/python3.12/site-packages/llm/cli.py", line 722, in logs_list
    rows = list(
           ^^^^^
  File "/opt/homebrew/Cellar/llm/0.14/libexec/lib/python3.12/site-packages/sqlite_utils/db.py", line 503, in query
    cursor = self.execute(sql, params or tuple())
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/homebrew/Cellar/llm/0.14/libexec/lib/python3.12/site-packages/sqlite_utils/db.py", line 521, in execute
    return self.conn.execute(sql, parameters)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
sqlite3.OperationalError: near "where": syntax error

Using the debugger shows the SQL string is this:

select
    responses.id,
    responses.model,
    responses.prompt,
    responses.system,
    responses.prompt_json,
    responses.options_json,
    responses.response,
    responses.response_json,
    responses.conversation_id,
    responses.duration_ms,
    responses.datetime_utc,
    conversations.name as conversation_name,
    conversations.model as conversation_model
from
    responses
left join conversations on responses.conversation_id = conversations.id
join responses_fts on responses_fts.rowid = responses.rowid
where responses_fts match :query where responses.model = :model
order by responses_fts.rank desc limit 3

[simonw]

Bug is here:

where responses_fts match :query where responses.model = :model

Relevant code:

llm/llm/cli.py

Lines 594 to 611 in 68df972

	LOGS_SQL = """
	select
	{columns}
	from
	responses
	left join conversations on responses.conversation_id = conversations.id{extra_where}
	order by responses.id desc{limit}
	"""
	LOGS_SQL_SEARCH = """
	select
	{columns}
	from
	responses
	left join conversations on responses.conversation_id = conversations.id
	join responses_fts on responses_fts.rowid = responses.rowid
	where responses_fts match :query{extra_where}
	order by responses_fts.rank desc{limit}
	"""

llm/llm/cli.py

Lines 700 to 721 in 68df972

	sql = LOGS_SQL
	if query:
	sql = LOGS_SQL_SEARCH
	limit = ""
	if count is not None and count > 0:
	limit = " limit {}".format(count)
	sql_format = {
	"limit": limit,
	"columns": LOGS_COLUMNS,
	"extra_where": "",
	}
	where_bits = []
	if model_id:
	where_bits.append("responses.model = :model")
	if conversation_id:
	where_bits.append("responses.conversation_id = :conversation_id")
	if where_bits:
	sql_format["extra_where"] = " where " + " and ".join(where_bits)
	final_sql = sql.format(**sql_format)