mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-07-08 11:56:59 +00: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 dropped c504214 ("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>
255 lines
12 KiB
Python
255 lines
12 KiB
Python
"""Notes-domain tool implementations.
|
|
|
|
Extracted from tool_implementations.py as part of slice 1 (#4082/#4071).
|
|
Holds the manage_notes tool (notes + checklists CRUD).
|
|
``src.tool_implementations`` re-exports these for backward compatibility.
|
|
"""
|
|
import json
|
|
import logging
|
|
import re
|
|
from typing import Dict, Optional
|
|
|
|
from src.tools._common import _parse_tool_args
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
async def do_manage_notes(content: str, owner: Optional[str] = None) -> Dict:
|
|
"""Handle manage_notes tool calls: CRUD on notes and checklists."""
|
|
import uuid as _uuid
|
|
from core.database import SessionLocal, Note
|
|
from sqlalchemy.orm.attributes import flag_modified
|
|
|
|
try:
|
|
args = _parse_tool_args(content)
|
|
except ValueError:
|
|
return {"error": "Invalid JSON arguments", "exit_code": 1}
|
|
|
|
# Action aliases — match what models actually emit. `create` is the most
|
|
# common alternative to `add`. Hyphenated forms also accepted.
|
|
action = (args.get("action") or "").replace("-", "_").strip().lower()
|
|
_NOTE_ACTION_ALIASES = {
|
|
"create": "add",
|
|
"new": "add",
|
|
"save": "add",
|
|
"remind": "add",
|
|
"remove": "delete",
|
|
"remove_item": "toggle_item",
|
|
}
|
|
action = _NOTE_ACTION_ALIASES.get(action, action)
|
|
db = SessionLocal()
|
|
|
|
def _norm_note_title(value: str) -> str:
|
|
text = (value or "").strip().lower()
|
|
text = re.sub(r"^\s*reminder\s*:\s*", "", text)
|
|
return re.sub(r"\s+", " ", text)
|
|
|
|
def _note_visible_to_owner(note, owner_value: Optional[str]) -> bool:
|
|
# Empty owner_value is single-user / auth-disabled mode. A real
|
|
# authenticated owner must match exactly; null/empty legacy rows are not
|
|
# shared between accounts.
|
|
if not owner_value:
|
|
return True
|
|
return getattr(note, "owner", None) == owner_value
|
|
|
|
def _note_by_prefix(note_id: str):
|
|
if not note_id:
|
|
return None
|
|
q = db.query(Note).filter(Note.id.startswith(note_id))
|
|
if owner:
|
|
q = q.filter(Note.owner == owner)
|
|
return q.first()
|
|
|
|
try:
|
|
if action == "list":
|
|
q = db.query(Note)
|
|
if owner is not None:
|
|
q = q.filter(Note.owner == owner)
|
|
if args.get("label"):
|
|
q = q.filter(Note.label == args["label"])
|
|
show_archived = args.get("archived", False)
|
|
q = q.filter(Note.archived == show_archived)
|
|
notes = q.order_by(Note.pinned.desc(), Note.updated_at.desc()).all()
|
|
if not notes:
|
|
return {"response": "No notes found.", "exit_code": 0}
|
|
lines = []
|
|
for n in notes:
|
|
pin = " [PINNED]" if n.pinned else ""
|
|
typ = " [checklist]" if n.note_type == "checklist" else ""
|
|
lbl = f" #{n.label}" if n.label else ""
|
|
title = n.title or "(untitled)"
|
|
lines.append(f"- [{n.id[:8]}] **{title}**{pin}{typ}{lbl}")
|
|
if n.note_type == "checklist" and n.items:
|
|
try:
|
|
items = json.loads(n.items)
|
|
for i, item in enumerate(items):
|
|
mark = "x" if item.get("done") else " "
|
|
lines.append(f" [{mark}] {i}: {item.get('text', '')}")
|
|
except (json.JSONDecodeError, TypeError):
|
|
pass
|
|
elif n.content:
|
|
snippet = n.content[:80].replace("\n", " ")
|
|
lines.append(f" {snippet}")
|
|
return {"results": "\n".join(lines)}
|
|
|
|
elif action == "add":
|
|
# Accept the various field names models emit: `text` is the most
|
|
# common stand-in for "title or body content" when the model
|
|
# treats the note as a single string. If text was supplied and
|
|
# neither title nor content, use it as the title.
|
|
title = (args.get("title") or "").strip()
|
|
content_raw = args.get("content")
|
|
text_raw = args.get("text") or args.get("body")
|
|
if not title and not content_raw and text_raw:
|
|
title = text_raw.strip()
|
|
elif not content_raw and text_raw:
|
|
content_raw = text_raw
|
|
# Accept both `items` (legacy/internal field) and `checklist_items`
|
|
# (the schema-exposed name used by native function calls). Models
|
|
# following the schema emit `checklist_items`; older code paths
|
|
# and direct API callers still use `items`.
|
|
items_raw = args.get("checklist_items")
|
|
if items_raw is None:
|
|
items_raw = args.get("items")
|
|
items_json = json.dumps(items_raw) if items_raw is not None else None
|
|
note_type = args.get("note_type", "checklist" if items_raw else "note")
|
|
# Accept natural-language due_date ("tomorrow at 1pm") in
|
|
# addition to ISO. Use the user-tz-aware parser so the LLM's
|
|
# naive times ("today at 9pm") are anchored to the USER's clock,
|
|
# not the server's. Returns ISO with explicit offset so frontend
|
|
# `new Date()` resolves the right absolute moment regardless of
|
|
# where the user is.
|
|
due_raw = args.get("due_date")
|
|
due_iso = None
|
|
if due_raw:
|
|
try:
|
|
from routes.calendar_routes import parse_due_for_user as _pdt_user
|
|
due_iso = _pdt_user(due_raw)
|
|
except Exception:
|
|
due_iso = due_raw # fall through; trust the model
|
|
if due_iso and title:
|
|
# Calendar event reminders are represented as Notes. If the
|
|
# model creates a calendar event with reminder_minutes and then
|
|
# also creates a separate note reminder for the same title/time,
|
|
# keep the existing note so the user gets only one dispatch.
|
|
existing_q = db.query(Note).filter(
|
|
Note.archived == False, # noqa: E712
|
|
Note.due_date == due_iso,
|
|
)
|
|
if owner is not None:
|
|
existing_q = existing_q.filter(Note.owner == owner)
|
|
target_title = _norm_note_title(title)
|
|
for existing in existing_q.limit(25).all():
|
|
if _norm_note_title(existing.title or "") == target_title:
|
|
return {
|
|
"response": f"Reminder already exists: \"{existing.title or title}\" (id: {existing.id[:8]})",
|
|
"note_id": existing.id,
|
|
"duplicate": True,
|
|
"exit_code": 0,
|
|
}
|
|
note = Note(
|
|
id=str(_uuid.uuid4()),
|
|
owner=owner,
|
|
title=title,
|
|
content=content_raw,
|
|
items=items_json,
|
|
note_type=note_type,
|
|
color=args.get("color"),
|
|
label=args.get("label"),
|
|
pinned=args.get("pinned", False),
|
|
due_date=due_iso,
|
|
source="agent",
|
|
session_id=args.get("session_id"),
|
|
)
|
|
db.add(note)
|
|
db.commit()
|
|
# Return note_id so the chat-side renderer can build a real
|
|
# "View note" button that opens the notes modal at this id.
|
|
# Previously the create response only included a prose
|
|
# confirmation; the model would type "View note" as a markdown
|
|
# link with no target, leaving the user with a click that
|
|
# did nothing and uncertainty about whether the note was made.
|
|
return {
|
|
"response": f"Note created: \"{title or '(untitled)'}\" (id: {note.id[:8]})",
|
|
"note_id": note.id,
|
|
"note_title": title or "",
|
|
"open_url": f"/#open=notes¬e={note.id}",
|
|
"exit_code": 0,
|
|
}
|
|
|
|
elif action == "update":
|
|
note_id = args.get("id", "")
|
|
note = _note_by_prefix(note_id)
|
|
if not note:
|
|
return {"error": f"Note '{note_id}' not found", "exit_code": 1}
|
|
if not _note_visible_to_owner(note, owner):
|
|
return {"error": "Note not found", "exit_code": 1}
|
|
for field in ("title", "content", "note_type", "color", "label"):
|
|
if field in args and args[field] is not None:
|
|
setattr(note, field, args[field])
|
|
# Parse due_date the same way the `add` action does. The schema
|
|
# advertises natural language ("tomorrow at 9am"), and naive ISO
|
|
# strings need the user's tz offset attached so the frontend's
|
|
# `new Date()` resolves the right absolute moment. Storing the raw
|
|
# value here left updated reminders as unparseable literals that
|
|
# never fired.
|
|
if args.get("due_date") is not None:
|
|
due_raw = args["due_date"]
|
|
try:
|
|
from routes.calendar_routes import parse_due_for_user as _pdt_user
|
|
note.due_date = _pdt_user(due_raw)
|
|
except Exception:
|
|
note.due_date = due_raw # fall through; trust the model
|
|
new_items = args.get("checklist_items")
|
|
if new_items is None:
|
|
new_items = args.get("items")
|
|
if new_items is not None:
|
|
note.items = json.dumps(new_items)
|
|
flag_modified(note, "items")
|
|
if "pinned" in args:
|
|
note.pinned = args["pinned"]
|
|
if "archived" in args:
|
|
note.archived = args["archived"]
|
|
db.commit()
|
|
return {"response": f"Note updated: \"{note.title or '(untitled)'}\"", "exit_code": 0}
|
|
|
|
elif action == "delete":
|
|
note_id = args.get("id", "")
|
|
note = _note_by_prefix(note_id)
|
|
if not note:
|
|
return {"error": f"Note '{note_id}' not found", "exit_code": 1}
|
|
if not _note_visible_to_owner(note, owner):
|
|
return {"error": "Note not found", "exit_code": 1}
|
|
title = note.title
|
|
db.delete(note)
|
|
db.commit()
|
|
return {"response": f"Deleted note: \"{title or '(untitled)'}\"", "exit_code": 0}
|
|
|
|
elif action == "toggle_item":
|
|
note_id = args.get("id", "")
|
|
index = args.get("index", 0)
|
|
note = _note_by_prefix(note_id)
|
|
if not note:
|
|
return {"error": f"Note '{note_id}' not found", "exit_code": 1}
|
|
if not _note_visible_to_owner(note, owner):
|
|
return {"error": "Note not found", "exit_code": 1}
|
|
if not note.items:
|
|
return {"error": "Note has no checklist items", "exit_code": 1}
|
|
items = json.loads(note.items)
|
|
if index < 0 or index >= len(items):
|
|
return {"error": f"Item index {index} out of range (0-{len(items)-1})", "exit_code": 1}
|
|
items[index]["done"] = not items[index].get("done", False)
|
|
note.items = json.dumps(items)
|
|
flag_modified(note, "items")
|
|
db.commit()
|
|
mark = "done" if items[index]["done"] else "undone"
|
|
return {"response": f"Item '{items[index].get('text', '')}' marked {mark}", "exit_code": 0}
|
|
|
|
else:
|
|
return {"error": f"Unknown action: {action}. Use list/add/update/delete/toggle_item", "exit_code": 1}
|
|
except Exception as e:
|
|
logger.error(f"manage_notes error: {e}")
|
|
return {"error": str(e), "exit_code": 1}
|
|
finally:
|
|
db.close()
|