test(streaming): cover chat/search/memory paths (v1.7.3)
This commit is contained in:
2
app.py
2
app.py
@@ -56,7 +56,7 @@ syslog_handler.setFormatter(
|
|||||||
log.addHandler(syslog_handler)
|
log.addHandler(syslog_handler)
|
||||||
|
|
||||||
# --- Configuration ---
|
# --- Configuration ---
|
||||||
VERSION = "1.7.2"
|
VERSION = "1.7.3"
|
||||||
OLLAMA_BASE = "http://localhost:11434"
|
OLLAMA_BASE = "http://localhost:11434"
|
||||||
SEARXNG_BASE = "http://localhost:8888"
|
SEARXNG_BASE = "http://localhost:8888"
|
||||||
BASE_DIR = Path(__file__).parent
|
BASE_DIR = Path(__file__).parent
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ Total identified items: 26
|
|||||||
5. [P1][DONE] Restrict settings updates to an allowlist of valid keys.
|
5. [P1][DONE] Restrict settings updates to an allowlist of valid keys.
|
||||||
6. [P1] Add pagination + hard caps on list endpoints (memories, conversations, message history).
|
6. [P1] Add pagination + hard caps on list endpoints (memories, conversations, message history).
|
||||||
7. [P1][DONE] Stop returning raw exception text to clients; use safe error envelopes.
|
7. [P1][DONE] Stop returning raw exception text to clients; use safe error envelopes.
|
||||||
8. [P1] Add automated tests for chat streaming, auto-search trigger, and memory command paths.
|
8. [P1][DONE] Add automated tests for chat streaming, auto-search trigger, and memory command paths.
|
||||||
9. [P2] Implement skills/tool-call framework (MCP-style) with per-skill enable controls.
|
9. [P2] Implement skills/tool-call framework (MCP-style) with per-skill enable controls.
|
||||||
10. [P2] Implement heartbeat/check-in pipeline with scheduler + summary endpoint.
|
10. [P2] Implement heartbeat/check-in pipeline with scheduler + summary endpoint.
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# ⚡ JarvisChat v1.7.2
|
# ⚡ JarvisChat v1.7.3
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
@@ -65,7 +65,7 @@ Top 10 (brief):
|
|||||||
5. P1 [DONE]: Restrict `/api/settings` updates to allowlisted keys
|
5. P1 [DONE]: Restrict `/api/settings` updates to allowlisted keys
|
||||||
6. P1: Add pagination + hard caps for list APIs
|
6. P1: Add pagination + hard caps for list APIs
|
||||||
7. P1 [DONE]: Replace raw exception leakage with safe client errors
|
7. P1 [DONE]: Replace raw exception leakage with safe client errors
|
||||||
8. P1: Add automated tests for streaming/search/memory paths
|
8. P1 [DONE]: Add automated tests for streaming/search/memory paths
|
||||||
9. P2: Implement MCP-style skills/tool-call framework
|
9. P2: Implement MCP-style skills/tool-call framework
|
||||||
10. P2: Implement heartbeat/check-in scheduler + summary endpoint
|
10. P2: Implement heartbeat/check-in scheduler + summary endpoint
|
||||||
|
|
||||||
|
|||||||
188
tests/test_chat_streaming_and_memory_paths.py
Normal file
188
tests/test_chat_streaming_and_memory_paths.py
Normal file
@@ -0,0 +1,188 @@
|
|||||||
|
import json
|
||||||
|
import os
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
from fastapi.testclient import TestClient
|
||||||
|
|
||||||
|
import app as app_module
|
||||||
|
|
||||||
|
|
||||||
|
def make_client(tmp_path: Path) -> TestClient:
|
||||||
|
os.environ["JARVISCHAT_ADMIN_PIN"] = "1234"
|
||||||
|
app_module.DB_PATH = tmp_path / "jarvischat-streaming.db"
|
||||||
|
app_module.SESSIONS.clear()
|
||||||
|
app_module.PIN_ATTEMPTS.clear()
|
||||||
|
app_module.RATE_EVENTS.clear()
|
||||||
|
app_module.init_db()
|
||||||
|
return TestClient(app_module.app, raise_server_exceptions=False)
|
||||||
|
|
||||||
|
|
||||||
|
def parse_sse_payloads(body: str) -> list[dict]:
|
||||||
|
payloads: list[dict] = []
|
||||||
|
for chunk in body.split("\n\n"):
|
||||||
|
chunk = chunk.strip()
|
||||||
|
if not chunk.startswith("data: "):
|
||||||
|
continue
|
||||||
|
raw = chunk[len("data: ") :]
|
||||||
|
payloads.append(json.loads(raw))
|
||||||
|
return payloads
|
||||||
|
|
||||||
|
|
||||||
|
class _MockStreamResponse:
|
||||||
|
def __init__(self, lines: list[str]):
|
||||||
|
self._lines = lines
|
||||||
|
|
||||||
|
async def __aenter__(self):
|
||||||
|
return self
|
||||||
|
|
||||||
|
async def __aexit__(self, exc_type, exc, tb):
|
||||||
|
return False
|
||||||
|
|
||||||
|
async def aiter_lines(self):
|
||||||
|
for line in self._lines:
|
||||||
|
yield line
|
||||||
|
|
||||||
|
|
||||||
|
def _stream_json_lines(events: list[dict]) -> list[str]:
|
||||||
|
return [json.dumps(event) for event in events]
|
||||||
|
|
||||||
|
|
||||||
|
def test_chat_stream_emits_tokens_and_done(tmp_path: Path, monkeypatch):
|
||||||
|
with make_client(tmp_path) as client:
|
||||||
|
sid = client.post("/api/auth/guest", headers={"Origin": "http://testserver"}).json()[
|
||||||
|
"session_id"
|
||||||
|
]
|
||||||
|
headers = {"X-Session-ID": sid, "Origin": "http://testserver"}
|
||||||
|
|
||||||
|
events = _stream_json_lines(
|
||||||
|
[
|
||||||
|
{"message": {"content": "Hel"}, "logprobs": [{"logprob": -0.01}]},
|
||||||
|
{"message": {"content": "lo"}, "logprobs": [{"logprob": -0.01}]},
|
||||||
|
{"done": True, "eval_count": 2, "eval_duration": 1000000000},
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
def stream_stub(self, method, url, json=None, timeout=None):
|
||||||
|
return _MockStreamResponse(events)
|
||||||
|
|
||||||
|
monkeypatch.setattr(app_module.httpx.AsyncClient, "stream", stream_stub)
|
||||||
|
|
||||||
|
resp = client.post(
|
||||||
|
"/api/chat",
|
||||||
|
json={"message": "hello", "model": app_module.DEFAULT_MODEL},
|
||||||
|
headers=headers,
|
||||||
|
)
|
||||||
|
assert resp.status_code == 200
|
||||||
|
payloads = parse_sse_payloads(resp.text)
|
||||||
|
|
||||||
|
token_text = "".join(p.get("token", "") for p in payloads if "token" in p)
|
||||||
|
assert token_text == "Hello"
|
||||||
|
done_events = [p for p in payloads if p.get("done")]
|
||||||
|
assert done_events
|
||||||
|
assert "searched" not in done_events[-1]
|
||||||
|
|
||||||
|
|
||||||
|
def test_chat_auto_search_trigger_emits_search_events(tmp_path: Path, monkeypatch):
|
||||||
|
with make_client(tmp_path) as client:
|
||||||
|
sid = client.post("/api/auth/guest", headers={"Origin": "http://testserver"}).json()[
|
||||||
|
"session_id"
|
||||||
|
]
|
||||||
|
headers = {"X-Session-ID": sid, "Origin": "http://testserver"}
|
||||||
|
|
||||||
|
first_stream = _stream_json_lines(
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"message": {"content": "I am uncertain."},
|
||||||
|
"logprobs": [{"logprob": -5.0}],
|
||||||
|
},
|
||||||
|
{"done": True, "eval_count": 2, "eval_duration": 1000000000},
|
||||||
|
]
|
||||||
|
)
|
||||||
|
second_stream = _stream_json_lines(
|
||||||
|
[
|
||||||
|
{"message": {"content": "Based on current data: 42."}},
|
||||||
|
{"done": True},
|
||||||
|
]
|
||||||
|
)
|
||||||
|
stream_batches = [first_stream, second_stream]
|
||||||
|
|
||||||
|
def stream_stub(self, method, url, json=None, timeout=None):
|
||||||
|
return _MockStreamResponse(stream_batches.pop(0))
|
||||||
|
|
||||||
|
async def search_stub(query: str, max_results: int = 5):
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
"title": "Answer",
|
||||||
|
"url": "https://example.com",
|
||||||
|
"content": "The value is 42.",
|
||||||
|
}
|
||||||
|
]
|
||||||
|
|
||||||
|
monkeypatch.setattr(app_module.httpx.AsyncClient, "stream", stream_stub)
|
||||||
|
monkeypatch.setattr(app_module, "query_searxng", search_stub)
|
||||||
|
|
||||||
|
resp = client.post(
|
||||||
|
"/api/chat",
|
||||||
|
json={"message": "what is the latest value", "model": app_module.DEFAULT_MODEL},
|
||||||
|
headers=headers,
|
||||||
|
)
|
||||||
|
assert resp.status_code == 200
|
||||||
|
payloads = parse_sse_payloads(resp.text)
|
||||||
|
|
||||||
|
assert any(p.get("searching") is True for p in payloads)
|
||||||
|
assert any("search_results" in p for p in payloads)
|
||||||
|
assert any(p.get("augmented") is True for p in payloads)
|
||||||
|
done_events = [p for p in payloads if p.get("done")]
|
||||||
|
assert done_events and done_events[-1].get("searched") is True
|
||||||
|
|
||||||
|
|
||||||
|
def test_memory_command_paths_remember_and_forget(tmp_path: Path, monkeypatch):
|
||||||
|
with make_client(tmp_path) as client:
|
||||||
|
sid = client.post("/api/auth/guest", headers={"Origin": "http://testserver"}).json()[
|
||||||
|
"session_id"
|
||||||
|
]
|
||||||
|
headers = {"X-Session-ID": sid, "Origin": "http://testserver"}
|
||||||
|
|
||||||
|
base_stream = _stream_json_lines(
|
||||||
|
[
|
||||||
|
{"message": {"content": "ok"}, "logprobs": [{"logprob": -0.01}]},
|
||||||
|
{"done": True, "eval_count": 1, "eval_duration": 1000000000},
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
def stream_stub(self, method, url, json=None, timeout=None):
|
||||||
|
return _MockStreamResponse(base_stream)
|
||||||
|
|
||||||
|
monkeypatch.setattr(app_module.httpx.AsyncClient, "stream", stream_stub)
|
||||||
|
|
||||||
|
remember_resp = client.post(
|
||||||
|
"/api/chat",
|
||||||
|
json={
|
||||||
|
"message": "remember that my favorite language is rust",
|
||||||
|
"model": app_module.DEFAULT_MODEL,
|
||||||
|
},
|
||||||
|
headers=headers,
|
||||||
|
)
|
||||||
|
assert remember_resp.status_code == 200
|
||||||
|
remember_events = parse_sse_payloads(remember_resp.text)
|
||||||
|
assert any("Remembered" in p.get("token", "") for p in remember_events)
|
||||||
|
|
||||||
|
memories_after_add = client.get("/api/memories", headers={"X-Session-ID": sid})
|
||||||
|
assert memories_after_add.status_code == 200
|
||||||
|
assert memories_after_add.json().get("count", 0) >= 1
|
||||||
|
|
||||||
|
forget_resp = client.post(
|
||||||
|
"/api/chat",
|
||||||
|
json={
|
||||||
|
"message": "forget about my favorite language",
|
||||||
|
"model": app_module.DEFAULT_MODEL,
|
||||||
|
},
|
||||||
|
headers=headers,
|
||||||
|
)
|
||||||
|
assert forget_resp.status_code == 200
|
||||||
|
forget_events = parse_sse_payloads(forget_resp.text)
|
||||||
|
assert any("Forgot" in p.get("token", "") for p in forget_events)
|
||||||
|
|
||||||
|
memories_after_forget = client.get("/api/memories", headers={"X-Session-ID": sid})
|
||||||
|
assert memories_after_forget.status_code == 200
|
||||||
|
assert memories_after_forget.json().get("count", 0) == 0
|
||||||
Reference in New Issue
Block a user