Add LLM client interface with LiteLLM adapter (A5/A11)
PR 2 of the steps-3/4 plan. - llm.py: LLMClient protocol — complete(events, tools, model) -> canonical events — present from the first real LLM call. LiteLLMClient renders requests via the A10 renderer, targets the proxy's OpenAI-compatible route, and maps provider tool-call IDs to locally-minted canonical IDs at the boundary - RoleMap (A11): executor/planner/delegate/consultant resolved from env; pinned() returns the mapping to record at task start - Config strictly from env: NISSE_LLM_BASE_URL, NISSE_LLM_TOKEN; envfile.py is a minimal .env loader where real env wins; .env now gitignored with a committed .env.example documenting all variables (Matrix ones included for the upcoming transport PR) - Live smoke test against the proxy is integration-marked and skips without credentials — CI stays credential-free per operator decision; the test runs locally once .env exists - httpx added as nisse-dev's HTTP client Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
e185bb7c88
commit
0c2021fced
8 files changed
+462
-2
No files matched your search
@@ -0,0 +1,147 @@
|
||||
import json
|
||||
from pathlib import Path
|
||||
|
||||
import httpx
|
||||
import pytest
|
||||
|
||||
from nisse_dev.canonical import (
|
||||
AssistantText,
|
||||
StoredEvent,
|
||||
ToolCall,
|
||||
UserMessage,
|
||||
)
|
||||
from nisse_dev.envfile import load_env_file
|
||||
from nisse_dev.llm import LiteLLMClient, LLMError, RoleMap
|
||||
|
||||
EVENTS = [StoredEvent(id=1, ts="t", event=UserMessage(text="hi", source="m:1"))]
|
||||
|
||||
|
||||
def make_client(handler) -> LiteLLMClient:
|
||||
return LiteLLMClient(
|
||||
"http://litellm.test/v1",
|
||||
"sk-test",
|
||||
transport=httpx.MockTransport(handler),
|
||||
)
|
||||
|
||||
|
||||
def completion(message: dict) -> httpx.Response:
|
||||
return httpx.Response(
|
||||
200, json={"model": "gpt-test-1", "choices": [{"message": message}]}
|
||||
)
|
||||
|
||||
|
||||
def test_request_shape_and_auth() -> None:
|
||||
seen: dict = {}
|
||||
|
||||
def handler(request: httpx.Request) -> httpx.Response:
|
||||
seen["url"] = str(request.url)
|
||||
seen["auth"] = request.headers.get("authorization")
|
||||
seen["body"] = json.loads(request.content)
|
||||
return completion({"content": "hello"})
|
||||
|
||||
make_client(handler).complete(EVENTS, tools=None, model="local/qwen", system="s")
|
||||
assert seen["url"] == "http://litellm.test/v1/chat/completions"
|
||||
assert seen["auth"] == "Bearer sk-test"
|
||||
assert seen["body"]["model"] == "local/qwen"
|
||||
assert seen["body"]["messages"][0] == {"role": "system", "content": "s"}
|
||||
assert seen["body"]["messages"][1] == {"role": "user", "content": "hi"}
|
||||
|
||||
|
||||
def test_assistant_text_parsed_with_producing_model() -> None:
|
||||
client = make_client(lambda request: completion({"content": "hello"}))
|
||||
[event] = client.complete(EVENTS, tools=None, model="local/qwen")
|
||||
assert event == AssistantText(text="hello", model="gpt-test-1")
|
||||
|
||||
|
||||
def test_tool_calls_get_locally_minted_canonical_ids() -> None:
|
||||
message = {
|
||||
"content": None,
|
||||
"tool_calls": [
|
||||
{
|
||||
"id": "call_provider_abc",
|
||||
"type": "function",
|
||||
"function": {
|
||||
"name": "run_tests",
|
||||
"arguments": '{"path": "tests/"}',
|
||||
},
|
||||
}
|
||||
],
|
||||
}
|
||||
client = make_client(lambda request: completion(message))
|
||||
[event] = client.complete(EVENTS, tools=None, model="local/qwen")
|
||||
assert isinstance(event, ToolCall)
|
||||
assert event.tool == "run_tests"
|
||||
assert event.arguments == {"path": "tests/"}
|
||||
assert event.call_id != "call_provider_abc" # provider ID never a join key
|
||||
assert event.call_id.startswith("call-")
|
||||
|
||||
|
||||
def test_http_error_status_raises_llm_error() -> None:
|
||||
client = make_client(lambda request: httpx.Response(429, text="rate limited"))
|
||||
with pytest.raises(LLMError, match="429"):
|
||||
client.complete(EVENTS, tools=None, model="local/qwen")
|
||||
|
||||
|
||||
def test_connection_failure_raises_llm_error() -> None:
|
||||
def handler(request: httpx.Request) -> httpx.Response:
|
||||
raise httpx.ConnectError("refused")
|
||||
|
||||
with pytest.raises(LLMError, match="request failed"):
|
||||
make_client(handler).complete(EVENTS, tools=None, model="local/qwen")
|
||||
|
||||
|
||||
def test_malformed_response_raises_llm_error() -> None:
|
||||
client = make_client(lambda request: httpx.Response(200, json={"oops": True}))
|
||||
with pytest.raises(LLMError, match="malformed"):
|
||||
client.complete(EVENTS, tools=None, model="local/qwen")
|
||||
|
||||
|
||||
ROLE_ENV = {
|
||||
"NISSE_ROLE_EXECUTOR": "local/qwen",
|
||||
"NISSE_ROLE_PLANNER": "anthropic/claude-opus-5",
|
||||
"NISSE_ROLE_DELEGATE": "anthropic/claude-opus-5",
|
||||
"NISSE_ROLE_CONSULTANT": "anthropic/claude-opus-5",
|
||||
}
|
||||
|
||||
|
||||
def test_role_map_resolves_and_pins() -> None:
|
||||
roles = RoleMap.from_env(ROLE_ENV)
|
||||
assert roles.resolve("executor") == "local/qwen"
|
||||
assert roles.pinned() == {
|
||||
"executor": "local/qwen",
|
||||
"planner": "anthropic/claude-opus-5",
|
||||
"delegate": "anthropic/claude-opus-5",
|
||||
"consultant": "anthropic/claude-opus-5",
|
||||
}
|
||||
|
||||
|
||||
def test_role_map_missing_env_raises() -> None:
|
||||
with pytest.raises(LLMError, match="NISSE_ROLE_PLANNER"):
|
||||
RoleMap.from_env({"NISSE_ROLE_EXECUTOR": "local/qwen"})
|
||||
|
||||
|
||||
def test_unknown_role_raises() -> None:
|
||||
with pytest.raises(LLMError, match="unknown role"):
|
||||
RoleMap.from_env(ROLE_ENV).resolve("boss")
|
||||
|
||||
|
||||
def test_client_from_env_requires_config() -> None:
|
||||
with pytest.raises(LLMError, match="NISSE_LLM_BASE_URL"):
|
||||
LiteLLMClient.from_env({})
|
||||
|
||||
|
||||
def test_load_env_file(tmp_path: Path) -> None:
|
||||
envfile = tmp_path / ".env"
|
||||
envfile.write_text(
|
||||
"# comment\n\nNISSE_LLM_TOKEN=sk-abc\nNISSE_LLM_BASE_URL = http://x \n"
|
||||
)
|
||||
env: dict[str, str] = {"NISSE_LLM_TOKEN": "sk-already-set"}
|
||||
load_env_file(envfile, env)
|
||||
assert env["NISSE_LLM_TOKEN"] == "sk-already-set" # real env wins
|
||||
assert env["NISSE_LLM_BASE_URL"] == "http://x"
|
||||
|
||||
|
||||
def test_load_env_file_missing_is_noop(tmp_path: Path) -> None:
|
||||
env: dict[str, str] = {}
|
||||
load_env_file(tmp_path / "nope.env", env)
|
||||
assert env == {}
|
||||
Reference in new issue
Block a user