DeepTutor: Lifelong Personalized Tutoring. https://deeptutor.info/.
Python ai-agentsai-tutorclawbotcli-tooldeepresearchinteractive-learninglearningmulti-agent-systemsrag
Merge PR batch with local follow-up fixes
Bingxi Zhao (Frank)8880529c6506
diff --cc deeptutor/api/routers/settings.pyindex 3489eab97,ab351511c..1420d584c--- a/deeptutor/api/routers/settings.py+++ b/deeptutor/api/routers/settings.py@@@ -143,8 -170,8 +171,8 @@@ class SidebarNavOrder(BaseModel)class UISettings(BaseModel):theme: Literal["light", "dark", "glass", "snow"] = "snow"- language: Literal["zh", "en", "fr", "uk"] = "en"+ language: UiLanguage = "en"- response_language: UiLanguage = "en"+ response_language: ResponseLanguage = "en"sidebar_description: Optional[str] = Nonesidebar_nav_order: Optional[SidebarNavOrder] = Nonecode_block_theme: Optional[str] = None@@@ -166,8 -193,8 +194,8 @@@ class UISettingsUpdate(BaseModel)# for exclude_unset partial merges, but an explicit value is still validated# so PUT /ui cannot persist a theme/language the app can't render.theme: Literal["light", "dark", "glass", "snow"] | None = None- language: Literal["zh", "en", "fr", "uk"] | None = None+ language: UiLanguage | None = None- response_language: UiLanguage | None = None+ response_language: ResponseLanguage | None = Nonesidebar_description: str | None = Nonesidebar_nav_order: SidebarNavOrder | None = Nonecode_block_theme: str | None = Nonediff --cc deeptutor/services/settings/interface_settings.pyindex 6adb462b2,0ab6fbecd..84fc88d2d--- a/deeptutor/services/settings/interface_settings.py+++ b/deeptutor/services/settings/interface_settings.py@@@ -13,8 -13,9 +13,9 @@@ import ofrom pathlib import Pathimport tempfileimport threading-from typing import Any+from typing import Any, Literal+ from deeptutor.response_languages import SUPPORTED_RESPONSE_LANGUAGESfrom deeptutor.services.path_service import get_path_servicefrom deeptutor.tools.builtin import USER_TOGGLEABLE_TOOL_NAMESdiff --cc tests/i18n/test_ukrainian_locale.pyindex 6b5a4d993,fc4a98bb0..5044b77cf--- a/tests/i18n/test_ukrainian_locale.py+++ b/tests/i18n/test_ukrainian_locale.py@@@ -60,14 -60,14 +60,22 @@@ def test_judge_speaks_every_language_itassert "українською" in _JUDGE_SYSTEM_PROMPTS["uk"]+def test_web_locale_has_core_copy_and_english_fallback() -> None:+ """Missing Ukrainian keys resolve through i18next's English bundle."""+ uk = json.loads((WEB / "locales/uk/app.json").read_text(encoding="utf-8"))+ assert {"language.ukrainian", "Start", "Model output language"} <= set(uk)+ init = (WEB / "i18n/init.ts").read_text(encoding="utf-8")+ assert 'fallbackLng: "en"' in init+++ def test_web_locale_covers_every_english_key() -> None:+ """Cover English keys plus Ukrainian's extra few/many plural forms."""+ en = json.loads((WEB / "locales/en/app.json").read_text(encoding="utf-8"))+ uk = json.loads((WEB / "locales/uk/app.json").read_text(encoding="utf-8"))+ assert set(en) <= set(uk)+ assert all(key.endswith(("_few", "_many")) for key in set(uk) - set(en))++def test_web_locale_keeps_interpolation_placeholders() -> None:import rediff --cc web/context/app-shell-storage.tsindex 3c3f23fdb,0951348c1..c82ccc830--- a/web/context/app-shell-storage.ts+++ b/web/context/app-shell-storage.ts@@@ -2,14 -2,65 +2,65 @@@import { browserStorage } from "@/shared/storage";import { activeWorkspaceId } from "@/lib/workspace-scope";+import {- isAppLanguage,+ normalizeLanguage as normalizeAppLanguage,+ type AppLanguage,+} from "@/i18n/languages";-// Re-exported rather than redeclared: this file had its own copy of the-// union, so widening the i18n one left this narrow and every call site-// that crossed the two failed to compile.-export type { AppLanguage } from "@/i18n/init";-import type { AppLanguage } from "@/i18n/init";+export type { AppLanguage } from "@/i18n/languages";+ /** Model output can use more languages than the app UI locale supports. */+ export type ResponseLanguage =+ | "en"+ | "zh"+ | "zh-tw"+ | "ja"+ | "ko"+ | "es"+ | "fr"+ | "de"+ | "ru"+ | "pt"+ | "it"+ | "ar"+ | "pl"+ | "uk";++ const SUPPORTED_RESPONSE_LANGUAGE_CODES: readonly ResponseLanguage[] = [+ "en",+ "zh",+ "zh-tw",+ "ja",+ "ko",+ "es",+ "fr",+ "de",+ "ru",+ "pt",+ "it",+ "ar",+ "pl",+ "uk",+ ];++ const RESPONSE_LANGUAGE_ALIASES: Record<string, ResponseLanguage> = {+ "simplified chinese": "zh",+ "traditional chinese": "zh-tw",+ chinese: "zh",+ japanese: "ja",+ korean: "ko",+ spanish: "es",+ french: "fr",+ german: "de",+ russian: "ru",+ portuguese: "pt",+ italian: "it",+ arabic: "ar",+ polish: "pl",+ ukrainian: "uk",+ "zh-cn": "zh",+ };+export const ACTIVE_SESSION_STORAGE_KEY = "deeptutor.activeSessionId.tab";export const LANGUAGE_STORAGE_KEY = "deeptutor-language";export const RESPONSE_LANGUAGE_STORAGE_KEY = "deeptutor-response-language";diff --cc web/contracts/generated/api.tsindex 980390725,c4c13961e..b7f68b4a6--- a/web/contracts/generated/api.ts+++ b/web/contracts/generated/api.ts@@@ -14488,6 -14897,6 +14963,11 @@@ export interface components* @default null*/readonly persona: string | null;++ /**++ * Preserve Session Preferences++ * @default false++ */++ readonly preserve_session_preferences: boolean;/** Question Notebook References */readonly question_notebook_references?: readonly number[];/**@@@ -14519,7 -14928,7 +14999,7 @@@* Regenerated From Message Id* @default null*/-- readonly regenerated_from_message_id: number | null;++ readonly regenerated_from_message_id: number | string | null;/*** Selection Tutor Context* @default null@@@ -14644,9 -15053,25 +15124,26 @@@/** Code Block Wrap Long Lines */readonly code_block_wrap_long_lines?: boolean | null;/** Language */- readonly language?: ("zh" | "en") | null;+ readonly language?: ("en" | "zh" | "fr" | "uk") | null;/** Response Language */- readonly response_language?: ("en" | "zh" | "fr" | "uk") | null;+ readonly response_language?:+ | (+ | "en"+ | "zh"+ | "zh-tw"+ | "ja"+ | "ko"+ | "es"+ | "fr"+ | "de"+ | "ru"+ | "pt"+ | "it"+ | "ar"+ | "pl"++ | "uk"+ )+ | null;/** Sidebar Description */readonly sidebar_description?: string | null;readonly sidebar_nav_order?:diff --cc web/contracts/generated/turn-protocol.tsindex c151a9191,c151a9191..efc920d1d--- a/web/contracts/generated/turn-protocol.ts+++ b/web/contracts/generated/turn-protocol.ts@@@ -60,6 -60,6 +60,7 @@@ export type PartnerGroupReferences =}[];export type PersistUserMessage = boolean;export type Persona = string | null;++export type PreserveSessionPreferences = boolean;export type ProtocolVersion = "2.0";export type QuestionNotebookReferences = number[];export type ReadingMaterialId = string | null;@@@ -72,7 -72,7 +73,7 @@@ export type Locator = number | nullexport type Selection = string | null;export type ReadingWorkspaceId = string | null;export type Regenerate = boolean;--export type RegeneratedFromMessageId = number | null;++export type RegeneratedFromMessageId = number | string | null;export type SelectionTutorContext = {[k: string]: unknown;} | null;@@@ -297,6 -297,6 +298,7 @@@ export interface StartTurnCommandpartner_group_references?: PartnerGroupReferences;persist_user_message?: PersistUserMessage;persona?: Persona;++ preserve_session_preferences?: PreserveSessionPreferences;protocol_version: ProtocolVersion;question_notebook_references?: QuestionNotebookReferences;reading_material_id?: ReadingMaterialId;diff --cc web/contracts/schema/openapi.jsonindex 773b69466,76cf53991..b06f2ad93--- a/web/contracts/schema/openapi.json+++ b/web/contracts/schema/openapi.json@@@ -9748,6 -10181,6 +10194,11 @@@"default": null,"title": "Persona"},++ "preserve_session_preferences": {++ "default": false,++ "title": "Preserve Session Preferences",++ "type": "boolean"++ },"question_notebook_references": {"items": {"type": "integer"@@@ -9820,6 -10253,6 +10271,9 @@@{"type": "integer"},++ {++ "type": "string"++ },{"type": "null"}@@@ -10119,8 -10550,17 +10573,18 @@@"enum": ["en","zh",+ "zh-tw",+ "ja",+ "ko",+ "es","fr",+ "de",+ "ru",+ "pt",+ "it",+ "ar",- "pl"++ "pl",+ "uk"],"type": "string"},diff --cc web/contracts/schema/turn-protocol.jsonindex 6630ddbfd,6630ddbfd..74848b4fd--- a/web/contracts/schema/turn-protocol.json+++ b/web/contracts/schema/turn-protocol.json@@@ -1062,6 -1062,6 +1062,11 @@@"default": null,"title": "Persona"},++ "preserve_session_preferences": {++ "default": false,++ "title": "Preserve Session Preferences",++ "type": "boolean"++ },"protocol_version": {"const": "2.0","title": "Protocol Version",@@@ -1139,6 -1139,6 +1144,9 @@@{"type": "integer"},++ {++ "type": "string"++ },{"type": "null"}diff --cc web/tests/language-preferences.test.tsindex f46578929,128af3a6d..3dedbe4b5--- a/web/tests/language-preferences.test.ts+++ b/web/tests/language-preferences.test.ts@@@ -19,10 -10,17 +19,19 @@@ test("response language remains indepenassert.equal(resolveResponseLanguage("en", "zh"), "en");assert.equal(resolveResponseLanguage("fr", "en"), "fr");assert.equal(resolveResponseLanguage("en", "fr"), "en");+ assert.equal(resolveResponseLanguage("uk", "en"), "uk");+ assert.equal(resolveResponseLanguage("en", "uk"), "en");});+ test("response language accepts and normalizes the extended registry", () => {+ assert.equal(resolveResponseLanguage("ja", "en"), "ja");+ assert.equal(resolveResponseLanguage("zh-tw", "en"), "zh-tw");+ assert.equal(resolveResponseLanguage("Japanese", "en"), "ja");+ assert.equal(resolveResponseLanguage("zh-cn", "en"), "zh");+ assert.equal(resolveResponseLanguage("pt-BR", "en"), "pt");+ assert.equal(resolveResponseLanguage("klingon", "zh"), "zh");+ });+test("legacy settings inherit the interface language when response language is missing", () => {assert.equal(resolveResponseLanguage(null, "zh"), "zh");assert.equal(resolveResponseLanguage(undefined, "en"), "en");diff --cc web/tests/partial-locale-fallback.spec.tsindex 6ba8e8acc,000000000..cf089da53mode 100644,000000..100644--- a/web/tests/partial-locale-fallback.spec.ts+++ b/web/tests/partial-locale-fallback.spec.ts@@@ -1,11 -1,0 +1,19 @@@+import { expect, it } from "vitest";++import { ensureLanguage, initI18n } from "@/i18n/init";+- it.each(["fr", "uk"] as const)("uses English copy for a missing %s translation", async (language) => {- const i18n = initI18n(language);- await ensureLanguage(language);- await i18n.changeLanguage(language);++it("uses English copy for a missing French translation", async () => {++ const i18n = initI18n("fr");++ await ensureLanguage("fr");++ await i18n.changeLanguage("fr");++ expect(i18n.t("common.save")).toBe("Save");+});++++it("uses Ukrainian copy when a translation exists", async () => {++ const i18n = initI18n("uk");++ await ensureLanguage("uk");++ await i18n.changeLanguage("uk");++++ expect(i18n.t("common.save")).toBe("зберегти");++});