diff --git a/src/fabledassistant/routes/notes.py b/src/fabledassistant/routes/notes.py index 0bb911c..5c4d835 100644 --- a/src/fabledassistant/routes/notes.py +++ b/src/fabledassistant/routes/notes.py @@ -288,11 +288,6 @@ async def assist_route(): if not target_section or not instruction: return jsonify({"error": "target_section and instruction are required"}), 400 - # Reject if an assist generation is already running for this user - existing = get_assist_buffer(uid) - if existing and existing.state == GenerationState.RUNNING: - return jsonify({"error": "Assist generation already running"}), 409 - model = await get_setting(uid, "default_model", Config.OLLAMA_MODEL) or Config.OLLAMA_MODEL messages = build_assist_messages(body, target_section, instruction) diff --git a/src/fabledassistant/services/generation_buffer.py b/src/fabledassistant/services/generation_buffer.py index ce289ad..dc90e07 100644 --- a/src/fabledassistant/services/generation_buffer.py +++ b/src/fabledassistant/services/generation_buffer.py @@ -100,7 +100,9 @@ def create_assist_buffer(user_id: int) -> GenerationBuffer: key = f"assist:{user_id}" existing = _buffers.get(key) if existing and existing.state == GenerationState.RUNNING: - raise RuntimeError(f"Assist generation already running for user {user_id}") + # Orphan the old buffer — the background task holds a direct reference + # and will complete against it harmlessly. A new request always wins. + logger.warning("Assist generation still running for user %d; orphaning old buffer", user_id) buf = GenerationBuffer(conversation_id=0, assistant_message_id=0) _buffers[key] = buf return buf diff --git a/src/fabledassistant/services/llm.py b/src/fabledassistant/services/llm.py index 5de6fb2..ac217f3 100644 --- a/src/fabledassistant/services/llm.py +++ b/src/fabledassistant/services/llm.py @@ -108,12 +108,18 @@ async def stream_chat( messages: list[dict], model: str, options: dict | None = None, + think: bool = False, ) -> AsyncGenerator[str, None]: - """Stream chat completion from Ollama, yielding content chunks.""" + """Stream chat completion from Ollama, yielding content chunks. + + Set think=False (default) to disable chain-of-thought on qwen3+ models. + Thinking tokens are silently discarded anyway, but disabling avoids the + multi-minute delay before the first content token arrives. + """ merged_options = {"num_ctx": Config.OLLAMA_NUM_CTX} if options: merged_options.update(options) - payload: dict = {"model": model, "messages": messages, "stream": True, "options": merged_options} + payload: dict = {"model": model, "messages": messages, "stream": True, "options": merged_options, "think": think} # read=None: no per-chunk timeout — Ollama may pause for any duration while # processing a large input context before the first token arrives. async with httpx.AsyncClient(timeout=httpx.Timeout(connect=30.0, read=None, write=None, pool=30.0)) as client: