Muttersprache koppeln und russischen A1-Kurs ergänzen

GUI und neue Erklärungen verwenden gemeinsam native_language. Deutsch und
Russisch sind die beiden Muttersprachen; Englisch bleibt die Lernsprache.
Kompatibilitätsfelder werden atomar gekoppelt, widersprüchliche Eingaben
abgewiesen und bestehende Profile sowie eingefrorene Inhalte erhalten.

Ergänzt vollständige russische GUI-Kataloge und 840 geprüfte Aufgabenansichten
in sieben Modulen einschließlich A1-Test, mit getrennten Sprachrollen für
Ausgangs- und Lernmaterial. Äquivalente Ansichten teilen ihre Nachweisidentität.
Stabile API-Fehlercodes, neue deterministische Hilfen und Trainingsbegründungen
berücksichtigen die Muttersprache. Dokumentiert das Sprachmodell in AGENTS.md.

Validierung: Go-Race-Suite mit eigener lokaler PostgreSQL-Testdatenbank, go vet,
Web-Build, Offline-Bank-/Variantenaudit, Diff-Prüfung sowie lokale Browser-Smokes
für Sprachen, Kurs, Administration, Aussprache und Aufnahme. Keine Live-Anbieter,
Produktionsprofile, Deployment-Schritte oder historischen Neubewertungen.
This commit is contained in:
Eugenius Naumenko
2026-11-07 17:02:17 +00:00
parent f3d42ee2b6
commit 16cceae28a
77 changed files with 46646 additions and 1969 deletions
+44 -19
View File
@@ -1,9 +1,13 @@
package domain
import "time"
import (
"errors"
"time"
)
type User struct {
ID string `json:"id"`
NativeLanguage string `json:"native_language"`
Email string `json:"email"`
UILanguage string `json:"ui_language"`
InstructionLanguage string `json:"instruction_language"`
@@ -11,20 +15,39 @@ type User struct {
CreatedAt time.Time `json:"created_at"`
}
// ExplanationLanguage preserves compatibility with callers that construct users
// without the additive field; persisted accounts always have an explicit value.
// Compatibility fields mirror NativeLanguage; they are never separate preferences.
func (u User) ExplanationLanguage() string {
if u.InstructionLanguage != "" {
return u.InstructionLanguage
if SupportedNativeLanguage(u.NativeLanguage) {
return u.NativeLanguage
}
if u.UILanguage != "" {
if SupportedNativeLanguage(u.UILanguage) {
return u.UILanguage
}
return "de-DE"
}
func SupportedUILanguage(language string) bool {
return language == "de-DE" || language == "en-US"
var ErrNativeLanguageUnsupported = errors.New("unsupported native language")
var ErrNativeLanguageConflict = errors.New("conflicting native language fields")
func SupportedNativeLanguage(language string) bool { return language == "de-DE" || language == "ru-RU" }
func SupportedUILanguage(language string) bool { return SupportedNativeLanguage(language) }
// ResolveNativeLanguage accepts old client aliases only if all provided values agree.
func ResolveNativeLanguage(values ...string) (string, error) {
selected := ""
for _, value := range values {
if value == "" {
continue
}
if !SupportedNativeLanguage(value) {
return "", ErrNativeLanguageUnsupported
}
if selected != "" && selected != value {
return "", ErrNativeLanguageConflict
}
selected = value
}
return selected, nil
}
type AdminOverview struct {
@@ -79,17 +102,18 @@ type Lesson struct {
}
type Exercise struct {
TrainingReason string `json:"training_reason,omitempty"`
TrainingCategory string `json:"training_category,omitempty"`
ID string `json:"id"`
LessonID string `json:"lesson_id"`
TargetLanguage string `json:"target_language"`
CEFRLevel string `json:"cefr_level"`
Type string `json:"type"`
PromptText string `json:"prompt_text"`
TargetText string `json:"target_text"`
Difficulty int `json:"difficulty"`
Source string `json:"source,omitempty"`
InstructionLanguage string `json:"instruction_language,omitempty"`
TrainingReason string `json:"training_reason,omitempty"`
TrainingCategory string `json:"training_category,omitempty"`
ID string `json:"id"`
LessonID string `json:"lesson_id"`
TargetLanguage string `json:"target_language"`
CEFRLevel string `json:"cefr_level"`
Type string `json:"type"`
PromptText string `json:"prompt_text"`
TargetText string `json:"target_text"`
Difficulty int `json:"difficulty"`
Source string `json:"source,omitempty"`
}
type WordScore struct {
@@ -173,6 +197,7 @@ type GeneratedExerciseRequest struct {
}
type GeneratedExercise struct {
NativeLanguage string `json:"native_language,omitempty"`
TrainingPlan *PronunciationPlan `json:"-"`
CandidateWord string `json:"candidate_word,omitempty"`
ID string `json:"exercise_id"`
@@ -58,6 +58,7 @@ type PronunciationProfile struct {
}
type PronunciationPlan struct {
NativeLanguage string `json:"native_language,omitempty"`
ID string `json:"id"`
Algorithm string `json:"algorithm"`
Language string `json:"language"`
+21 -3
View File
@@ -39,6 +39,9 @@ func adaptiveError(w http.ResponseWriter, err error) {
return
}
status := http.StatusInternalServerError
if errors.Is(err, domain.ErrNativeLanguageUnsupported) || errors.Is(err, domain.ErrNativeLanguageConflict) {
status = http.StatusBadRequest
}
if errors.Is(err, store.ErrNotFound) {
status = http.StatusNotFound
}
@@ -121,7 +124,7 @@ func (s *Server) adaptiveCatalog(w http.ResponseWriter, r *http.Request) {
adaptiveError(w, err)
return
}
writeJSON(w, 200, map[string]any{"instruction_language": user.ExplanationLanguage(), "instruction_languages": instructionLanguages, "exam_available": s.course.Mode != "bank" || user.ExplanationLanguage() == "de-DE", "task_mode": s.course.Mode, "grading_available": s.course.EvaluationAvailable(r.Context()), "bank": inventory, "analysis_job": analysisJob, "profile": p, "modules": snap.Modules, "progress": snap.Progress, "analysis": snap.PreviousAnalysis, "facts_version": snap.FactsVersion, "enabled_languages": available, "languages": languages, "exams": exams})
writeJSON(w, 200, map[string]any{"native_language": user.ExplanationLanguage(), "native_languages": []string{"de-DE", "ru-RU"}, "instruction_language": user.ExplanationLanguage(), "instruction_languages": instructionLanguages, "exam_available": s.course.Mode != "bank" || bankExamInventoryAvailable(inventory), "task_mode": s.course.Mode, "grading_available": s.course.EvaluationAvailable(r.Context()), "bank": inventory, "analysis_job": analysisJob, "profile": p, "modules": snap.Modules, "progress": snap.Progress, "analysis": snap.PreviousAnalysis, "facts_version": snap.FactsVersion, "enabled_languages": available, "languages": languages, "exams": exams})
}
func (s *Server) adaptiveNext(w http.ResponseWriter, r *http.Request) {
p, ok := s.adaptiveProfile(w, r)
@@ -584,7 +587,7 @@ func (s *Server) adaptiveNewExam(w http.ResponseWriter, r *http.Request) {
adaptiveError(w, err)
return
}
if user.ExplanationLanguage() != "de-DE" {
if !domain.SupportedNativeLanguage(user.ExplanationLanguage()) {
exists, err := s.course.Repo.HasExamRequest(r.Context(), user.ID, p.TargetLanguage, input.RequestID)
if err != nil {
adaptiveError(w, err)
@@ -711,5 +714,20 @@ func (s *Server) adaptiveInstructionLanguage(w http.ResponseWriter, r *http.Requ
adaptiveError(w, err)
return
}
writeJSON(w, 200, map[string]string{"instruction_language": input.InstructionLanguage})
writeJSON(w, 200, map[string]string{"native_language": input.InstructionLanguage, "ui_language": input.InstructionLanguage, "instruction_language": input.InstructionLanguage})
}
func bankExamInventoryAvailable(inventory []store.BankInventoryItem) bool {
skills := map[string]bool{}
for _, item := range inventory {
if item.ModuleID == "a1_review_test_v1" && item.Total >= 2 {
skills[item.Skill] = true
}
}
for _, skill := range domain.CourseSkills {
if !skills[skill] {
return false
}
}
return true
}
@@ -404,9 +404,9 @@ func TestBankBrowserSmoke(t *testing.T) {
}
for _, check := range []struct{ script, language string }{
{"tests/languages.e2e.cjs", "de-DE"},
{"tests/course-variants.e2e.cjs", "en-US"},
{"tests/course-variants.e2e.cjs", "ru-RU"},
{"tests/course-bank.e2e.cjs", "de-DE"},
{"tests/course-bank.e2e.cjs", "en-US"},
{"tests/course-bank.e2e.cjs", "ru-RU"},
} {
node := exec.Command("node", check.script)
node.Dir = web
+47 -1
View File
@@ -4,10 +4,14 @@ import (
"encoding/json"
"errors"
"net/http"
"speech-learning-api/internal/domain"
"speech-learning-api/internal/services"
"strings"
)
type errorResponse struct {
Error string `json:"error"`
Code string `json:"code"`
}
func writeJSON(w http.ResponseWriter, status int, value any) {
@@ -20,7 +24,49 @@ func writeError(w http.ResponseWriter, status int, err error) {
if err == nil {
err = errors.New(http.StatusText(status))
}
writeJSON(w, status, errorResponse{Error: err.Error()})
writeJSON(w, status, errorResponse{Error: err.Error(), Code: errorCode(status, err)})
}
// Codes are presentation contracts; provider diagnostics remain in the error field.
func errorCode(status int, err error) string {
switch {
case errors.Is(err, domain.ErrNativeLanguageUnsupported):
return "native_language_unsupported"
case errors.Is(err, domain.ErrNativeLanguageConflict):
return "native_language_conflict"
case errors.Is(err, services.ErrInvalidCredentials):
return "invalid_credentials"
case err.Error() == "valid email is required":
return "invalid_email"
case err.Error() == "password must be at least 8 characters":
return "password_too_short"
case strings.Contains(err.Error(), "duplicate key") && strings.Contains(err.Error(), "email"):
return "email_in_use"
}
switch status {
case 400, 422:
return "invalid_request"
case 401:
return "authentication_required"
case 403:
return "access_denied"
case 404:
return "not_found"
case 409:
return "operation_conflict"
case 413:
return "upload_too_large"
case 415:
return "unsupported_audio_format"
case 429:
return "rate_limited"
case 502, 503:
return "service_unavailable"
case 408, 504:
return "request_timeout"
default:
return "internal_error"
}
}
func decodeJSON(r *http.Request, dst any) error {
+28
View File
@@ -0,0 +1,28 @@
package httpapi
import (
"errors"
"net/http"
"speech-learning-api/internal/domain"
"speech-learning-api/internal/services"
"testing"
)
func TestStablePresentationErrorCodes(t *testing.T) {
for _, test := range []struct {
status int
err error
code string
}{
{400, domain.ErrNativeLanguageUnsupported, "native_language_unsupported"},
{400, domain.ErrNativeLanguageConflict, "native_language_conflict"},
{401, services.ErrInvalidCredentials, "invalid_credentials"},
{503, errors.New("provider diagnostic"), "service_unavailable"},
{500, errors.New("private database detail"), "internal_error"},
{http.StatusUnauthorized, errors.New("expired token"), "authentication_required"},
} {
if got := errorCode(test.status, test.err); got != test.code {
t.Errorf("code=%s want=%s", got, test.code)
}
}
}
+37 -14
View File
@@ -128,17 +128,24 @@ func (s *Server) health(w http.ResponseWriter, r *http.Request) {
func (s *Server) register(w http.ResponseWriter, r *http.Request) {
var req struct {
Email string `json:"email"`
Password string `json:"password"`
UILanguage string `json:"ui_language"`
TargetLanguage string `json:"target_language"`
DailyGoalMinutes int `json:"daily_goal_minutes"`
Email string `json:"email"`
Password string `json:"password"`
NativeLanguage string `json:"native_language"`
InstructionLanguage string `json:"instruction_language"`
UILanguage string `json:"ui_language"`
TargetLanguage string `json:"target_language"`
DailyGoalMinutes int `json:"daily_goal_minutes"`
}
if err := decodeJSON(r, &req); err != nil {
writeError(w, http.StatusBadRequest, err)
return
}
result, err := s.auth.Register(r.Context(), req.Email, req.Password, req.UILanguage, req.TargetLanguage, req.DailyGoalMinutes)
native, err := domain.ResolveNativeLanguage(req.NativeLanguage, req.UILanguage, req.InstructionLanguage)
if err != nil {
writeError(w, 400, err)
return
}
result, err := s.auth.Register(r.Context(), req.Email, req.Password, native, req.TargetLanguage, req.DailyGoalMinutes)
if err != nil {
writeError(w, http.StatusBadRequest, err)
return
@@ -187,16 +194,23 @@ func (s *Server) me(w http.ResponseWriter, r *http.Request) {
func (s *Server) updatePreferences(w http.ResponseWriter, r *http.Request) {
var req struct {
UILanguage string `json:"ui_language"`
TargetLanguage string `json:"target_language"`
CEFRLevel string `json:"cefr_level"`
DailyGoalMinutes int `json:"daily_goal_minutes"`
NativeLanguage string `json:"native_language"`
InstructionLanguage string `json:"instruction_language"`
UILanguage string `json:"ui_language"`
TargetLanguage string `json:"target_language"`
CEFRLevel string `json:"cefr_level"`
DailyGoalMinutes int `json:"daily_goal_minutes"`
}
if err := decodeJSON(r, &req); err != nil {
writeError(w, http.StatusBadRequest, err)
return
}
profile, err := s.store.UpdatePreferences(r.Context(), currentUserID(r), req.UILanguage, req.TargetLanguage, req.CEFRLevel, req.DailyGoalMinutes)
native, err := domain.ResolveNativeLanguage(req.NativeLanguage, req.UILanguage, req.InstructionLanguage)
if err != nil {
writeError(w, 400, err)
return
}
profile, err := s.store.UpdatePreferences(r.Context(), currentUserID(r), native, req.TargetLanguage, req.CEFRLevel, req.DailyGoalMinutes)
if err != nil {
writeError(w, http.StatusBadRequest, err)
return
@@ -348,6 +362,7 @@ func (s *Server) nextAgentExercise(ctx context.Context, user domain.User, profil
AvoidReferenceTexts: avoidReferenceTexts,
})
if err == nil && (generated.Source == "flowise" || generated.Source == "ai") && strings.TrimSpace(generated.ReferenceText) != "" {
generated.NativeLanguage = user.ExplanationLanguage()
generated.TrainingPlan = plan
if plan != nil && plan.Mode == "transfer" {
plan.CandidateWord = generated.CandidateWord
@@ -469,7 +484,7 @@ func (s *Server) createAttempt(w http.ResponseWriter, r *http.Request) {
writeError(w, http.StatusBadGateway, err)
return
}
teacher, err := s.teacher.FeedbackForAttempt(r.Context(), exercise.TargetText, result, weakWords(result.WordScores))
teacher, err := s.teacher.FeedbackForAttempt(s.nativeContext(r), exercise.TargetText, result, weakWords(result.WordScores))
if err != nil {
writeError(w, http.StatusBadGateway, err)
return
@@ -511,7 +526,7 @@ func (s *Server) startConversation(w http.ResponseWriter, r *http.Request) {
writeError(w, http.StatusInternalServerError, err)
return
}
teacher, err := s.teacher.StartConversation(r.Context(), profile.TargetLanguage, profile.CEFRLevel)
teacher, err := s.teacher.StartConversation(s.nativeContext(r), profile.TargetLanguage, profile.CEFRLevel)
if err != nil {
writeError(w, http.StatusBadGateway, err)
return
@@ -546,7 +561,7 @@ func (s *Server) conversationTurn(w http.ResponseWriter, r *http.Request) {
writeError(w, http.StatusInternalServerError, err)
return
}
teacher, err := s.teacher.ContinueConversation(r.Context(), profile.TargetLanguage, profile.CEFRLevel, req.Text)
teacher, err := s.teacher.ContinueConversation(s.nativeContext(r), profile.TargetLanguage, profile.CEFRLevel, req.Text)
if err != nil {
writeError(w, http.StatusBadGateway, err)
return
@@ -605,3 +620,11 @@ func valueOr(value, fallback string) string {
}
return value
}
func (s *Server) nativeContext(r *http.Request) context.Context {
user, err := s.store.GetUser(r.Context(), currentUserID(r))
if err != nil {
return r.Context()
}
return services.WithNativeLanguage(r.Context(), user.ExplanationLanguage())
}
@@ -0,0 +1,24 @@
package pronunciation
import (
"speech-learning-api/internal/domain"
"strings"
"testing"
)
func TestNativePlanReasonPreservesEvidence(t *testing.T) {
for _, mode := range []string{"general", "targeted", "transfer"} {
target := &domain.PronunciationTarget{Kind: "phoneme", Symbol: "θ", Samples: 3, Mean: 64, State: "needs_practice"}
plan := domain.PronunciationPlan{Mode: mode, Category: "targeted", Target: target, RequiredWords: []string{"three"}, Reason: "historical German reason"}
if mode == "general" {
plan.Target = nil
}
SetNativeLanguage(&plan, "ru-RU")
if plan.NativeLanguage != "ru-RU" || plan.Reason == "historical German reason" || plan.RequiredWords[0] != "three" || target.Samples != 3 || target.Mean != 64 {
t.Fatal(plan)
}
if mode == "transfer" && !strings.Contains(plan.Reason, "ещё должно быть проверено Azure") {
t.Fatal("transfer presented as confirmed", plan.Reason)
}
}
}
@@ -408,3 +408,34 @@ func label(t domain.PronunciationTarget) string {
}
return "Wort „" + t.Symbol + "“"
}
// SetNativeLanguage formats only the reason of a newly selected plan. Evidence,
// priority, required words and historical plans remain unchanged.
func SetNativeLanguage(plan *domain.PronunciationPlan, native string) {
plan.NativeLanguage = native
if native != "ru-RU" {
return
}
if plan.Target == nil {
plan.Reason = "Общая практика произношения: пока нет подтверждённой цели тренировки."
return
}
target := plan.Target
label := "Слово «" + target.Symbol + "»"
if target.Kind == "phoneme" {
label = "Звук /" + target.Symbol + "/"
}
if target.Kind == "omission" {
label = "Полнота произнесения слова «" + target.Symbol + "»"
}
switch {
case plan.Mode == "transfer":
plan.Reason = fmt.Sprintf("Потренируйте измеренный звук /%s/ в новом слове; соответствие ещё должно быть проверено Azure.", target.Symbol)
case plan.Category == "review":
plan.Reason = fmt.Sprintf("Повторение после перерыва: %s. Ранее наблюдалось улучшение.", label)
case target.State == "needs_practice":
plan.Reason = fmt.Sprintf("%s: повторные затруднения в независимых наблюдениях (%d).", label, target.Samples)
default:
plan.Reason = fmt.Sprintf("%s: нужна дополнительная проверка, пока наблюдений мало или они неоднородны.", label)
}
}
+30 -3
View File
@@ -141,17 +141,17 @@ func (e *CourseEngine) Process(ctx context.Context, j domain.CourseJob) (*domain
}
return &t, err
case "exam":
if j.InstructionLanguage != "" && j.InstructionLanguage != "de-DE" {
if j.InstructionLanguage != "" && !domain.SupportedNativeLanguage(j.InstructionLanguage) {
return nil, store.ErrCourseVariantUnavailable
}
tasks, err := e.Repo.BankExam(ctx, j.UserID, j.Language, j.ModuleID)
tasks, err := e.Repo.BankExam(ctx, j.UserID, j.Language, j.ModuleID, j.InstructionLanguage)
if errors.Is(err, store.ErrNotFound) {
tasks, err = e.Repo.ReserveExam(ctx, j.UserID, j.Language, j.ModuleID)
}
if err != nil {
return nil, err
}
if err = ValidateExamTasks(tasks, j.Language, j.ModuleID); err != nil {
if err = validateReviewedExamTasks(tasks, j.Language, j.ModuleID); err != nil {
return nil, err
}
return nil, e.Repo.SaveExamTasks(ctx, j.UserID, j.Language, j.SubjectID, tasks)
@@ -585,3 +585,30 @@ func (e *CourseEngine) completeBankExam(ctx context.Context, user, language, id
}
return e.Repo.EnsureBankExamSummary(ctx, user, id)
}
// Reviewed packages carry server-owned metadata that the model contract forbids.
// Validate their renderer/test coverage without treating trusted metadata as model output.
func validateReviewedExamTasks(tasks []domain.AdaptiveTask, language, module string) error {
plain := make([]domain.AdaptiveTask, len(tasks))
for i, task := range tasks {
task.InstructionLanguage = ""
task.Instruction = ""
task.Stimulus = nil
task.VariantID = ""
task.ContentRevision = ""
task.CanonicalTaskID = ""
task.EvidenceTaskID = ""
task.Options = append([]domain.TaskOption(nil), task.Options...)
for j := range task.Options {
task.Options[j].Language = ""
task.Options[j].Role = ""
}
if task.AnswerKey != nil {
key := *task.AnswerKey
key.ReferenceAnswerLanguage = ""
task.AnswerKey = &key
}
plain[i] = task
}
return ValidateExamTasks(plain, language, module)
}
+1 -1
View File
@@ -631,7 +631,7 @@ func (a *AIService) NextExercise(ctx context.Context, input domain.GeneratedExer
// Preserve the existing non-AI feedback and demo conversation behavior.
func (a *AIService) FeedbackForAttempt(ctx context.Context, text string, r domain.PronunciationResult, weak []domain.WordScore) (domain.TeacherResponse, error) {
return mockFeedback(text, r), nil
return localizedFeedback(ctx, text, r), nil
}
func (a *AIService) StartConversation(ctx context.Context, lang, level string) (domain.TeacherResponse, error) {
return (&FlowiseTeacher{}).StartConversation(ctx, lang, level)
+1 -1
View File
@@ -54,7 +54,7 @@ func (s *AuthService) Register(ctx context.Context, email, password, uiLanguage,
uiLanguage = "de-DE"
}
if !domain.SupportedUILanguage(uiLanguage) {
return AuthResult{}, errors.New("unsupported UI language")
return AuthResult{}, domain.ErrNativeLanguageUnsupported
}
if targetLanguage == "" {
targetLanguage = "en-US"
@@ -11,6 +11,7 @@ import (
"speech-learning-api/internal/config"
"speech-learning-api/internal/domain"
"speech-learning-api/internal/store"
"strings"
"sync"
"testing"
)
@@ -163,9 +164,14 @@ func TestBankPostgresSelectionAndOptionalEvaluation(t *testing.T) {
}
func TestBankPostgresExamSubmissionAndLaterGrades(t *testing.T) {
for _, native := range []string{"de-DE", "ru-RU"} {
t.Run(native, func(t *testing.T) { testBankExamNative(t, native) })
}
}
func testBankExamNative(t *testing.T, native string) {
db, profiles := adaptiveTestDB(t)
ctx := context.Background()
user, err := profiles.CreateUser(ctx, store.NewID("exam-bank")+"@example.test", "hash", "de-DE")
user, err := profiles.CreateUser(ctx, store.NewID("exam-bank")+"@example.test", "hash", native)
if err != nil {
t.Fatal(err)
}
@@ -195,8 +201,15 @@ func TestBankPostgresExamSubmissionAndLaterGrades(t *testing.T) {
if err != nil || len(exam.Tasks) != 12 {
t.Fatal(err, exam)
}
if err = engine.Repo.SetInstructionLanguage(ctx, user.ID, "en-US", "de-DE"); err != nil {
t.Fatal(err)
}
// Task presentations and the final static summary retain the exam language.
ungraded := []domain.AdaptiveAttempt{}
for n, pub := range exam.Tasks {
if pub.InstructionLanguage != native {
t.Fatal("exam language not frozen", pub.InstructionLanguage, native)
}
if pub.AnswerKey != nil || pub.AudioText != "" {
t.Fatal("exam key leaked")
}
@@ -277,7 +290,7 @@ func TestBankPostgresExamSubmissionAndLaterGrades(t *testing.T) {
if message.Task != "evaluate_course_attempt" {
t.Error("unexpected model action", message.Task)
}
json.NewEncoder(w).Encode(aiCompletion(domain.CourseEvaluation{Score: 100, Verdict: "correct", Feedback: "Richtig.", Issues: []string{}}, true))
json.NewEncoder(w).Encode(aiCompletion(domain.CourseEvaluation{Score: 100, Verdict: "correct", Feedback: map[string]string{"de-DE": "Richtig.", "ru-RU": "Верно."}[native], Issues: []string{}}, true))
}))
defer server.Close()
agent.Keys["mistral"] = "fixture-secret"
@@ -311,6 +324,9 @@ func TestBankPostgresExamSubmissionAndLaterGrades(t *testing.T) {
if err != nil || exam.Status != "completed" || exam.Score == nil || *exam.Score != 100 || exam.SummaryStatus != "ready" {
t.Fatal("later grading failed", err, exam)
}
if native == "ru-RU" && !strings.HasPrefix(exam.Summary, "Внутренняя") {
t.Fatal("wrong summary language", exam.Summary)
}
// Repair a crash after score completion without invoking a summarizing model.
if _, err = db.Exec(`UPDATE course_v2_exams SET result=jsonb_set(result,'{summary_status}','"pending"') WHERE id=$1`, exam.ID); err != nil {
t.Fatal(err)
@@ -5,6 +5,7 @@ import (
"context"
"encoding/json"
"errors"
"fmt"
"io"
"log/slog"
"testing"
@@ -60,7 +61,7 @@ func TestCourseVariantSnapshotsAndEvidence(t *testing.T) {
if _, _, err = engine.Submit(ctx, user.ID, "en-US", old.ID, "old-answer", old.AnswerKey.CorrectOptionID, nil); err != nil {
t.Fatal(err)
}
if err = repo.SetInstructionLanguage(ctx, user.ID, "en-US", "en-US"); err != nil {
if err = repo.SetInstructionLanguage(ctx, user.ID, "en-US", "ru-RU"); err != nil {
t.Fatal(err)
}
run := func(skill, request string, changeAfterEnqueue bool) domain.AdaptiveTask {
@@ -69,7 +70,7 @@ func TestCourseVariantSnapshotsAndEvidence(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if j.InstructionLanguage != "en-US" {
if j.InstructionLanguage != "ru-RU" {
t.Fatal("job did not freeze explanation language", j)
}
if changeAfterEnqueue {
@@ -88,24 +89,32 @@ func TestCourseVariantSnapshotsAndEvidence(t *testing.T) {
if err = repo.Finish(ctx, j, task, ""); err != nil {
t.Fatal(err)
}
if task.InstructionLanguage != "en-US" || task.VariantID == "" || task.ContentRevision == "" || task.Instruction == "" {
if task.InstructionLanguage != "ru-RU" || task.VariantID == "" || task.ContentRevision == "" || task.Instruction == "" {
t.Fatal("incomplete frozen variant", task)
}
return *task
}
first := run("grammar", "english-grammar-first", false)
if _, _, err = engine.Submit(ctx, user.ID, "en-US", first.ID, "english-first-answer", first.AnswerKey.CorrectOptionID, nil); err != nil {
// Limit this fixture to the historical grammar goal so evidence reuse is deterministic.
if _, err = db.ExecContext(ctx, `UPDATE course_v2_bank_variants v SET active=false FROM course_v2_bank b WHERE v.base_entry_id=b.id AND b.module_id='a1_introductions_v1' AND b.skill='grammar' AND b.id<>(SELECT bank_entry_id FROM course_v2_tasks WHERE id=$1)`, old.ID); err != nil {
t.Fatal(err)
}
translated := run("grammar", "english-grammar-second", true)
if !translated.Review || translated.EvidenceTaskID != old.ID {
t.Fatal("translation did not reuse existing evidence", translated, old)
var translated domain.AdaptiveTask
distinct := map[string]bool{old.ID: true}
for n := 0; n < 2; n++ {
translated = run("grammar", fmt.Sprintf("russian-grammar-%d", n), n == 1)
distinct[translated.EvidenceTaskID] = true
if _, _, err = engine.Submit(ctx, user.ID, "en-US", translated.ID, fmt.Sprintf("russian-answer-%d", n), translated.AnswerKey.CorrectOptionID, nil); err != nil {
t.Fatal(err)
}
}
if _, _, err = engine.Submit(ctx, user.ID, "en-US", translated.ID, "english-second-answer", translated.AnswerKey.CorrectOptionID, nil); err != nil {
t.Fatal(err)
// The translated historical task retains its canonical evidence identity.
var shared int
if err = db.QueryRowContext(ctx, `SELECT count(*) FROM course_v2_tasks WHERE owner_id=$1 AND data->>'evidence_task_id'=$2 AND variant_id IS NOT NULL`, user.ID, old.ID).Scan(&shared); err != nil || shared != 1 {
t.Fatal("translation did not share historical evidence", shared, err)
}
replay, err := repo.Enqueue(ctx, user.ID, "en-US", "next", "a1_introductions_v1", "grammar", "", "english-grammar-second")
if err != nil || replay.TaskID != translated.ID || replay.InstructionLanguage != "en-US" {
replay, err := repo.Enqueue(ctx, user.ID, "en-US", "next", "a1_introductions_v1", "grammar", "", "russian-grammar-1")
if err != nil || replay.TaskID != translated.ID || replay.InstructionLanguage != "ru-RU" {
t.Fatal("locale change altered idempotent replay", replay, err)
}
snapshot, err := repo.Snapshot(ctx, user.ID, "en-US", "de-DE")
@@ -116,7 +125,7 @@ func TestCourseVariantSnapshotsAndEvidence(t *testing.T) {
for _, p := range snapshot.Progress {
if p.Skill == "grammar" && p.ModuleID == old.ModuleID {
found = true
if p.Attempts != 3 || p.DistinctTasks != 2 {
if p.Attempts != 3 || p.DistinctTasks != len(distinct) {
t.Fatalf("translation inflated task evidence: %+v", p)
}
}
@@ -124,7 +133,10 @@ func TestCourseVariantSnapshotsAndEvidence(t *testing.T) {
if !found {
t.Fatal("missing graded evidence")
}
if err = repo.SetInstructionLanguage(ctx, user.ID, "en-US", "en-US"); err != nil {
if err = repo.SetInstructionLanguage(ctx, user.ID, "en-US", "ru-RU"); err != nil {
t.Fatal(err)
}
if _, err = db.ExecContext(ctx, `UPDATE course_v2_bank_variants SET active=true WHERE instruction_language='ru-RU'`); err != nil {
t.Fatal(err)
}
inventory, err := repo.BankInventory(ctx, user.ID, "en-US")
@@ -134,11 +146,9 @@ func TestCourseVariantSnapshotsAndEvidence(t *testing.T) {
total := 0
for _, item := range inventory {
total += item.Total
if item.ModuleID != "a1_introductions_v1" {
t.Fatal("German fallback advertised as English", item)
}
}
if total != 12 {
if total != 840 {
t.Fatal("incorrect locale inventory", inventory)
}
// Local speech fixtures exercise the real observation path; no Azure is called.
@@ -146,13 +156,16 @@ func TestCourseVariantSnapshotsAndEvidence(t *testing.T) {
if _, _, err = engine.Submit(ctx, user.ID, "en-US", oldSpeech.ID, "old-speech", oldSpeech.ReferenceText, &speech); err != nil {
t.Fatal(err)
}
localizedSpeech := run("speaking", "localized-speech", false)
if localizedSpeech.Kind != "free_speech" { // The existing repeat may be scheduled after the unseen free task.
if localizedSpeech.Kind != "repeat_sentence" {
t.Fatal(localizedSpeech.Kind)
if _, err = db.ExecContext(ctx, `UPDATE course_v2_bank_variants v SET active=false FROM course_v2_bank b WHERE v.base_entry_id=b.id AND b.module_id='a1_introductions_v1' AND b.skill='speaking' AND b.id<>(SELECT bank_entry_id FROM course_v2_tasks WHERE id=$1)`, oldSpeech.ID); err != nil {
t.Fatal(err)
}
var localizedSpeech domain.AdaptiveTask
for n := 0; n < 20; n++ {
localizedSpeech = run("speaking", fmt.Sprintf("localized-speech-%d", n), false)
if localizedSpeech.EvidenceTaskID == oldSpeech.ID {
break
}
} else {
localizedSpeech = run("speaking", "localized-repeat", false)
}
if localizedSpeech.EvidenceTaskID != oldSpeech.ID {
t.Fatal("translated repeat changed evidence identity", localizedSpeech)
@@ -182,10 +195,13 @@ func TestCourseVariantSnapshotsAndEvidence(t *testing.T) {
if !bytes.Equal(before, after) {
t.Fatal("historical snapshot was rewritten")
}
if err = repo.SetInstructionLanguage(ctx, user.ID, "en-US", "fr-FR"); !errors.Is(err, store.ErrCourseVariantUnavailable) {
if err = repo.SetInstructionLanguage(ctx, user.ID, "en-US", "fr-FR"); !errors.Is(err, domain.ErrNativeLanguageUnsupported) {
t.Fatal("unsupported locale accepted", err)
}
// Missing reviewed variants must not silently select a German reserve.
if _, err = db.ExecContext(ctx, `UPDATE course_v2_bank_variants v SET active=false FROM course_v2_bank b WHERE v.base_entry_id=b.id AND b.module_id='a1_family_v1'`); err != nil {
t.Fatal(err)
}
if _, err = repo.Enqueue(ctx, user.ID, "en-US", "next", "a1_family_v1", "grammar", "", "missing-variants"); err != nil {
t.Fatal(err)
}
+21 -5
View File
@@ -54,6 +54,12 @@ func (f *FlowiseTeacher) NextExercise(ctx context.Context, input domain.Generate
ReasonForChoice: "Fallback exercise because Flowise did not return a valid exercise.",
Source: "fallback",
}
if input.UILanguage == "ru-RU" {
fallback.DisplayPrompt = "Чётко повторите предложение вслух."
fallback.FocusPoints = []string{"ритм", "конечные звуки"}
fallback.SuccessCriteria = []string{"точность выше 80"}
fallback.ReasonForChoice = "Резервное упражнение: новое упражнение сейчас недоступно."
}
progress := compactProgressForFlowise(input.Progress)
payload := map[string]any{
"task": "next_exercise",
@@ -96,20 +102,25 @@ func withoutPhonemeScores(words []domain.WordScore) []domain.WordScore {
func (f *FlowiseTeacher) FeedbackForAttempt(ctx context.Context, targetText string, result domain.PronunciationResult, weakWords []domain.WordScore) (domain.TeacherResponse, error) {
_ = ctx
_ = weakWords
return mockFeedback(targetText, result), nil
return localizedFeedback(ctx, targetText, result), nil
}
func (f *FlowiseTeacher) StartConversation(ctx context.Context, targetLanguage, cefrLevel string) (domain.TeacherResponse, error) {
_ = ctx
_ = targetLanguage
_ = cefrLevel
return domain.TeacherResponse{
response := domain.TeacherResponse{
ExerciseType: "conversation",
TargetText: "Hello. What is your name?",
TeacherFeedback: "Wir starten sehr einfach. Antworte mit: My name is ...",
TTSText: "Hello. What is your name?",
NextRecommendation: "Antworten: My name is ...",
}, nil
}
if nativeLanguage(ctx) == "ru-RU" {
response.TeacherFeedback = "Начнём с простого. Ответьте: My name is ..."
response.NextRecommendation = "Ответьте: My name is ..."
}
return response, nil
}
func (f *FlowiseTeacher) ContinueConversation(ctx context.Context, targetLanguage, cefrLevel, userText string) (domain.TeacherResponse, error) {
@@ -117,13 +128,18 @@ func (f *FlowiseTeacher) ContinueConversation(ctx context.Context, targetLanguag
_ = targetLanguage
_ = cefrLevel
_ = userText
return domain.TeacherResponse{
response := domain.TeacherResponse{
ExerciseType: "conversation",
TargetText: "Nice to meet you. Where are you from?",
TeacherFeedback: "Gut. Jetzt uebe einen kurzen Satz mit Herkunft.",
TTSText: "Nice to meet you. Where are you from?",
NextRecommendation: "Antworten: I am from ...",
}, nil
}
if nativeLanguage(ctx) == "ru-RU" {
response.TeacherFeedback = "Теперь потренируйте короткое предложение о том, откуда вы."
response.NextRecommendation = "Ответьте: I am from ..."
}
return response, nil
}
func (f *FlowiseTeacher) askExercise(ctx context.Context, payload map[string]any, input domain.GeneratedExerciseRequest, fallback domain.GeneratedExercise) (domain.GeneratedExercise, error) {
@@ -19,7 +19,7 @@ func TestLanguagePreferencesPreserveCourseAndExplanations(t *testing.T) {
if err != nil {
t.Fatal(err)
}
updated, err := profiles.UpdatePreferences(ctx, user.ID, "en-US", "", "", 0)
updated, err := profiles.UpdatePreferences(ctx, user.ID, "ru-RU", "", "", 0)
if err != nil {
t.Fatal(err)
}
@@ -30,7 +30,7 @@ func TestLanguagePreferencesPreserveCourseAndExplanations(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if loaded.UILanguage != "en-US" || loaded.InstructionLanguage != "de-DE" {
if loaded.NativeLanguage != "ru-RU" || loaded.UILanguage != "ru-RU" || loaded.InstructionLanguage != "ru-RU" {
t.Fatalf("language roles conflated: %+v", loaded)
}
_, _, err = profiles.GetPasswordHashByEmail(ctx, user.Email)
@@ -42,7 +42,7 @@ func TestLanguagePreferencesPreserveCourseAndExplanations(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if snapshot.UILanguage != "de-DE" {
if snapshot.UILanguage != "ru-RU" {
t.Fatalf("model instructions follow interface language: %q", snapshot.UILanguage)
}
if _, err = profiles.UpdatePreferences(ctx, user.ID, "unsupported", "en-US", "A1", 10); err == nil {
@@ -60,7 +60,7 @@ func TestLanguagePreferencesPreserveCourseAndExplanations(t *testing.T) {
t.Fatal("expected profile constraint failure")
}
loaded, err = profiles.GetUser(ctx, user.ID)
if err != nil || loaded.UILanguage != "en-US" {
if err != nil || loaded.UILanguage != "ru-RU" {
t.Fatalf("failed update changed interface: %+v %v", loaded, err)
}
active, err = profiles.GetPrimaryProfile(ctx, user.ID)
@@ -69,39 +69,48 @@ func TestLanguagePreferencesPreserveCourseAndExplanations(t *testing.T) {
}
}
func TestInstructionLanguageMigrationPreservesLegacyPreference(t *testing.T) {
func TestNativeLanguageMigrationAndCompatibility(t *testing.T) {
db, profiles := adaptiveTestDB(t)
ctx := context.Background()
user, err := profiles.CreateUser(ctx, "legacy-language@example.test", "hash", "fr-FR")
user, err := profiles.CreateUser(ctx, "legacy-language@example.test", "hash", "de-DE")
if err != nil {
t.Fatal(err)
}
// Simulate the previous schema in this disposable test schema only.
if _, err = db.ExecContext(ctx, `ALTER TABLE users DROP COLUMN instruction_language`); err != nil {
// Simulate the old independent settings in this disposable schema only.
if _, err = db.ExecContext(ctx, `ALTER TABLE users DROP CONSTRAINT users_native_language_coupled; ALTER TABLE users DROP COLUMN native_language; UPDATE users SET ui_language='ru-RU',instruction_language='de-DE'`); err != nil {
t.Fatal(err)
}
if err = profiles.Init(ctx); err != nil {
t.Fatal(err)
}
loaded, err := profiles.GetUser(ctx, user.ID)
if err != nil || loaded.InstructionLanguage != "fr-FR" {
t.Fatalf("legacy instruction preference lost: %+v %v", loaded, err)
if err != nil || loaded.NativeLanguage != "ru-RU" || loaded.UILanguage != "ru-RU" || loaded.InstructionLanguage != "ru-RU" {
t.Fatalf("migration did not couple native language: %+v %v", loaded, err)
}
if _, err = profiles.UpdatePreferences(ctx, user.ID, "en-US", "", "", 0); err != nil {
if _, err = profiles.UpdatePreferences(ctx, user.ID, "de-DE", "", "", 0); err != nil {
t.Fatal(err)
}
if err = profiles.Init(ctx); err != nil {
t.Fatal(err)
}
loaded, err = profiles.GetUser(ctx, user.ID)
if err != nil || loaded.UILanguage != "en-US" || loaded.InstructionLanguage != "fr-FR" {
t.Fatalf("repeated migration changed instruction preference: %+v %v", loaded, err)
if err != nil || loaded.NativeLanguage != "de-DE" || loaded.UILanguage != "de-DE" || loaded.InstructionLanguage != "de-DE" {
t.Fatalf("restart changed preference: %+v %v", loaded, err)
}
result, err := NewAuthService(profiles, "language-test-only").Register(ctx, "new-language@example.test", "test-password", "en-US", "en-US", 15)
if _, err = db.ExecContext(ctx, `UPDATE users SET instruction_language='ru-RU' WHERE id=$1`, user.ID); err == nil {
t.Fatal("database allowed divergent language roles")
}
result, err := NewAuthService(profiles, "language-test-only").Register(ctx, "new-language@example.test", "test-password", "ru-RU", "en-US", 15)
if err != nil {
t.Fatal(err)
}
if result.User.UILanguage != "en-US" || result.User.InstructionLanguage != "de-DE" {
t.Fatalf("new account did not keep German course explanations: %+v", result.User)
if result.User.NativeLanguage != "ru-RU" || result.User.UILanguage != "ru-RU" || result.User.InstructionLanguage != "ru-RU" {
t.Fatal(result.User)
}
if _, err = profiles.CreateUser(ctx, "unsupported@example.test", "hash", "en-US"); err == nil {
t.Fatal("English native language accepted")
}
if _, err = domain.ResolveNativeLanguage("de-DE", "ru-RU"); err != domain.ErrNativeLanguageConflict {
t.Fatal("conflicting aliases accepted", err)
}
}
@@ -0,0 +1,59 @@
package services
import (
"context"
"fmt"
"speech-learning-api/internal/domain"
"strings"
)
type nativeLanguageKey struct{}
// Request-scoped native language also applies to deterministic feedback; target
// texts and Azure measurements are never translated by this presentation step.
func WithNativeLanguage(ctx context.Context, language string) context.Context {
return context.WithValue(ctx, nativeLanguageKey{}, language)
}
func nativeLanguage(ctx context.Context) string {
language, _ := ctx.Value(nativeLanguageKey{}).(string)
return language
}
func localizedFeedback(ctx context.Context, text string, result domain.PronunciationResult) domain.TeacherResponse {
if nativeLanguage(ctx) != "ru-RU" {
return mockFeedback(text, result)
}
response := domain.TeacherResponse{ExerciseType: "repeat_sentence", TargetText: text, TTSText: text,
TeacherFeedback: "Предложение стоит ещё потренировать. Повторите его вслух.", NextRecommendation: "Повторите это упражнение."}
weakWord, phonemeWord := "", ""
var weak domain.PhonemeScore
for _, word := range result.WordScores {
if word.Highlight == "weak" && weakWord == "" {
weakWord = word.Word
}
if strings.EqualFold(word.ErrorType, "Omission") {
continue
}
for _, phoneme := range word.PhonemeScores {
if phoneme.Accuracy < 75 && (phonemeWord == "" || phoneme.Accuracy < weak.Accuracy) {
weak = phoneme
phonemeWord = word.Word
}
}
}
switch {
case result.OverallScore >= 95 && result.AccuracyScore >= 95 && result.FluencyScore >= 95 && result.CompletenessScore >= 95:
response.TeacherFeedback = "Отлично! Произношение этого предложения получило очень высокую оценку."
response.NextRecommendation = "Можно перейти к новому упражнению."
case phonemeWord != "":
response.TeacherFeedback = fmt.Sprintf("В слове %q звук /%s/ получил %.0f из 100 баллов.", phonemeWord, weak.Phoneme, weak.Accuracy)
response.NextRecommendation = fmt.Sprintf("Повторите предложение, уделяя внимание слову %q.", phonemeWord)
case weakWord != "":
response.TeacherFeedback = fmt.Sprintf("Слово %q получило невысокую оценку. Потренируйте его ещё раз в предложении.", weakWord)
response.NextRecommendation = fmt.Sprintf("Повторите предложение, уделяя внимание слову %q.", weakWord)
case result.OverallScore >= 85:
response.TeacherFeedback = "Хорошо! Произношение этого предложения получило высокую оценку."
response.NextRecommendation = "Можно перейти к новому упражнению."
}
return response
}
@@ -0,0 +1,30 @@
package services
import (
"context"
"speech-learning-api/internal/domain"
"strings"
"testing"
)
func TestRussianDeterministicFeedbackKeepsMeasurementsAndTarget(t *testing.T) {
ctx := WithNativeLanguage(context.Background(), "ru-RU")
result := domain.PronunciationResult{OverallScore: 86, WordScores: []domain.WordScore{{Word: "name", PhonemeScores: []domain.PhonemeScore{{Phoneme: "n", Accuracy: 62}}}}}
response := localizedFeedback(ctx, "My name is Anna.", result)
if response.TargetText != "My name is Anna." || response.TTSText != response.TargetText || !strings.Contains(response.TeacherFeedback, "/n/") || !strings.Contains(response.TeacherFeedback, "62 из 100") {
t.Fatal(response)
}
if result.WordScores[0].PhonemeScores[0].Accuracy != 62 {
t.Fatal("measurement changed")
}
result.WordScores[0].ErrorType = "Omission"
response = localizedFeedback(ctx, "My name is Anna.", result)
if strings.Contains(response.TeacherFeedback, "/n/") {
t.Fatal("omission treated as phoneme error")
}
teacher := &FlowiseTeacher{}
start, err := teacher.StartConversation(ctx, "en-US", "A1")
if err != nil || start.TargetText != "Hello. What is your name?" || !strings.Contains(start.TeacherFeedback, "Ответьте") {
t.Fatal(start, err)
}
}
+21 -1
View File
@@ -241,6 +241,11 @@ func (s *AdaptiveStore) SaveExamTasks(ctx context.Context, user, language, exam
return err
}
defer tx.Rollback()
// Serialize equivalent assignments with ordinary bank selection, so a
// concurrent exam and exercise share the same first evidence identity.
if _, err = tx.ExecContext(ctx, `SELECT pg_advisory_xact_lock(hashtextextended($1,0))`, user+":"+language+":"+domain.CourseVersion); err != nil {
return err
}
var status string
err = tx.QueryRowContext(ctx, `SELECT status FROM course_v2_exams WHERE id=$1 AND user_id=$2 AND language=$3 FOR UPDATE`, exam, user, language).Scan(&status)
if err != nil {
@@ -259,11 +264,26 @@ func (s *AdaptiveStore) SaveExamTasks(ctx context.Context, user, language, exam
fp = "bank-exam:" + t.BriefID
t.BriefID = ""
}
bankID := ""
if t.Source == "curated" {
bankID = t.CanonicalTaskID
if t.VariantID != "" {
if err = tx.QueryRowContext(ctx, `SELECT base_entry_id FROM course_v2_bank_variants WHERE id=$1`, t.VariantID).Scan(&bankID); err != nil {
return err
}
}
err = tx.QueryRowContext(ctx, `SELECT COALESCE(NULLIF(data->>'evidence_task_id',''),id) FROM course_v2_tasks WHERE owner_id=$1 AND language=$2 AND version=$3 AND COALESCE(NULLIF(data->>'canonical_task_id',''),bank_entry_id)=$4 ORDER BY created_at,id LIMIT 1`, user, language, domain.CourseVersion, t.CanonicalTaskID).Scan(&t.EvidenceTaskID)
if errors.Is(err, sql.ErrNoRows) {
t.EvidenceTaskID = t.ID
} else if err != nil {
return err
}
}
data, err := json.Marshal(t)
if err != nil {
return err
}
_, err = tx.ExecContext(ctx, `INSERT INTO course_v2_tasks(id,module_id,language,version,owner_id,source,skill,kind,data,fingerprint,exam_id) VALUES($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11)`, t.ID, t.ModuleID, language, domain.CourseVersion, user, t.Source, t.Skill, t.Kind, data, fp, exam)
_, err = tx.ExecContext(ctx, `INSERT INTO course_v2_tasks(id,module_id,language,version,owner_id,source,skill,kind,data,fingerprint,exam_id,bank_entry_id,variant_id) VALUES($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,NULLIF($12,''),NULLIF($13,''))`, t.ID, t.ModuleID, language, domain.CourseVersion, user, t.Source, t.Skill, t.Kind, data, fp, exam, bankID, t.VariantID)
if err != nil {
return err
}
+16 -4
View File
@@ -389,7 +389,7 @@ func (s *AdaptiveStore) AssignBankTask(ctx context.Context, j domain.CourseJob)
t.CanonicalTaskID = chosen.bankEntryID
}
// Reuse the earliest evidence identity without editing any historic snapshot.
err = tx.QueryRowContext(ctx, `SELECT COALESCE(NULLIF(data->>'evidence_task_id',''),id) FROM course_v2_tasks WHERE owner_id=$1 AND language=$2 AND version=$3 AND exam_id IS NULL AND COALESCE(NULLIF(data->>'canonical_task_id',''),bank_entry_id)=$4 ORDER BY created_at,id LIMIT 1`, j.UserID, j.Language, domain.CourseVersion, t.CanonicalTaskID).Scan(&t.EvidenceTaskID)
err = tx.QueryRowContext(ctx, `SELECT COALESCE(NULLIF(data->>'evidence_task_id',''),id) FROM course_v2_tasks WHERE owner_id=$1 AND language=$2 AND version=$3 AND COALESCE(NULLIF(data->>'canonical_task_id',''),bank_entry_id)=$4 ORDER BY created_at,id LIMIT 1`, j.UserID, j.Language, domain.CourseVersion, t.CanonicalTaskID).Scan(&t.EvidenceTaskID)
if errors.Is(err, sql.ErrNoRows) {
t.EvidenceTaskID = t.ID
} else if err != nil {
@@ -415,8 +415,12 @@ func (s *AdaptiveStore) AssignBankTask(ctx context.Context, j domain.CourseJob)
return out, err
}
func (s *AdaptiveStore) BankExam(ctx context.Context, user, language, module string) ([]domain.AdaptiveTask, error) {
func (s *AdaptiveStore) BankExam(ctx context.Context, user, language, module string, native ...string) ([]domain.AdaptiveTask, error) {
out := []domain.AdaptiveTask{}
mother := "de-DE"
if len(native) > 0 && native[0] != "" {
mother = native[0]
}
mods, err := s.Modules(ctx, language)
if err != nil {
return nil, err
@@ -428,7 +432,7 @@ func (s *AdaptiveStore) BankExam(ctx context.Context, user, language, module str
for n := 0; n < 2; n++ {
origin := mods[(i+n+1)%6].Key
var data []byte
err = s.db.QueryRowContext(ctx, `SELECT b.data FROM course_v2_bank b WHERE b.active AND b.language=$1 AND b.version=$2 AND b.module_id=$3 AND b.skill=$4 AND b.data->'task'->>'origin_module_key'=$5 ORDER BY (SELECT count(*) FROM course_v2_tasks t WHERE t.owner_id=$6 AND (t.bank_entry_id=b.id OR t.fingerprint='bank-exam:'||b.id)),md5(b.id||$6) LIMIT 1`, language, domain.CourseVersion, module, skill, origin, user).Scan(&data)
err = s.db.QueryRowContext(ctx, availableBank+` SELECT av.entry FROM available av WHERE av.module_id=$5 AND av.skill=$6 AND av.entry->'task'->>'origin_module_key'=$7 ORDER BY (SELECT count(*) FROM course_v2_tasks t WHERE t.owner_id=$1 AND (t.bank_entry_id=av.base_id OR t.fingerprint='bank-exam:'||(CASE WHEN av.variant_id='' THEN av.base_id ELSE av.variant_id END))),md5((av.entry->>'id')||$1) LIMIT 1`, user, language, domain.CourseVersion, mother, module, skill, origin).Scan(&data)
if errors.Is(err, sql.ErrNoRows) {
return nil, ErrNotFound
}
@@ -442,6 +446,12 @@ func (s *AdaptiveStore) BankExam(ctx context.Context, user, language, module str
t := entry.Task
t.Source = "curated"
t.BriefID = entry.ID
if t.CanonicalTaskID == "" {
t.CanonicalTaskID = entry.ID
}
if t.InstructionLanguage == "" {
t.InstructionLanguage = "de-DE"
}
out = append(out, t)
}
}
@@ -483,6 +493,8 @@ func (s *AdaptiveStore) BankInventory(ctx context.Context, user, language string
// Also repairs a crash between completing scores and storing the static summary.
// Existing ready/historical summaries are not overwritten.
func (s *AdaptiveStore) EnsureBankExamSummary(ctx context.Context, user, id string) error {
_, err := s.db.ExecContext(ctx, `UPDATE course_v2_exams SET result=result||jsonb_build_object('summary',$3::text,'summary_status','ready') WHERE id=$1 AND user_id=$2 AND status='completed' AND result->>'summary_status'='pending'`, id, user, "Interne A1-Lerneinschätzung aus den gespeicherten Bewertungen. Kein Zertifikat.")
_, err := s.db.ExecContext(ctx, `UPDATE course_v2_exams e SET result=result||jsonb_build_object('summary',CASE WHEN (SELECT t.data->>'instruction_language' FROM course_v2_tasks t WHERE t.owner_id=$2 AND t.exam_id=e.id ORDER BY t.id LIMIT 1)='ru-RU' THEN $3::text ELSE $4::text END,'summary_status','ready') WHERE e.id=$1 AND e.user_id=$2 AND e.status='completed' AND e.result->>'summary_status'='pending'`, id, user,
"Внутренняя оценка уровня A1 на основе сохранённых результатов. Это не сертификат.",
"Interne A1-Lerneinschätzung aus den gespeicherten Bewertungen. Kein Zertifikat.")
return err
}
+9 -4
View File
@@ -223,15 +223,20 @@ func (s *AdaptiveStore) InstructionLanguages(ctx context.Context, language strin
return out, rows.Err()
}
// Deprecated endpoint compatibility: changing explanations changes the entire
// native language, even for a target language without installed course content.
func (s *AdaptiveStore) SetInstructionLanguage(ctx context.Context, user, language, instruction string) error {
options, err := s.InstructionLanguages(ctx, language)
if !domain.SupportedNativeLanguage(instruction) {
return domain.ErrNativeLanguageUnsupported
}
result, err := s.db.ExecContext(ctx, `UPDATE users SET native_language=$2,ui_language=$2,instruction_language=$2 WHERE id=$1`, user, instruction)
if err != nil {
return err
}
if !bankMember(instruction, options) {
return ErrCourseVariantUnavailable
n, err := result.RowsAffected()
if err == nil && n == 0 {
return ErrNotFound
}
_, err = s.db.ExecContext(ctx, `UPDATE users SET instruction_language=$2 WHERE id=$1`, user, instruction)
return err
}
@@ -16,8 +16,8 @@ func TestReviewedVariantsRejectChangedIdentityAndLeakedMedia(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if len(variants) != 12 {
t.Fatal("unexpected pilot count", len(variants))
if len(variants) != 840 {
t.Fatal("unexpected Russian count", len(variants))
}
copyVariants := func() []domain.BankVariant {
raw, _ := json.Marshal(variants)
@@ -29,12 +29,8 @@ func TestReviewedVariantsRejectChangedIdentityAndLeakedMedia(t *testing.T) {
}
t.Run("changed requirement is not a translation", func(t *testing.T) {
v := copyVariants()
for i := range v {
if v[i].Equivalence == "adaptation" {
v[i].Equivalence = "translation"
break
}
}
v[0].CanonicalTaskID = v[0].ID
v[0].Task.CanonicalTaskID = v[0].ID
if ValidateVariants(base, v) == nil {
t.Fatal("adaptation with shared identity accepted")
}
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
@@ -1,630 +0,0 @@
[
{
"id": "intro_en_explanations_v1_grammar_01",
"revision": "introductions-en-explanations-v1",
"base_entry_id": "a1bank_en_v1_introductions_grammar_01",
"canonical_task_id": "a1bank_en_v1_introductions_grammar_01",
"instruction_language": "en-US",
"module_title": "Greetings & introductions",
"module_description": "Greet people, introduce a name and origin; I am, my name is",
"equivalence": "translation",
"reviewed": true,
"task": {
"schema_version": 2,
"module_id": "a1_introductions_v1",
"origin_module_key": "introductions",
"target_language": "en-US",
"course_version": "a1-v2",
"cefr_level": "A1",
"skill": "grammar",
"kind": "choice",
"prompt": "Complete the sentence. I ___ Anna.",
"options": [
{
"id": "o1",
"label": "am",
"role": "target",
"language": "en-US"
},
{
"id": "o2",
"label": "is",
"role": "target",
"language": "en-US"
},
{
"id": "o3",
"label": "are",
"role": "target",
"language": "en-US"
}
],
"answer_key": {
"correct_option_id": "o1",
"reference_answer": "am",
"rubric": [
"Choose the one answer supported by the sentence, word meaning or supplied text."
],
"explanation": "Use am after I.",
"reference_answer_language": "en-US"
},
"instruction_language": "en-US",
"variant_id": "intro_en_explanations_v1_grammar_01",
"canonical_task_id": "a1bank_en_v1_introductions_grammar_01",
"content_revision": "introductions-en-explanations-v1",
"instruction": "Complete the sentence.",
"stimulus": {
"role": "target",
"language": "en-US",
"text": "I ___ Anna."
}
}
},
{
"id": "intro_en_explanations_v1_grammar_02",
"revision": "introductions-en-explanations-v1",
"base_entry_id": "a1bank_en_v1_introductions_grammar_02",
"canonical_task_id": "a1bank_en_v1_introductions_grammar_02",
"instruction_language": "en-US",
"module_title": "Greetings & introductions",
"module_description": "Greet people, introduce a name and origin; I am, my name is",
"equivalence": "translation",
"reviewed": true,
"task": {
"schema_version": 2,
"module_id": "a1_introductions_v1",
"origin_module_key": "introductions",
"target_language": "en-US",
"course_version": "a1-v2",
"cefr_level": "A1",
"skill": "grammar",
"kind": "choice",
"prompt": "Complete the sentence. You ___ my friend.",
"options": [
{
"id": "o1",
"label": "is",
"role": "target",
"language": "en-US"
},
{
"id": "o2",
"label": "are",
"role": "target",
"language": "en-US"
},
{
"id": "o3",
"label": "am",
"role": "target",
"language": "en-US"
}
],
"answer_key": {
"correct_option_id": "o2",
"reference_answer": "are",
"rubric": [
"Choose the one answer supported by the sentence, word meaning or supplied text."
],
"explanation": "Use are after you.",
"reference_answer_language": "en-US"
},
"instruction_language": "en-US",
"variant_id": "intro_en_explanations_v1_grammar_02",
"canonical_task_id": "a1bank_en_v1_introductions_grammar_02",
"content_revision": "introductions-en-explanations-v1",
"instruction": "Complete the sentence.",
"stimulus": {
"role": "target",
"language": "en-US",
"text": "You ___ my friend."
}
}
},
{
"id": "intro_en_explanations_v1_vocabulary_01",
"revision": "introductions-en-explanations-v1",
"base_entry_id": "a1bank_en_v1_introductions_vocabulary_01",
"canonical_task_id": "intro_en_explanations_v1_vocabulary_01",
"instruction_language": "en-US",
"module_title": "Greetings & introductions",
"module_description": "Greet people, introduce a name and origin; I am, my name is",
"equivalence": "adaptation",
"reviewed": true,
"task": {
"schema_version": 2,
"module_id": "a1_introductions_v1",
"origin_module_key": "introductions",
"target_language": "en-US",
"course_version": "a1-v2",
"cefr_level": "A1",
"skill": "vocabulary",
"kind": "choice",
"prompt": "What does hello mean in this sentence? Hello, I am Anna.",
"options": [
{
"id": "o1",
"label": "a greeting",
"role": "meaning",
"language": "en-US"
},
{
"id": "o2",
"label": "a farewell",
"role": "meaning",
"language": "en-US"
},
{
"id": "o3",
"label": "a polite request",
"role": "meaning",
"language": "en-US"
}
],
"answer_key": {
"correct_option_id": "o1",
"reference_answer": "a greeting",
"rubric": [
"Choose the one answer supported by the sentence, word meaning or supplied text."
],
"explanation": "Hello is a greeting. We use it when we meet someone.",
"reference_answer_language": "en-US"
},
"instruction_language": "en-US",
"variant_id": "intro_en_explanations_v1_vocabulary_01",
"canonical_task_id": "intro_en_explanations_v1_vocabulary_01",
"content_revision": "introductions-en-explanations-v1",
"instruction": "What does hello mean in this sentence?",
"stimulus": {
"role": "target",
"language": "en-US",
"text": "Hello, I am Anna."
}
}
},
{
"id": "intro_en_explanations_v1_vocabulary_02",
"revision": "introductions-en-explanations-v1",
"base_entry_id": "a1bank_en_v1_introductions_vocabulary_02",
"canonical_task_id": "intro_en_explanations_v1_vocabulary_02",
"instruction_language": "en-US",
"module_title": "Greetings & introductions",
"module_description": "Greet people, introduce a name and origin; I am, my name is",
"equivalence": "adaptation",
"reviewed": true,
"task": {
"schema_version": 2,
"module_id": "a1_introductions_v1",
"origin_module_key": "introductions",
"target_language": "en-US",
"course_version": "a1-v2",
"cefr_level": "A1",
"skill": "vocabulary",
"kind": "choice",
"prompt": "What does name mean in this sentence? My name is Ben.",
"options": [
{
"id": "o1",
"label": "where someone lives",
"role": "meaning",
"language": "en-US"
},
{
"id": "o2",
"label": "what a person is called",
"role": "meaning",
"language": "en-US"
},
{
"id": "o3",
"label": "how old someone is",
"role": "meaning",
"language": "en-US"
}
],
"answer_key": {
"correct_option_id": "o2",
"reference_answer": "what a person is called",
"rubric": [
"Choose the one answer supported by the sentence, word meaning or supplied text."
],
"explanation": "A name is what a person is called. The person's name here is Ben.",
"reference_answer_language": "en-US"
},
"instruction_language": "en-US",
"variant_id": "intro_en_explanations_v1_vocabulary_02",
"canonical_task_id": "intro_en_explanations_v1_vocabulary_02",
"content_revision": "introductions-en-explanations-v1",
"instruction": "What does name mean in this sentence?",
"stimulus": {
"role": "target",
"language": "en-US",
"text": "My name is Ben."
}
}
},
{
"id": "intro_en_explanations_v1_reading_01",
"revision": "introductions-en-explanations-v1",
"base_entry_id": "a1bank_en_v1_introductions_reading_01",
"canonical_task_id": "a1bank_en_v1_introductions_reading_01",
"instruction_language": "en-US",
"module_title": "Greetings & introductions",
"module_description": "Greet people, introduce a name and origin; I am, my name is",
"equivalence": "translation",
"reviewed": true,
"task": {
"schema_version": 2,
"module_id": "a1_introductions_v1",
"origin_module_key": "introductions",
"target_language": "en-US",
"course_version": "a1-v2",
"cefr_level": "A1",
"skill": "reading",
"kind": "choice",
"prompt": "What is the person's name?",
"passage": "My name is Anna. I am from Spain.",
"options": [
{
"id": "o1",
"label": "Anna",
"role": "target",
"language": "en-US"
},
{
"id": "o2",
"label": "Mia",
"role": "target",
"language": "en-US"
},
{
"id": "o3",
"label": "Eva",
"role": "target",
"language": "en-US"
}
],
"answer_key": {
"correct_option_id": "o1",
"reference_answer": "Anna",
"rubric": [
"Choose the one answer supported by the sentence, word meaning or supplied text."
],
"explanation": "The text says: My name is Anna. The correct answer is Anna.",
"reference_answer_language": "en-US"
},
"instruction_language": "en-US",
"variant_id": "intro_en_explanations_v1_reading_01",
"canonical_task_id": "a1bank_en_v1_introductions_reading_01",
"content_revision": "introductions-en-explanations-v1",
"instruction": "What is the person's name?"
}
},
{
"id": "intro_en_explanations_v1_reading_02",
"revision": "introductions-en-explanations-v1",
"base_entry_id": "a1bank_en_v1_introductions_reading_02",
"canonical_task_id": "a1bank_en_v1_introductions_reading_02",
"instruction_language": "en-US",
"module_title": "Greetings & introductions",
"module_description": "Greet people, introduce a name and origin; I am, my name is",
"equivalence": "translation",
"reviewed": true,
"task": {
"schema_version": 2,
"module_id": "a1_introductions_v1",
"origin_module_key": "introductions",
"target_language": "en-US",
"course_version": "a1-v2",
"cefr_level": "A1",
"skill": "reading",
"kind": "choice",
"prompt": "Which country is Ben from?",
"passage": "Ben is from Canada. He lives in London.",
"options": [
{
"id": "o1",
"label": "Italy",
"role": "target",
"language": "en-US"
},
{
"id": "o2",
"label": "Canada",
"role": "target",
"language": "en-US"
},
{
"id": "o3",
"label": "Germany",
"role": "target",
"language": "en-US"
}
],
"answer_key": {
"correct_option_id": "o2",
"reference_answer": "Canada",
"rubric": [
"Choose the one answer supported by the sentence, word meaning or supplied text."
],
"explanation": "The text says: Ben is from Canada. The correct answer is Canada.",
"reference_answer_language": "en-US"
},
"instruction_language": "en-US",
"variant_id": "intro_en_explanations_v1_reading_02",
"canonical_task_id": "a1bank_en_v1_introductions_reading_02",
"content_revision": "introductions-en-explanations-v1",
"instruction": "Which country is Ben from?"
}
},
{
"id": "intro_en_explanations_v1_listening_01",
"revision": "introductions-en-explanations-v1",
"base_entry_id": "a1bank_en_v1_introductions_listening_01",
"canonical_task_id": "a1bank_en_v1_introductions_listening_01",
"instruction_language": "en-US",
"module_title": "Greetings & introductions",
"module_description": "Greet people, introduce a name and origin; I am, my name is",
"equivalence": "translation",
"reviewed": true,
"task": {
"schema_version": 2,
"module_id": "a1_introductions_v1",
"origin_module_key": "introductions",
"target_language": "en-US",
"course_version": "a1-v2",
"cefr_level": "A1",
"skill": "listening",
"kind": "choice",
"prompt": "Which country is Anna from?",
"audio_text": "My name is Anna. I am from Spain.",
"options": [
{
"id": "o1",
"label": "Spain",
"role": "target",
"language": "en-US"
},
{
"id": "o2",
"label": "France",
"role": "target",
"language": "en-US"
},
{
"id": "o3",
"label": "Italy",
"role": "target",
"language": "en-US"
}
],
"answer_key": {
"correct_option_id": "o1",
"reference_answer": "Spain",
"rubric": [
"Choose the one answer supported by the sentence, word meaning or supplied text."
],
"explanation": "The recording says: I am from Spain. The correct answer is Spain.",
"reference_answer_language": "en-US"
},
"instruction_language": "en-US",
"variant_id": "intro_en_explanations_v1_listening_01",
"canonical_task_id": "a1bank_en_v1_introductions_listening_01",
"content_revision": "introductions-en-explanations-v1",
"instruction": "Which country is Anna from?"
}
},
{
"id": "intro_en_explanations_v1_listening_02",
"revision": "introductions-en-explanations-v1",
"base_entry_id": "a1bank_en_v1_introductions_listening_02",
"canonical_task_id": "a1bank_en_v1_introductions_listening_02",
"instruction_language": "en-US",
"module_title": "Greetings & introductions",
"module_description": "Greet people, introduce a name and origin; I am, my name is",
"equivalence": "translation",
"reviewed": true,
"task": {
"schema_version": 2,
"module_id": "a1_introductions_v1",
"origin_module_key": "introductions",
"target_language": "en-US",
"course_version": "a1-v2",
"cefr_level": "A1",
"skill": "listening",
"kind": "choice",
"prompt": "Where does Ben live?",
"audio_text": "Ben is from Canada. He lives in London.",
"options": [
{
"id": "o1",
"label": "Rome",
"role": "target",
"language": "en-US"
},
{
"id": "o2",
"label": "London",
"role": "target",
"language": "en-US"
},
{
"id": "o3",
"label": "Paris",
"role": "target",
"language": "en-US"
}
],
"answer_key": {
"correct_option_id": "o2",
"reference_answer": "London",
"rubric": [
"Choose the one answer supported by the sentence, word meaning or supplied text."
],
"explanation": "The recording says: He lives in London. The correct answer is London.",
"reference_answer_language": "en-US"
},
"instruction_language": "en-US",
"variant_id": "intro_en_explanations_v1_listening_02",
"canonical_task_id": "a1bank_en_v1_introductions_listening_02",
"content_revision": "introductions-en-explanations-v1",
"instruction": "Where does Ben live?"
}
},
{
"id": "intro_en_explanations_v1_speaking_01",
"revision": "introductions-en-explanations-v1",
"base_entry_id": "a1bank_en_v1_introductions_speaking_01",
"canonical_task_id": "a1bank_en_v1_introductions_speaking_01",
"instruction_language": "en-US",
"module_title": "Greetings & introductions",
"module_description": "Greet people, introduce a name and origin; I am, my name is",
"equivalence": "translation",
"reviewed": true,
"task": {
"schema_version": 2,
"module_id": "a1_introductions_v1",
"origin_module_key": "introductions",
"target_language": "en-US",
"course_version": "a1-v2",
"cefr_level": "A1",
"skill": "speaking",
"kind": "repeat_sentence",
"prompt": "Repeat the English sentence.",
"reference_text": "My name is Anna.",
"answer_key": {
"reference_answer": "My name is Anna.",
"rubric": [
"Repeat the displayed English sentence clearly.",
"Do not claim pronunciation or fluency errors without actual Azure measurements."
],
"explanation": "Repeat the complete sentence clearly. Pronunciation feedback uses only available speech measurements.",
"reference_answer_language": "en-US"
},
"instruction_language": "en-US",
"variant_id": "intro_en_explanations_v1_speaking_01",
"canonical_task_id": "a1bank_en_v1_introductions_speaking_01",
"content_revision": "introductions-en-explanations-v1",
"instruction": "Repeat the English sentence."
}
},
{
"id": "intro_en_explanations_v1_speaking_11",
"revision": "introductions-en-explanations-v1",
"base_entry_id": "a1bank_en_v2_introductions_speaking_11",
"canonical_task_id": "a1bank_en_v2_introductions_speaking_11",
"instruction_language": "en-US",
"module_title": "Greetings & introductions",
"module_description": "Greet people, introduce a name and origin; I am, my name is",
"equivalence": "translation",
"reviewed": true,
"task": {
"schema_version": 2,
"module_id": "a1_introductions_v1",
"origin_module_key": "introductions",
"target_language": "en-US",
"course_version": "a1-v2",
"cefr_level": "A1",
"skill": "speaking",
"kind": "free_speech",
"prompt": "Introduce yourself. Give a name and the country you are from. You may use real or invented details. Say two or three short English sentences in at most 30 seconds.",
"answer_key": {
"reference_answer": "My name is Nina. I am not from Germany. I am from Poland.",
"rubric": [
"Introduce one person with a name and country of origin.",
"Two or three short, understandable English sentences meet the required length.",
"Real or invented names and countries are allowed. Facts in the example are not mandatory.",
"Assess only the explicitly requested content and actual language errors. Do not penalise ambiguity in the task.",
"For this free-speech response, assess content and English formulations only. Azure pronunciation is displayed separately and is not part of this score."
],
"explanation": "The example is only one possible answer. You may choose your own name and country. Content and language are assessed separately from Azure pronunciation.",
"reference_answer_language": "en-US"
},
"instruction_language": "en-US",
"variant_id": "intro_en_explanations_v1_speaking_11",
"canonical_task_id": "a1bank_en_v2_introductions_speaking_11",
"content_revision": "introductions-en-explanations-v1",
"instruction": "Introduce yourself. Give a name and the country you are from. You may use real or invented details. Say two or three short English sentences in at most 30 seconds."
}
},
{
"id": "intro_en_explanations_v1_writing_01",
"revision": "introductions-en-explanations-v1",
"base_entry_id": "a1bank_en_v1_introductions_writing_01",
"canonical_task_id": "intro_en_explanations_v1_writing_01",
"instruction_language": "en-US",
"module_title": "Greetings & introductions",
"module_description": "Greet people, introduce a name and origin; I am, my name is",
"equivalence": "adaptation",
"reviewed": true,
"task": {
"schema_version": 2,
"module_id": "a1_introductions_v1",
"origin_module_key": "introductions",
"target_language": "en-US",
"course_version": "a1-v2",
"cefr_level": "A1",
"skill": "writing",
"kind": "short_text",
"prompt": "Write one short English sentence to introduce yourself. For this exercise, use the name Anna. Name: Anna",
"answer_key": {
"reference_answer": "My name is Anna.",
"rubric": [
"Write one understandable English sentence to introduce yourself using the explicitly requested name Anna.",
"Accept My name is Anna., I am Anna. and other correct equivalent formulations.",
"Consider actual A1 language errors proportionately. Do not invent additional requirements."
],
"explanation": "My name is Anna. and I am Anna. are both valid answers. Use the name Anna as requested; other correct ways to introduce yourself are allowed.",
"reference_answer_language": "en-US"
},
"instruction_language": "en-US",
"variant_id": "intro_en_explanations_v1_writing_01",
"canonical_task_id": "intro_en_explanations_v1_writing_01",
"content_revision": "introductions-en-explanations-v1",
"instruction": "Write one short English sentence to introduce yourself. For this exercise, use the name Anna.",
"stimulus": {
"role": "context",
"language": "en-US",
"text": "Name: Anna"
}
}
},
{
"id": "intro_en_explanations_v1_writing_11",
"revision": "introductions-en-explanations-v1",
"base_entry_id": "a1bank_en_v2_introductions_writing_11",
"canonical_task_id": "a1bank_en_v2_introductions_writing_11",
"instruction_language": "en-US",
"module_title": "Greetings & introductions",
"module_description": "Greet people, introduce a name and origin; I am, my name is",
"equivalence": "translation",
"reviewed": true,
"task": {
"schema_version": 2,
"module_id": "a1_introductions_v1",
"origin_module_key": "introductions",
"target_language": "en-US",
"course_version": "a1-v2",
"cefr_level": "A1",
"skill": "writing",
"kind": "free_text",
"prompt": "Introduce yourself. Give a name and the country you are from. You may use real or invented details. Write two or three short English sentences.",
"answer_key": {
"reference_answer": "My name is Nina. I am not from Germany. I am from Poland.",
"rubric": [
"Introduce one person with a name and country of origin.",
"Two or three short, understandable English sentences meet the required length.",
"Real or invented names and countries are allowed. Facts in the example are not mandatory.",
"Assess only the explicitly requested content and actual language errors. Do not penalise ambiguity in the task."
],
"explanation": "The example is only one possible answer. You may choose your own name and country. Only the explicitly requested information is required.",
"reference_answer_language": "en-US"
},
"instruction_language": "en-US",
"variant_id": "intro_en_explanations_v1_writing_11",
"canonical_task_id": "a1bank_en_v2_introductions_writing_11",
"content_revision": "introductions-en-explanations-v1",
"instruction": "Introduce yourself. Give a name and the country you are from. You may use real or invented details. Write two or three short English sentences."
}
}
]
@@ -1,7 +1,13 @@
{
"total": 12,
"editorial_review_sha256": "05cf8e999f341338101fa42d667e031ea6509a19f56b116b5af7329457a75368",
"total": 840,
"editorial_review_sha256": "bf482411a30c9e6096e9ab7f34785b844541f40bdb70d725a8a465696d53ee75",
"files": {
"introductions.en-US.v1.json": "07f3a3935290760bd64935ca66825c6321654aa017cd45c5651b86ddd9fbdc39"
"a1_daily_life_v1.ru-RU.v1.json": "83120bc77948d6c3b0ede8fd7ca013302bf7f570fe17db09195fa00ab24dcc4f",
"a1_family_v1.ru-RU.v1.json": "2d439fba0686cdd29794affa32a29f145bc101375e36c4dc550d434839f6c135",
"a1_food_shopping_v1.ru-RU.v1.json": "e13f1aa36f1ace664305947382b965ad6e01029e9363ce34b2ae9b31a049777c",
"a1_home_city_v1.ru-RU.v1.json": "783179d50cb197bd28310cbd7a605c43216bfcb9f691cadd3dd5b7c77dcebbbe",
"a1_introductions_v1.ru-RU.v1.json": "6458a0fc052c615f5a11b87f6a2a6ce9be67c4e03e1c6532092009bef2841bd0",
"a1_numbers_time_v1.ru-RU.v1.json": "403d758af8264eaa98a0f6b869f35e45a519efd7727daed68bc3f179ed9f1fdc",
"a1_review_test_v1.ru-RU.v1.json": "4b89bc0ecdb283cc49e75ee3d6113bd49f9d678b2261af682dbcd6a7edd308ae"
}
}
+5
View File
@@ -259,6 +259,11 @@ func (s *PostgresStore) PlanPronunciation(ctx context.Context, user, language st
return domain.PronunciationPlan{}, err
}
plan := pronunciation.Select(p, history, now)
var native string
if err = tx.QueryRowContext(ctx, `SELECT native_language FROM users WHERE id=$1`, user).Scan(&native); err != nil {
return plan, err
}
pronunciation.SetNativeLanguage(&plan, native)
plan.ID = NewID("pronplan")
raw, err := json.Marshal(plan)
if err != nil {
+38 -21
View File
@@ -98,15 +98,16 @@ func (s *PostgresStore) SaveGeneratedExercise(ctx context.Context, userID string
return domain.Lesson{}, domain.Exercise{}, err
}
exercise := domain.Exercise{
ID: NewID("exg"),
LessonID: lesson.ID,
TargetLanguage: targetLanguage,
CEFRLevel: cefrLevel,
Type: valueOr(generated.ExerciseType, "repeat_sentence"),
PromptText: valueOr(generated.DisplayPrompt, "Sprich den Satz klar nach."),
TargetText: generated.ReferenceText,
Difficulty: 1,
Source: valueOr(generated.Source, "flowise"),
ID: NewID("exg"),
LessonID: lesson.ID,
TargetLanguage: targetLanguage,
CEFRLevel: cefrLevel,
Type: valueOr(generated.ExerciseType, "repeat_sentence"),
PromptText: valueOr(generated.DisplayPrompt, "Sprich den Satz klar nach."),
InstructionLanguage: valueOr(generated.NativeLanguage, "de-DE"),
TargetText: generated.ReferenceText,
Difficulty: 1,
Source: valueOr(generated.Source, "flowise"),
}
if strings.TrimSpace(exercise.TargetText) == "" {
return domain.Lesson{}, domain.Exercise{}, errors.New("generated exercise reference_text is required")
@@ -178,13 +179,16 @@ func (s *PostgresStore) DebugStatus(ctx context.Context) domain.DebugDBStatus {
}
func (s *PostgresStore) CreateUser(ctx context.Context, email, passwordHash, uiLanguage string) (domain.User, error) {
if !domain.SupportedNativeLanguage(uiLanguage) {
return domain.User{}, domain.ErrNativeLanguageUnsupported
}
user := domain.User{ID: NewID("usr"), Email: strings.ToLower(strings.TrimSpace(email)), UILanguage: uiLanguage}
row := s.db.QueryRowContext(ctx, `
INSERT INTO users (id, email, password_hash, ui_language)
VALUES ($1, $2, $3, $4)
RETURNING id, email, ui_language, instruction_language, role, created_at
INSERT INTO users (id, email, password_hash, native_language, ui_language, instruction_language)
VALUES ($1, $2, $3, $4, $4, $4)
RETURNING id, email, native_language, ui_language, instruction_language, role, created_at
`, user.ID, user.Email, passwordHash, uiLanguage)
if err := row.Scan(&user.ID, &user.Email, &user.UILanguage, &user.InstructionLanguage, &user.Role, &user.CreatedAt); err != nil {
if err := row.Scan(&user.ID, &user.Email, &user.NativeLanguage, &user.UILanguage, &user.InstructionLanguage, &user.Role, &user.CreatedAt); err != nil {
return domain.User{}, err
}
return user, nil
@@ -194,11 +198,11 @@ func (s *PostgresStore) GetPasswordHashByEmail(ctx context.Context, email string
var user domain.User
var hash string
row := s.db.QueryRowContext(ctx, `
SELECT id, email, password_hash, ui_language, instruction_language, role, created_at
SELECT id, email, password_hash, native_language, ui_language, instruction_language, role, created_at
FROM users
WHERE email = $1
`, strings.ToLower(strings.TrimSpace(email)))
if err := row.Scan(&user.ID, &user.Email, &hash, &user.UILanguage, &user.InstructionLanguage, &user.Role, &user.CreatedAt); err != nil {
if err := row.Scan(&user.ID, &user.Email, &hash, &user.NativeLanguage, &user.UILanguage, &user.InstructionLanguage, &user.Role, &user.CreatedAt); err != nil {
if errors.Is(err, sql.ErrNoRows) {
return domain.User{}, "", ErrNotFound
}
@@ -210,11 +214,11 @@ func (s *PostgresStore) GetPasswordHashByEmail(ctx context.Context, email string
func (s *PostgresStore) GetUser(ctx context.Context, id string) (domain.User, error) {
var user domain.User
row := s.db.QueryRowContext(ctx, `
SELECT id, email, ui_language, instruction_language, role, created_at
SELECT id, email, native_language, ui_language, instruction_language, role, created_at
FROM users
WHERE id = $1
`, id)
if err := row.Scan(&user.ID, &user.Email, &user.UILanguage, &user.InstructionLanguage, &user.Role, &user.CreatedAt); err != nil {
if err := row.Scan(&user.ID, &user.Email, &user.NativeLanguage, &user.UILanguage, &user.InstructionLanguage, &user.Role, &user.CreatedAt); err != nil {
if errors.Is(err, sql.ErrNoRows) {
return domain.User{}, ErrNotFound
}
@@ -266,7 +270,7 @@ func (s *PostgresStore) GetPrimaryProfile(ctx context.Context, userID string) (d
func (s *PostgresStore) UpdatePreferences(ctx context.Context, userID, uiLanguage, targetLanguage, cefrLevel string, dailyGoalMinutes int) (domain.LearnerProfile, error) {
if uiLanguage != "" && !domain.SupportedUILanguage(uiLanguage) {
return domain.LearnerProfile{}, errors.New("unsupported UI language")
return domain.LearnerProfile{}, domain.ErrNativeLanguageUnsupported
}
tx, err := s.db.BeginTx(ctx, nil)
if err != nil {
@@ -302,7 +306,7 @@ func (s *PostgresStore) UpdatePreferences(ctx context.Context, userID, uiLanguag
if err != nil {
return profile, err
}
_, err = tx.ExecContext(ctx, `UPDATE users SET active_profile_id=$2,ui_language=CASE WHEN $3='' THEN ui_language ELSE $3 END WHERE id=$1`, userID, profile.ID, uiLanguage)
_, err = tx.ExecContext(ctx, `UPDATE users SET active_profile_id=$2,native_language=CASE WHEN $3='' THEN native_language ELSE $3 END,ui_language=CASE WHEN $3='' THEN native_language ELSE $3 END,instruction_language=CASE WHEN $3='' THEN native_language ELSE $3 END WHERE id=$1`, userID, profile.ID, uiLanguage)
if err != nil {
return profile, err
}
@@ -414,11 +418,11 @@ func (s *PostgresStore) RecentPronunciationTexts(ctx context.Context, userID, la
func (s *PostgresStore) GetExercise(ctx context.Context, id, userID string) (domain.Exercise, error) {
var e domain.Exercise
row := s.db.QueryRowContext(ctx, `
SELECT id, lesson_id, target_language, cefr_level, type, prompt_text, target_text, difficulty, COALESCE(source, 'seed'), COALESCE((SELECT data->>'reason' FROM pronunciation_plans WHERE exercise_id=exercises.id),''), COALESCE((SELECT data->>'category' FROM pronunciation_plans WHERE exercise_id=exercises.id),'')
SELECT id, lesson_id, target_language, cefr_level, type, prompt_text, target_text, difficulty, COALESCE(source, 'seed'), COALESCE((SELECT data->>'reason' FROM pronunciation_plans WHERE exercise_id=exercises.id),''), COALESCE((SELECT data->>'category' FROM pronunciation_plans WHERE exercise_id=exercises.id),''), COALESCE(NULLIF(agent_context_json->>'native_language',''),'de-DE')
FROM exercises
WHERE id = $1 AND (COALESCE(source, 'seed') = 'seed' OR created_by_user_id = $2)
`, id, userID)
if err := row.Scan(&e.ID, &e.LessonID, &e.TargetLanguage, &e.CEFRLevel, &e.Type, &e.PromptText, &e.TargetText, &e.Difficulty, &e.Source, &e.TrainingReason, &e.TrainingCategory); err != nil {
if err := row.Scan(&e.ID, &e.LessonID, &e.TargetLanguage, &e.CEFRLevel, &e.Type, &e.PromptText, &e.TargetText, &e.Difficulty, &e.Source, &e.TrainingReason, &e.TrainingCategory, &e.InstructionLanguage); err != nil {
if errors.Is(err, sql.ErrNoRows) {
return domain.Exercise{}, ErrNotFound
}
@@ -699,6 +703,19 @@ ALTER TABLE users ADD COLUMN IF NOT EXISTS instruction_language TEXT;
UPDATE users SET instruction_language=ui_language WHERE instruction_language IS NULL;
ALTER TABLE users ALTER COLUMN instruction_language SET DEFAULT 'de-DE';
ALTER TABLE users ALTER COLUMN instruction_language SET NOT NULL;
-- The product has two roles: native language (GUI and explanations together)
-- and target language. Old unsupported GUI preferences become German once.
ALTER TABLE users ADD COLUMN IF NOT EXISTS native_language TEXT;
UPDATE users SET native_language=CASE WHEN ui_language IN ('de-DE','ru-RU') THEN ui_language ELSE 'de-DE' END WHERE native_language IS NULL;
ALTER TABLE users ALTER COLUMN native_language SET DEFAULT 'de-DE';
ALTER TABLE users ALTER COLUMN native_language SET NOT NULL;
UPDATE users SET ui_language=native_language,instruction_language=native_language WHERE ui_language IS DISTINCT FROM native_language OR instruction_language IS DISTINCT FROM native_language;
DO $$ BEGIN
IF NOT EXISTS(SELECT 1 FROM pg_constraint WHERE conrelid='users'::regclass AND conname='users_native_language_coupled') THEN
ALTER TABLE users ADD CONSTRAINT users_native_language_coupled CHECK(native_language IN ('de-DE','ru-RU') AND ui_language=native_language AND instruction_language=native_language);
END IF;
END $$;
CREATE TABLE IF NOT EXISTS learner_profiles (
id TEXT PRIMARY KEY,