* feat: align project sidebar UX with ChatGPT * feat: align project sidebar UX with ChatGPT * feat(chat): load stored project list * feat(chat): add project sidebar workflows * fix: stabilize project page navigation * fix: projects chat loading * fix: show project chat thread * style: sidebar project spacing and hover clipping * style: add expandable project chat history and move-to-project submenu * feat: polish project sidebar * feat: persist project sandbox paths * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix: only create sandbox project workspace dir * feat: add optional project workspace deletion from delete dialog * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix: stabilize chat projects CI failures * fix: polish project chat navigation * Studio: manage chat history with projects Group chats into projects with a dedicated projects page and route. Sidebar shows recents with per-row actions and a vertical more-vertical menu, and the sidebar scrollbar stays hidden so rows never shift on hover. Includes chat settings and composer refinements. * Studio: projects sidebar and breadcrumb polish Sidebar: - Remove the Compare nav item. - Widen the sidebar to match the projects layout. - Replace the scroll-gated bottom fade with a static fade pinned above the profile box, so it no longer attaches to Recents or lags the collapse and expand animation. Topbar breadcrumb (chat-page): - On a project landing show "Projects" linking to the projects list. - Inside a project chat show the project name and chat title, with the project name linking back to that specific project page. - Drop the divider between the model selector and the breadcrumb. * Studio: make project workspace delete test cross-platform test_chat_project_delete_files_removes_workspace rooted the project under pytest tmp_path, which resolves to /private/tmp on macOS. The workspace delete guard refuses paths under the system denylist by design, so the test passed on Linux CI but failed on macOS. Add a workspace_projects_home fixture that keeps tmp_path on Linux and Windows (CI unchanged) and falls back to a home subdir only when the temp root is on the platform denylist. Derive the workspace path from the created project so it tracks the projects home. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Studio: satisfy import-hoist check for new path re-exports documents_root and project_workspaces_root are re-exported from utils.paths but only referenced as __all__ string literals, which the import-hoist safety net does not count as a use. It flagged the two newly added re-exports as unused imports and failed Source lint. Name-load both via a module-level _REEXPORTED tuple so the check sees them used. No behaviour change; consumers still import them from utils.paths. * fix: avoid projects empty-state flash * fix: batch chat search indexing * Studio: polish chat sidebar, run settings, and search - Use the native OS scrollbar for the chat sidebar, Run settings panel, and chat search list instead of a custom scrollbar - Highlight the active run in the sidebar and keep chat search available during training - Stop the training log view from replaying when navigating back to a run - Rename the chat settings panel to Run settings and align its toggle icon and position - Tighten heading and sidebar letter spacing and lighten the Train and Recents labels - Match the search dialog corner style across light and dark and drop the stray border - Make the MCP Servers section header plain text instead of a link - Remove a stray .orig backup file * studio/frontend: restore Compare entry point in the sidebar The chat-projects sidebar redesign dropped the Compare nav item and moved it to thread-sidebar.tsx, which is not imported or rendered anywhere. That left no way for a user to start a new model comparison (enterCompare only fired from the guided tour and the training handoff), and broke the Compare/Recipes/Export UI smoke test that clicks [data-tour="chat-compare"]. Re-add the Compare NavItem to the New Chat / Search group, carrying data-tour="chat-compare" and the same new-comparison navigation as before. * studio/frontend: use Unsloth green for the fallback profile avatar Switch the initials-avatar background from blue to #14b789 so the sidebar and edit-profile avatar match the Unsloth brand colour. * studio/frontend: turn project breadcrumb into a project switcher dropdown * studio/frontend: stop project card kebab clicks from opening the project * studio/frontend: hide project switcher outside projects * studio/frontend: stabilize project switcher loading * style: project switcher alignment --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: shimmyshimmer <107991372+shimmyshimmer@users.noreply.github.com> Co-authored-by: Unsloth <michaelhan@Michaels-MacBook-Pro.local> Co-authored-by: Roland Tannous <rolandtannous@gravityq.ai> Co-authored-by: Roland Tannous <115670425+rolandtannous@users.noreply.github.com>
397 lines
13 KiB
Python
397 lines
13 KiB
Python
# SPDX-License-Identifier: AGPL-3.0-only
|
|
# Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0
|
|
|
|
import os
|
|
import platform
|
|
import shutil
|
|
import threading
|
|
import uuid
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
from storage import studio_db
|
|
|
|
|
|
def _reset_studio_db(tmp_path, monkeypatch, projects_home = None):
|
|
monkeypatch.setenv("UNSLOTH_STUDIO_HOME", str(tmp_path))
|
|
monkeypatch.setenv(
|
|
"UNSLOTH_STUDIO_PROJECTS_HOME",
|
|
str(projects_home if projects_home is not None else tmp_path / "Projects"),
|
|
)
|
|
monkeypatch.setattr(studio_db, "_schema_ready", False)
|
|
|
|
|
|
@pytest.fixture
|
|
def workspace_projects_home(tmp_path):
|
|
"""Projects root outside the platform delete denylist.
|
|
|
|
tmp_path resolves under /private/tmp on macOS, which the workspace
|
|
delete guard refuses by design. Linux/Windows tmp is not denied and is
|
|
used as-is; only the denied case falls back to a home subdir.
|
|
"""
|
|
candidate = tmp_path / "Projects"
|
|
resolved = str(candidate.resolve())
|
|
check = os.path.normcase(resolved) if platform.system() == "Windows" else resolved
|
|
denied = studio_db._denied_path_prefixes()
|
|
if any(check == p or check.startswith(p + os.sep) for p in denied):
|
|
candidate = Path.home() / ".unsloth-studio-tests" / uuid.uuid4().hex
|
|
candidate.mkdir(parents = True, exist_ok = True)
|
|
try:
|
|
yield candidate
|
|
finally:
|
|
if ".unsloth-studio-tests" in candidate.parts:
|
|
shutil.rmtree(candidate, ignore_errors = True)
|
|
|
|
|
|
def _thread(thread_id: str = "thread-1") -> dict:
|
|
return {
|
|
"id": thread_id,
|
|
"title": "Test Chat",
|
|
"modelType": "base",
|
|
"modelId": "test-model",
|
|
"pairId": None,
|
|
"archived": False,
|
|
"createdAt": 1_700_000_000_000,
|
|
}
|
|
|
|
|
|
def _message(
|
|
message_id: str,
|
|
created_at: int,
|
|
content: str,
|
|
thread_id: str = "thread-1",
|
|
) -> dict:
|
|
return {
|
|
"id": message_id,
|
|
"threadId": thread_id,
|
|
"parentId": None,
|
|
"role": "user",
|
|
"content": [{"type": "text", "text": content}],
|
|
"createdAt": created_at,
|
|
}
|
|
|
|
|
|
def _project(project_id: str = "project-1") -> dict:
|
|
return {
|
|
"id": project_id,
|
|
"name": "Research",
|
|
"instructions": "Use terse answers.",
|
|
"archived": False,
|
|
"createdAt": 1_700_000_000_000,
|
|
"updatedAt": 1_700_000_000_000,
|
|
}
|
|
|
|
|
|
def test_sync_chat_messages_upserts_without_pruning(tmp_path, monkeypatch):
|
|
_reset_studio_db(tmp_path, monkeypatch)
|
|
studio_db.upsert_chat_thread(_thread())
|
|
studio_db.sync_chat_messages(
|
|
"thread-1",
|
|
[
|
|
_message("msg-1", 1, "keep me"),
|
|
_message("msg-2", 2, "old text"),
|
|
],
|
|
prune_missing = True,
|
|
)
|
|
|
|
messages = studio_db.sync_chat_messages(
|
|
"thread-1",
|
|
[_message("msg-2", 2, "updated text")],
|
|
)
|
|
|
|
by_id = {message["id"]: message for message in messages}
|
|
assert set(by_id) == {"msg-1", "msg-2"}
|
|
assert by_id["msg-2"]["content"] == [{"type": "text", "text": "updated text"}]
|
|
|
|
|
|
def test_chat_projects_delete_cascades_threads_and_messages(
|
|
tmp_path,
|
|
monkeypatch,
|
|
):
|
|
_reset_studio_db(tmp_path, monkeypatch)
|
|
project = studio_db.upsert_chat_project(_project())
|
|
assert project["rootPath"].startswith(str(tmp_path / "Projects"))
|
|
assert (tmp_path / "Projects" / "Research-project").exists()
|
|
assert (tmp_path / "Projects" / "Research-project" / "sandbox").is_dir()
|
|
assert not (tmp_path / "Projects" / "Research-project" / "chats").exists()
|
|
assert not (tmp_path / "Projects" / "Research-project" / "files").exists()
|
|
assert not (tmp_path / "Projects" / "Research-project" / "exports").exists()
|
|
studio_db.upsert_chat_thread({**_thread(), "projectId": "project-1"})
|
|
studio_db.upsert_chat_message(_message("msg-1", 1, "delete with project"))
|
|
|
|
[thread] = studio_db.list_chat_threads(project_id = "project-1")
|
|
assert thread["projectId"] == "project-1"
|
|
|
|
deleted = studio_db.delete_chat_project("project-1")
|
|
|
|
assert deleted is not None
|
|
assert deleted["id"] == "project-1"
|
|
assert studio_db.get_chat_project("project-1") is None
|
|
assert studio_db.list_chat_threads(project_id = "project-1") == []
|
|
assert studio_db.get_chat_thread("thread-1") is None
|
|
assert studio_db.list_chat_messages("thread-1") == []
|
|
assert (tmp_path / "Projects" / "Research-project").exists()
|
|
|
|
|
|
def test_chat_project_delete_files_removes_workspace(
|
|
tmp_path, monkeypatch, workspace_projects_home
|
|
):
|
|
_reset_studio_db(tmp_path, monkeypatch, projects_home = workspace_projects_home)
|
|
project = studio_db.upsert_chat_project(_project())
|
|
# Derive root from the created project so it tracks the projects home.
|
|
root = Path(project["rootPath"])
|
|
marker = root / "sandbox" / "marker.txt"
|
|
marker.write_text("created by code execution", encoding = "utf-8")
|
|
|
|
deleted = studio_db.delete_chat_project(project["id"], delete_files = True)
|
|
|
|
assert deleted is not None
|
|
assert deleted["rootPath"] == project["rootPath"]
|
|
assert not root.exists()
|
|
assert studio_db.get_chat_project(project["id"]) is None
|
|
|
|
|
|
def test_sync_chat_messages_prunes_when_requested(tmp_path, monkeypatch):
|
|
_reset_studio_db(tmp_path, monkeypatch)
|
|
studio_db.upsert_chat_thread(_thread())
|
|
studio_db.sync_chat_messages(
|
|
"thread-1",
|
|
[
|
|
_message("msg-1", 1, "delete me"),
|
|
_message("msg-2", 2, "keep me"),
|
|
],
|
|
)
|
|
|
|
messages = studio_db.sync_chat_messages(
|
|
"thread-1",
|
|
[_message("msg-2", 2, "keep me")],
|
|
prune_missing = True,
|
|
)
|
|
|
|
assert [message["id"] for message in messages] == ["msg-2"]
|
|
|
|
|
|
def test_upsert_chat_message_rejects_cross_thread_id_conflict(tmp_path, monkeypatch):
|
|
_reset_studio_db(tmp_path, monkeypatch)
|
|
studio_db.upsert_chat_thread(_thread("thread-1"))
|
|
studio_db.upsert_chat_thread(_thread("thread-2"))
|
|
studio_db.upsert_chat_message(_message("msg-1", 1, "original", "thread-1"))
|
|
|
|
with pytest.raises(studio_db.ChatMessageConflictError):
|
|
studio_db.upsert_chat_message(_message("msg-1", 2, "moved", "thread-2"))
|
|
|
|
assert [m["id"] for m in studio_db.list_chat_messages("thread-1")] == ["msg-1"]
|
|
assert studio_db.list_chat_messages("thread-2") == []
|
|
|
|
|
|
def test_sync_chat_messages_detects_conflict_before_prune(tmp_path, monkeypatch):
|
|
_reset_studio_db(tmp_path, monkeypatch)
|
|
studio_db.upsert_chat_thread(_thread("thread-1"))
|
|
studio_db.upsert_chat_thread(_thread("thread-2"))
|
|
studio_db.sync_chat_messages(
|
|
"thread-1",
|
|
[_message("keep-me", 1, "keep", "thread-1")],
|
|
)
|
|
studio_db.upsert_chat_message(_message("conflict", 2, "other", "thread-2"))
|
|
|
|
with pytest.raises(studio_db.ChatMessageConflictError):
|
|
studio_db.sync_chat_messages(
|
|
"thread-1",
|
|
[_message("conflict", 3, "bad", "thread-1")],
|
|
prune_missing = True,
|
|
)
|
|
|
|
assert [m["id"] for m in studio_db.list_chat_messages("thread-1")] == ["keep-me"]
|
|
assert [m["id"] for m in studio_db.list_chat_messages("thread-2")] == ["conflict"]
|
|
|
|
|
|
def test_settings_merge_atomic_under_concurrency(tmp_path, monkeypatch):
|
|
"""Two threads writing distinct keys must not drop each other's update."""
|
|
_reset_studio_db(tmp_path, monkeypatch)
|
|
studio_db.upsert_chat_settings_merge({"inferenceParams": {}})
|
|
|
|
barrier = threading.Barrier(2)
|
|
|
|
def writer(key: str, value: float) -> None:
|
|
barrier.wait()
|
|
studio_db.upsert_chat_settings_merge({"inferenceParams": {key: value}})
|
|
|
|
t1 = threading.Thread(target = writer, args = ("temperature", 0.7))
|
|
t2 = threading.Thread(target = writer, args = ("topP", 0.9))
|
|
t1.start()
|
|
t2.start()
|
|
t1.join()
|
|
t2.join()
|
|
|
|
merged = studio_db.list_chat_settings()["inferenceParams"]
|
|
assert merged.get("temperature") == 0.7
|
|
assert merged.get("topP") == 0.9
|
|
|
|
|
|
def test_settings_merge_preserves_nested_keys(tmp_path, monkeypatch):
|
|
_reset_studio_db(tmp_path, monkeypatch)
|
|
studio_db.upsert_chat_settings_merge(
|
|
{"inferenceParams": {"temperature": 0.5, "topP": 0.8}}
|
|
)
|
|
studio_db.upsert_chat_settings_merge({"inferenceParams": {"temperature": 0.9}})
|
|
|
|
params = studio_db.list_chat_settings()["inferenceParams"]
|
|
assert params == {"temperature": 0.9, "topP": 0.8}
|
|
|
|
|
|
def test_settings_merge_quarantines_corrupt_json_and_rejects_partial_patch(
|
|
tmp_path,
|
|
monkeypatch,
|
|
):
|
|
_reset_studio_db(tmp_path, monkeypatch)
|
|
studio_db.upsert_chat_settings_merge(
|
|
{"inferenceParams": {"temperature": 0.5, "topP": 0.8}}
|
|
)
|
|
conn = studio_db.get_connection()
|
|
try:
|
|
conn.execute(
|
|
"UPDATE chat_settings SET value_json = ? WHERE key = ?",
|
|
('{"temperature": 0.5', "inferenceParams"),
|
|
)
|
|
conn.commit()
|
|
finally:
|
|
conn.close()
|
|
|
|
with pytest.raises(studio_db.CorruptSettingsError):
|
|
studio_db.upsert_chat_settings_merge({"inferenceParams": {"temperature": 0.9}})
|
|
|
|
conn = studio_db.get_connection()
|
|
try:
|
|
quarantined = conn.execute(
|
|
"SELECT key, value_json, reason FROM chat_settings_quarantine"
|
|
).fetchall()
|
|
remaining = conn.execute(
|
|
"SELECT key FROM chat_settings WHERE key = ?",
|
|
("inferenceParams",),
|
|
).fetchall()
|
|
finally:
|
|
conn.close()
|
|
assert [row["key"] for row in quarantined] == ["inferenceParams"]
|
|
assert quarantined[0]["reason"] == "json_decode_error"
|
|
assert remaining == []
|
|
|
|
|
|
def test_settings_merge_replaces_corrupt_scalar_after_quarantine(tmp_path, monkeypatch):
|
|
_reset_studio_db(tmp_path, monkeypatch)
|
|
studio_db.upsert_chat_settings_merge({"autoTitle": False})
|
|
conn = studio_db.get_connection()
|
|
try:
|
|
conn.execute(
|
|
"UPDATE chat_settings SET value_json = ? WHERE key = ?",
|
|
("not-json", "autoTitle"),
|
|
)
|
|
conn.commit()
|
|
finally:
|
|
conn.close()
|
|
|
|
settings = studio_db.upsert_chat_settings_merge({"autoTitle": True})
|
|
|
|
assert settings["autoTitle"] is True
|
|
conn = studio_db.get_connection()
|
|
try:
|
|
quarantined = conn.execute(
|
|
"SELECT key, reason FROM chat_settings_quarantine"
|
|
).fetchall()
|
|
finally:
|
|
conn.close()
|
|
assert [(row["key"], row["reason"]) for row in quarantined] == [
|
|
("autoTitle", "json_decode_error")
|
|
]
|
|
|
|
|
|
def test_list_chat_messages_for_threads_chunks_over_900_ids(tmp_path, monkeypatch):
|
|
"""SQLite host-parameter limit is 999 on older builds; chunk at 900."""
|
|
_reset_studio_db(tmp_path, monkeypatch)
|
|
n = 901
|
|
for i in range(n):
|
|
studio_db.upsert_chat_thread(
|
|
{
|
|
"id": f"t-{i}",
|
|
"title": "T",
|
|
"modelType": "base",
|
|
"modelId": "m",
|
|
"pairId": None,
|
|
"archived": False,
|
|
"createdAt": 1_700_000_000_000 + i,
|
|
}
|
|
)
|
|
studio_db.upsert_chat_message(
|
|
{
|
|
"id": f"m-{i}",
|
|
"threadId": f"t-{i}",
|
|
"parentId": None,
|
|
"role": "user",
|
|
"content": [{"type": "text", "text": "hi"}],
|
|
"createdAt": 1_700_000_000_000 + i,
|
|
}
|
|
)
|
|
out = studio_db.list_chat_messages_for_threads([f"t-{i}" for i in range(n)])
|
|
assert len(out) == n
|
|
assert {m["threadId"] for m in out} == {f"t-{i}" for i in range(n)}
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Legacy Dexie import ledger
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_legacy_imports_empty_by_default(tmp_path, monkeypatch):
|
|
_reset_studio_db(tmp_path, monkeypatch)
|
|
assert studio_db.list_chat_legacy_imports() == []
|
|
|
|
|
|
def test_legacy_imports_records_and_lists(tmp_path, monkeypatch):
|
|
_reset_studio_db(tmp_path, monkeypatch)
|
|
accepted, inserted = studio_db.upsert_chat_legacy_imports(
|
|
["legacy-a", "legacy-b", "legacy-c"],
|
|
)
|
|
assert accepted == 3
|
|
assert inserted == 3
|
|
assert set(studio_db.list_chat_legacy_imports()) == {
|
|
"legacy-a",
|
|
"legacy-b",
|
|
"legacy-c",
|
|
}
|
|
|
|
|
|
def test_legacy_imports_is_idempotent(tmp_path, monkeypatch):
|
|
_reset_studio_db(tmp_path, monkeypatch)
|
|
accepted1, inserted1 = studio_db.upsert_chat_legacy_imports(
|
|
["legacy-a", "legacy-b"],
|
|
)
|
|
accepted2, inserted2 = studio_db.upsert_chat_legacy_imports(
|
|
["legacy-b", "legacy-c"],
|
|
)
|
|
assert (accepted1, inserted1) == (2, 2)
|
|
# legacy-b is already in the ledger, only legacy-c is genuinely new.
|
|
assert (accepted2, inserted2) == (2, 1)
|
|
assert set(studio_db.list_chat_legacy_imports()) == {
|
|
"legacy-a",
|
|
"legacy-b",
|
|
"legacy-c",
|
|
}
|
|
|
|
|
|
def test_legacy_imports_dedups_input(tmp_path, monkeypatch):
|
|
_reset_studio_db(tmp_path, monkeypatch)
|
|
accepted, inserted = studio_db.upsert_chat_legacy_imports(
|
|
["x", "x", "y", "x"],
|
|
)
|
|
# accepted is the deduped non-empty input size; inserted is the rows
|
|
# actually new in the ledger after ON CONFLICT DO NOTHING.
|
|
assert accepted == 2
|
|
assert inserted == 2
|
|
assert set(studio_db.list_chat_legacy_imports()) == {"x", "y"}
|
|
|
|
|
|
def test_legacy_imports_ignores_empty(tmp_path, monkeypatch):
|
|
_reset_studio_db(tmp_path, monkeypatch)
|
|
assert studio_db.upsert_chat_legacy_imports([]) == (0, 0)
|
|
assert studio_db.upsert_chat_legacy_imports(["", None]) == (0, 0) # type: ignore[list-item]
|
|
assert studio_db.list_chat_legacy_imports() == []
|