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.
77 lines
2.7 KiB
Python
77 lines
2.7 KiB
Python
"""
|
|
This module intentionally imports NOTHING from the project (except
|
|
src.constants which imports nothing from src). Adding a project import here
|
|
will reintroduce the circular dependency that this module exists to break.
|
|
"""
|
|
|
|
import json
|
|
|
|
from src.constants import MAX_OUTPUT_CHARS
|
|
|
|
_mcp_manager = None
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# MCP Manager singleton
|
|
# ---------------------------------------------------------------------------
|
|
|
|
def set_mcp_manager(manager):
|
|
"""Set the global MCP manager instance."""
|
|
global _mcp_manager
|
|
_mcp_manager = manager
|
|
|
|
def get_mcp_manager():
|
|
"""Get the global MCP manager instance."""
|
|
return _mcp_manager
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Helpers
|
|
# ---------------------------------------------------------------------------
|
|
def _truncate(text: str, limit: int = MAX_OUTPUT_CHARS) -> str:
|
|
"""
|
|
Truncate text to *limit* characters with a suffix note.
|
|
|
|
Callers treat the result as text, so always return a string: coerce a
|
|
non-string (None -> "", otherwise str(...)) instead of returning it raw,
|
|
which would just move the crash downstream.
|
|
"""
|
|
if not isinstance(text, str):
|
|
text = "" if text is None else str(text)
|
|
if len(text) > limit:
|
|
return text[:limit] + f"\n... (truncated, {len(text)} chars total)"
|
|
return text
|
|
|
|
|
|
def _parse_tool_args(content):
|
|
"""Parse a tool-call argument blob.
|
|
|
|
Accepts either a JSON string or an already-decoded dict. Unwraps the
|
|
common `{"body": {...}}` envelope that smaller models emit when they
|
|
read tool descriptions like "Body is JSON: {...}" literally and
|
|
pass `body` as a field name rather than treating it as a noun.
|
|
|
|
Returns a dict on success, raises ValueError on bad JSON.
|
|
"""
|
|
if isinstance(content, str):
|
|
try:
|
|
args = json.loads(content) if content.strip() else {}
|
|
if not isinstance(args, dict):
|
|
args = {}
|
|
except (json.JSONDecodeError, TypeError) as e:
|
|
raise ValueError(str(e))
|
|
elif isinstance(content, dict):
|
|
args = content
|
|
else:
|
|
args = {}
|
|
# Unwrap {"body": {...}} envelope, but only if `body` is the sole key
|
|
# and points at a dict. We don't want to clobber a legitimate `body`
|
|
# field on tools where it's a real arg (e.g. send_email body text).
|
|
if (
|
|
isinstance(args, dict)
|
|
and len(args) == 1
|
|
and "body" in args
|
|
and isinstance(args["body"], dict)
|
|
and "action" in args["body"] # extra safety: only unwrap if the inner dict looks like a tool call
|
|
):
|
|
args = args["body"]
|
|
return args
|