Adds synapse/slash_commands.py: a chat message that's nothing but /tool_name(arg=val, arg=val) dispatches straight through tools.dispatch(), skipping model selection, RAG/playbook context assembly, and the ask-policy approval round-trip entirely. A human typing this IS the approval - there's no one else to ask - so it's a deliberate, reviewed bypass of the approval step specifically, not of anything a tool validates internally (path boundaries, size caps, Curry's own sandbox checks all still run). Argument values parse via ast.literal_eval only: strings/numbers/bools/None/literal containers, no names, no calls, no attribute access - a malformed or hostile-looking argument fails to parse rather than executing anything. Wired into chat_stream_endpoint (main.py) as an early short-circuit, before any of the RAG/model-selection work that a slash-command doesn't need. Web needed no changes (it already forwards raw text unchanged); the TUI previously swallowed every leading "/" locally and never reached the backend with it, so tui_app.py's _handle_slash now falls through to _start_chat for anything shaped like a tool call while still handling its own local meta-commands (/help, /model, /new, ...) exactly as before. Also finally wires Curry in as ten real tools (curry_declare_constant, curry_get_constant/_latest, curry_list_constants, curry_retire_constant, curry_declare_function, curry_get_function, curry_list_functions, curry_call_function, curry_retire_function) - deferred from the vendoring pass. The five write/execute ones are ACTION tools in the same always-ask-regardless-of-global-policy floor as edit_source (ALWAYS_ASK_ACTION_TOOLS, generalized in tools.py from the old self_edit-only ALWAYS_ASK_TOOLS so future tool families share one place to register into). curry_call_function is gated as an action for the same reason run_snippet is: it executes code, even sandboxed. Fixed a real bug surfaced while wiring this up: curry_db is a long-lived singleton holding one sqlite3 connection (unlike NexusOS's own memory store, which opens/closes a fresh connection per call specifically to dodge this), and sqlite3 forbids using a connection from a different thread than created it. That's a non-issue in production (uvicorn's single event-loop thread), but Starlette's TestClient runs the ASGI app through an anyio portal thread, so it broke immediately under test. Fixed at the source (curry_core.py, Curry.__init__) with check_same_thread=False, documented as a second deliberate vendoring deviation alongside the PR #4 sandbox fix - there was never real concurrent access here, just an overly strict same-thread assertion tripping on a thread-identity change with only one logical caller. Verified: 244 backend tests pass (18 new for the parser + endpoint wiring + curry tool registration, 4 new for the TUI passthrough); the 12 pre-existing C/C++/Rust toolchain failures are unrelated and unchanged. Confirmed by hand over the real HTTP endpoint: successful dispatch, zero tool_request events (approval bypass working as designed), a format()-dunder exploit attempt still rejected by the vendored sandbox fix even through the new tool registration, malformed arguments rejected before ever reaching dispatch, and an unknown tool name rejected cleanly. Wheel rebuilt and content-checked (bin/check.sh's gate now also asserts slash_commands.py ships). Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
318 lines
12 KiB
Python
318 lines
12 KiB
Python
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import json as _json
|
|
import logging
|
|
import secrets
|
|
import threading
|
|
from typing import AsyncGenerator, Dict, List, Optional, Any
|
|
|
|
from .nexus_config import settings, DEFAULT_CHAT_MODEL
|
|
from .ollama_manager import get_ollama_manager
|
|
from . import tools as _tools
|
|
|
|
# Cap on tool-call round-trips before the final answer — stops a confused small
|
|
# model from looping forever.
|
|
MAX_TOOL_STEPS = 5
|
|
|
|
|
|
# -------------------------
|
|
# Logger setup
|
|
# -------------------------
|
|
_logger = logging.getLogger("nexus.chat")
|
|
_logger.setLevel(logging.INFO)
|
|
if not _logger.handlers:
|
|
handler = logging.FileHandler(str(settings.chat_log)) if getattr(settings, "chat_log", None) else logging.StreamHandler()
|
|
formatter = logging.Formatter("%(asctime)s %(levelname)s %(name)s: %(message)s")
|
|
handler.setFormatter(formatter)
|
|
_logger.addHandler(handler)
|
|
|
|
|
|
# -------------------------
|
|
# Synapse tracer (real-time prompt/token view for control panel)
|
|
# -------------------------
|
|
_synapse_lock = threading.Lock()
|
|
_synapse_fh = None
|
|
|
|
def _synapse_trace(text: str) -> None:
|
|
global _synapse_fh
|
|
try:
|
|
log_path = getattr(settings, "chat_log", None)
|
|
if not log_path:
|
|
return
|
|
with _synapse_lock:
|
|
if _synapse_fh is None or _synapse_fh.closed:
|
|
_synapse_fh = open(str(log_path), "a", buffering=1, encoding="utf-8")
|
|
_synapse_fh.write(text)
|
|
_synapse_fh.flush()
|
|
except Exception:
|
|
pass
|
|
|
|
|
|
# -------------------------
|
|
# Non-streaming generation
|
|
# -------------------------
|
|
async def generate_chat_response(
|
|
user_message: str,
|
|
metadata: Optional[Dict[str, Any]] = None,
|
|
history: Optional[List[Dict[str, str]]] = None,
|
|
timeout: Optional[float] = None,
|
|
) -> Dict[str, Any]:
|
|
metadata = metadata or {}
|
|
timeout = timeout or getattr(settings, "ollama_timeout", 120)
|
|
|
|
manager = get_ollama_manager()
|
|
system = metadata.get("system", "")
|
|
model = metadata.get("model") or DEFAULT_CHAT_MODEL
|
|
temperature = metadata.get("temperature")
|
|
num_gpu = metadata.get("num_gpu")
|
|
|
|
messages: List[Dict[str, str]] = []
|
|
if system:
|
|
messages.append({"role": "system", "content": system})
|
|
for msg in (history or []):
|
|
messages.append({"role": msg["role"], "content": msg["content"]})
|
|
messages.append({"role": "user", "content": user_message})
|
|
|
|
_logger.info("generate_chat_response: model=%s turns=%d timeout=%s", model, len(messages), timeout)
|
|
|
|
sys_preview = (system or "")[:200].replace("\n", " ")
|
|
_synapse_trace(f"\n── TURN [{model} | {len(messages)} msgs] {'─' * 30}\n")
|
|
if system:
|
|
_synapse_trace(f"SYS: {sys_preview}{'…' if len(system) > 200 else ''}\n")
|
|
_synapse_trace(f"USR: {user_message}\n{'─' * 50}\n")
|
|
|
|
try:
|
|
result = await asyncio.wait_for(
|
|
manager.chat(messages=messages, model=model, stream=False, temperature=temperature, num_gpu=num_gpu),
|
|
timeout=timeout,
|
|
)
|
|
response_text = result if isinstance(result, str) else str(result)
|
|
|
|
preview = response_text[:500].replace("\n", " ")
|
|
_synapse_trace(f"{preview}{'…' if len(response_text) > 500 else ''}\n{'─' * 50}\n")
|
|
_logger.info("generate_chat_response: completed model=%s", model)
|
|
return {"response": response_text, "model": model, "metadata": metadata}
|
|
|
|
except asyncio.TimeoutError:
|
|
_logger.exception("generate_chat_response: timeout after %s seconds", timeout)
|
|
raise
|
|
except Exception:
|
|
_logger.exception("generate_chat_response: unexpected error")
|
|
raise
|
|
|
|
|
|
# -------------------------
|
|
# Async iterator timeout helper
|
|
# -------------------------
|
|
async def _aiter_with_timeout(aiterable, timeout: Optional[float]):
|
|
if timeout is None or timeout <= 0:
|
|
async for item in aiterable:
|
|
yield item
|
|
return
|
|
|
|
aiter = aiterable.__aiter__()
|
|
while True:
|
|
try:
|
|
item = await asyncio.wait_for(aiter.__anext__(), timeout=timeout)
|
|
yield item
|
|
except StopAsyncIteration:
|
|
break
|
|
|
|
|
|
# -------------------------
|
|
# Normalizer for many return shapes
|
|
# -------------------------
|
|
async def _normalize_to_async_generator(maybe_iterable) -> AsyncGenerator[str, None]:
|
|
# The sole caller passes manager.chat(stream=True) — an async-def call, i.e.
|
|
# a coroutine that resolves to an async generator. Await it if needed, then
|
|
# stream the tokens.
|
|
result = await maybe_iterable if asyncio.iscoroutine(maybe_iterable) else maybe_iterable
|
|
async for item in result:
|
|
yield str(item)
|
|
|
|
|
|
# Per-call approval waiters, keyed by conversation_id. The chat stream stays open
|
|
# and the loop awaits the Event; POST /chat/approve fills decisions and sets it.
|
|
# ponytail: in-memory, single-process — fine for a local single-user app; needs a
|
|
# shared store only if this ever runs multi-worker.
|
|
pending_approvals: Dict[str, Dict[str, Any]] = {}
|
|
_APPROVAL_TIMEOUT = 300 # seconds; a timeout is treated as "deny all"
|
|
|
|
|
|
async def _run_tool_loop(manager, messages, model, tool_schemas, temperature, num_gpu,
|
|
conversation_id="", policy="allow"):
|
|
"""Let the model call tools before the final streamed answer.
|
|
|
|
Mutates `messages` IN PLACE, appending the assistant tool-call turns and
|
|
their `role:"tool"` results, and yields `__status__<tool>` sentinels.
|
|
When policy == "ask" and a turn contains action tools, yields an
|
|
`__approve__<json>` sentinel and awaits the user's decision (via
|
|
`pending_approvals`) before running them; declined actions get a "denied"
|
|
result the model can react to. Degrades to untouched `messages` if the model
|
|
can't do tool calling.
|
|
|
|
ponytail: the turn that finally returns content is thrown away and the answer
|
|
is re-generated by the streaming turn (one wasted call).
|
|
"""
|
|
for _ in range(MAX_TOOL_STEPS):
|
|
msg = await manager.chat(
|
|
messages=messages, model=model, stream=False,
|
|
temperature=temperature, num_gpu=num_gpu, tools=tool_schemas,
|
|
)
|
|
if not isinstance(msg, dict):
|
|
break # None/error or no tool support -> fall back to plain stream
|
|
calls = msg.get("tool_calls")
|
|
if not calls:
|
|
break
|
|
messages.append(msg)
|
|
|
|
# Curry write/execute tools always require approval when model-issued,
|
|
# even if the global policy allows lower-risk actions. A human-typed
|
|
# /tool(...) command is dispatched separately by main.py.
|
|
decisions = None
|
|
action_calls = [c for c in calls if _tools.is_action(c.get("function", {}).get("name", ""))]
|
|
needs_approval = policy == "ask" or any(
|
|
c.get("function", {}).get("name", "") in _tools.ALWAYS_ASK_ACTION_TOOLS
|
|
for c in action_calls
|
|
)
|
|
if needs_approval and action_calls:
|
|
event = asyncio.Event()
|
|
# Single-use capability token, delivered only to the client that owns
|
|
# this stream. /chat/approve requires it, so knowing the (guessable,
|
|
# enumerable) conversation_id is no longer enough to approve someone
|
|
# else's pending action.
|
|
token = secrets.token_urlsafe(32)
|
|
pending_approvals[conversation_id] = {"event": event, "decisions": {}, "token": token}
|
|
yield "__approve__" + _json.dumps({
|
|
"token": token,
|
|
"actions": [
|
|
{"name": c.get("function", {}).get("name", ""),
|
|
"arguments": c.get("function", {}).get("arguments")}
|
|
for c in action_calls
|
|
],
|
|
})
|
|
try:
|
|
await asyncio.wait_for(event.wait(), timeout=_APPROVAL_TIMEOUT)
|
|
decisions = pending_approvals[conversation_id]["decisions"]
|
|
except asyncio.TimeoutError:
|
|
decisions = {} # no answer in time -> deny all actions
|
|
finally:
|
|
pending_approvals.pop(conversation_id, None)
|
|
|
|
for c in calls:
|
|
fn = c.get("function", {})
|
|
name = fn.get("name", "")
|
|
if decisions is not None and _tools.is_action(name) and not decisions.get(name, False):
|
|
messages.append({"role": "tool", "content": _json.dumps({"denied": f"user declined {name}"})})
|
|
continue
|
|
yield f"__status__{name}"
|
|
result = await _tools.dispatch(name, fn.get("arguments"))
|
|
messages.append({"role": "tool", "content": result})
|
|
|
|
|
|
# -------------------------
|
|
# Streaming implementation
|
|
# -------------------------
|
|
async def stream_chat_response(
|
|
user_message: str,
|
|
metadata: Optional[Dict[str, Any]] = None,
|
|
history: Optional[List[Dict[str, str]]] = None,
|
|
timeout: Optional[float] = None,
|
|
) -> AsyncGenerator[str, None]:
|
|
metadata = metadata or {}
|
|
timeout = timeout or getattr(settings, "ollama_timeout", 120)
|
|
|
|
manager = get_ollama_manager()
|
|
system = metadata.get("system", "")
|
|
model = metadata.get("model") or DEFAULT_CHAT_MODEL
|
|
temperature = metadata.get("temperature")
|
|
num_gpu = metadata.get("num_gpu")
|
|
num_ctx = metadata.get("num_ctx")
|
|
think = metadata.get("think", False)
|
|
|
|
# Build messages array for /api/chat multi-turn format
|
|
messages: List[Dict[str, str]] = []
|
|
if system:
|
|
messages.append({"role": "system", "content": system})
|
|
for msg in (history or []):
|
|
messages.append({"role": msg["role"], "content": msg["content"]})
|
|
user_msg: Dict[str, Any] = {"role": "user", "content": user_message}
|
|
images = metadata.get("images") # base64 strings (no data: prefix) for vision models
|
|
if images:
|
|
user_msg["images"] = images
|
|
messages.append(user_msg)
|
|
|
|
# Tool-using playbooks: run tool calls, then stream the final answer with
|
|
# their results already in the messages array.
|
|
tool_schemas = metadata.get("tools")
|
|
if tool_schemas:
|
|
try:
|
|
async for status in _run_tool_loop(
|
|
manager, messages, model, tool_schemas, temperature, num_gpu,
|
|
conversation_id=metadata.get("conversation_id", ""),
|
|
policy=metadata.get("action_tool_policy", "allow"),
|
|
):
|
|
yield status
|
|
except Exception:
|
|
_logger.exception("tool loop failed; streaming without tools")
|
|
|
|
_logger.info("stream_chat_response: starting stream (model=%s, turns=%d, timeout=%s)", model, len(messages), timeout)
|
|
|
|
sys_preview = (system or "")[:200].replace("\n", " ")
|
|
_synapse_trace(f"\n── TURN [{model} | {len(messages)} msgs] {'─' * 30}\n")
|
|
if system:
|
|
_synapse_trace(f"SYS: {sys_preview}{'…' if len(system) > 200 else ''}\n")
|
|
_synapse_trace(f"USR: {user_message}\n{'─' * 50}\n")
|
|
|
|
try:
|
|
maybe_iter = manager.chat(messages=messages, model=model, stream=True, temperature=temperature, num_gpu=num_gpu, think=think, num_ctx=num_ctx)
|
|
async_gen = _normalize_to_async_generator(maybe_iter)
|
|
|
|
buffer_parts: list[str] = []
|
|
buffer_len = 0
|
|
FLUSH_THRESHOLD = 24
|
|
|
|
async for piece in _aiter_with_timeout(async_gen, timeout):
|
|
if piece is None:
|
|
continue
|
|
text = str(piece)
|
|
if not text:
|
|
continue
|
|
|
|
# Pass stats sentinel through immediately, don't buffer it
|
|
if text.startswith("__meta__"):
|
|
if buffer_parts:
|
|
chunk = "".join(buffer_parts)
|
|
buffer_parts = []
|
|
buffer_len = 0
|
|
_synapse_trace(chunk.replace("\n", " ") + "\n")
|
|
yield chunk
|
|
yield text
|
|
continue
|
|
|
|
buffer_parts.append(text)
|
|
buffer_len += len(text)
|
|
|
|
if buffer_len >= FLUSH_THRESHOLD or any(text.endswith(c) for c in (".", "!", "?", "\n")):
|
|
chunk = "".join(buffer_parts)
|
|
buffer_parts = []
|
|
buffer_len = 0
|
|
_synapse_trace(chunk.replace("\n", " ") + "\n")
|
|
yield chunk
|
|
|
|
if buffer_parts:
|
|
chunk = "".join(buffer_parts)
|
|
_synapse_trace(chunk.replace("\n", " ") + "\n")
|
|
yield chunk
|
|
|
|
_synapse_trace(f"{'─' * 50}\n")
|
|
_logger.info("stream_chat_response: stream completed")
|
|
|
|
except asyncio.TimeoutError:
|
|
_logger.exception("stream_chat_response: timeout after %s seconds", timeout)
|
|
raise
|
|
except Exception:
|
|
_logger.exception("stream_chat_response: unexpected error during streaming")
|
|
raise
|