mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-06-16 01:35:36 -04:00
Mateus Oliveira
f7ae85590b
* refactor(tools): consolidate duplicated _truncate and get_mcp_manager into src/tool_utils
Move all copies of _truncate(), get_mcp_manager(), and set_mcp_manager()
into a single leaf module (src/tool_utils.py) that imports only from
src.constants. This eliminates the lazy-import hack
('from src import agent_tools' inside function bodies) in tool_execution.py
and tool_implementations.py, and fixes a latent bug: the _truncate copy in
tool_execution.py was missing the isinstance guard and would crash on None.
Also deletes mcp_servers/_common.py — it was dead code with zero callers
anywhere in the codebase, containing its own copy of truncate() and
constants that already exist in src/constants.py.
* fix(tools): route remaining get_mcp_manager imports to src.tool_utils
The maintainer's feedback flagged src/task_scheduler.py:1857 and
routes/task_routes.py:977. A project-wide search found a third call site
in src/agent_loop.py that also imported get_mcp_manager from
src.agent_tools instead of src.tool_utils.
All three are now sourced from the canonical location in src.tool_utils.
---------
Co-authored-by: mcnoliveira <mcnoliveira@gmail.com>
40 lines
1.4 KiB
Python
40 lines
1.4 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.
|
|
"""
|
|
|
|
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
|