mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-06-18 02:35:23 -04:00
Kenny Van de Maele
56ba144875
Moves chat_with_model, ask_teacher and list_models out of ai_interaction.py into src/agent_tools/model_interaction_tools.py (the do_ prefix dropped) and registers them in TOOL_HANDLERS, so dispatch flows through the registry instead of the dispatch_ai_tool elif in tool_execution.py. The implementations are relocated, not wrapped. ai_interaction.py keeps only the shared helpers they reuse (_resolve_model, AI_CHAT_TIMEOUT), still used by the not-yet-migrated session/pipeline tools. dispatch_ai_tool loses its three now-unused branches. Also removes the dead do_second_opinion: it was already off the live tool surface (no tag/schema/parsing/dispatch; tool_index.py notes it was removed), so the function and its stale frontend catalog entries (admin.js, assistant.js) are deleted. Tests: owner-scope test points at the new list_models location and drops the moved tools from the dispatch_ai_tool parametrize; a new test_model_interaction_registry covers registration, owner threading, and registry dispatch.
64 lines
2.2 KiB
Python
64 lines
2.2 KiB
Python
import inspect
|
|
|
|
import pytest
|
|
|
|
from src import ai_interaction
|
|
from src.agent_tools import model_interaction_tools
|
|
|
|
|
|
def _source(fn) -> str:
|
|
return inspect.getsource(fn)
|
|
|
|
|
|
def test_model_resolver_applies_owner_filter():
|
|
body = _source(ai_interaction._resolve_model)
|
|
|
|
assert "owner: Optional[str] = None" in body
|
|
assert "from src.auth_helpers import owner_filter" in body
|
|
assert "owner_filter(query, ModelEndpoint, owner)" in body
|
|
|
|
|
|
def test_model_listing_and_image_fallback_are_owner_scoped():
|
|
# list_models moved to agent_tools.model_interaction_tools (#3629).
|
|
list_body = _source(model_interaction_tools.list_models)
|
|
image_body = _source(ai_interaction.do_generate_image)
|
|
|
|
assert "owner: Optional[str] = None" in list_body
|
|
assert "owner_filter(query, ModelEndpoint, owner)" in list_body
|
|
assert "_resolve_model(candidate, owner=owner)" in image_body
|
|
assert "owner_filter(_img_q, ModelEndpoint, owner)" in image_body
|
|
assert "_resolve_model(model_spec, owner=owner)" in image_body
|
|
|
|
|
|
# chat_with_model, list_models and ask_teacher moved to the registry (#3629)
|
|
# and no longer route through dispatch_ai_tool; their owner threading is covered
|
|
# by tests/test_model_interaction_registry.py. The remaining model-ish tools
|
|
# still dispatched here:
|
|
@pytest.mark.parametrize("tool,content", [
|
|
("pipeline", "gpt-test | summarize this"),
|
|
("ui_control", "switch_model gpt-test"),
|
|
])
|
|
async def test_dispatch_passes_owner_to_model_tools(monkeypatch, tool, content):
|
|
seen = {}
|
|
|
|
async def capture(name, content, session_id=None, owner=None):
|
|
seen[name] = {"content": content, "session_id": session_id, "owner": owner}
|
|
return {"ok": True}
|
|
|
|
monkeypatch.setattr(
|
|
ai_interaction,
|
|
"do_pipeline",
|
|
lambda content, session_id=None, owner=None: capture("pipeline", content, session_id, owner),
|
|
)
|
|
monkeypatch.setattr(
|
|
ai_interaction,
|
|
"do_ui_control",
|
|
lambda content, session_id=None, owner=None: capture("ui_control", content, session_id, owner),
|
|
)
|
|
|
|
_desc, result = await ai_interaction.dispatch_ai_tool(tool, content, session_id="sid1", owner="alice")
|
|
|
|
assert result == {"ok": True}
|
|
assert seen[tool]["owner"] == "alice"
|
|
assert seen[tool]["session_id"] == "sid1"
|