Skip to content

Local UI to run and train LLMs and diffusion models. Supports GGUF, MLX, Qwen3.8, DeepSeek-V4.1, MiniMax-H3, Gemma 4, FLUX and more.

Deep Research: keep a clean attachment inventory clean when inserting the terminal fallback (#16997)

Daniel Hanfa31fb1da593
diff --git a/studio/backend/storage/chat_generation_runs_db.py b/studio/backend/storage/chat_generation_runs_db.py
index f1db5f0ae72..1cdb2b1e08f 100644
--- a/studio/backend/storage/chat_generation_runs_db.py
+++ b/studio/backend/storage/chat_generation_runs_db.py
@@ -17,7 +17,7 @@ from functools import partial
from pathlib import Path
from typing import Any, Iterable, Union
-from storage.studio_db import get_connection, on_wal_keeper_closed
+from storage.studio_db import get_connection, insert_server_chat_message, on_wal_keeper_closed
from utils.account_context import current_account_id
from utils.paths import studio_db_path
@@ -572,28 +572,15 @@ def create_run(
(assistant_message_id,),
).fetchone()
if assistant is None:
- # An empty placeholder adds no attachment entries. Preserve an already
- # clean inventory without clearing older dirtiness or advancing its version.
- inventory_was_clean = (
- conn.execute(
- "SELECT 1 FROM chat_attachment_inventory_state WHERE singleton=1 AND dirty=0"
- ).fetchone()
- is not None
- )
- conn.execute(
- """INSERT INTO chat_messages
- (id, thread_id, parent_id, role, content_json, metadata_json, created_at)
- VALUES (?, ?, ?, 'assistant', '[]', ?, ?)""",
- (
- assistant_message_id,
- thread_id,
- user_message_id,
- json.dumps(metadata, ensure_ascii = False),
- created,
- ),
+ insert_server_chat_message(
+ conn,
+ assistant_message_id,
+ thread_id,
+ user_message_id,
+ "[]",
+ json.dumps(metadata, ensure_ascii = False),
+ created,
)
- if inventory_was_clean:
- conn.execute("UPDATE chat_attachment_inventory_state SET dirty=0 WHERE singleton=1")
else:
assistant_metadata = _loads(assistant["metadata_json"], {})
existing_run_id = (
diff --git a/studio/backend/storage/research_runs_db.py b/studio/backend/storage/research_runs_db.py
index 20614e96974..78df6671ba4 100644
--- a/studio/backend/storage/research_runs_db.py
+++ b/studio/backend/storage/research_runs_db.py
@@ -14,7 +14,7 @@ import time
from typing import Any
from core.inference.web_access_policy import check_url_access, normalize_website_policy
-from storage.studio_db import get_connection as _studio_connection
+from storage.studio_db import get_connection as _studio_connection, insert_server_chat_message
ACTIVE_STATUSES = frozenset(
{"planning", "awaiting_approval", "queued", "running", "paused", "cancelling"}
@@ -158,27 +158,15 @@ def _bind_assistant_locked(
"serverManaged": True,
}
if message is None:
- # An empty placeholder adds no attachment entries; keep a clean inventory clean (#14217).
- inventory_was_clean = (
- conn.execute(
- "SELECT 1 FROM chat_attachment_inventory_state WHERE singleton=1 AND dirty=0"
- ).fetchone()
- is not None
- )
- conn.execute(
- """INSERT INTO chat_messages
- (id, thread_id, parent_id, role, content_json, metadata_json, created_at)
- VALUES (?, ?, ?, 'assistant', '[]', ?, ?)""",
- (
- assistant_message_id,
- thread_id,
- user_message_id,
- json.dumps(metadata, ensure_ascii = False),
- created,
- ),
+ insert_server_chat_message(
+ conn,
+ assistant_message_id,
+ thread_id,
+ user_message_id,
+ "[]",
+ json.dumps(metadata, ensure_ascii = False),
+ created,
)
- if inventory_was_clean:
- conn.execute("UPDATE chat_attachment_inventory_state SET dirty=0 WHERE singleton=1")
conn.execute(
"UPDATE chat_threads SET updated_at=MAX(COALESCE(updated_at, created_at), ?) WHERE id=?",
(created, thread_id),
@@ -638,18 +626,14 @@ def create_and_bind_terminal_fallback(
"serverManaged": True,
}
created = now_ms()
- conn.execute(
- """INSERT INTO chat_messages
- (id, thread_id, parent_id, role, content_json, metadata_json, created_at)
- VALUES (?, ?, ?, 'assistant', ?, ?, ?)""",
- (
- message_id,
- run["thread_id"],
- run["user_message_id"],
- json.dumps(parts, ensure_ascii = False),
- json.dumps(metadata, ensure_ascii = False),
- created,
- ),
+ insert_server_chat_message(
+ conn,
+ message_id,
+ run["thread_id"],
+ run["user_message_id"],
+ json.dumps(parts, ensure_ascii = False),
+ json.dumps(metadata, ensure_ascii = False),
+ created,
)
conn.execute(
"UPDATE research_runs SET assistant_message_id=?, updated_at=? WHERE id=?",
diff --git a/studio/backend/storage/studio_db.py b/studio/backend/storage/studio_db.py
index 71a4fa1f711..591302bf7b1 100644
--- a/studio/backend/storage/studio_db.py
+++ b/studio/backend/storage/studio_db.py
@@ -4205,6 +4205,41 @@ def _mark_chat_attachment_inventory_clean(conn: sqlite3.Connection) -> None:
)
+def insert_server_chat_message(
+ conn: sqlite3.Connection,
+ message_id: str,
+ thread_id: str,
+ parent_id: Optional[str],
+ content_json: str,
+ metadata_json: str,
+ created_at: int,
+) -> None:
+ """Insert a server-owned assistant message, indexing it in place so the insert trigger leaves a clean inventory clean."""
+ was_clean = (
+ conn.execute(
+ "SELECT 1 FROM chat_attachment_inventory_state WHERE singleton=1 AND dirty=0"
+ ).fetchone()
+ is not None
+ )
+ conn.execute(
+ """INSERT INTO chat_messages
+ (id, thread_id, parent_id, role, content_json, metadata_json, created_at)
+ VALUES (?, ?, ?, 'assistant', ?, ?, ?)""",
+ (message_id, thread_id, parent_id, content_json, metadata_json, created_at),
+ )
+ if not was_clean:
+ return
+ tombstones = {
+ row[0]
+ for row in conn.execute(
+ "SELECT attachment_id FROM chat_attachment_tombstones WHERE thread_id=? AND message_id=?",
+ (thread_id, message_id),
+ )
+ }
+ _replace_chat_attachment_inventory(conn, message_id, None, content_json, tombstones)
+ conn.execute("UPDATE chat_attachment_inventory_state SET dirty=0 WHERE singleton=1")
+
+
def _rebuild_chat_attachment_inventory(conn: sqlite3.Connection) -> None:
"""Rebuild after schema upgrade or a write from an older Unsloth build."""
conn.execute("DELETE FROM chat_attachment_inventory")
diff --git a/studio/backend/tests/test_research_runs_storage.py b/studio/backend/tests/test_research_runs_storage.py
index 65eddd0ef56..00289ff165b 100644
--- a/studio/backend/tests/test_research_runs_storage.py
+++ b/studio/backend/tests/test_research_runs_storage.py
@@ -4679,3 +4679,93 @@ def test_worker_leaves_an_approved_run_unsearched_under_disable_tools(research_h
run = research_db.get_run("run-1")
assert called == []
assert (run["status"], run["error"]) == ("failed", "Tools are disabled on this server")
+
+
+def _inventory_snapshot():
+ conn = studio_db.get_connection()
+ try:
+ state = conn.execute(
+ "SELECT dirty FROM chat_attachment_inventory_state WHERE singleton=1"
+ ).fetchone()
+ rows = conn.execute("SELECT * FROM chat_attachment_inventory ORDER BY 1, 2").fetchall()
+ return (state["dirty"] if state is not None else None), [tuple(r) for r in rows]
+ finally:
+ conn.close()
+
+
+def test_terminal_fallback_keeps_a_clean_attachment_inventory_clean():
+ studio_db.upsert_chat_thread(
+ {
+ "id": "thread-inv",
+ "title": "T",
+ "modelType": "base",
+ "modelId": "local-model",
+ "createdAt": 1,
+ }
+ )
+ studio_db.upsert_chat_message(
+ {
+ "id": "user-inv",
+ "threadId": "thread-inv",
+ "role": "user",
+ "content": [
+ {"type": "text", "text": "question"},
+ {"type": "image", "image": "data:image/png;base64,iVBORw0KGgo="},
+ ],
+ "createdAt": 2,
+ }
+ )
+ _create(
+ "run-inv", assistant_message_id = None, thread_id = "thread-inv", user_message_id = "user-inv"
+ )
+ research_db.set_plan("run-inv", _plan())
+ assert research_db.request_cancel("run-inv") == "cancelled"
+ before_dirty, before_rows = _inventory_snapshot()
+ assert before_dirty == 0
+
+ message_id, created = research_db.create_and_bind_terminal_fallback(
+ "run-inv",
+ text = "Research cancelled.",
+ status = "cancelled",
+ sources = [{"url": "https://example.com", "title": "Example", "snippet": "s"}],
+ )
+ assert created is True
+ dirty, rows = _inventory_snapshot()
+ assert dirty == 0
+ assert rows == before_rows
+
+ conn = studio_db.get_connection()
+ try:
+ studio_db._rebuild_chat_attachment_inventory(conn)
+ conn.commit()
+ finally:
+ conn.close()
+ rebuilt_dirty, rebuilt_rows = _inventory_snapshot()
+ assert rebuilt_dirty == 0
+ assert rebuilt_rows == rows
+ assert any(m["id"] == message_id for m in studio_db.list_chat_messages("thread-inv"))
+
+
+def test_insert_server_chat_message_indexes_entries_like_a_rebuild():
+ studio_db.upsert_chat_thread(
+ {"id": "thread-img", "title": "T", "modelType": "base", "modelId": "m", "createdAt": 1}
+ )
+ assert _inventory_snapshot()[0] == 0
+ content = [{"type": "image", "image": "data:image/png;base64,iVBORw0KGgo="}]
+ conn = studio_db.get_connection()
+ try:
+ studio_db.insert_server_chat_message(
+ conn, "server-img", "thread-img", None, json.dumps(content), "{}", 2
+ )
+ conn.commit()
+ finally:
+ conn.close()
+ dirty, rows = _inventory_snapshot()
+ assert dirty == 0 and len(rows) == 1
+ conn = studio_db.get_connection()
+ try:
+ studio_db._rebuild_chat_attachment_inventory(conn)
+ conn.commit()
+ finally:
+ conn.close()
+ assert _inventory_snapshot() == (0, rows)