Skip to content

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

Fix response language normalization and circular import after #1345

Bingxi Zhao (Frank)6a1913626a5b
diff --git a/deeptutor/response_languages.py b/deeptutor/response_languages.py
new file mode 100644
index 000000000..066feaabb
--- /dev/null
+++ b/deeptutor/response_languages.py
@@ -0,0 +1,17 @@
+"""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",
+)
diff --git a/deeptutor/services/prompt/language.py b/deeptutor/services/prompt/language.py
index e920c79ea..686b35ace 100644
--- a/deeptutor/services/prompt/language.py
+++ b/deeptutor/services/prompt/language.py
@@ -25,26 +25,6 @@ _LANGUAGE_LABELS: dict[str, str] = {
}
-# Model output can use every language for which the prompt helper has a
-# reader-facing label. UI locale stays en/zh; response language is the wider
-# contract consumed by Settings and prompts.
-SUPPORTED_RESPONSE_LANGUAGES: tuple[str, ...] = (
- "en",
- "zh",
- "zh-tw",
- "ja",
- "ko",
- "es",
- "fr",
- "de",
- "ru",
- "pt",
- "it",
- "ar",
- "pl",
-)
-
-
def normalize_language(language: str | None) -> str:
return (language or "en").strip().lower() or "en"
diff --git a/deeptutor/services/settings/interface_settings.py b/deeptutor/services/settings/interface_settings.py
index ce28ccca2..a9834298c 100644
--- a/deeptutor/services/settings/interface_settings.py
+++ b/deeptutor/services/settings/interface_settings.py
@@ -15,8 +15,8 @@ import tempfile
import threading
from typing import Any
+from deeptutor.response_languages import SUPPORTED_RESPONSE_LANGUAGES
from deeptutor.services.path_service import get_path_service
-from deeptutor.services.prompt.language import SUPPORTED_RESPONSE_LANGUAGES
from deeptutor.tools.builtin import USER_TOGGLEABLE_TOOL_NAMES
DEFAULT_UI_SETTINGS: dict[str, Any] = {
@@ -111,12 +111,11 @@ def _normalize_response_language(language: Any, default: str = "en") -> str:
code = language.strip().lower().replace("_", "-")
code = _RESPONSE_LANGUAGE_ALIASES.get(code, code)
- if code == "zh-cn":
- code = "zh"
- elif code.startswith("pt-"):
- code = "pt"
if code in SUPPORTED_RESPONSE_LANGUAGES:
return code
+ base = code.split("-", 1)[0]
+ if base in SUPPORTED_RESPONSE_LANGUAGES:
+ return base
return fallback
diff --git a/tests/multi_user/test_ui_language_scoping.py b/tests/multi_user/test_ui_language_scoping.py
index 79f5bc1a8..ca24ac87d 100644
--- a/tests/multi_user/test_ui_language_scoping.py
+++ b/tests/multi_user/test_ui_language_scoping.py
@@ -73,6 +73,8 @@ def test_response_language_normalizes_supported_labels_and_variants():
resolve_languages({"language": "en", "response_language": "pt-BR"})["response_language"]
== "pt"
)
+ assert resolve_languages({"response_language": "ja-JP"})["response_language"] == "ja"
+ assert resolve_languages({"response_language": "zh-TW"})["response_language"] == "zh-tw"
def test_response_language_falls_back_when_unsupported():