Adaptiven A1-Kurs und statistisches Aussprachetraining integrieren
Direkte DeepSeek- und Mistral-Anbindung mit versionierten Aktionsprofilen, Budgetreservierung, Tokenabrechnung und administrativen Qualitätsprüfungen ersetzen die Flowise-Abhängigkeit im regulären Betrieb. 840 geprüfte A1-Aufgaben mit geschützter Testauswertung und konkreten offenen Arbeitsaufträgen ergänzen den Kurs. Inhalts- und Sprachbewertung bleiben von Azure-Aussprachewerten getrennt; historische Aufgaben und Antworten bleiben erhalten. Echte Wort- und Phonemmessungen werden mit Herkunft, Aktualität und Nachweisdichte gebündelt. Go bestimmt Trainingsziele und Wiederholungen, das Modell formuliert dazu passende Nachsprechübungen. Profilansicht und Auswahlgründe werden angezeigt. Validierung: Go-Race-Tests mit lokaler PostgreSQL-Integration, go vet, Web-Build, Audit aller 840 Aufgaben und drei Browser-Smokes mit lokalen Modell-/Speech-Fixtures bestanden. Keine Produktionsänderungen oder Live-Aufrufe.
This commit is contained in:
@@ -25,6 +25,7 @@ type DataStore interface {
|
||||
NextLessonAndExercise(ctx context.Context, profile domain.LearnerProfile, avoidReferenceText ...string) (domain.Lesson, domain.Exercise, error)
|
||||
SaveGeneratedExercise(ctx context.Context, userID string, generated domain.GeneratedExercise) (domain.Lesson, domain.Exercise, error)
|
||||
GetExercise(ctx context.Context, id, userID string) (domain.Exercise, error)
|
||||
RecentPronunciationTexts(ctx context.Context, userID, language, level string) ([]string, error)
|
||||
SaveAttempt(ctx context.Context, attempt domain.Attempt) (domain.Attempt, error)
|
||||
Progress(ctx context.Context, userID string, limit int) (domain.ProgressSummary, error)
|
||||
AdminOverview(ctx context.Context) (domain.AdminOverview, error)
|
||||
@@ -32,20 +33,33 @@ type DataStore interface {
|
||||
CreateConversationSession(ctx context.Context, userID, targetLanguage, cefrLevel string) (domain.ConversationSession, error)
|
||||
SaveConversationTurn(ctx context.Context, turn domain.ConversationTurn) (domain.ConversationTurn, error)
|
||||
DebugStatus(ctx context.Context) domain.DebugDBStatus
|
||||
CourseModules(ctx context.Context, userID, language, level string) ([]domain.CourseModule, error)
|
||||
CourseModule(ctx context.Context, userID, language, level, id string) (domain.CourseModuleDetail, error)
|
||||
CourseTaskKey(ctx context.Context, taskID, userID, language, level string) (domain.CourseTaskKey, error)
|
||||
SaveCourseAttempt(ctx context.Context, userID, taskID, answer string, correct bool) (string, error)
|
||||
SelectCoursePractice(ctx context.Context, userID, moduleID string) (domain.CoursePracticeSelection, error)
|
||||
CoursePractice(ctx context.Context, userID, moduleID string) ([]domain.CourseTask, error)
|
||||
CoursePracticeByRequest(ctx context.Context, userID, moduleID, requestID string) (domain.CoursePracticeResult, error)
|
||||
CoursePracticeFallback(ctx context.Context, userID, seedID string) (domain.CoursePracticeResult, error)
|
||||
SaveGeneratedCourseTask(ctx context.Context, userID, requestID string, out domain.GeneratedCourseTask) (domain.CoursePracticeResult, error)
|
||||
}
|
||||
|
||||
type Server struct {
|
||||
cfg config.Config
|
||||
logger *slog.Logger
|
||||
store DataStore
|
||||
auth *services.AuthService
|
||||
speech services.SpeechService
|
||||
teacher services.TeacherAgent
|
||||
started time.Time
|
||||
ai *services.AIService
|
||||
course *services.CourseEngine
|
||||
cfg config.Config
|
||||
logger *slog.Logger
|
||||
store DataStore
|
||||
auth *services.AuthService
|
||||
speech services.SpeechService
|
||||
teacher services.TeacherAgent
|
||||
courseGenerator services.CourseTaskGenerator
|
||||
started time.Time
|
||||
}
|
||||
|
||||
func NewServer(cfg config.Config, logger *slog.Logger, store DataStore, auth *services.AuthService, speech services.SpeechService, teacher services.TeacherAgent) *Server {
|
||||
return &Server{cfg: cfg, logger: logger, store: store, auth: auth, speech: speech, teacher: teacher, started: time.Now()}
|
||||
generator, _ := teacher.(services.CourseTaskGenerator)
|
||||
return &Server{courseGenerator: generator, cfg: cfg, logger: logger, store: store, auth: auth, speech: speech, teacher: teacher, started: time.Now()}
|
||||
}
|
||||
|
||||
func (s *Server) Routes() http.Handler {
|
||||
@@ -60,17 +74,45 @@ func (s *Server) Routes() http.Handler {
|
||||
mux.Handle("GET /languages", s.requireAuth(http.HandlerFunc(s.languages)))
|
||||
mux.Handle("GET /languages/{code}/voices", s.requireAuth(http.HandlerFunc(s.languageVoices)))
|
||||
mux.Handle("GET /dashboard", s.requireAuth(http.HandlerFunc(s.dashboard)))
|
||||
mux.Handle("GET /pronunciation/profile", s.requireAuth(http.HandlerFunc(s.pronunciationProfile)))
|
||||
mux.Handle("GET /progress", s.requireAuth(http.HandlerFunc(s.progress)))
|
||||
mux.Handle("POST /lessons/next", s.requireAuth(http.HandlerFunc(s.nextLesson)))
|
||||
mux.Handle("GET /practice/exercises/{id}/audio", s.requireAuth(http.HandlerFunc(s.exerciseAudio)))
|
||||
mux.Handle("POST /practice/attempts", s.requireAuth(http.HandlerFunc(s.createAttempt)))
|
||||
mux.Handle("GET /course/catalog", s.requireAuth(http.HandlerFunc(s.adaptiveCatalog)))
|
||||
mux.Handle("POST /course/modules/{id}/tasks/next", s.requireAuth(http.HandlerFunc(s.adaptiveNext)))
|
||||
mux.Handle("GET /course/modules/{id}/tasks", s.requireAuth(http.HandlerFunc(s.adaptiveHistory)))
|
||||
mux.Handle("GET /course/jobs/{id}", s.requireAuth(http.HandlerFunc(s.adaptiveJob)))
|
||||
mux.Handle("POST /course/jobs/{id}/retry", s.requireAuth(http.HandlerFunc(s.adaptiveRetryJob)))
|
||||
mux.Handle("GET /course/tasks/{id}", s.requireAuth(http.HandlerFunc(s.adaptiveTask)))
|
||||
mux.Handle("POST /course/tasks/{id}/audio-attempts", s.requireAuth(http.HandlerFunc(s.adaptiveAudioAttempt)))
|
||||
mux.Handle("GET /course/attempts/{id}", s.requireAuth(http.HandlerFunc(s.adaptiveGetAttempt)))
|
||||
mux.Handle("POST /course/attempts/{id}/retry", s.requireAuth(http.HandlerFunc(s.adaptiveRetryAttempt)))
|
||||
mux.Handle("POST /course/exams", s.requireAuth(http.HandlerFunc(s.adaptiveNewExam)))
|
||||
mux.Handle("GET /course/exams/{id}", s.requireAuth(http.HandlerFunc(s.adaptiveExam)))
|
||||
mux.Handle("GET /course/modules", s.requireAuth(http.HandlerFunc(s.courseModules)))
|
||||
mux.Handle("POST /course/modules/{id}/practice/next", s.requireAuth(http.HandlerFunc(s.nextCoursePractice)))
|
||||
mux.Handle("GET /course/modules/{id}/practice", s.requireAuth(http.HandlerFunc(s.coursePractice)))
|
||||
mux.Handle("GET /course/modules/{id}", s.requireAuth(http.HandlerFunc(s.courseModule)))
|
||||
mux.Handle("POST /course/tasks/{id}/attempts", s.requireAuth(http.HandlerFunc(s.courseAttempt)))
|
||||
mux.Handle("GET /course/tasks/{id}/audio", s.requireAuth(http.HandlerFunc(s.courseAudio)))
|
||||
mux.Handle("POST /conversation/start", s.requireAuth(http.HandlerFunc(s.startConversation)))
|
||||
mux.Handle("POST /conversation/{id}/turn", s.requireAuth(http.HandlerFunc(s.conversationTurn)))
|
||||
mux.Handle("GET /admin/overview", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.adminOverview))))
|
||||
mux.Handle("GET /admin/users", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.adminUsers))))
|
||||
mux.Handle("GET /admin/ai/settings", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.aiSettings))))
|
||||
mux.Handle("PUT /admin/ai/profiles/{action}", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.aiSaveProfile))))
|
||||
mux.Handle("PUT /admin/ai/budget", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.aiSaveBudget))))
|
||||
mux.Handle("GET /admin/ai/providers/{provider}/models", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.aiModels))))
|
||||
mux.Handle("GET /admin/ai/usage", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.aiUsage))))
|
||||
mux.Handle("GET /admin/ai/calls/{id}", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.aiCallDetail))))
|
||||
mux.Handle("POST /admin/ai/calls/{id}/resolve", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.aiResolve))))
|
||||
mux.Handle("POST /admin/ai/quality", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.aiQuality))))
|
||||
mux.Handle("POST /admin/ai/test", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.aiTest))))
|
||||
if s.cfg.DebugEnabled {
|
||||
mux.Handle("GET /debug/status", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.debugStatus))))
|
||||
mux.Handle("GET /debug/db", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.debugDB))))
|
||||
mux.Handle("GET /debug/ai", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.debugAI))))
|
||||
mux.Handle("GET /debug/flowise", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.debugFlowise))))
|
||||
mux.Handle("GET /debug/azure", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.debugAzure))))
|
||||
mux.Handle("GET /debug/runtime", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.debugRuntime))))
|
||||
@@ -266,11 +308,32 @@ func (s *Server) nextLesson(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
func (s *Server) nextAgentExercise(ctx context.Context, user domain.User, profile domain.LearnerProfile, progress domain.ProgressSummary, avoidReferenceTexts []string) (domain.Lesson, domain.Exercise, error) {
|
||||
// Keep fallback exercises available even when the learner has already used
|
||||
// every seed. The broader persisted history constrains generated sentences.
|
||||
fallbackAvoid := append([]string{}, avoidReferenceTexts...)
|
||||
recent, err := s.store.RecentPronunciationTexts(ctx, user.ID, profile.TargetLanguage, profile.CEFRLevel)
|
||||
if err != nil {
|
||||
return domain.Lesson{}, domain.Exercise{}, err
|
||||
}
|
||||
avoidReferenceTexts = append(append([]string{}, avoidReferenceTexts...), recent...)
|
||||
avoidReferenceText := ""
|
||||
if len(avoidReferenceTexts) > 0 {
|
||||
avoidReferenceText = avoidReferenceTexts[len(avoidReferenceTexts)-1]
|
||||
}
|
||||
var plan *domain.PronunciationPlan
|
||||
if s.cfg.PronunciationStrategy == "statistical" {
|
||||
repo, ok := s.store.(pronunciationStore)
|
||||
if !ok {
|
||||
return domain.Lesson{}, domain.Exercise{}, errors.New("pronunciation statistics unavailable")
|
||||
}
|
||||
selected, err := repo.PlanPronunciation(ctx, user.ID, profile.TargetLanguage, time.Now().UTC())
|
||||
if err != nil {
|
||||
return domain.Lesson{}, domain.Exercise{}, err
|
||||
}
|
||||
plan = &selected
|
||||
}
|
||||
generated, err := s.teacher.NextExercise(ctx, domain.GeneratedExerciseRequest{
|
||||
TrainingPlan: plan,
|
||||
UserID: user.ID,
|
||||
Profile: profile,
|
||||
Progress: progress,
|
||||
@@ -283,7 +346,11 @@ func (s *Server) nextAgentExercise(ctx context.Context, user domain.User, profil
|
||||
AvoidReferenceText: avoidReferenceText,
|
||||
AvoidReferenceTexts: avoidReferenceTexts,
|
||||
})
|
||||
if err == nil && generated.Source == "flowise" && strings.TrimSpace(generated.ReferenceText) != "" {
|
||||
if err == nil && (generated.Source == "flowise" || generated.Source == "ai") && strings.TrimSpace(generated.ReferenceText) != "" {
|
||||
generated.TrainingPlan = plan
|
||||
if plan != nil && plan.Mode == "transfer" {
|
||||
plan.CandidateWord = generated.CandidateWord
|
||||
}
|
||||
lesson, exercise, saveErr := s.store.SaveGeneratedExercise(ctx, user.ID, generated)
|
||||
if saveErr == nil {
|
||||
s.logger.Info("next exercise selected", "request_id", ctx.Value(requestIDKey), "source", exercise.Source, "exercise_id", exercise.ID)
|
||||
@@ -292,9 +359,16 @@ func (s *Server) nextAgentExercise(ctx context.Context, user domain.User, profil
|
||||
s.logger.Warn("saving generated exercise failed, using seed fallback", "error", saveErr)
|
||||
}
|
||||
if err != nil {
|
||||
s.logger.Warn("flowise next exercise failed, using seed fallback", "error", err)
|
||||
s.logger.Warn("AI next exercise failed, using seed fallback", "error", err)
|
||||
}
|
||||
lesson, exercise, err := s.store.NextLessonAndExercise(ctx, profile, avoidReferenceTexts...)
|
||||
if plan != nil {
|
||||
if repo, ok := s.store.(pronunciationStore); ok {
|
||||
if planErr := repo.FailPronunciationPlan(ctx, user.ID, plan.ID); planErr != nil {
|
||||
s.logger.Warn("pronunciation plan cleanup failed", "error", planErr)
|
||||
}
|
||||
}
|
||||
}
|
||||
lesson, exercise, err := s.store.NextLessonAndExercise(ctx, profile, fallbackAvoid...)
|
||||
if err == nil {
|
||||
s.logger.Info("next exercise selected", "request_id", ctx.Value(requestIDKey), "source", exercise.Source, "exercise_id", exercise.ID)
|
||||
}
|
||||
@@ -400,7 +474,8 @@ func (s *Server) createAttempt(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
attempt, err := s.store.SaveAttempt(r.Context(), domain.Attempt{
|
||||
UserID: currentUserID(r),
|
||||
UserID: currentUserID(r),
|
||||
Provider: result.Provider, Measurement: &result,
|
||||
ExerciseID: exercise.ID,
|
||||
TargetLanguage: exercise.TargetLanguage,
|
||||
RecognizedText: result.RecognizedText,
|
||||
@@ -416,6 +491,11 @@ func (s *Server) createAttempt(w http.ResponseWriter, r *http.Request) {
|
||||
writeError(w, http.StatusInternalServerError, err)
|
||||
return
|
||||
}
|
||||
if s.course != nil {
|
||||
if err := s.course.Repo.SyncLegacyForExercise(r.Context(), exercise.ID); err != nil {
|
||||
s.logger.Warn("legacy speech evidence sync failed", "error", err)
|
||||
}
|
||||
}
|
||||
writeJSON(w, http.StatusCreated, map[string]any{"attempt": attempt, "teacher": teacher, "provider": result.Provider})
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user