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

llm chat now respects default model options (#985)

Browse source
This commit is contained in:
André Arko 2025-05-24 14:24:53 -07:00 committed by GitHub
parent 5d6f96a908
commit fc44fd6a0d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 36 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
llm/cli.py
View file

@ -1071,7 +1071,7 @@ def chat(
conversation.model = model
# Validate options
validated_options = {}
validated_options = get_model_options(model.model_id)
if options:
try:
validated_options = dict(

43
tests/test_chat.py
View file

@ -1,10 +1,10 @@
from click.testing import CliRunner
from unittest.mock import ANY
import json
import llm.cli
from unittest.mock import ANY
import pytest
import sys
import sqlite_utils
import sys
import textwrap
@ -171,13 +171,23 @@ def test_chat_system(mock_model, logs_db):
@pytest.mark.xfail(sys.platform == "win32", reason="Expected to fail on Windows")
def test_chat_options(mock_model, logs_db):
def test_chat_options(mock_model, logs_db, user_path):
options_path = user_path / "model_options.json"
options_path.write_text(json.dumps({"mock": {"max_tokens": "5"}}), "utf-8")
runner = CliRunner()
mock_model.enqueue(["Some text"])
mock_model.enqueue(["Default options response"])
result = runner.invoke(
llm.cli.cli,
["chat", "-m", "mock"],
input="Hi\nquit\n",
)
assert result.exit_code == 0
mock_model.enqueue(["Override options response"])
result = runner.invoke(
llm.cli.cli,
["chat", "-m", "mock", "--option", "max_tokens", "10"],
input="Hi\nquit\n",
input="Hi with override\nquit\n",
)
assert result.exit_code == 0
responses = list(logs_db["responses"].rows)
@ -188,8 +198,8 @@ def test_chat_options(mock_model, logs_db):
"prompt": "Hi",
"system": None,
"prompt_json": None,
"options_json": '{"max_tokens": 10}',
"response": "Some text",
"options_json": '{"max_tokens": 5}',
"response": "Default options response",
"response_json": None,
"conversation_id": ANY,
"duration_ms": ANY,
@ -198,7 +208,24 @@ def test_chat_options(mock_model, logs_db):
"output_tokens": 1,
"token_details": None,
"schema_id": None,
}
},
{
"id": ANY,
"model": "mock",
"prompt": "Hi with override",
"system": None,
"prompt_json": None,
"options_json": '{"max_tokens": 10}',
"response": "Override options response",
"response_json": None,
"conversation_id": ANY,
"duration_ms": ANY,
"datetime_utc": ANY,
"input_tokens": 3,
"output_tokens": 1,
"token_details": None,
"schema_id": None,
},
]