Skip to content

DeepTutor: Lifelong Personalized Tutoring. https://deeptutor.info/.

Stage presets with canonical settings extension keys after #1383

Bingxi Zhao (Frank)9453350015f2
diff --git a/deeptutor/api/routers/settings.py b/deeptutor/api/routers/settings.py
index 055e501de..b702507de 100644
--- a/deeptutor/api/routers/settings.py
+++ b/deeptutor/api/routers/settings.py
@@ -51,16 +51,16 @@ from deeptutor.services.config.settings_draft import (
merge_draft_secrets,
redact_draft,
)
-from deeptutor.services.config.settings_profile import (
- SettingsProfileError,
- export_settings_profile,
- review_settings_profile_import,
-)
from deeptutor.services.config.settings_presets import (
SETTINGS_PRESETS_SCHEMA_VERSION,
get_settings_preset,
list_settings_presets,
)
+from deeptutor.services.config.settings_profile import (
+ SettingsProfileError,
+ export_settings_profile,
+ review_settings_profile_import,
+)
from deeptutor.services.llm.config import clear_llm_config_cache
from deeptutor.services.model_selection import list_llm_options
from deeptutor.services.path_service import get_path_service
@@ -1308,8 +1308,8 @@ async def _stage_settings_preset(
get_model_catalog_service().load(),
)
preset_draft = preset.draft_extensions()
- tools = preset_draft.get("enabled_tools", {}).get("enabled_tools", [])
- preset_draft["enabled_tools"]["enabled_tools"] = sanitize_enabled_tools(tools)
+ tools = preset_draft["tools"]["enabled_tools"]
+ preset_draft["tools"]["enabled_tools"] = sanitize_enabled_tools(tools)
merged["extensions"].update(preset_draft)
return {
diff --git a/deeptutor/services/config/settings_presets.py b/deeptutor/services/config/settings_presets.py
index bca500334..487f5a0f0 100644
--- a/deeptutor/services/config/settings_presets.py
+++ b/deeptutor/services/config/settings_presets.py
@@ -13,8 +13,8 @@ from typing import Any
SETTINGS_PRESETS_SCHEMA_VERSION = "deeptutor.settings-presets/v1"
-_DOCUMENT_PARSING_EXTENSION = "document_parsing"
-_ENABLED_TOOLS_EXTENSION = "enabled_tools"
+_DOCUMENT_PARSING_EXTENSION = "document-parsing"
+_ENABLED_TOOLS_EXTENSION = "tools"
@dataclass(frozen=True, slots=True)
@@ -49,7 +49,7 @@ class SettingsPreset:
"""Return payload shapes accepted by the existing draft apply flow."""
return {
- _DOCUMENT_PARSING_EXTENSION: {"engine": self.parser_engine},
+ _DOCUMENT_PARSING_EXTENSION: {"engine": self.parser_engine, "engines": {}},
_ENABLED_TOOLS_EXTENSION: {"enabled_tools": list(self.tools)},
}
diff --git a/tests/api/test_settings_presets.py b/tests/api/test_settings_presets.py
index c07c4f491..b97d8a3bc 100644
--- a/tests/api/test_settings_presets.py
+++ b/tests/api/test_settings_presets.py
@@ -87,15 +87,15 @@ async def test_staging_a_preset_writes_only_the_reviewable_draft(
assert guarded == 1
assert response["preset"]["id"] == "university_study"
draft = response["draft"]
- assert draft["extensions"]["document_parsing"] == {"engine": "markitdown"}
- assert draft["extensions"]["enabled_tools"] == {
+ assert draft["extensions"]["document-parsing"] == {"engine": "markitdown", "engines": {}}
+ assert draft["extensions"]["tools"] == {
"enabled_tools": ["brainstorm", "web_search", "paper_search", "reason"]
}
assert draft["extensions"]["memory"] == {"enabled": False}
assert draft["catalog"]["services"]["llm"]["profiles"][0]["api_key"] == (CATALOG_SECRET_MASK)
saved = draft_service.load()
- assert saved["extensions"]["document_parsing"] == draft["extensions"]["document_parsing"]
+ assert saved["extensions"]["document-parsing"] == draft["extensions"]["document-parsing"]
assert saved["catalog"]["services"]["llm"]["profiles"][0]["api_key"] == "sk-live"
assert catalog_service.load() == _catalog("sk-live")
diff --git a/tests/services/config/test_settings_presets.py b/tests/services/config/test_settings_presets.py
index c1699065c..8158e857a 100644
--- a/tests/services/config/test_settings_presets.py
+++ b/tests/services/config/test_settings_presets.py
@@ -29,8 +29,8 @@ def test_a_preset_has_the_draft_payloads_the_apply_flow_already_writes() -> None
draft = preset.draft_extensions()
- assert draft["document_parsing"] == {"engine": "markitdown"}
- assert draft["enabled_tools"] == {
+ assert draft["document-parsing"] == {"engine": "markitdown", "engines": {}}
+ assert draft["tools"] == {
"enabled_tools": ["brainstorm", "web_search", "paper_search", "reason"]
}
diff --git a/web/lib/settings-extensions.ts b/web/lib/settings-extensions.ts
index 368229e2c..97dad24d3 100644
--- a/web/lib/settings-extensions.ts
+++ b/web/lib/settings-extensions.ts
@@ -28,8 +28,6 @@ export const EXTENSION_ENDPOINTS = {
capabilities: "/api/capabilities/settings",
memory: "/api/memory/settings",
network: "/api/settings/network",
- "document_parsing": "/api/settings/document-parsing",
- enabled_tools: "/api/settings/enabled-tools",
} as const;
export type ExtensionKey = keyof typeof EXTENSION_ENDPOINTS;
diff --git a/web/tests/settings-presets.test.ts b/web/tests/settings-presets.test.ts
index a6212f3a6..ee4e0a30e 100644
--- a/web/tests/settings-presets.test.ts
+++ b/web/tests/settings-presets.test.ts
@@ -17,8 +17,8 @@ function locale(name: string): Record<string, string> {
test("preset drafts reuse the apply flow that owns each setting", () => {
const endpoints = source("lib/settings-extensions.ts");
- assert.match(endpoints, /"document_parsing": "\/api\/settings\/document-parsing"/);
- assert.match(endpoints, /enabled_tools: "\/api\/settings\/enabled-tools"/);
+ assert.match(endpoints, /"document-parsing": "\/api\/settings\/document-parsing"/);
+ assert.match(endpoints, /tools: "\/api\/settings\/enabled-tools"/);
const panel = source("components/settings/SettingsPresetsPanel.tsx");
assert.match(panel, /stagePreset\(preset\.id\)/);