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:
@@ -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
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user