mirror of
https://github.com/hansjone/oclaw.git
synced 2026-10-09 04:40:45 +08:00
oliver
420abac9f1
- Rename platform/ to svc/ to avoid shadowing stdlib platform. - Replace from oclaw.* with from svc/runtime/interfaces; update -m CLI paths. - tests/conftest: prepend repo root to sys.path (no parent-folder package name). - CI: paths and offline_eval script under repo root. - Ops scripts: PYTHONPATH must be repo root for python -m runtime.* (fixes gateway/WhatsApp sidecar startup). - Fix default oclaw.json path in tabular/file attachment limits; stabilize attachment test config. Co-authored-by: Cursor <cursoragent@cursor.com>
120 lines
4 KiB
Python
120 lines
4 KiB
Python
from __future__ import annotations
|
|
|
|
import json
|
|
from pathlib import Path
|
|
|
|
from runtime.direct_loop import _OCLAW_TOOL_RESULT_HARD_CAP_CHARS, _build_model_context
|
|
from svc.llm.chat_models import RuleBasedChatModel
|
|
from svc.persistence.sqlite_store import SqliteStore
|
|
|
|
|
|
def test_oclaw_tool_result_context_guard_truncates_large_tool_message(tmp_path: Path) -> None:
|
|
store = SqliteStore(str(tmp_path / "ops.sqlite"))
|
|
sess = store.create_session("t")
|
|
# Ensure the tool message is not a dangling orphan (some providers require pairing).
|
|
store.add_message(
|
|
session_id=sess.id,
|
|
role="assistant",
|
|
content="",
|
|
tool_calls=[{"id": "c1", "name": "echo", "arguments": {"x": 1}}],
|
|
)
|
|
huge = "X" * (_OCLAW_TOOL_RESULT_HARD_CAP_CHARS + 5000)
|
|
store.add_message(
|
|
session_id=sess.id,
|
|
role="tool",
|
|
content='{"ok": true, "blob": "' + huge + '"}',
|
|
tool_calls={"tool_call_id": "c1", "name": "echo", "assistant_message_id": 1},
|
|
)
|
|
msgs = _build_model_context(
|
|
store=store,
|
|
session_id=sess.id,
|
|
max_messages=50,
|
|
system_prompt="sys",
|
|
model=RuleBasedChatModel(),
|
|
lang="zh",
|
|
memory_context=None,
|
|
trace_id="t1",
|
|
parent_span_id=None,
|
|
)
|
|
tool_msgs = [m for m in msgs if m.get("role") == "tool"]
|
|
assert tool_msgs, msgs
|
|
guarded = str(tool_msgs[-1].get("content") or "")
|
|
assert len(guarded) <= _OCLAW_TOOL_RESULT_HARD_CAP_CHARS + 2000
|
|
assert "_tool_result_guarded" in guarded
|
|
|
|
|
|
def test_oclaw_tool_result_context_guard_skips_active_turn_tool_messages(tmp_path: Path) -> None:
|
|
store = SqliteStore(str(tmp_path / "ops.sqlite"))
|
|
sess = store.create_session("t")
|
|
turn_uuid = "turn-active-1"
|
|
store.add_message(
|
|
session_id=sess.id,
|
|
role="assistant",
|
|
content="",
|
|
tool_calls=[{"id": "c1", "name": "echo", "arguments": {"x": 1}}],
|
|
turn_uuid=turn_uuid,
|
|
)
|
|
huge = "X" * (_OCLAW_TOOL_RESULT_HARD_CAP_CHARS + 5000)
|
|
store.add_message(
|
|
session_id=sess.id,
|
|
role="tool",
|
|
content='{"ok": true, "blob": "' + huge + '"}',
|
|
tool_calls={"tool_call_id": "c1", "name": "echo", "assistant_message_id": 1},
|
|
turn_uuid=turn_uuid,
|
|
)
|
|
msgs = _build_model_context(
|
|
store=store,
|
|
session_id=sess.id,
|
|
max_messages=50,
|
|
system_prompt="sys",
|
|
model=RuleBasedChatModel(),
|
|
lang="zh",
|
|
memory_context=None,
|
|
trace_id="t1",
|
|
parent_span_id=None,
|
|
active_turn_uuid=turn_uuid,
|
|
)
|
|
tool_msgs = [m for m in msgs if m.get("role") == "tool"]
|
|
assert tool_msgs, msgs
|
|
raw = str(tool_msgs[-1].get("content") or "")
|
|
assert "_tool_result_guarded" not in raw
|
|
|
|
|
|
def test_guard_redacts_mcp_nested_image_for_non_active_turn(tmp_path: Path) -> None:
|
|
store = SqliteStore(str(tmp_path / "ops.sqlite"))
|
|
sess = store.create_session("t")
|
|
past_turn = "turn-old"
|
|
blob = "/9j/" + "a" * 1200
|
|
body = {"ok": True, "result": {"content": [{"type": "image", "mime": "image/jpeg", "data": blob}]}}
|
|
store.add_message(
|
|
session_id=sess.id,
|
|
role="assistant",
|
|
content="",
|
|
tool_calls=[{"id": "c_hist", "name": "mcp", "arguments": {}}],
|
|
turn_uuid=past_turn,
|
|
)
|
|
store.add_message(
|
|
session_id=sess.id,
|
|
role="tool",
|
|
content=json.dumps(body, ensure_ascii=False),
|
|
tool_calls={"tool_call_id": "c_hist", "name": "mcp", "assistant_message_id": 1},
|
|
turn_uuid=past_turn,
|
|
)
|
|
msgs = _build_model_context(
|
|
store=store,
|
|
session_id=sess.id,
|
|
max_messages=50,
|
|
system_prompt="sys",
|
|
model=RuleBasedChatModel(),
|
|
lang="zh",
|
|
memory_context=None,
|
|
trace_id="t1",
|
|
parent_span_id=None,
|
|
active_turn_uuid="different-active-turn",
|
|
)
|
|
tm = next(m for m in msgs if m.get("role") == "tool")
|
|
inner = json.loads(str(tm.get("content") or ""))
|
|
block = inner["result"]["content"][0]
|
|
assert block.get("_image_payload_redacted") is True
|
|
assert "data" not in block
|
|
|