Skip to content

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

Merge branch 'codex/evan-backend-prs-20260923' into codex/pr-batch-root

Bingxi Zhao (Frank)064034a283c5
diff --cc deeptutor/api/routers/settings.py
index 6c51db8ea,b702507de..ab351511c
--- a/deeptutor/api/routers/settings.py
+++ b/deeptutor/api/routers/settings.py
@@@ -82,6 -92,24 +92,24 @@@ public_router = APIRouter(
TOUR_CACHE = None
-# The UI locale is en/zh; reader-facing model output supports the wider set
-# already accepted by the shared prompt-language helper.
++# Reader-facing model output supports more languages than the interface.
+ ResponseLanguage = Literal[
+ "en",
+ "zh",
+ "zh-tw",
+ "ja",
+ "ko",
+ "es",
+ "fr",
+ "de",
+ "ru",
+ "pt",
+ "it",
+ "ar",
+ "pl",
++ "uk",
+ ]
+
def get_enabled_optional_tools() -> list[str]:
"""Compatibility export; the source of truth lives in the service layer."""
@@@ -142,8 -167,8 +170,8 @@@ class SidebarNavOrder(BaseModel)
class UISettings(BaseModel):
theme: Literal["light", "dark", "glass", "snow"] = "snow"
- language: Literal["zh", "en", "fr"] = "en"
- response_language: Literal["zh", "en", "fr"] = "en"
- language: Literal["zh", "en"] = "en"
++ language: Literal["zh", "en", "fr", "uk"] = "en"
+ response_language: ResponseLanguage = "en"
sidebar_description: Optional[str] = None
sidebar_nav_order: Optional[SidebarNavOrder] = None
code_block_theme: Optional[str] = None
@@@ -165,8 -190,8 +193,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"] | None = None
- response_language: Literal["zh", "en", "fr"] | None = None
- language: Literal["zh", "en"] | None = None
++ language: Literal["zh", "en", "fr", "uk"] | None = None
+ response_language: ResponseLanguage | None = None
sidebar_description: str | None = None
sidebar_nav_order: SidebarNavOrder | None = None
code_block_theme: str | None = None
@@@ -191,7 -212,7 +219,7 @@@ class ThemeUpdate(BaseModel)
class LanguageUpdate(BaseModel):
- language: Literal["zh", "en", "fr"]
- language: Literal["zh", "en"]
++ language: Literal["zh", "en", "fr", "uk"]
class SidebarDescriptionUpdate(BaseModel):
diff --cc deeptutor/response_languages.py
index 000000000,066feaabb..9e9e7a6ba
mode 000000,100644..100644
--- a/deeptutor/response_languages.py
+++ b/deeptutor/response_languages.py
@@@ -1,0 -1,17 +1,18 @@@
+ """Supported model output languages shared by prompts and Settings."""
+
+ SUPPORTED_RESPONSE_LANGUAGES: tuple[str, ...] = (
+ "en",
+ "zh",
+ "zh-tw",
+ "ja",
+ "ko",
+ "es",
+ "fr",
+ "de",
+ "ru",
+ "pt",
+ "it",
+ "ar",
+ "pl",
++ "uk",
+ )
diff --cc deeptutor/services/config/settings_spec.py
index 7a7c7f16a,3a6c71847..f3e501cde
--- a/deeptutor/services/config/settings_spec.py
+++ b/deeptutor/services/config/settings_spec.py
@@@ -128,9 -128,24 +128,25 @@@ class SettingSpec
_LANGUAGE_CHOICES: tuple[tuple[str, str, str], ...] = (
("en", "English", "Interface and replies in English."),
("zh", "简体中文", "Interface and replies in Simplified Chinese."),
+ ("uk", "Українська", "Interface and replies in Ukrainian."),
)
+ _RESPONSE_LANGUAGE_CHOICES: tuple[tuple[str, str, str], ...] = (
+ ("en", "English", "Replies in English."),
+ ("zh", "简体中文", "Replies in Simplified Chinese."),
+ ("zh-tw", "繁體中文", "Replies in Traditional Chinese."),
+ ("ja", "日本語", "Replies in Japanese."),
+ ("ko", "한국어", "Replies in Korean."),
+ ("es", "Español", "Replies in Spanish."),
+ ("fr", "Français", "Replies in French."),
+ ("de", "Deutsch", "Replies in German."),
+ ("ru", "Русский", "Replies in Russian."),
+ ("pt", "Português", "Replies in Portuguese."),
+ ("it", "Italiano", "Replies in Italian."),
+ ("ar", "العربية", "Replies in Arabic."),
+ ("pl", "Polski", "Replies in Polish."),
+ )
+
_THEME_CHOICES: tuple[tuple[str, str, str], ...] = (
("snow", "Default", "Pure-white neutral theme."),
("light", "Light", "Warm light theme."),
diff --cc deeptutor/services/prompt/language.py
index f750245f1,686b35ace..608756758
--- a/deeptutor/services/prompt/language.py
+++ b/deeptutor/services/prompt/language.py
@@@ -18,9 -18,10 +18,11 @@@ _LANGUAGE_LABELS: dict[str, str] =
"fr": "Français",
"de": "Deutsch",
"ru": "Русский",
+ "uk": "Українська",
"pt": "Português",
"it": "Italiano",
+ "ar": "العربية",
+ "pl": "Polski",
}
diff --cc tests/api/test_settings_router.py
index be40d061d,7575f8701..a034819c4
--- a/tests/api/test_settings_router.py
+++ b/tests/api/test_settings_router.py
@@@ -75,31 -75,22 +75,49 @@@ async def test_ui_languages_are_persist
assert response["response_language"] == "zh"
+async def test_ui_settings_persist_french_independently(
+ monkeypatch: pytest.MonkeyPatch, tmp_path
+) -> None:
+ settings_file = tmp_path / "interface.json"
+ monkeypatch.setattr(settings_router, "_settings_file", lambda: settings_file)
+
+ response = await settings_router.update_ui_settings(
+ settings_router.UISettingsUpdate(theme="snow", language="fr", response_language="en")
+ )
+
+ assert response["language"] == "fr"
+ assert response["response_language"] == "en"
+ persisted = settings_router.load_ui_settings()
+ assert persisted["language"] == "fr"
+ assert persisted["response_language"] == "en"
+
+
+def test_ui_settings_update_rejects_unsupported_language() -> None:
+ from pydantic import ValidationError
+
+ with pytest.raises(ValidationError):
+ settings_router.UISettingsUpdate(language="de")
+ with pytest.raises(ValidationError):
- settings_router.UISettingsUpdate(response_language="es")
++ settings_router.UISettingsUpdate(response_language="xx")
++
++
+ @pytest.mark.asyncio
+ async def test_ui_accepts_extended_response_languages(
+ monkeypatch: pytest.MonkeyPatch, tmp_path
+ ) -> None:
+ settings_file = tmp_path / "interface.json"
+ monkeypatch.setattr(settings_router, "_settings_file", lambda: settings_file)
+
+ response = await settings_router.update_ui_settings(
+ settings_router.UISettingsUpdate(language="en", response_language="ja")
+ )
+ assert response["response_language"] == "ja"
+
+ response = await settings_router.update_ui_settings(
+ settings_router.UISettingsUpdate(response_language="pt")
+ )
+ assert response["response_language"] == "pt"
class _FakeEmbeddingAdapter:
diff --cc web/components/settings/SettingsOverview.tsx
index 8161bf76a,dafaf7caf..baf29e189
--- a/web/components/settings/SettingsOverview.tsx
+++ b/web/components/settings/SettingsOverview.tsx
@@@ -3,11 -3,12 +3,12 @@@
import Link from "next/link";
import { ArrowRight } from "lucide-react";
import { useTranslation } from "react-i18next";
+import { APP_LANGUAGES, type AppLanguage } from "@/i18n/init";
- import { SettingRow, SettingSection, SettingsPageHeader } from "./shared";
- import { useUiSettings } from "@/features/settings/store";
+ import SettingsPresetsPanel from "@/components/settings/SettingsPresetsPanel";
+ import { selectClass, SettingRow, SettingSection, SettingsPageHeader } from "./shared";
+ import { RESPONSE_LANGUAGE_OPTIONS, useUiSettings } from "@/features/settings/store";
import { useSettings } from "@/features/settings/store/SettingsStore";
-/** The en/zh segmented control both language rows use. */
function LanguageToggle({
value,
onChange,
diff --cc web/context/app-shell-storage.ts
index 059d5ad50,98a596bcb..0951348c1
--- a/web/context/app-shell-storage.ts
+++ b/web/context/app-shell-storage.ts
@@@ -3,12 -3,57 +3,64 @@@
import { browserStorage } from "@/shared/storage";
import { activeWorkspaceId } from "@/lib/workspace-scope";
-export type AppLanguage = "en" | "zh";
+// 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";
+ /** 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";
++ | "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/features/knowledge/api/sources.ts
index 3809ffa77,126d56739..82f970682
--- a/web/features/knowledge/api/sources.ts
+++ b/web/features/knowledge/api/sources.ts
@@@ -1,16 -1,16 +1,20 @@@
export {
addGitHubSource,
addWebSource,
+ linkFolder,
+ cancelWebSourceSync,
listGitHubSources,
+ listLinkedFolders,
listWebSources,
+ listWebSourceSyncJobs,
removeGitHubSource,
removeWebSource,
+ retryWebSourceSync,
syncGitHubSources,
+ syncLinkedFolder,
syncWebSources,
+ unlinkFolder,
+ updateWebSourceSchedule,
} from "./client";
export type {
@@@ -18,8 -18,9 +22,10 @@@
AddWebSourcePayload,
GitHubSource,
GitHubSyncResult,
+ LinkedFolderInfo,
WebSource,
+ WebSourceSchedulePayload,
+ WebSourceSyncJob,
WebSyncResult,
WebSyncSourceResult,
} from "../model/types";
diff --cc web/features/knowledge/model/types.ts
index c6331469d,bbfbb42ef..bed2800fc
--- a/web/features/knowledge/model/types.ts
+++ b/web/features/knowledge/model/types.ts
@@@ -31,8 -30,9 +31,10 @@@ export type
PageIndexConfig,
PreflightCheck,
RagProviderSummary,
+ SyncFolderResponse,
WebSource,
+ WebSourceSchedulePayload,
+ WebSourceSyncJob,
WebSyncResult,
WebSyncSourceResult,
WeKnoraProbe,
diff --cc web/features/settings/store/SettingsStore.tsx
index 81bcb7d07,93e5b93c8..abf7c6fc5
--- a/web/features/settings/store/SettingsStore.tsx
+++ b/web/features/settings/store/SettingsStore.tsx
@@@ -87,13 -87,34 +88,35 @@@ export type
export type UiSettings = {
theme: "light" | "dark" | "glass" | "snow";
- language: "en" | "zh";
+ language: AppLanguage;
- response_language: AppLanguage;
+ response_language: ResponseLanguage;
code_block_theme: string;
code_block_show_line_numbers: boolean;
code_block_wrap_long_lines: boolean;
};
+ export type ResponseLanguageOption = {
+ value: ResponseLanguage;
+ label: string;
+ };
+
+ export const RESPONSE_LANGUAGE_OPTIONS: readonly ResponseLanguageOption[] = [
+ { value: "en", label: "English" },
+ { value: "zh", label: "简体中文" },
+ { value: "zh-tw", label: "繁體中文" },
+ { value: "ja", label: "日本語" },
+ { value: "ko", label: "한국어" },
+ { value: "es", label: "Español" },
+ { value: "fr", label: "Français" },
+ { value: "de", label: "Deutsch" },
+ { value: "ru", label: "Русский" },
+ { value: "pt", label: "Português" },
+ { value: "it", label: "Italiano" },
+ { value: "ar", label: "العربية" },
+ { value: "pl", label: "Polski" },
++ { value: "uk", label: "Українська" },
+ ];
+
type CodeBlockUiSettings = Pick<
UiSettings,
| "code_block_theme"
diff --cc web/tests/language-preferences.test.ts
index 66ecf82f7,e3ca1a6b8..128af3a6d
--- a/web/tests/language-preferences.test.ts
+++ b/web/tests/language-preferences.test.ts
@@@ -8,10 -6,17 +8,19 @@@ import { resolveResponseLanguage } fro
test("response language remains independent from the interface language", () => {
assert.equal(resolveResponseLanguage("zh", "en"), "zh");
assert.equal(resolveResponseLanguage("en", "zh"), "en");
+ assert.equal(resolveResponseLanguage("fr", "en"), "fr");
+ assert.equal(resolveResponseLanguage("en", "fr"), "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");