mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-06-27 07:05:23 -04:00
fc1351d0f8
* test(tools): add shim protection test for tool_implementations split Covers all 48 top-level functions (33 do_* + 15 _helpers) extracted from the original module. Guards the upcoming split: the shim must re-export every symbol so existing 'from src.tool_implementations import X' imports keep working. Passes on baseline (pre-split). * refactor(tools): add src/tools/ package with shared _common Slice 1 Task 2 (#4082/#4071). Adds the package skeleton and moves the shared _parse_tool_args helper into src/tools/_common.py. Domain modules will import from here. tool_implementations.py is untouched at this step. * refactor(tools): extract system domain into src/tools/system.py Slice 1 (#4082/#4071), Task 3: move the system-domain tool functions (do_manage_skills/_skill_dump/do_manage_tasks/do_manage_endpoints/ do_manage_mcp/do_manage_webhooks/do_manage_tokens/do_manage_settings/ do_api_call/do_app_api) and the app_api blocklist constants out of tool_implementations.py into a new src/tools/system.py module. tool_implementations.py re-imports all of them so it stays a working backward-compatible facade (shim test stays green). - do_manage_mcp resolves get_mcp_manager via a function-local import from tool_implementations so the test that patches src.tool_implementations.get_mcp_manager still applies post-move. - do_app_api imports _internal_headers and _INTERNAL_BASE (still in tool_implementations) function-locally to avoid a circular import. - Repoint test_context_budget introspection assertion to the moved code's new home in src/tools/system.py. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * refactor(tools): extract cookbook domain into src/tools/cookbook.py Moves the model-serving (cookbook) tool domain out of tool_implementations.py into src/tools/cookbook.py as part of slice 1 (#4082/#4071): - 13 do_* tools: download/serve/list/stop/tail/search/adopt/cached models, list downloads/cancel, list cookbook servers, serve presets - 9 private helpers: _cookbook_servers, _resolve_cookbook_host, _cookbook_env_for_host, _infer_serve_{port,host}, _ensure_served_endpoint, _cookbook_register_task, _cookbook_apply_retry_suggestion, _scan_running_model_processes, _cookbook_kill_session - _MODEL_PROCESS_PATTERNS constant (used only by _scan_running_model_processes) tool_implementations.py stays a backward-compatible facade via a re-import from src.tools.cookbook; src/tools/__init__ re-exports the same symbols. _internal_headers and _INTERNAL_BASE stay in tool_implementations.py (shared by system.py's do_app_api and many cookbook funcs). Each cookbook function that needs them does a function-local import to avoid a top-level circular dependency, matching the system-domain split. Verified: compileall clean; shim test green; cookbook-touching suite (652 passed, 1 skipped); full suite 3587 passed, 2 failed (pre-existing test_api_chat_security, unrelated). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * refactor(tools): extract search domain into src/tools/search.py * refactor(tools): extract notes domain into src/tools/notes.py * refactor(tools): extract calendar domain into src/tools/calendar.py Repoints tests/test_caldav_bidirectional_sync.py source-introspection to src/tools/calendar.py (do_manage_calendar moved there). * refactor(tools): extract image domain into src/tools/image.py * refactor(tools): extract research domain into src/tools/research.py * refactor(tools): extract contacts domain into src/tools/contacts.py * refactor(tools): extract vault domain into src/tools/vault.py Repoints tests/test_vault_password_not_in_argv.py source-introspection to src/tools/vault.py (the vault do_* helpers moved there). * refactor(tools): collapse tool_implementations to clean re-export shim Move shared _INTERNAL_BASE/_internal_headers to src/tools/_common.py and drop the duplicate _parse_tool_args (already in _common). tool_implementations.py is now a pure re-export facade (+ 3 pre-existing email-context helpers, out of scope). Domain files' function-local imports of these names still resolve via the facade re-export. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * fix(tools): port upstream cookbook workflow changes to split module Rebase onto dev droppedc504214("Cookbook model workflow fixes") edits to do_serve_model / do_tail_serve_output: the extraction commit moved the pre-edit bodies into src/tools/cookbook.py and git auto-accepted the deletion from tool_implementations.py, losing dev's changes. Restore them in their post-split home: - do_serve_model: add where/log_path/next_tools and the expanded "Next required check" output message - do_tail_serve_output: empty-output fallback message replacing "(empty pane)" (do_manage_settings web_fetch alias edit was already applied to src/tools/system.py during the system-extract conflict resolution.) Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * fix(tools): break admin_tools circular import in split facade After rebasing onto dev (#3629 moved the admin manage_* tools into src/agent_tools/admin_tools), the facade re-exported them via a top-level `from src.agent_tools.admin_tools import ...`. But src.agent_tools.__init__ imports this facade at top level, so the eager import re-entered the partially-initialized agent_tools package and broke collection. Re-export the admin symbols (do_manage_endpoints/mcp/webhooks/tokens/ settings, _MCP_DENIED_COMMANDS, _validate_mcp_command) lazily through module __getattr__ instead, and drop them from src/tools/__init__ (they no longer live in the src.tools package). system.py now holds only the skills/tasks/api bridges; admin tools live solely in admin_tools.py, matching upstream. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * fix(tools): re-export dropped helpers through the split shim Address review finding from #4423: the compatibility facade claimed to preserve every original top-level symbol but omitted three helpers the old src.tool_implementations exposed. Re-export them and pin them in the shim protection test: - _string_arg, _validate_cookbook_ssh_target <- src/tools/cookbook.py - _mcp_allowed_commands <- src/agent_tools/admin_tools.py (lazily via __getattr__, to keep the agent_tools.__init__ <-> facade import acyclic after the #3629 admin-tools migration) All three added to tests/test_tool_implementations_shim.py _EXPECTED so the test contract now matches its "every original top-level function" comment. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * test(tools): self-verify shim re-exports every domain do_* The hand-maintained _EXPECTED list in the shim protection test can drift silently when a new tool is added to a domain module but not re-exported by the facade — exactly the omission a reviewer flagged post-split. Add an auto-discovering test that enumerates every do_* from the domain modules (incl. admin_tools) and asserts reachability through the shim, so a forgotten re-export fails the build automatically. Uses hasattr (not dir(ti)) because the admin symbols are re-exported lazily via module __getattr__ and don't appear in dir(ti). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * test(tools): self-verify every in-repo facade import resolves RaresKeY's P3 on the shim test was a claim-vs-reality gap: the docstring said it protected "every from src.tool_implementations import X" but the hand-maintained _EXPECTED list omitted three underscore helpers, so the claim wasn't enforced. Re-exporting the three (cf1f5e3) fixed the known gap; this closes the structural one. Add test_every_facade_import_in_repo_resolves: ast-enumerate every `from src.tool_implementations import X` site in src/ and tests/ and assert hasattr(ti, X) for each. A forgotten re-export that anything in the repo imports now fails the build automatically — including underscore helpers, which the do_* discovery test does not cover. Together with test_shim_reexports_every_domain_do_function, the shim contract is now self-verifying. Demote _EXPECTED in the docstring to the curated historical/downstream surface (the three helpers have no in-repo consumer, so they stay manual by necessity) instead of "ground truth". Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * fix(tools): dedupe _parse_tool_args + align shim guard with route consumers Addresses two P3s from review (RaresKeY, 2026-06-26): 1. maintainability — _common carried a full copy of _parse_tool_args alongside the canonical src.tool_utils one; future parser fixes could diverge. The two bodies were byte-identical in logic, so _common now re-exports from tool_utils (a leaf module, no circular-import risk). The single-source test is extended to assert _common._parse_tool_args and tool_implementations._parse_tool_args are the same object as tool_utils._parse_tool_args. 2. test — the shim guard's import-site scan only walked src/ and tests/, missing routes/chat_routes.py's clear_active_email/set_active_email imports, and _EXPECTED omitted the active-email facade helpers. The scan now walks every first-party Python dir (pruning venvs/caches/data in-place), and set/get/clear_active_email are added to _EXPECTED (get_active_email has no in-repo importer, so the scan alone can't see it). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> --------- Co-authored-by: yuandonghao <yuandonghao@cohl.com> Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
166 lines
7.4 KiB
Python
166 lines
7.4 KiB
Python
"""Protection test: the tool_implementations compatibility shim must keep
|
|
re-exporting every symbol importers depend on.
|
|
|
|
Guards the slice-1 split (tool_implementations.py -> src/tools/*) from
|
|
accidentally dropping a symbol. The contract is enforced by two
|
|
self-verifying tests, not by the hand-maintained list below:
|
|
|
|
* ``test_shim_reexports_every_domain_do_function`` discovers every ``do_*``
|
|
from the domain modules and asserts reachability through the shim.
|
|
* ``test_every_facade_import_in_repo_resolves`` discovers every
|
|
``from src.tool_implementations import X`` site across first-party Python
|
|
dirs (src/, tests/, routes/, ...) and asserts ``X`` resolves through the
|
|
shim.
|
|
|
|
Both fail automatically if a re-export is forgotten (the do_* discovery
|
|
covers the tool surface; the import-site scan covers underscore helpers a
|
|
reviewer's P3 finding showed could otherwise slip through the list). The
|
|
``_EXPECTED`` list below is the curated historical surface (the original
|
|
module's top-level names), kept as a belt-and-suspenders check and as the
|
|
async-shape contract for ``do_*``; it is not the ground truth.
|
|
"""
|
|
|
|
import inspect
|
|
|
|
import src.tool_implementations as ti
|
|
|
|
# 33 do_* tool functions
|
|
_EXPECTED = [
|
|
"do_adopt_served_model", "do_api_call", "do_app_api", "do_cancel_download",
|
|
"do_download_model", "do_edit_image", "do_list_cached_models",
|
|
"do_list_cookbook_servers", "do_list_downloads", "do_list_served_models",
|
|
"do_list_serve_presets", "do_manage_calendar", "do_manage_contact",
|
|
"do_manage_endpoints", "do_manage_mcp", "do_manage_notes",
|
|
"do_manage_research", "do_manage_settings", "do_manage_skills",
|
|
"do_manage_tasks", "do_manage_tokens", "do_manage_webhooks",
|
|
"do_resolve_contact", "do_search_chats", "do_search_hf_models",
|
|
"do_serve_model", "do_serve_preset", "do_stop_served_model",
|
|
"do_tail_serve_output", "do_trigger_research", "do_vault_get",
|
|
"do_vault_search", "do_vault_unlock",
|
|
# module-private helpers (importable by name too)
|
|
"_cookbook_apply_retry_suggestion", "_cookbook_env_for_host",
|
|
"_cookbook_kill_session", "_cookbook_register_task", "_cookbook_servers",
|
|
"_ensure_served_endpoint", "_infer_serve_host", "_infer_serve_port",
|
|
"_internal_headers", "_load_vault_config", "_mcp_allowed_commands",
|
|
"_parse_tool_args", "_resolve_cookbook_host", "_run_bw",
|
|
"_scan_running_model_processes", "_skill_dump", "_string_arg",
|
|
"_validate_cookbook_ssh_target",
|
|
# active-email facade helpers (no do_* prefix); consumed by
|
|
# routes/chat_routes.py — listed here because get_active_email has no
|
|
# in-repo importer, so the import-site scan below can't see it alone.
|
|
"set_active_email", "get_active_email", "clear_active_email",
|
|
]
|
|
|
|
|
|
def test_shim_reexports_all_top_level_symbols():
|
|
"""Every original top-level function must remain importable via the module."""
|
|
missing = [name for name in _EXPECTED if not hasattr(ti, name)]
|
|
assert not missing, f"shim dropped symbols: {missing}"
|
|
|
|
|
|
def test_do_functions_remain_async_through_shim():
|
|
"""Every do_* must remain a coroutine function through the shim."""
|
|
for name in _EXPECTED:
|
|
if name.startswith("do_"):
|
|
obj = getattr(ti, name)
|
|
assert inspect.iscoroutinefunction(obj), (
|
|
f"{name} is not async via shim (got {type(obj).__name__})"
|
|
)
|
|
|
|
|
|
# Domain modules that own tool implementations after the slice-1 split.
|
|
# The shim must re-export every public do_* from each so existing
|
|
# `from src.tool_implementations import do_X` imports keep resolving.
|
|
_DOMAIN_MODULES = (
|
|
"src.tools.system",
|
|
"src.tools.cookbook",
|
|
"src.tools.search",
|
|
"src.tools.notes",
|
|
"src.tools.calendar",
|
|
"src.tools.image",
|
|
"src.tools.research",
|
|
"src.tools.contacts",
|
|
"src.tools.vault",
|
|
"src.agent_tools.admin_tools", # admin manage_* tools migrated here (#3629)
|
|
)
|
|
|
|
|
|
def test_shim_reexports_every_domain_do_function():
|
|
"""Auto-discovered guard: every do_* defined in a domain module must be
|
|
reachable through the shim.
|
|
|
|
The hand-maintained ``_EXPECTED`` list above can drift silently when a
|
|
new tool is added to a domain module but not re-exported by the facade
|
|
(exactly the omission a reviewer found post-split). This test discovers
|
|
the ground truth from the domain modules themselves, so a forgotten
|
|
re-export fails the build automatically. ``hasattr`` is used (not
|
|
``dir(ti)``) because the admin symbols are re-exported lazily via
|
|
module ``__getattr__`` and therefore do not appear in ``dir(ti)``.
|
|
"""
|
|
import importlib
|
|
|
|
dropped = []
|
|
for mod_name in _DOMAIN_MODULES:
|
|
mod = importlib.import_module(mod_name)
|
|
for name in dir(mod):
|
|
if not name.startswith("do_"):
|
|
continue
|
|
if not inspect.iscoroutinefunction(getattr(mod, name, None)):
|
|
continue
|
|
if not hasattr(ti, name):
|
|
dropped.append(f"{mod_name}.{name}")
|
|
assert not dropped, f"shim dropped domain do_* (re-export forgotten): {dropped}"
|
|
|
|
|
|
def test_every_facade_import_in_repo_resolves():
|
|
"""Every ``from src.tool_implementations import X`` in any first-party
|
|
Python dir (src/, tests/, routes/, ...) must resolve through the shim.
|
|
|
|
This makes the module-docstring contract ("existing ``from
|
|
src.tool_implementations import X`` imports keep working") self-verifying
|
|
instead of reliant on the hand-maintained ``_EXPECTED`` list, which
|
|
omitted three underscore helpers in a reviewer's P3 finding and can drift
|
|
again. The import sites are enumerated with ``ast`` rather than checked
|
|
at runtime because the invariant is *which names the rest of the
|
|
codebase asks the facade for* — no runtime hook enumerates that set,
|
|
only the import statements do (the narrow source-scanning exception to
|
|
the behavioral-first rule). The per-name assertion is runtime
|
|
(``hasattr``), so any forgotten re-export — helper or ``do_*`` — fails
|
|
here automatically.
|
|
"""
|
|
import ast
|
|
import os
|
|
from pathlib import Path
|
|
|
|
repo = Path(__file__).resolve().parents[1]
|
|
# Walk every first-party Python dir so route-level (and any future)
|
|
# facade consumers are covered, not just src/ and tests/. Prune
|
|
# non-source trees (venvs, caches, data, build artifacts) in-place.
|
|
_SKIP_DIRS = {
|
|
"__pycache__", "venv", "node_modules", "data", "logs",
|
|
"odysseus.egg-info", "static", "specs", "licenses", "docker",
|
|
}
|
|
names = set()
|
|
for root, _dirs, files in os.walk(repo):
|
|
_dirs[:] = [d for d in _dirs if not (d.startswith(".") or d in _SKIP_DIRS)]
|
|
for fn in files:
|
|
if not fn.endswith(".py"):
|
|
continue
|
|
path = Path(root) / fn
|
|
text = path.read_text(encoding="utf-8")
|
|
if "src.tool_implementations" not in text:
|
|
continue
|
|
try:
|
|
tree = ast.parse(text, filename=str(path))
|
|
except SyntaxError:
|
|
continue # unrelated to the facade contract
|
|
for node in ast.walk(tree):
|
|
if isinstance(node, ast.ImportFrom) and node.module == "src.tool_implementations":
|
|
for alias in node.names:
|
|
if alias.name != "*":
|
|
names.add(alias.name)
|
|
unresolved = sorted(n for n in names if not hasattr(ti, n))
|
|
assert not unresolved, (
|
|
f"facade consumers import names the shim does not re-export: {unresolved}"
|
|
)
|