mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-07-08 11:56:59 +00:00
Tanmay Garg
7f43678a24
When an LLM generates a valid JSON string that parses to a native non-dict
type (like a list, int, or string), _parse_tool_args previously returned
that object. Callers expecting a dictionary would then crash with
AttributeError or KeyError when attempting to look up action keys.
- Update _parse_tool_args in src/tool_utils.py to explicitly type-check
the parsed JSON object and return {} for non-dict objects.
- Add test coverage in tests/test_admin_tools_registry.py for lists,
ints, and strings.
80 lines
2.9 KiB
Python
80 lines
2.9 KiB
Python
"""Registry wiring for the config/integration admin tools (#3629).
|
|
|
|
manage_endpoints/mcp/webhooks/tokens/settings moved from tool_implementations
|
|
into agent_tools.admin_tools. These pin the registration + the single
|
|
owner-threading adapter factory, without touching the DB (the do_* impls
|
|
themselves are exercised by their own suites).
|
|
"""
|
|
import asyncio
|
|
|
|
from src.agent_tools import TOOL_HANDLERS
|
|
from src.agent_tools.admin_tools import (
|
|
ADMIN_TOOL_HANDLERS, _owner_adapter,
|
|
do_manage_endpoints, do_manage_mcp, do_manage_webhooks,
|
|
do_manage_tokens, do_manage_settings,
|
|
)
|
|
|
|
_NAMES = ["manage_endpoints", "manage_mcp", "manage_webhooks", "manage_tokens", "manage_settings"]
|
|
|
|
|
|
def test_all_registered_in_tool_handlers():
|
|
for n in _NAMES:
|
|
assert n in TOOL_HANDLERS, f"{n} missing from TOOL_HANDLERS"
|
|
assert n in ADMIN_TOOL_HANDLERS
|
|
|
|
|
|
def test_re_exported_from_agent_tools():
|
|
# Back-compat: importers that used `from src.agent_tools import do_manage_*`
|
|
# keep working after the move.
|
|
from src.agent_tools import ( # noqa: F401
|
|
do_manage_endpoints, do_manage_mcp, do_manage_webhooks,
|
|
do_manage_tokens, do_manage_settings,
|
|
)
|
|
|
|
|
|
def test_owner_adapter_threads_owner_from_ctx():
|
|
seen = {}
|
|
|
|
async def _spy(content, owner):
|
|
seen["content"] = content
|
|
seen["owner"] = owner
|
|
return {"response": "ok", "exit_code": 0}
|
|
|
|
handler = _owner_adapter(_spy)
|
|
res = asyncio.run(handler('{"action":"list"}', {"owner": "alice", "session_id": "s1"}))
|
|
assert res["exit_code"] == 0
|
|
assert seen == {"content": '{"action":"list"}', "owner": "alice"}
|
|
|
|
|
|
def test_owner_adapter_defaults_owner_to_none():
|
|
captured = {}
|
|
|
|
async def _spy(content, owner):
|
|
captured["owner"] = owner
|
|
return {"exit_code": 0}
|
|
|
|
asyncio.run(_owner_adapter(_spy)("{}", {})) # ctx without owner
|
|
assert captured["owner"] is None
|
|
|
|
|
|
def test_parse_tool_args_lives_in_tool_utils_single_source():
|
|
# The helper was de-duplicated into tool_utils; every consumer imports it
|
|
# from there rather than carrying its own copy. After the tool_implementations
|
|
# split, _common and the facade must also re-export the same object.
|
|
from src.tool_utils import _parse_tool_args
|
|
from src.agent_tools import admin_tools, document_tools
|
|
from src.tools import _common
|
|
import src.tool_implementations as ti
|
|
assert admin_tools._parse_tool_args is _parse_tool_args
|
|
assert document_tools._parse_tool_args is _parse_tool_args
|
|
assert _common._parse_tool_args is _parse_tool_args
|
|
assert ti._parse_tool_args is _parse_tool_args
|
|
assert _parse_tool_args('{"action":"add"}') == {"action": "add"}
|
|
# body-envelope unwrap still works
|
|
assert _parse_tool_args('{"body":{"action":"x"}}') == {"action": "x"}
|
|
|
|
# non-dict JSON values should return {}
|
|
assert _parse_tool_args('[1, 2]') == {}
|
|
assert _parse_tool_args('42') == {}
|
|
assert _parse_tool_args('"hello"') == {}
|