Compare commits
6
Commits
2c24c18614
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c79da17919 | ||
|
|
8d618b7fe6 | ||
|
|
7499491ae8 | ||
|
|
16cceae28a | ||
|
|
f3d42ee2b6 | ||
|
|
87684ba0fd |
@@ -17,10 +17,39 @@ die aktuellen Daten, bevor du Aussagen aus älteren Dokumenten übernimmst.
|
||||
- Empfehlungen dürfen Lernende unterstützen, aber keine unbelegte
|
||||
Beherrschung, Unfähigkeit oder künstliche Zugangssperren behaupten.
|
||||
|
||||
## Verbindliches Sprachmodell
|
||||
|
||||
- Es gibt genau zwei Sprachrollen: **Muttersprache** und **Lernsprache**.
|
||||
- Die Muttersprache bestimmt gemeinsam die gesamte GUI, Aufgabenanweisungen,
|
||||
Erklärungen, Hilfen und neue Rückmeldungen. GUI- und Erklärungssprache dürfen
|
||||
weder unabhängig wählbar sein noch auseinanderlaufen. Im Produkt heißen sie
|
||||
einheitlich „Muttersprache“, nicht GUI-/Oberflächen-/Erklärungssprache.
|
||||
- Unterstützte Muttersprachen sind Deutsch (`de-DE`) und Russisch (`ru-RU`).
|
||||
Englisch (`en-US`) ist die bisherige Lernsprache, keine dritte Muttersprache.
|
||||
- Neue Nutzer haben eine gemeinsame Muttersprache. Ein Wechsel aktualisiert
|
||||
diese atomar und erhält Lernsprache, Niveau, Tagesziel und Lernstand.
|
||||
- Die kanonische Präferenz heißt `native_language`. Historische/API-kompatible
|
||||
Felder `ui_language` und `instruction_language` dürfen lediglich denselben
|
||||
Wert abbilden; widersprüchliche Eingaben werden abgelehnt.
|
||||
- Zielsprache und Speech-Locale richten sich nach der Lernsprache des jeweiligen
|
||||
Lerninhalts. Englische Lerntexte, Antwortwörter und Aufnahmen werden nicht
|
||||
durch eine Übersetzung der Muttersprache ersetzt.
|
||||
- Übersetzte Aufgaben behalten eindeutige Lösungsschlüssel und sichtbare,
|
||||
gleichwertige Anforderungen. Russische Wortbedeutungen und Ausgangssätze
|
||||
brauchen eine fachliche Prüfung; keine pauschale Textübersetzung.
|
||||
- Bereits zugewiesene Aufgaben, alte Rückmeldungen, Bewertungen und Messungen
|
||||
behalten ihren eingefrorenen Inhalt und ihre damalige Sprache. Neue Aufgaben
|
||||
und Aufträge speichern ihre Muttersprache und Inhaltsrevision. Ein Wechsel
|
||||
der Muttersprache ist keine Neubewertung und kein zusätzlicher Lernnachweis.
|
||||
|
||||
## Orientierung und Quellen
|
||||
|
||||
- `README.md` beschreibt Einrichtung und aktuellen Funktionsumfang.
|
||||
- `docs/AI_OPERATIONS.md` beschreibt KI-Verträge, Kosten und Betriebsgrenzen.
|
||||
- `docs/LEARNING_EXPERIENCE_ROADMAP.md` enthält priorisierte Verbesserungen aus
|
||||
Nutzerbewertungen, Abnahmekriterien und den Umsetzungsstand. Bei Aufträgen zur
|
||||
Roadmap den nächsten beauftragten Schritt bearbeiten und Status sowie Nachweise
|
||||
dort aktualisieren; vorhandene Teilfunktionen vorher im Code prüfen.
|
||||
- `PROJECT_CONTEXT.md` dokumentiert die Entwicklung einschließlich historischer
|
||||
Zwischenstände. Datierte Aussagen sind keine Garantie für den Live-Stand.
|
||||
- Die API liegt in `apps/api`, das React-Frontend in `apps/web`.
|
||||
@@ -63,6 +92,18 @@ die aktuellen Daten, bevor du Aussagen aus älteren Dokumenten übernimmst.
|
||||
42 Kombinationen aus Modul und Lernbereich mit jeweils 20 Aufgaben.
|
||||
- Diese Bestandsgröße ist eine überprüfbare Eigenschaft der aktuellen Bank,
|
||||
keine Einschränkung zukünftiger Sprachen oder Erweiterungen.
|
||||
- Im Bankbetrieb ist die thematische Lernsequenz die Standardempfehlung in den
|
||||
sechs Lernmodulen: Hören und Wortschatz früh, freies Sprechen nach passender
|
||||
Vorbereitung. Redaktionelle Verknüpfungen liegen getrennt von Aufgabeninhalten.
|
||||
- Lernwegposition und übersprungene Schritte sind keine Leistungsnachweise.
|
||||
Bereiche bleiben direkt wählbar; keine Mindestnote als Zugangssperre einführen.
|
||||
Lernwege und ihre Wiederholungen verändern weder historische Aufgaben noch Tests.
|
||||
- Gute aktuelle Grundlagen dürfen seltener wiederholt werden. Neue Grammatikbeispiele
|
||||
brauchen ausdrücklich geprüfte Verknüpfungen zum selben Satzmuster; gleiche grobe
|
||||
Lernzielbezeichnungen allein reichen nicht. Wortbedeutungen nicht austauschen.
|
||||
- Berücksichtigte frühere Übung ist getrennt von manuellem Überspringen zu zählen.
|
||||
Keine Antworten, Noten oder Beherrschungsnachweise dafür erzeugen. Neuere Fehler,
|
||||
unbenotete Antworten und die Privatsphäre laufender Tests berücksichtigen.
|
||||
- Unterstützte Darstellungen: `choice`, `short_text`, `free_text`,
|
||||
`repeat_sentence` und `free_speech`.
|
||||
- Hör- und Lesematerial sowie Lösungsschlüssel nur entsprechend der
|
||||
|
||||
@@ -2,6 +2,94 @@
|
||||
|
||||
Hinweise für Coding-Agenten und Beitragsarbeit: [AGENTS.md](AGENTS.md).
|
||||
|
||||
Geplante Verbesserungen mit Prioritäten und Abnahmekriterien:
|
||||
[Roadmap für das Lernerlebnis](docs/LEARNING_EXPERIENCE_ROADMAP.md).
|
||||
|
||||
## Mehrsprachigkeit
|
||||
|
||||
Es gibt genau zwei Sprachrollen: **Muttersprache** und **Lernsprache**.
|
||||
Die Muttersprache steuert gemeinsam Oberfläche, neue Aufgabenanweisungen,
|
||||
Erklärungen und Rückmeldungen. Zur Auswahl stehen Deutsch (`de-DE`) und Russisch
|
||||
(`ru-RU`). Die Lernsprache des vorhandenen A1-Kurses bleibt Englisch (`en-US`).
|
||||
Eine separate Einstellung für GUI- oder Erklärungssprache gibt es nicht.
|
||||
|
||||
Vor dem Login wird die Muttersprache im Browser gespeichert; nach dem Login gilt
|
||||
die Kontoeinstellung. Ein Wechsel erhält Lernsprache, Niveau, Tagesziel,
|
||||
Lernfortschritt, eingegebene Antworten und laufende Aufnahmen. Historische Aufgaben,
|
||||
Bewertungen und Rückmeldungen behalten ihren eingefrorenen Inhalt und ihre Sprache.
|
||||
Technische Rohdaten, Prompts, Schemas und Anbieterdiagnosen werden nicht automatisch
|
||||
übersetzt. Die normale Fehleranzeige verwendet übersetzte stabile API-Fehlercodes.
|
||||
|
||||
Navigation, Anmeldung, Dashboard, Fortschritt und Ausspracheprofil, Kursbedienung,
|
||||
Aufnahme, Dialog, Administration und Debug verwenden deutsche und russische
|
||||
Textkataloge. Datums-, Zahlen-, Kosten- und Pluralanzeigen folgen der Muttersprache.
|
||||
Neue deterministische Aussprache- und Dialoghilfen berücksichtigen diese ebenfalls.
|
||||
|
||||
### Aufgabenvarianten
|
||||
|
||||
Die 840 deutschen Basisaufgaben bleiben unverändert. Zusätzlich gibt es **840
|
||||
russische Aufgabenansichten**, verteilt auf sieben Module und sechs Lernbereiche
|
||||
mit jeweils 20 Aufgaben. Auch der interne A1-Test mit zwölf Aufgaben steht mit
|
||||
russischen Anweisungen zur Verfügung. Russischsprachige Bedeutungsoptionen und
|
||||
Ausgangssätze sind redaktionelle Quelldaten; englische Lücken, Lesetexte,
|
||||
Hörtexte und Nachsprechsätze bleiben Lernmaterial auf Englisch. Räumliche und
|
||||
zeitliche Bedeutungen werden kontextabhängig übersetzt.
|
||||
|
||||
Alle russischen Ansichten sind äquivalente Übersetzungen und teilen die fachliche
|
||||
Kennung ihrer Basisaufgabe. Sprachansichten werden getrennt eingefroren, erhöhen
|
||||
aber nicht die Zahl unterschiedlicher Aufgaben oder die Aussprache-Nachweisdichte.
|
||||
Versuche bleiben einzeln erhalten. Lösungen und Hörtranskripte bleiben bis zur
|
||||
vorgesehenen Freigabe geschützt; offene Antworten ohne Bewertungsprofil bleiben
|
||||
unbenotet. Der interne Test ist kein Zertifikat.
|
||||
|
||||
`instruction`, `stimulus` mit Sprachrolle, Optionssprache, Variantenkennung und
|
||||
Revision trennen Anweisung, Ausgangsmaterial und Lerninhalt. Das kombinierte
|
||||
`prompt` bleibt für kompatible Clients erhalten. Hintergrundaufträge frieren die
|
||||
Muttersprache beim Einreihen ein; wiederholte Anfragen behalten den ursprünglichen
|
||||
Auftrag. Alte englische Pilotansichten in vorhandenen Datenbanken werden deaktiviert,
|
||||
aber weder gelöscht noch an bereits zugewiesenen Aufgaben verändert.
|
||||
|
||||
Redaktionelle Quellen liegen in `tools/course_bank/russian/*.tsv` und
|
||||
`variant_sources.json`; `variant_review.json` bindet die Durchsicht an Prüfsummen.
|
||||
Generierte Ansichten liegen unter `apps/api/internal/store/coursebank/variants/`.
|
||||
Die dokumentierte Codex-Durchsicht ist keine unabhängige Lehrkräfte-Zertifizierung.
|
||||
|
||||
```bash
|
||||
python tools/course_bank/build.py
|
||||
python tools/course_bank/audit.py
|
||||
```
|
||||
|
||||
Beide Befehle prüfen Basisbank und Varianten offline. Geänderte fachliche Inhalte
|
||||
benötigen neue IDs beziehungsweise Revisionen; historische Daten werden nicht
|
||||
umgeschrieben oder neu bewertet.
|
||||
|
||||
### Kontoeinstellung und Kompatibilität
|
||||
|
||||
`users.native_language` ist die maßgebliche Einstellung. `PATCH /me/preferences`
|
||||
akzeptiert `{"native_language":"ru-RU"}`. Die bisherigen Felder `ui_language` und
|
||||
`instruction_language` bleiben als gekoppelte Kompatibilitätsfelder erhalten.
|
||||
Alle drei Werte müssen gleich sein; widersprüchliche Angaben liefern HTTP 400
|
||||
mit `native_language_conflict`, nicht unterstützte Werte `native_language_unsupported`.
|
||||
Eine Datenbankbedingung schützt die Kopplung auch bei direkten Schreibzugriffen.
|
||||
`PUT /course/instruction-language` bleibt ein veralteter Kompatibilitätsendpunkt
|
||||
und ändert ebenfalls die gesamte Muttersprache.
|
||||
|
||||
Die additive Migration übernimmt eine vorhandene deutsche/russische GUI-Einstellung;
|
||||
andere alte GUI-Werte werden auf Deutsch gesetzt. Vorhandene Aufgaben, Aufträge,
|
||||
Bewertungen und Messungen werden dabei nicht übersetzt. Wiederholte Starts erhalten
|
||||
die bereits gesetzte Muttersprache. Profil und Sprache werden atomar aktualisiert.
|
||||
KI-Verträge behalten vorerst den Wire-Namen `ui_language`; dessen Wert stammt aus
|
||||
der eingefrorenen Muttersprache. `GET /course/catalog` liefert Muttersprache,
|
||||
verfügbare Muttersprachen, Bestand und Testverfügbarkeit. Fehlende Sprachpakete
|
||||
führen zu `course_variant_unavailable`, ohne stillen Rückfall auf Deutsch.
|
||||
|
||||
Die historische feste Kursansicht und gespeicherte Rückmeldungen bleiben historische
|
||||
Inhalte. Die festen Recorder-Anweisungen sind übersetzte Oberflächenvorlagen; neue
|
||||
statistische Trainingsbegründungen werden mit der Muttersprache gespeichert. Neue Lernsprachen benötigen eigene Kursinhalte und geprüfte
|
||||
Speech-Unterstützung. Lokale Fixturetests bestätigen keine Live-Modellqualität
|
||||
oder echte Audioqualität. Preise, Produktionsprofile und Budgets werden durch die
|
||||
Spracherweiterung nicht geändert.
|
||||
|
||||
## Klare offene Aufgaben (01.11.2026)
|
||||
|
||||
Die 140 freien Sprech- und Schreibaufgaben benennen ihre Anforderungen konkret und erlauben eigene oder erfundene Angaben. Beim freien Sprechen zeigt die App die KI-Bewertung als **Inhalt und Sprache**, den erkannten Text und den separaten Azure-Aussprachewert. Korrigierte Aufgaben erhalten neue IDs; historische Aufgaben und Bewertungen bleiben erhalten. Nach dem API-/Web-Neubau eine neue Aufgabe anfordern.
|
||||
@@ -22,9 +110,10 @@ Betriebsanleitung: [docs/AI_OPERATIONS.md](docs/AI_OPERATIONS.md). Die echte `.e
|
||||
|
||||
## Aktueller Funktionsumfang
|
||||
|
||||
- Registrierung, Login und Lernerprofil mit Zielsprache, Oberflächensprache und Tagesziel
|
||||
- Registrierung, Login und Lernerprofil mit Lernsprache, Muttersprache und Tagesziel
|
||||
- Kurze englische `repeat_sentence`-Übungen aus direkten Modellaufrufen; Seed-Übungen als Fallback
|
||||
- Audioaufnahme im Browser und Aussprachebewertung über Azure Speech
|
||||
- Audio-Monitoring ist für eine spätere Erprobung im Code erhalten, derzeit aber in allen Aufnahmebereichen ausgeblendet und deaktiviert. Bei einem manuellen Test mit USB-Headset unter Debian/Firefox wurden etwa 900 ms Verzögerung berichtet; die Ursache ist nicht geklärt. Eine spätere Freigabe erfolgt ausdrücklich über die Komponenten-Option `enableMonitoring`; Schalter und Mithörlautstärke (0–100 %) bleiben vorbereitet.
|
||||
- Gesamt-, Wort- und bei echten Azure-Antworten auch Phonemwerte
|
||||
- Feedback zum Versuch sowie Fortschrittsansicht mit schwachen Wörtern und Lauten
|
||||
- Mock-Modus für lokale Entwicklung ohne Azure-Zugang
|
||||
@@ -35,9 +124,66 @@ Auswahlantworten bewertet die Go-API anhand des gespeicherten Lösungsschlüssel
|
||||
|
||||
## A1-Kurs
|
||||
|
||||
Der Menüpunkt **A1-Kurs** öffnet sieben frei wählbare Module mit Grammatik, Wortschatz, Hören, Lesen, Sprechen und Schreiben. **Nächste Aufgabe** wählt aus dem geprüften Bestand: noch nicht gezeigte Aufgaben zuerst, bei belegtem Lernbedarf passende Lernziele, nach Ausschöpfen des Bereichs Wiederholungen. Schwierigkeit und Wiederholung beruhen auf tatsächlich bewerteten Antworten. Auch bereits gezeigte, noch unbeantwortete Aufgaben zählen als gesehen, nicht als Leistungsnachweis. Im Browser stehen Herkunft und verbleibender Bestand.
|
||||
Der Menüpunkt **A1-Kurs** öffnet sieben frei wählbare Module mit Grammatik,
|
||||
Wortschatz, Hören, Lesen, Sprechen und Schreiben. Im Bankbetrieb ist der
|
||||
**Empfohlene Lernweg** der Standard: 60 redaktionell verknüpfte Themen, zehn in
|
||||
jedem der sechs Lernmodule. Jede Folge beginnt mit Hören und führt über
|
||||
Wortschatz, Lesen, Nachsprechen, passende Grammatik und kurze Schreibaufgaben
|
||||
zum freien Schreiben und erst danach zum freien Sprechen über dasselbe Thema.
|
||||
Vorlagen und eigene Angaben dürfen unterschiedlich sein; es geht um übertragbare
|
||||
Wörter und Satzmuster, nicht um das Auswendiglernen eines Lösungssatzes.
|
||||
|
||||
Die 840 Aufgaben liegen in 42 versionierten JSON-Dateien unter `apps/api/internal/store/coursebank/en-US/a1-v2/`. Ihre redaktionellen Quellen und der an Dateiprüfsummen gebundene Prüfvermerk liegen unter `tools/course_bank/`. Es gibt 560 Auswahlaufgaben, je 70 kurze und freie Schreibaufgaben sowie je 70 Nachsprech- und freie Sprechaufgaben. Hörtexte bleiben bis zur zulässigen Freigabe privat. Alte Reserven bleiben als Rückfall erhalten.
|
||||
**Nächste Aufgabe** setzt den gespeicherten Lernweg fort. Eine unbeantwortete
|
||||
Aufgabe bleibt der aktuelle Schritt; **Diesen Schritt überspringen** geht
|
||||
bewusst weiter. Nach einem bereits bewerteten Fehler unter 80 Punkten wird pro
|
||||
Schritt höchstens eine Wiederholung empfohlen. Eine weitere Antwort oder
|
||||
explizites Überspringen setzt den Weg ohne Mindestnote fort. Gespeicherte
|
||||
unbenotete Antworten zählen als Bearbeitung, niemals als Beherrschung.
|
||||
Demoantworten und bloßes Klicken auf „Nächste Aufgabe“ zählen nicht als Bearbeitung.
|
||||
|
||||
Bereits gut bearbeitete Grundlagen werden seltener erneut angeboten. Nur für
|
||||
Grammatik gibt es ausdrücklich redaktionell freigegebene neue Beispiele zum
|
||||
selben Satzmuster; ein grob gemeinsames Lernziel allein reicht nicht aus.
|
||||
Wortschatzaufgaben behalten ihre konkrete Wortbedeutung. Hören, Lesen,
|
||||
Nachsprechen und die Schreib-/Sprechaufgaben zum Thema bleiben erhalten.
|
||||
|
||||
Für diese Auswahl zählen nur eigene, echte Bewertungen derselben Lernsprache
|
||||
und Kursversion. Demoantworten, unbenotete Antworten und noch nicht abgeschlossene
|
||||
Tests liefern keine positiven Nachweise. Eine neuere unbenotete Antwort oder ein
|
||||
neuerer Fehler verdrängt die bisherige positive Auswahlannahme. Bereits zugewiesene
|
||||
Aufgaben bleiben während eines Schritts stabil, auch bei Neuladen oder Sprachwechsel.
|
||||
|
||||
Eine gerade gut gelöste identische Grundlage wird innerhalb von 30 Minuten nicht
|
||||
unnötig wiederholt, sofern kein unbekanntes freigegebenes Grammatikbeispiel
|
||||
angeboten werden kann. Danach begründen zwei gute Antworten mit mindestens
|
||||
24 Stunden Abstand oder bei Grammatik gute Ergebnisse in drei verschiedenen
|
||||
freigegebenen Beispielen weniger Wiederholungen. Die jüngste passende Bewertung
|
||||
muss mindestens 85 Punkte haben und höchstens sieben Tage alt sein; betrachtet
|
||||
werden bis zu 2.000 jüngste Antworten der letzten 30 Tage pro Modul. Ältere oder
|
||||
unzureichende Nachweise führen zum Auffrischen. Das sind Auswahlheuristiken,
|
||||
keine Beherrschungsdiagnose. Berücksichtigte frühere Übungsschritte werden getrennt
|
||||
vom manuellen Überspringen gezählt; es entstehen keine neuen Antworten oder Noten.
|
||||
|
||||
Frühere Bewertungen einer erneut empfohlenen Aufgabe erscheinen eingeklappt als
|
||||
**Bewertung deines vorherigen Versuchs**. Eine neue Antwort erhält weiterhin ihren
|
||||
eigenen Versuch und gegebenenfalls eine eigene Bewertung.
|
||||
|
||||
Die Oberfläche zeigt Thema und Schritt auf Deutsch beziehungsweise Russisch.
|
||||
Neuladen, ein Modulwechsel und der Wechsel der Muttersprache erhalten den Lernweg.
|
||||
Die sechs Lernbereiche bleiben direkt auswählbar und verändern den Lernweg nicht.
|
||||
Dabei, nach Abschluss des Lernwegs und bei der Wiederholung im siebten Modul
|
||||
bleibt die bisherige Auswahl nach ungesehenen Aufgaben, tatsächlichen Bewertungen
|
||||
und Wiederholungen verfügbar. Der A1-Test verwendet seine eigene eingefrorene
|
||||
Auswahl; weder Lernwege noch Überspringen verändern Testnoten oder Lösungen.
|
||||
|
||||
Die Verknüpfungen liegen separat in `tools/course_bank/sequence_sources.json`,
|
||||
mit eigenem Prüfvermerk in `sequence_review.json`. Build und Audit berücksichtigen
|
||||
sie automatisch. Bestehende Aufgaben-IDs, Aufgabeninhalte, Messungen und Bewertungen
|
||||
bleiben unverändert. Es gibt keinen zusätzlichen Modellaufruf und noch keinen
|
||||
Button „Grammatik erklären“. Der alternative KI-Kursmodus behält seine eigene
|
||||
Planung. Die redaktionelle Codex-Durchsicht ist keine unabhängige Lehrkräfteprüfung.
|
||||
|
||||
Die 840 Aufgaben liegen in 42 versionierten JSON-Dateien unter `apps/api/internal/store/coursebank/en-US/a1-v2/`. Ihre redaktionellen Quellen und der an Dateiprüfsummen gebundene Prüfvermerk liegen unter `tools/course_bank/`. Es gibt 560 Auswahlaufgaben, je 70 kurze und freie Schreibaufgaben sowie je 70 Nachsprech- und freie Sprechaufgaben. Hörtexte bleiben bis zur zulässigen Freigabe privat. Alte Reserven bleiben für den deutschen Bestand und den alternativen KI-Modus erhalten; fehlende muttersprachliche Bankvarianten werden nicht dadurch ersetzt.
|
||||
|
||||
Der A1-Test besteht aus zwölf vor der ersten Antwort eingefrorenen Aufgaben, zwei je Lernbereich, mit Abdeckung der sechs Lernmodule. Nach zwölf Abgaben ohne vollständige Bewertung erscheint **Abgegeben – Bewertung ausstehend**. Erst nach vollständiger Bewertung werden Lösungen und Gesamtnote gezeigt. Gespeicherte unbenotete Antworten begründen keinen Modulabschluss. Das Testergebnis ist eine interne Lerneinschätzung, kein Zertifikat.
|
||||
|
||||
|
||||
@@ -23,39 +23,59 @@ type CoursePack struct {
|
||||
Reserves []AdaptiveTask `json:"reserves"`
|
||||
}
|
||||
type TaskOption struct {
|
||||
ID string `json:"id"`
|
||||
Label string `json:"label"`
|
||||
ID string `json:"id"`
|
||||
Label string `json:"label"`
|
||||
Language string `json:"language,omitempty"`
|
||||
Role string `json:"role,omitempty"`
|
||||
}
|
||||
type TaskKey struct {
|
||||
CorrectOptionID string `json:"correct_option_id,omitempty"`
|
||||
ReferenceAnswer string `json:"reference_answer,omitempty"`
|
||||
Rubric []string `json:"rubric"`
|
||||
Explanation string `json:"explanation"`
|
||||
CorrectOptionID string `json:"correct_option_id,omitempty"`
|
||||
ReferenceAnswer string `json:"reference_answer,omitempty"`
|
||||
ReferenceAnswerLanguage string `json:"reference_answer_language,omitempty"`
|
||||
Rubric []string `json:"rubric"`
|
||||
Explanation string `json:"explanation"`
|
||||
}
|
||||
|
||||
// TaskStimulus is public exercise material, separate from the instruction.
|
||||
// Private listening text remains AudioText and is excluded by Public(false).
|
||||
type TaskStimulus struct {
|
||||
Role string `json:"role"`
|
||||
Language string `json:"language"`
|
||||
Text string `json:"text"`
|
||||
}
|
||||
|
||||
type AdaptiveTask struct {
|
||||
SchemaVersion int `json:"schema_version"`
|
||||
ID string `json:"id,omitempty"`
|
||||
ModuleID string `json:"module_id"`
|
||||
OriginModuleKey string `json:"origin_module_key,omitempty"`
|
||||
TargetLanguage string `json:"target_language"`
|
||||
CourseVersion string `json:"course_version"`
|
||||
CEFRLevel string `json:"cefr_level"`
|
||||
Skill string `json:"skill"`
|
||||
Kind string `json:"kind"`
|
||||
Prompt string `json:"prompt"`
|
||||
Passage string `json:"passage,omitempty"`
|
||||
Options []TaskOption `json:"options,omitempty"`
|
||||
ReferenceText string `json:"reference_text,omitempty"`
|
||||
AudioText string `json:"audio_text,omitempty"`
|
||||
AnswerKey *TaskKey `json:"answer_key,omitempty"`
|
||||
Source string `json:"source,omitempty"`
|
||||
BriefID string `json:"brief_id,omitempty"`
|
||||
ExamID string `json:"exam_id,omitempty"`
|
||||
Review bool `json:"review,omitempty"`
|
||||
CreatedAt time.Time `json:"created_at,omitempty"`
|
||||
SchemaVersion int `json:"schema_version"`
|
||||
ID string `json:"id,omitempty"`
|
||||
ModuleID string `json:"module_id"`
|
||||
OriginModuleKey string `json:"origin_module_key,omitempty"`
|
||||
TargetLanguage string `json:"target_language"`
|
||||
CourseVersion string `json:"course_version"`
|
||||
CEFRLevel string `json:"cefr_level"`
|
||||
Skill string `json:"skill"`
|
||||
Kind string `json:"kind"`
|
||||
Prompt string `json:"prompt"`
|
||||
Passage string `json:"passage,omitempty"`
|
||||
Options []TaskOption `json:"options,omitempty"`
|
||||
ReferenceText string `json:"reference_text,omitempty"`
|
||||
AudioText string `json:"audio_text,omitempty"`
|
||||
AnswerKey *TaskKey `json:"answer_key,omitempty"`
|
||||
Source string `json:"source,omitempty"`
|
||||
BriefID string `json:"brief_id,omitempty"`
|
||||
ExamID string `json:"exam_id,omitempty"`
|
||||
Review bool `json:"review,omitempty"`
|
||||
CreatedAt time.Time `json:"created_at,omitempty"`
|
||||
InstructionLanguage string `json:"instruction_language,omitempty"`
|
||||
Instruction string `json:"instruction,omitempty"`
|
||||
Stimulus *TaskStimulus `json:"stimulus,omitempty"`
|
||||
VariantID string `json:"variant_id,omitempty"`
|
||||
ContentRevision string `json:"content_revision,omitempty"`
|
||||
CanonicalTaskID string `json:"canonical_task_id,omitempty"`
|
||||
EvidenceTaskID string `json:"evidence_task_id,omitempty"`
|
||||
}
|
||||
|
||||
func (t AdaptiveTask) Public(reveal bool) AdaptiveTask {
|
||||
t.EvidenceTaskID = ""
|
||||
if !reveal {
|
||||
t.AnswerKey = nil
|
||||
t.AudioText = ""
|
||||
@@ -136,21 +156,23 @@ type CourseBrief struct {
|
||||
Reason string `json:"reason"`
|
||||
}
|
||||
type CourseJob struct {
|
||||
AIRevision int `json:"-"`
|
||||
ID string `json:"id"`
|
||||
UserID string `json:"-"`
|
||||
Language string `json:"target_language"`
|
||||
Kind string `json:"kind"`
|
||||
ModuleID string `json:"module_id"`
|
||||
Skill string `json:"skill,omitempty"`
|
||||
SubjectID string `json:"subject_id,omitempty"`
|
||||
Status string `json:"status"`
|
||||
Stage string `json:"stage"`
|
||||
TaskID string `json:"task_id,omitempty"`
|
||||
Source string `json:"source,omitempty"`
|
||||
Review bool `json:"review,omitempty"`
|
||||
Error string `json:"error,omitempty"`
|
||||
Lease string `json:"-"`
|
||||
Recommendation *SequenceRecommendation `json:"recommendation,omitempty"`
|
||||
InstructionLanguage string `json:"instruction_language"`
|
||||
AIRevision int `json:"-"`
|
||||
ID string `json:"id"`
|
||||
UserID string `json:"-"`
|
||||
Language string `json:"target_language"`
|
||||
Kind string `json:"kind"`
|
||||
ModuleID string `json:"module_id"`
|
||||
Skill string `json:"skill,omitempty"`
|
||||
SubjectID string `json:"subject_id,omitempty"`
|
||||
Status string `json:"status"`
|
||||
Stage string `json:"stage"`
|
||||
TaskID string `json:"task_id,omitempty"`
|
||||
Source string `json:"source,omitempty"`
|
||||
Review bool `json:"review,omitempty"`
|
||||
Error string `json:"error,omitempty"`
|
||||
Lease string `json:"-"`
|
||||
}
|
||||
type AdaptiveExam struct {
|
||||
PreparationJobID string `json:"preparation_job_id,omitempty"`
|
||||
|
||||
@@ -9,3 +9,18 @@ type BankEntry struct {
|
||||
Reviewed bool `json:"reviewed"`
|
||||
Task AdaptiveTask `json:"task"`
|
||||
}
|
||||
|
||||
// BankVariant references a reviewed base entry but has its own immutable revision.
|
||||
// Only equivalent translations share a canonical identity with that base.
|
||||
type BankVariant struct {
|
||||
ModuleTitle string `json:"module_title"`
|
||||
ModuleDescription string `json:"module_description"`
|
||||
ID string `json:"id"`
|
||||
Revision string `json:"revision"`
|
||||
BaseEntryID string `json:"base_entry_id"`
|
||||
CanonicalTaskID string `json:"canonical_task_id"`
|
||||
InstructionLanguage string `json:"instruction_language"`
|
||||
Equivalence string `json:"equivalence"`
|
||||
Reviewed bool `json:"reviewed"`
|
||||
Task AdaptiveTask `json:"task"`
|
||||
}
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
package domain
|
||||
|
||||
// Learning sequences link immutable tasks; they do not redefine their answers or
|
||||
// turn a submitted/ungraded answer into evidence of mastery.
|
||||
type LearningSequence struct {
|
||||
ID string `json:"id"`
|
||||
ModuleID string `json:"module_id"`
|
||||
Titles map[string]string `json:"titles"`
|
||||
Steps []LearningSequenceStep `json:"steps"`
|
||||
}
|
||||
type LearningSequenceStep struct {
|
||||
Alternatives []string `json:"alternatives,omitempty"`
|
||||
Phase string `json:"phase"`
|
||||
BankEntryID string `json:"bank_entry_id"`
|
||||
}
|
||||
type SequenceRecommendation struct {
|
||||
SelectionRevision string `json:"selection_revision"`
|
||||
PracticeReason string `json:"practice_reason,omitempty"`
|
||||
ReusedSteps int `json:"reused_steps"`
|
||||
Review bool `json:"review"`
|
||||
NeedsAnswer bool `json:"needs_answer"`
|
||||
Revision string `json:"revision"`
|
||||
SequenceID string `json:"sequence_id,omitempty"`
|
||||
Title string `json:"title,omitempty"`
|
||||
Phase string `json:"phase,omitempty"`
|
||||
Step int `json:"step"`
|
||||
Steps int `json:"steps"`
|
||||
Topic int `json:"topic"`
|
||||
Topics int `json:"topics"`
|
||||
TaskID string `json:"task_id,omitempty"`
|
||||
Complete bool `json:"complete"`
|
||||
SkippedSteps int `json:"skipped_steps"`
|
||||
}
|
||||
@@ -1,13 +1,53 @@
|
||||
package domain
|
||||
|
||||
import "time"
|
||||
import (
|
||||
"errors"
|
||||
"time"
|
||||
)
|
||||
|
||||
type User struct {
|
||||
ID string `json:"id"`
|
||||
Email string `json:"email"`
|
||||
UILanguage string `json:"ui_language"`
|
||||
Role string `json:"role"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
ID string `json:"id"`
|
||||
NativeLanguage string `json:"native_language"`
|
||||
Email string `json:"email"`
|
||||
UILanguage string `json:"ui_language"`
|
||||
InstructionLanguage string `json:"instruction_language"`
|
||||
Role string `json:"role"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
}
|
||||
|
||||
// Compatibility fields mirror NativeLanguage; they are never separate preferences.
|
||||
func (u User) ExplanationLanguage() string {
|
||||
if SupportedNativeLanguage(u.NativeLanguage) {
|
||||
return u.NativeLanguage
|
||||
}
|
||||
if SupportedNativeLanguage(u.UILanguage) {
|
||||
return u.UILanguage
|
||||
}
|
||||
return "de-DE"
|
||||
}
|
||||
|
||||
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 {
|
||||
@@ -62,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 {
|
||||
@@ -156,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"`
|
||||
|
||||
@@ -34,7 +34,14 @@ func (s *Server) adaptiveProfile(w http.ResponseWriter, r *http.Request) (domain
|
||||
return p, true
|
||||
}
|
||||
func adaptiveError(w http.ResponseWriter, err error) {
|
||||
if errors.Is(err, store.ErrCourseVariantUnavailable) {
|
||||
writeJSON(w, http.StatusConflict, map[string]string{"error": err.Error(), "code": "course_variant_unavailable"})
|
||||
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
|
||||
}
|
||||
@@ -72,7 +79,7 @@ func (s *Server) adaptiveCatalog(w http.ResponseWriter, r *http.Request) {
|
||||
adaptiveError(w, err)
|
||||
return
|
||||
}
|
||||
snap, err := s.course.Repo.Snapshot(r.Context(), user.ID, p.TargetLanguage, user.UILanguage)
|
||||
snap, err := s.course.Repo.Snapshot(r.Context(), user.ID, p.TargetLanguage, user.ExplanationLanguage())
|
||||
if err != nil {
|
||||
adaptiveError(w, err)
|
||||
return
|
||||
@@ -112,7 +119,25 @@ func (s *Server) adaptiveCatalog(w http.ResponseWriter, r *http.Request) {
|
||||
adaptiveError(w, err)
|
||||
return
|
||||
}
|
||||
writeJSON(w, 200, map[string]any{"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})
|
||||
instructionLanguages, err := s.course.Repo.InstructionLanguages(r.Context(), p.TargetLanguage)
|
||||
if err != nil {
|
||||
adaptiveError(w, err)
|
||||
return
|
||||
}
|
||||
recommendations := map[string]*domain.SequenceRecommendation{}
|
||||
if s.course.Mode == "bank" {
|
||||
for _, module := range snap.Modules {
|
||||
recommendation, err := s.course.Repo.SequenceRecommendation(r.Context(), user.ID, p.TargetLanguage, module.ID, user.ExplanationLanguage())
|
||||
if err != nil {
|
||||
adaptiveError(w, err)
|
||||
return
|
||||
}
|
||||
if recommendation != nil {
|
||||
recommendations[module.ID] = recommendation
|
||||
}
|
||||
}
|
||||
}
|
||||
writeJSON(w, 200, map[string]any{"sequence_recommendations": recommendations, "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)
|
||||
@@ -120,13 +145,14 @@ func (s *Server) adaptiveNext(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
var input struct {
|
||||
RequestID string `json:"request_id"`
|
||||
Skill string `json:"skill"`
|
||||
RequestID string `json:"request_id"`
|
||||
SkipTaskID string `json:"skip_task_id"`
|
||||
Skill string `json:"skill"`
|
||||
}
|
||||
if !adaptiveJSON(w, r, &input) {
|
||||
return
|
||||
}
|
||||
if !courseRequestIDPattern.MatchString(input.RequestID) || !validCourseSkill(input.Skill) {
|
||||
if !courseRequestIDPattern.MatchString(input.RequestID) || !validCourseSkill(input.Skill) || (input.SkipTaskID != "" && (input.Skill != "" || len(input.SkipTaskID) > 120 || s.course.Mode != "bank")) {
|
||||
writeError(w, 400, errors.New("invalid request ID or skill"))
|
||||
return
|
||||
}
|
||||
@@ -134,7 +160,7 @@ func (s *Server) adaptiveNext(w http.ResponseWriter, r *http.Request) {
|
||||
adaptiveError(w, err)
|
||||
return
|
||||
}
|
||||
j, err := s.course.Repo.Enqueue(r.Context(), currentUserID(r), p.TargetLanguage, "next", r.PathValue("id"), input.Skill, "", input.RequestID)
|
||||
j, err := s.course.Repo.Enqueue(r.Context(), currentUserID(r), p.TargetLanguage, "next", r.PathValue("id"), input.Skill, input.SkipTaskID, input.RequestID)
|
||||
if err != nil {
|
||||
adaptiveError(w, err)
|
||||
return
|
||||
@@ -569,6 +595,24 @@ func (s *Server) adaptiveNewExam(w http.ResponseWriter, r *http.Request) {
|
||||
writeError(w, 404, store.ErrNotFound)
|
||||
return
|
||||
}
|
||||
if s.course.Mode == "bank" {
|
||||
user, err := s.store.GetUser(r.Context(), currentUserID(r))
|
||||
if err != nil {
|
||||
adaptiveError(w, err)
|
||||
return
|
||||
}
|
||||
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)
|
||||
return
|
||||
}
|
||||
if !exists {
|
||||
adaptiveError(w, store.ErrCourseVariantUnavailable)
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
exam, err := s.course.Repo.NewExam(r.Context(), currentUserID(r), p.TargetLanguage, input.RequestID)
|
||||
if err != nil {
|
||||
adaptiveError(w, err)
|
||||
@@ -666,3 +710,38 @@ func legacyAdaptiveTask(t domain.AdaptiveTask) domain.CourseTask {
|
||||
func writeLegacyAdaptiveTask(w http.ResponseWriter, t domain.AdaptiveTask) {
|
||||
writeJSON(w, 200, domain.CoursePracticeResult{Task: legacyAdaptiveTask(t), Source: t.Source})
|
||||
}
|
||||
|
||||
// Preference changes affect future jobs only. Task snapshots keep their original
|
||||
// instructions, keys and evidence identity, including tasks in older exams.
|
||||
func (s *Server) adaptiveInstructionLanguage(w http.ResponseWriter, r *http.Request) {
|
||||
p, ok := s.adaptiveProfile(w, r)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
var input struct {
|
||||
InstructionLanguage string `json:"instruction_language"`
|
||||
}
|
||||
if !adaptiveJSON(w, r, &input) {
|
||||
return
|
||||
}
|
||||
if err := s.course.Repo.SetInstructionLanguage(r.Context(), currentUserID(r), p.TargetLanguage, input.InstructionLanguage); err != nil {
|
||||
adaptiveError(w, err)
|
||||
return
|
||||
}
|
||||
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
|
||||
}
|
||||
|
||||
@@ -402,16 +402,26 @@ func TestBankBrowserSmoke(t *testing.T) {
|
||||
stopDev()
|
||||
t.Fatal("Vite did not start", devOutput.String())
|
||||
}
|
||||
node := exec.Command("node", "tests/course-bank.e2e.cjs")
|
||||
node.Dir = web
|
||||
node.Env = append(os.Environ(), "AI_E2E_API="+api.URL, "AI_E2E_TOKEN="+token, "AI_E2E_URL=http://localhost:15175")
|
||||
output, err := node.CombinedOutput()
|
||||
stopDev()
|
||||
t.Log(string(output))
|
||||
t.Log("Vite:", devOutput.String())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
for _, check := range []struct{ script, language string }{
|
||||
{"tests/languages.e2e.cjs", "de-DE"},
|
||||
{"tests/course-variants.e2e.cjs", "ru-RU"},
|
||||
{"tests/course-sequences.e2e.cjs", "de-DE"},
|
||||
{"tests/course-bank.e2e.cjs", "de-DE"},
|
||||
{"tests/course-bank.e2e.cjs", "ru-RU"},
|
||||
} {
|
||||
node := exec.Command("node", check.script)
|
||||
node.Dir = web
|
||||
node.Env = append(os.Environ(), "AI_E2E_API="+api.URL, "AI_E2E_TOKEN="+token, "AI_E2E_URL=http://localhost:15175")
|
||||
node.Env = append(node.Env, "UI_E2E_LANGUAGE="+check.language)
|
||||
output, err := node.CombinedOutput()
|
||||
t.Log(string(output))
|
||||
if err != nil {
|
||||
stopDev()
|
||||
t.Fatal(check.script, check.language, err)
|
||||
}
|
||||
}
|
||||
stopDev()
|
||||
t.Log("Vite:", devOutput.String())
|
||||
}
|
||||
|
||||
func TestPronunciationBrowserSmoke(t *testing.T) {
|
||||
|
||||
@@ -126,7 +126,7 @@ func (s *Server) nextCoursePractice(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
request := domain.GenerateCourseTaskRequest{
|
||||
Task: "generate_course_task", SchemaVersion: 1, TargetLanguage: detail.Module.TargetLanguage,
|
||||
CEFRLevel: detail.Module.CEFRLevel, UILanguage: user.UILanguage, ModuleID: detail.Module.ID,
|
||||
CEFRLevel: detail.Module.CEFRLevel, UILanguage: user.ExplanationLanguage(), ModuleID: detail.Module.ID,
|
||||
Skill: selection.Goal.Skill, Kind: "choice", LearningGoal: selection.Goal,
|
||||
LearningState: selection.State, AvoidPrompts: selection.AvoidPrompts,
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -79,6 +79,7 @@ func (s *Server) Routes() http.Handler {
|
||||
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("PUT /course/instruction-language", s.requireAuth(http.HandlerFunc(s.adaptiveInstructionLanguage)))
|
||||
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)))
|
||||
@@ -127,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
|
||||
@@ -186,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, valueOr(req.CEFRLevel, "A1"), 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
|
||||
@@ -339,7 +354,7 @@ func (s *Server) nextAgentExercise(ctx context.Context, user domain.User, profil
|
||||
Progress: progress,
|
||||
TargetLanguage: profile.TargetLanguage,
|
||||
CEFRLevel: profile.CEFRLevel,
|
||||
UILanguage: user.UILanguage,
|
||||
UILanguage: user.ExplanationLanguage(),
|
||||
SessionID: flowiseSessionID(user.ID, profile.TargetLanguage, "practice"),
|
||||
RecentWeakWords: progress.WeakWords,
|
||||
PreferredType: "repeat_sentence",
|
||||
@@ -347,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
|
||||
@@ -468,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
|
||||
@@ -510,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
|
||||
@@ -545,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
|
||||
@@ -604,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)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -155,6 +155,16 @@ func courseMember(s string, values []string) bool {
|
||||
// Technical validity only. No word lists, English patterns, fixed objectives,
|
||||
// fixed distractors, or linguistic judgement live in the application.
|
||||
func ValidateAdaptiveTask(t domain.AdaptiveTask, language, module, skill string) error {
|
||||
// Locale revisions and evidence identities are assigned by Go or the reviewed
|
||||
// bank importer. Adding typed fields must not let model output claim them.
|
||||
if t.VariantID != "" || t.ContentRevision != "" || t.CanonicalTaskID != "" || t.EvidenceTaskID != "" || t.InstructionLanguage != "" || t.Instruction != "" || t.Stimulus != nil || (t.AnswerKey != nil && t.AnswerKey.ReferenceAnswerLanguage != "") {
|
||||
return errors.New("task contains server-owned variant metadata")
|
||||
}
|
||||
for _, option := range t.Options {
|
||||
if option.Language != "" || option.Role != "" {
|
||||
return errors.New("task contains server-owned option metadata")
|
||||
}
|
||||
}
|
||||
if !courseText(t.ModuleID, 200) || !courseText(t.TargetLanguage, 50) || t.SchemaVersion != 2 || t.TargetLanguage != language || t.CourseVersion != domain.CourseVersion || t.CEFRLevel != "A1" || t.ModuleID != module || !courseMember(t.Skill, domain.CourseSkills) || (skill != "" && t.Skill != skill) {
|
||||
return errors.New("task context mismatch")
|
||||
}
|
||||
|
||||
@@ -98,7 +98,11 @@ func (e *CourseEngine) snapshot(ctx context.Context, j domain.CourseJob) (domain
|
||||
if err != nil {
|
||||
return domain.CourseSnapshot{}, err
|
||||
}
|
||||
return e.Repo.Snapshot(ctx, j.UserID, j.Language, user.UILanguage)
|
||||
instructionLanguage := j.InstructionLanguage
|
||||
if instructionLanguage == "" {
|
||||
instructionLanguage = user.ExplanationLanguage()
|
||||
}
|
||||
return e.Repo.Snapshot(ctx, j.UserID, j.Language, instructionLanguage)
|
||||
}
|
||||
func (e *CourseEngine) analyze(ctx context.Context, j domain.CourseJob) (domain.CourseSnapshot, error) {
|
||||
snapshot, err := e.snapshot(ctx, j)
|
||||
@@ -137,14 +141,17 @@ func (e *CourseEngine) Process(ctx context.Context, j domain.CourseJob) (*domain
|
||||
}
|
||||
return &t, err
|
||||
case "exam":
|
||||
tasks, err := e.Repo.BankExam(ctx, j.UserID, j.Language, j.ModuleID)
|
||||
if j.InstructionLanguage != "" && !domain.SupportedNativeLanguage(j.InstructionLanguage) {
|
||||
return nil, store.ErrCourseVariantUnavailable
|
||||
}
|
||||
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)
|
||||
@@ -538,7 +545,7 @@ func (e *CourseEngine) finalizeExam(ctx context.Context, j domain.CourseJob) err
|
||||
var summary struct {
|
||||
Summary string `json:"summary"`
|
||||
}
|
||||
err = e.Agent.Teacher(ctx, "summarize_course_exam", map[string]any{"target_language": j.Language, "ui_language": user.UILanguage, "exam": exam}, &summary)
|
||||
err = e.Agent.Teacher(ctx, "summarize_course_exam", map[string]any{"target_language": j.Language, "ui_language": valueOr(j.InstructionLanguage, user.ExplanationLanguage()), "exam": exam}, &summary)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -548,7 +555,7 @@ func (e *CourseEngine) finalizeExam(ctx context.Context, j domain.CourseJob) err
|
||||
if err = e.Repo.ExamSummary(ctx, j.UserID, j.SubjectID, summary.Summary); err != nil {
|
||||
return err
|
||||
}
|
||||
snapshot, err := e.Repo.Snapshot(ctx, j.UserID, j.Language, user.UILanguage)
|
||||
snapshot, err := e.Repo.Snapshot(ctx, j.UserID, j.Language, user.ExplanationLanguage())
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -578,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)
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -53,6 +53,9 @@ func (s *AuthService) Register(ctx context.Context, email, password, uiLanguage,
|
||||
if uiLanguage == "" {
|
||||
uiLanguage = "de-DE"
|
||||
}
|
||||
if !domain.SupportedUILanguage(uiLanguage) {
|
||||
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)
|
||||
|
||||
@@ -0,0 +1,185 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"speech-learning-api/internal/domain"
|
||||
"speech-learning-api/internal/store"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestLearningPathAdaptsOnlyFromOwnedGradedEvidence(t *testing.T) {
|
||||
for _, scenario := range []string{"fresh-vocabulary", "spaced-vocabulary", "old-vocabulary", "ungraded", "demo", "other-user", "same-day", "grammar-transfer", "newer-mistake"} {
|
||||
t.Run(scenario, func(t *testing.T) {
|
||||
db, profiles := adaptiveTestDB(t)
|
||||
ctx := context.Background()
|
||||
now := time.Now().UTC()
|
||||
user, err := profiles.CreateUser(ctx, store.NewID("adapt")+"@example.test", "hash", "ru-RU")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err = profiles.CreateLearnerProfile(ctx, user.ID, "en-US", "A1", 17); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
engine := NewCourseEngine(store.NewAdaptiveStore(db), profiles, nil, nil)
|
||||
engine.Mode = "bank"
|
||||
entries, err := store.BundledBank()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
bank := map[string]domain.BankEntry{}
|
||||
for _, e := range entries {
|
||||
bank[e.ID] = e
|
||||
}
|
||||
baseID := "a1bank_en_v1_introductions_vocabulary_02"
|
||||
if scenario == "grammar-transfer" || scenario == "newer-mistake" {
|
||||
baseID = "a1bank_en_v1_introductions_grammar_01"
|
||||
}
|
||||
owner := user.ID
|
||||
if scenario == "other-user" {
|
||||
other, err := profiles.CreateUser(ctx, store.NewID("unrelated")+"@example.test", "hash", "de-DE")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
owner = other.ID
|
||||
}
|
||||
entry := bank[baseID]
|
||||
historical := entry.Task
|
||||
historical.ID = store.NewID("history")
|
||||
historical.Source = "curated"
|
||||
historical.CanonicalTaskID = entry.ID
|
||||
historical.InstructionLanguage = "de-DE"
|
||||
raw, _ := json.Marshal(historical)
|
||||
if _, err = db.ExecContext(ctx, `INSERT INTO course_v2_tasks(id,module_id,language,version,owner_id,source,skill,kind,data,fingerprint,bank_entry_id) VALUES($1,$2,'en-US',$3,$4,'curated',$5,$6,$7,$8,$9)`, historical.ID, historical.ModuleID, domain.CourseVersion, owner, historical.Skill, historical.Kind, raw, "bank:"+baseID, baseID); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
insert := func(status string, score float64, age time.Duration, demo bool) {
|
||||
t.Helper()
|
||||
var evaluation any
|
||||
if status == "graded" {
|
||||
verdict := "correct"
|
||||
if score < 100 {
|
||||
verdict = "incorrect"
|
||||
}
|
||||
b, _ := json.Marshal(domain.CourseEvaluation{Score: score, Verdict: verdict, Feedback: "fixture", Issues: []string{}})
|
||||
evaluation = b
|
||||
}
|
||||
if _, err = db.ExecContext(ctx, `INSERT INTO course_v2_attempts(id,user_id,task_id,request_id,answer,status,evaluation,demo,created_at) VALUES($1,$2,$3,$4,'fixture',$5,$6,$7,$8)`, store.NewID("answer"), owner, historical.ID, store.NewID("request"), status, evaluation, demo, now.Add(-age)); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
switch scenario {
|
||||
case "spaced-vocabulary":
|
||||
insert("graded", 100, 48*time.Hour, false)
|
||||
insert("graded", 100, time.Hour, false)
|
||||
case "old-vocabulary":
|
||||
insert("graded", 100, 8*24*time.Hour, false)
|
||||
case "ungraded":
|
||||
insert("graded", 100, time.Hour, false)
|
||||
insert("ungraded", 0, time.Minute, false)
|
||||
case "demo":
|
||||
insert("graded", 100, time.Minute, true)
|
||||
case "same-day":
|
||||
insert("graded", 100, 3*time.Hour, false)
|
||||
insert("graded", 100, 2*time.Hour, false)
|
||||
insert("graded", 100, time.Hour, false)
|
||||
case "newer-mistake":
|
||||
insert("graded", 100, time.Hour, false)
|
||||
insert("graded", 0, time.Minute, false)
|
||||
default:
|
||||
insert("graded", 100, 10*time.Minute, false)
|
||||
}
|
||||
run := func(skip string) (domain.AdaptiveTask, domain.CourseJob) {
|
||||
t.Helper()
|
||||
job, err := engine.Repo.Enqueue(ctx, user.ID, "en-US", "next", "a1_introductions_v1", "", skip, store.NewID("next"))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
job, err = engine.Repo.Claim(ctx)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
task, err := engine.Process(ctx, job)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err = engine.Repo.Finish(ctx, job, task, ""); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
saved, err := engine.Repo.Job(ctx, user.ID, "en-US", job.ID)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
return *task, saved
|
||||
}
|
||||
task, job := run("")
|
||||
if task.Skill != "listening" {
|
||||
t.Fatal("context was skipped")
|
||||
}
|
||||
task, job = run(task.ID)
|
||||
if scenario == "fresh-vocabulary" || scenario == "spaced-vocabulary" {
|
||||
if task.CanonicalTaskID == baseID || job.Recommendation.ReusedSteps != 1 || job.Recommendation.SkippedSteps != 1 {
|
||||
t.Fatal("good prior evidence not reused separately from skipping", job)
|
||||
}
|
||||
} else if scenario != "grammar-transfer" && scenario != "newer-mistake" {
|
||||
if task.CanonicalTaskID != baseID || job.Recommendation.ReusedSteps != 0 {
|
||||
t.Fatal("unreliable evidence reduced practice", job)
|
||||
}
|
||||
}
|
||||
if scenario == "grammar-transfer" || scenario == "newer-mistake" {
|
||||
for n := 0; n < 20 && job.Recommendation.Phase != "grammar"; n++ {
|
||||
task, job = run(task.ID)
|
||||
}
|
||||
if job.Recommendation.Phase != "grammar" {
|
||||
t.Fatal("grammar not reached")
|
||||
}
|
||||
if scenario == "grammar-transfer" {
|
||||
if task.CanonicalTaskID == baseID || job.Recommendation.PracticeReason != "transfer" || bank[task.CanonicalTaskID].Goal != entry.Goal {
|
||||
t.Fatal("missing approved new example", task, job)
|
||||
}
|
||||
chosen := task.CanonicalTaskID
|
||||
task, job = run("")
|
||||
if task.CanonicalTaskID != chosen {
|
||||
t.Fatal("new request swapped unanswered transfer example")
|
||||
}
|
||||
beforeStep := job.Recommendation.Step
|
||||
if _, err = profiles.UpdatePreferences(ctx, user.ID, "de-DE", "", "", 0); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
task, job = run("")
|
||||
if task.CanonicalTaskID != chosen || task.InstructionLanguage != "de-DE" || job.Recommendation.Step != beforeStep {
|
||||
t.Fatal("native change reset transfer/path")
|
||||
}
|
||||
} else if task.CanonicalTaskID != baseID || job.Recommendation.PracticeReason != "refresh" {
|
||||
t.Fatal("newer mistake ignored")
|
||||
}
|
||||
}
|
||||
var frozen []byte
|
||||
if err = db.QueryRowContext(ctx, `SELECT data FROM course_v2_tasks WHERE id=$1`, historical.ID).Scan(&frozen); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var stored domain.AdaptiveTask
|
||||
if err = json.Unmarshal(frozen, &stored); err != nil || stored.Prompt != historical.Prompt {
|
||||
t.Fatal("historical content changed", err)
|
||||
}
|
||||
var graded int
|
||||
if err = db.QueryRowContext(ctx, `SELECT count(*) FROM course_v2_attempts WHERE user_id=$1 AND status='graded'`, user.ID).Scan(&graded); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
expected := 1
|
||||
if scenario == "spaced-vocabulary" || scenario == "newer-mistake" {
|
||||
expected = 2
|
||||
}
|
||||
if scenario == "same-day" {
|
||||
expected = 3
|
||||
}
|
||||
if scenario == "other-user" {
|
||||
expected = 0
|
||||
}
|
||||
if graded != expected {
|
||||
t.Fatal("navigation fabricated a graded attempt", graded, expected)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,195 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"testing"
|
||||
|
||||
"speech-learning-api/internal/domain"
|
||||
"speech-learning-api/internal/store"
|
||||
)
|
||||
|
||||
func TestThematicLearningPathAndFrozenProgress(t *testing.T) {
|
||||
for _, native := range []string{"de-DE", "ru-RU"} {
|
||||
t.Run(native, func(t *testing.T) {
|
||||
db, profiles := adaptiveTestDB(t)
|
||||
ctx := context.Background()
|
||||
user, err := profiles.CreateUser(ctx, store.NewID("sequence")+"@example.test", "hash", native)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err = profiles.CreateLearnerProfile(ctx, user.ID, "en-US", "A1", 17); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
engine := NewCourseEngine(store.NewAdaptiveStore(db), profiles, nil, nil)
|
||||
engine.Mode = "bank"
|
||||
module := "a1_introductions_v1"
|
||||
requests := map[string]string{}
|
||||
run := func(skill, skip string) (domain.AdaptiveTask, domain.CourseJob) {
|
||||
t.Helper()
|
||||
request := store.NewID("sequence-request")
|
||||
job, err := engine.Repo.Enqueue(ctx, user.ID, "en-US", "next", module, skill, skip, request)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
job, err = engine.Repo.Claim(ctx)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
task, err := engine.Process(ctx, job)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err = engine.Repo.Finish(ctx, job, task, ""); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
saved, err := engine.Repo.Job(ctx, user.ID, "en-US", job.ID)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
requests[saved.ID] = request
|
||||
return *task, saved
|
||||
}
|
||||
answer := func(task domain.AdaptiveTask, correct bool) domain.AdaptiveAttempt {
|
||||
t.Helper()
|
||||
text := task.AnswerKey.ReferenceAnswer
|
||||
if task.Kind == "choice" {
|
||||
text = task.AnswerKey.CorrectOptionID
|
||||
if !correct {
|
||||
for _, o := range task.Options {
|
||||
if o.ID != text {
|
||||
text = o.ID
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
var speech *domain.PronunciationResult
|
||||
if task.Skill == "speaking" {
|
||||
speech = &domain.PronunciationResult{Provider: "azure", RecognizedText: text, OverallScore: 90}
|
||||
}
|
||||
attempt, _, err := engine.Submit(ctx, user.ID, "en-US", task.ID, store.NewID("sequence-answer"), text, speech)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
return attempt
|
||||
}
|
||||
first, job := run("", "")
|
||||
if first.Skill != "listening" || first.InstructionLanguage != native || job.Recommendation == nil || job.Recommendation.Step != 1 {
|
||||
t.Fatal(first, job)
|
||||
}
|
||||
var frozen []byte
|
||||
if err = db.QueryRowContext(ctx, `SELECT data FROM course_v2_tasks WHERE id=$1`, first.ID).Scan(&frozen); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
again, _ := run("", "")
|
||||
if again.ID != first.ID {
|
||||
t.Fatal("unanswered step silently bypassed")
|
||||
}
|
||||
// A graded mistake offers one bounded review, even with an unchanged task ID.
|
||||
answer(first, false)
|
||||
repeated, reviewJob := run("", "")
|
||||
if repeated.ID != first.ID || !reviewJob.Recommendation.Review {
|
||||
t.Fatal("missing bounded review", reviewJob)
|
||||
}
|
||||
blocked, _ := run("", "")
|
||||
if blocked.ID != first.ID {
|
||||
t.Fatal("old answer passed the new review")
|
||||
}
|
||||
answer(repeated, false)
|
||||
next, nextJob := run("", "")
|
||||
if next.ID == first.ID || nextJob.Recommendation.Step != 2 {
|
||||
t.Fatal("grade became a permanent gate", nextJob)
|
||||
}
|
||||
// Manual free speaking remains available and never moves the thematic cursor.
|
||||
before, _ := engine.Repo.SequenceRecommendation(ctx, user.ID, "en-US", module, native)
|
||||
manual, _ := run("speaking", "")
|
||||
if manual.Skill != "speaking" {
|
||||
t.Fatal(manual)
|
||||
}
|
||||
after, _ := engine.Repo.SequenceRecommendation(ctx, user.ID, "en-US", module, native)
|
||||
if before.Step != after.Step || before.SequenceID != after.SequenceID {
|
||||
t.Fatal("manual choice moved path")
|
||||
}
|
||||
// Explicit skipping is separate from evidence and replaying a request is stable.
|
||||
skipped, skipJob := run("", next.ID)
|
||||
if skipJob.Recommendation.SkippedSteps != 1 || skipJob.Recommendation.Step != 3 {
|
||||
t.Fatal(skipJob)
|
||||
}
|
||||
replayed, err := engine.Repo.Enqueue(ctx, user.ID, "en-US", "next", module, "", next.ID, requests[skipJob.ID])
|
||||
if err != nil || replayed.TaskID != skipped.ID || replayed.Recommendation.Step != 3 {
|
||||
t.Fatal("request replay advanced path", err)
|
||||
}
|
||||
|
||||
wrong, err := engine.Repo.Enqueue(ctx, user.ID, "en-US", "next", module, "", "another-users-task", store.NewID("skip-other"))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
wrong, err = engine.Repo.Claim(ctx)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err = engine.Process(ctx, wrong); err == nil {
|
||||
t.Fatal("stale/foreign skip accepted")
|
||||
}
|
||||
if err = engine.Repo.Finish(ctx, wrong, nil, "expected conflict"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// Changing native language preserves the thematic position and frozen content.
|
||||
other := "de-DE"
|
||||
if native == other {
|
||||
other = "ru-RU"
|
||||
}
|
||||
if _, err = profiles.UpdatePreferences(ctx, user.ID, other, "", "", 0); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
changed, err := engine.Repo.SequenceRecommendation(ctx, user.ID, "en-US", module, other)
|
||||
if err != nil || changed.Step != 3 || changed.SkippedSteps != 1 || changed.Title == before.Title {
|
||||
t.Fatal(changed, err)
|
||||
}
|
||||
if err = profiles.Init(ctx); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var current []byte
|
||||
if err = db.QueryRowContext(ctx, `SELECT data FROM course_v2_tasks WHERE id=$1`, first.ID).Scan(¤t); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !bytes.Equal(frozen, current) {
|
||||
t.Fatal("frozen task edited")
|
||||
}
|
||||
|
||||
// Finish the path through the reported two-friends speaking task. Every free
|
||||
// speech task follows a submitted, matching free-writing task, not a score gate.
|
||||
task := skipped
|
||||
seenCompose := map[string]bool{}
|
||||
foundFriends := false
|
||||
for n := 0; n < 110; n++ {
|
||||
if task.Kind == "free_speech" {
|
||||
key := task.AnswerKey.ReferenceAnswer
|
||||
if !seenCompose[key] {
|
||||
t.Fatal("speaking without related writing", task.CanonicalTaskID)
|
||||
}
|
||||
if task.CanonicalTaskID == "a1bank_en_v2_introductions_speaking_14" {
|
||||
foundFriends = true
|
||||
break
|
||||
}
|
||||
}
|
||||
attempt := answer(task, true)
|
||||
if task.Kind == "free_text" {
|
||||
if attempt.Status != "ungraded" {
|
||||
t.Fatal("missing model fabricated a writing grade", attempt)
|
||||
}
|
||||
seenCompose[task.AnswerKey.ReferenceAnswer] = true
|
||||
}
|
||||
task, _ = run("", "")
|
||||
}
|
||||
if !foundFriends {
|
||||
t.Fatal("two-friends sequence was not reached")
|
||||
}
|
||||
var calls int
|
||||
if err = db.QueryRowContext(ctx, `SELECT count(*) FROM ai_calls`).Scan(&calls); err != nil || calls != 0 {
|
||||
t.Fatal("sequence spent model budget", calls, err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,234 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"log/slog"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"speech-learning-api/internal/domain"
|
||||
"speech-learning-api/internal/store"
|
||||
)
|
||||
|
||||
func TestCourseVariantSnapshotsAndEvidence(t *testing.T) {
|
||||
db, profiles := adaptiveTestDB(t)
|
||||
ctx := context.Background()
|
||||
user, err := profiles.CreateUser(ctx, "variants@example.test", "hash", "de-DE")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err = profiles.CreateLearnerProfile(ctx, user.ID, "en-US", "A1", 20); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
repo := store.NewAdaptiveStore(db)
|
||||
engine := NewCourseEngine(repo, profiles, nil, slog.New(slog.NewTextHandler(io.Discard, nil)))
|
||||
engine.Mode = "bank"
|
||||
base, err := store.BundledBank()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// Existing releases assigned ordinary task snapshots without locale metadata.
|
||||
historical := func(skill string) domain.AdaptiveTask {
|
||||
t.Helper()
|
||||
var entry domain.BankEntry
|
||||
for _, candidate := range base {
|
||||
if candidate.Task.ModuleID == "a1_introductions_v1" && candidate.Task.Skill == skill && candidate.Task.Kind != "free_speech" && candidate.Task.Kind != "free_text" {
|
||||
entry = candidate
|
||||
break
|
||||
}
|
||||
}
|
||||
task := entry.Task
|
||||
task.ID = store.NewID("historic")
|
||||
task.Source = "curated"
|
||||
raw, _ := json.Marshal(task)
|
||||
_, err := db.ExecContext(ctx, `INSERT INTO course_v2_tasks(id,module_id,language,version,owner_id,source,skill,kind,data,fingerprint,bank_entry_id,last_presented_at,presentation_count) VALUES($1,$2,$3,$4,$5,'curated',$6,$7,$8,$9,$10,now(),1)`, task.ID, task.ModuleID, task.TargetLanguage, task.CourseVersion, user.ID, task.Skill, task.Kind, raw, "bank:"+entry.ID, entry.ID)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
return task
|
||||
}
|
||||
old := historical("grammar")
|
||||
oldSpeech := historical("speaking")
|
||||
var before []byte
|
||||
if err = db.QueryRowContext(ctx, `SELECT data FROM course_v2_tasks WHERE id=$1`, old.ID).Scan(&before); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
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", "ru-RU"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
run := func(skill, request string, changeAfterEnqueue bool) domain.AdaptiveTask {
|
||||
t.Helper()
|
||||
j, err := repo.Enqueue(ctx, user.ID, "en-US", "next", "a1_introductions_v1", skill, "", request)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if j.InstructionLanguage != "ru-RU" {
|
||||
t.Fatal("job did not freeze explanation language", j)
|
||||
}
|
||||
if changeAfterEnqueue {
|
||||
if err = repo.SetInstructionLanguage(ctx, user.ID, "en-US", "de-DE"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
j, err = repo.Claim(ctx)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
task, err := engine.Process(ctx, j)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err = repo.Finish(ctx, j, task, ""); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if task.InstructionLanguage != "ru-RU" || task.VariantID == "" || task.ContentRevision == "" || task.Instruction == "" {
|
||||
t.Fatal("incomplete frozen variant", task)
|
||||
}
|
||||
return *task
|
||||
}
|
||||
|
||||
// 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)
|
||||
}
|
||||
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)
|
||||
}
|
||||
}
|
||||
// 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", "", "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")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
found := false
|
||||
for _, p := range snapshot.Progress {
|
||||
if p.Skill == "grammar" && p.ModuleID == old.ModuleID {
|
||||
found = true
|
||||
if p.Attempts != 3 || p.DistinctTasks != len(distinct) {
|
||||
t.Fatalf("translation inflated task evidence: %+v", p)
|
||||
}
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
t.Fatal("missing graded evidence")
|
||||
}
|
||||
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")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
total := 0
|
||||
for _, item := range inventory {
|
||||
total += item.Total
|
||||
|
||||
}
|
||||
if total != 840 {
|
||||
t.Fatal("incorrect locale inventory", inventory)
|
||||
}
|
||||
// Local speech fixtures exercise the real observation path; no Azure is called.
|
||||
speech := domain.PronunciationResult{Provider: "azure", Method: "scripted", Locale: "en-US", Alphabet: "IPA", OverallScore: 65, WordScores: []domain.WordScore{{Word: "name", Accuracy: 65, PhonemeScores: []domain.PhonemeScore{{Phoneme: "n", Accuracy: 60}}}}}
|
||||
if _, _, err = engine.Submit(ctx, user.ID, "en-US", oldSpeech.ID, "old-speech", oldSpeech.ReferenceText, &speech); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
}
|
||||
if localizedSpeech.EvidenceTaskID != oldSpeech.ID {
|
||||
t.Fatal("translated repeat changed evidence identity", localizedSpeech)
|
||||
}
|
||||
if _, _, err = engine.Submit(ctx, user.ID, "en-US", localizedSpeech.ID, "translated-speech", localizedSpeech.ReferenceText, &speech); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
profile, err := profiles.PronunciationProfile(ctx, user.ID, "en-US", time.Now().UTC().Add(time.Second))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, target := range profile.Targets {
|
||||
if target.Tasks != 1 || target.Samples != 1 {
|
||||
t.Fatalf("translation inflated pronunciation density: %+v", target)
|
||||
}
|
||||
}
|
||||
if len(profile.Targets) == 0 {
|
||||
t.Fatal("missing fixture observations")
|
||||
}
|
||||
if err = profiles.Init(ctx); err != nil {
|
||||
t.Fatal("restart after multiple locale assignments", err)
|
||||
}
|
||||
var after []byte
|
||||
if err = db.QueryRowContext(ctx, `SELECT data FROM course_v2_tasks WHERE id=$1`, old.ID).Scan(&after); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
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, 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)
|
||||
}
|
||||
job, err := repo.Claim(ctx)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err = engine.Process(ctx, job); !errors.Is(err, store.ErrCourseVariantUnavailable) {
|
||||
t.Fatal("wrong-language fallback", err)
|
||||
}
|
||||
if err = repo.Finish(ctx, job, nil, "no reviewed variants"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
history, err := repo.History(ctx, user.ID, "en-US", "a1_family_v1", 0)
|
||||
if err != nil || len(history) != 0 {
|
||||
t.Fatal("unsupported request assigned German content", history, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestModelCannotSetVariantEvidence(t *testing.T) {
|
||||
entries, err := store.BundledBank()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
task := entries[0].Task
|
||||
task.EvidenceTaskID = "another-assignment"
|
||||
if ValidateAdaptiveTask(task, task.TargetLanguage, task.ModuleID, task.Skill) == nil {
|
||||
t.Fatal("model-owned evidence identity accepted")
|
||||
}
|
||||
}
|
||||
@@ -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) {
|
||||
|
||||
@@ -0,0 +1,116 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"context"
|
||||
"testing"
|
||||
|
||||
"speech-learning-api/internal/domain"
|
||||
"speech-learning-api/internal/store"
|
||||
)
|
||||
|
||||
func TestLanguagePreferencesPreserveCourseAndExplanations(t *testing.T) {
|
||||
db, profiles := adaptiveTestDB(t)
|
||||
ctx := context.Background()
|
||||
user, err := profiles.CreateUser(ctx, "languages@example.test", "hash", "de-DE")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
original, err := profiles.CreateLearnerProfile(ctx, user.ID, "es-ES", "A2", 25)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
updated, err := profiles.UpdatePreferences(ctx, user.ID, "ru-RU", "", "", 0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if updated != original {
|
||||
t.Fatalf("interface switch changed learning profile: before=%+v after=%+v", original, updated)
|
||||
}
|
||||
loaded, err := profiles.GetUser(ctx, user.ID)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
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)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
engine := NewCourseEngine(store.NewAdaptiveStore(db), profiles, nil, nil)
|
||||
snapshot, err := engine.snapshot(ctx, domain.CourseJob{UserID: user.ID, Language: "es-ES"})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
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 {
|
||||
t.Fatal("unsupported interface accepted")
|
||||
}
|
||||
active, err := profiles.GetPrimaryProfile(ctx, user.ID)
|
||||
if err != nil || active != original {
|
||||
t.Fatalf("rejected update changed active profile: %+v %v", active, err)
|
||||
}
|
||||
// A failed profile write must not commit the accompanying interface change.
|
||||
if _, err = db.ExecContext(ctx, `ALTER TABLE learner_profiles ADD CONSTRAINT test_daily_limit CHECK(daily_goal_minutes<=60)`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err = profiles.UpdatePreferences(ctx, user.ID, "de-DE", "en-US", "A1", 100); err == nil {
|
||||
t.Fatal("expected profile constraint failure")
|
||||
}
|
||||
loaded, err = profiles.GetUser(ctx, user.ID)
|
||||
if err != nil || loaded.UILanguage != "ru-RU" {
|
||||
t.Fatalf("failed update changed interface: %+v %v", loaded, err)
|
||||
}
|
||||
active, err = profiles.GetPrimaryProfile(ctx, user.ID)
|
||||
if err != nil || active != original {
|
||||
t.Fatalf("failed update changed learning profile: %+v %v", active, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestNativeLanguageMigrationAndCompatibility(t *testing.T) {
|
||||
db, profiles := adaptiveTestDB(t)
|
||||
ctx := context.Background()
|
||||
user, err := profiles.CreateUser(ctx, "legacy-language@example.test", "hash", "de-DE")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// 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.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, "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.NativeLanguage != "de-DE" || loaded.UILanguage != "de-DE" || loaded.InstructionLanguage != "de-DE" {
|
||||
t.Fatalf("restart changed preference: %+v %v", loaded, err)
|
||||
}
|
||||
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.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)
|
||||
}
|
||||
}
|
||||
@@ -89,7 +89,7 @@ func (s *AdaptiveStore) Task(ctx context.Context, user, language, id string) (do
|
||||
t.BriefID = brief.String
|
||||
t.ExamID = exam.String
|
||||
if t.Source == "curated" && t.ExamID == "" {
|
||||
t.Review = presentations > 1
|
||||
t.Review = t.Review || presentations > 1
|
||||
}
|
||||
return t, nil
|
||||
}
|
||||
@@ -141,6 +141,7 @@ func fingerprint(t domain.AdaptiveTask) string {
|
||||
return hex.EncodeToString(h[:])
|
||||
}
|
||||
func (s *AdaptiveStore) SaveTask(ctx context.Context, j domain.CourseJob, t domain.AdaptiveTask) (domain.AdaptiveTask, error) {
|
||||
t.InstructionLanguage = j.InstructionLanguage
|
||||
t.ID = NewID("a2")
|
||||
if t.Source != "ai" {
|
||||
t.Source = "flowise"
|
||||
@@ -266,11 +267,15 @@ func (s *AdaptiveStore) Snapshot(ctx context.Context, user, language, uiLanguage
|
||||
if err != nil {
|
||||
return out, err
|
||||
}
|
||||
if err = s.localizeModuleLabels(ctx, language, uiLanguage, out.Modules); err != nil {
|
||||
return out, err
|
||||
}
|
||||
|
||||
err = s.db.QueryRowContext(ctx, `SELECT COALESCE((SELECT facts_version FROM course_v2_versions WHERE user_id=$1 AND language=$2 AND version=$3),0)`, user, language, domain.CourseVersion).Scan(&out.FactsVersion)
|
||||
if err != nil {
|
||||
return out, err
|
||||
}
|
||||
rows, err := s.db.QueryContext(ctx, `SELECT t.module_id,t.skill,count(*),count(DISTINCT t.id),avg((a.evaluation->>'score')::float8),(array_agg(a.id ORDER BY a.created_at DESC,a.id DESC))[1]
|
||||
rows, err := s.db.QueryContext(ctx, `SELECT t.module_id,t.skill,count(*),count(DISTINCT COALESCE(NULLIF(t.data->>'evidence_task_id',''),t.id)),avg((a.evaluation->>'score')::float8),(array_agg(a.id ORDER BY a.created_at DESC,a.id DESC))[1]
|
||||
FROM course_v2_attempts a JOIN course_v2_tasks t ON t.id=a.task_id WHERE a.user_id=$1 AND t.language=$2 AND t.version=$3 AND a.status='graded' AND NOT a.demo AND (a.exam_id IS NULL OR EXISTS(SELECT 1 FROM course_v2_exams e WHERE e.id=a.exam_id AND e.status='completed')) GROUP BY t.module_id,t.skill`, user, language, domain.CourseVersion)
|
||||
if err != nil {
|
||||
return out, err
|
||||
@@ -422,7 +427,7 @@ func (s *AdaptiveStore) Submit(ctx context.Context, user, request string, t doma
|
||||
return domain.AdaptiveAttempt{}, err
|
||||
}
|
||||
if actualID == id {
|
||||
if err = recordPronunciation(ctx, tx, user, "course", actualID, "course:"+t.ID, t.TargetLanguage, t.ExamID, actualTime, *speech); err != nil {
|
||||
if err = recordPronunciation(ctx, tx, user, "course", actualID, "course:"+valueOr(t.EvidenceTaskID, t.ID), t.TargetLanguage, t.ExamID, actualTime, *speech); err != nil {
|
||||
return domain.AdaptiveAttempt{}, err
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
|
||||
func (s *AdaptiveStore) Enqueue(ctx context.Context, user, language, kind, module, skill, subject, request string) (domain.CourseJob, error) {
|
||||
id := NewID("job")
|
||||
_, err := s.db.ExecContext(ctx, `INSERT INTO course_v2_jobs(id,user_id,language,version,kind,module_id,skill,subject_id,request_id) VALUES($1,$2,$3,$4,$5,$6,$7,$8,$9) ON CONFLICT(user_id,kind,request_id) DO NOTHING`, id, user, language, domain.CourseVersion, kind, module, skill, subject, request)
|
||||
_, err := s.db.ExecContext(ctx, `INSERT INTO course_v2_jobs(id,user_id,language,version,kind,module_id,skill,subject_id,request_id,instruction_language) SELECT $1,$2,$3,$4,$5,$6,$7,$8,$9,COALESCE(NULLIF(u.instruction_language,''),NULLIF(u.ui_language,''),'de-DE') FROM users u WHERE u.id=$2 ON CONFLICT(user_id,kind,request_id) DO NOTHING`, id, user, language, domain.CourseVersion, kind, module, skill, subject, request)
|
||||
if err != nil {
|
||||
return domain.CourseJob{}, err
|
||||
}
|
||||
@@ -28,7 +28,7 @@ func (s *AdaptiveStore) Enqueue(ctx context.Context, user, language, kind, modul
|
||||
func scanCourseJob(row interface{ Scan(...any) error }) (domain.CourseJob, error) {
|
||||
var j domain.CourseJob
|
||||
var result []byte
|
||||
err := row.Scan(&j.ID, &j.UserID, &j.Language, &j.Kind, &j.ModuleID, &j.Skill, &j.SubjectID, &j.Status, &j.Stage, &j.Error, &j.Lease, &result, &j.AIRevision)
|
||||
err := row.Scan(&j.ID, &j.UserID, &j.Language, &j.Kind, &j.ModuleID, &j.Skill, &j.SubjectID, &j.Status, &j.Stage, &j.Error, &j.Lease, &result, &j.AIRevision, &j.InstructionLanguage)
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return j, ErrNotFound
|
||||
}
|
||||
@@ -37,21 +37,23 @@ func scanCourseJob(row interface{ Scan(...any) error }) (domain.CourseJob, error
|
||||
}
|
||||
if len(result) > 0 {
|
||||
var r struct {
|
||||
TaskID string `json:"task_id"`
|
||||
Source string `json:"source"`
|
||||
Review bool `json:"review"`
|
||||
TaskID string `json:"task_id"`
|
||||
Recommendation *domain.SequenceRecommendation `json:"recommendation"`
|
||||
Source string `json:"source"`
|
||||
Review bool `json:"review"`
|
||||
}
|
||||
if err = json.Unmarshal(result, &r); err != nil {
|
||||
return j, err
|
||||
}
|
||||
j.TaskID = r.TaskID
|
||||
j.Recommendation = r.Recommendation
|
||||
j.Source = r.Source
|
||||
j.Review = r.Review
|
||||
}
|
||||
return j, nil
|
||||
}
|
||||
|
||||
const jobColumns = `id,user_id,language,kind,module_id,skill,subject_id,status,stage,error,lease,result,ai_revision`
|
||||
const jobColumns = `id,user_id,language,kind,module_id,skill,subject_id,status,stage,error,lease,result,ai_revision,instruction_language`
|
||||
|
||||
func (s *AdaptiveStore) Job(ctx context.Context, user, language, id string) (domain.CourseJob, error) {
|
||||
return scanCourseJob(s.db.QueryRowContext(ctx, `SELECT `+jobColumns+` FROM course_v2_jobs WHERE id=$1 AND user_id=$2 AND language=$3 AND version=$4`, id, user, language, domain.CourseVersion))
|
||||
@@ -91,7 +93,7 @@ func (s *AdaptiveStore) Finish(ctx context.Context, j domain.CourseJob, task *do
|
||||
if failure != "" {
|
||||
status = "failed"
|
||||
}
|
||||
_, err := s.db.ExecContext(ctx, `UPDATE course_v2_jobs SET status=$3,stage=$3,result=COALESCE($4,result),error=$5,lease_until=NULL WHERE id=$1 AND lease=$2 AND status='running'`, j.ID, j.Lease, status, result, failure)
|
||||
_, err := s.db.ExecContext(ctx, `UPDATE course_v2_jobs SET status=$3,stage=$3,result=COALESCE(result,'{}'::jsonb)||COALESCE($4,'{}'::jsonb),error=$5,lease_until=NULL WHERE id=$1 AND lease=$2 AND status='running'`, j.ID, j.Lease, status, result, failure)
|
||||
return err
|
||||
}
|
||||
func (s *AdaptiveStore) RetryEvaluation(ctx context.Context, user, language, attemptID string) (domain.CourseJob, error) {
|
||||
@@ -241,6 +243,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 +266,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
|
||||
}
|
||||
|
||||
@@ -57,6 +57,9 @@ CREATE TABLE IF NOT EXISTS course_v2_jobs (
|
||||
deliveries INT NOT NULL DEFAULT 0,created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
UNIQUE(user_id,kind,request_id)
|
||||
);
|
||||
ALTER TABLE course_v2_jobs ADD COLUMN IF NOT EXISTS instruction_language TEXT NOT NULL DEFAULT '';
|
||||
-- Freeze the previous effective preference once for pre-existing queued jobs.
|
||||
UPDATE course_v2_jobs j SET instruction_language=COALESCE(NULLIF(u.instruction_language,''),NULLIF(u.ui_language,''),'de-DE') FROM users u WHERE j.user_id=u.id AND j.instruction_language='';
|
||||
ALTER TABLE course_v2_jobs ADD COLUMN IF NOT EXISTS ai_revision INT NOT NULL DEFAULT 0;
|
||||
CREATE INDEX IF NOT EXISTS course_v2_queue ON course_v2_jobs(status,created_at);
|
||||
UPDATE users u SET active_profile_id=(SELECT p.id FROM learner_profiles p WHERE p.user_id=u.id ORDER BY p.created_at,p.id LIMIT 1) WHERE active_profile_id IS NULL;
|
||||
|
||||
@@ -29,7 +29,6 @@ ALTER TABLE course_v2_tasks ADD COLUMN IF NOT EXISTS bank_entry_id TEXT REFERENC
|
||||
ALTER TABLE course_v2_tasks ADD COLUMN IF NOT EXISTS last_presented_at TIMESTAMPTZ;
|
||||
ALTER TABLE course_v2_tasks ADD COLUMN IF NOT EXISTS presentation_count INT NOT NULL DEFAULT 0;
|
||||
UPDATE course_v2_tasks SET presentation_count=1 WHERE source='curated' AND bank_entry_id IS NOT NULL AND presentation_count=0;
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS course_v2_bank_assignment ON course_v2_tasks(owner_id,bank_entry_id) WHERE exam_id IS NULL AND bank_entry_id IS NOT NULL;
|
||||
ALTER TABLE course_v2_tasks DROP CONSTRAINT IF EXISTS course_v2_tasks_source_check;
|
||||
ALTER TABLE course_v2_tasks ADD CONSTRAINT course_v2_tasks_source_check CHECK(source IN ('seed','flowise','ai','curated'));
|
||||
ALTER TABLE course_v2_attempts DROP CONSTRAINT IF EXISTS course_v2_attempts_status_check;
|
||||
@@ -172,7 +171,10 @@ func (s *AdaptiveStore) InstallBank(ctx context.Context) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if _, err = s.db.ExecContext(ctx, bankSchema); err != nil {
|
||||
if _, err = bundledSequences(); err != nil {
|
||||
return err
|
||||
}
|
||||
if _, err = s.db.ExecContext(ctx, bankSchema+sequenceSchema); err != nil {
|
||||
return err
|
||||
}
|
||||
tx, err := s.db.BeginTx(ctx, nil)
|
||||
@@ -201,15 +203,21 @@ func (s *AdaptiveStore) InstallBank(ctx context.Context) error {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return tx.Commit()
|
||||
if err = tx.Commit(); err != nil {
|
||||
return err
|
||||
}
|
||||
return s.installVariants(ctx, entries)
|
||||
}
|
||||
|
||||
type bankCandidate struct {
|
||||
entry domain.BankEntry
|
||||
taskID string
|
||||
score float64
|
||||
seen bool
|
||||
presented int64
|
||||
entry domain.BankEntry
|
||||
bankEntryID string
|
||||
variantID string
|
||||
previousID string
|
||||
taskID string
|
||||
score float64
|
||||
seen bool
|
||||
presented int64
|
||||
}
|
||||
|
||||
// AssignBankTask serializes selections per learner, including presentation of
|
||||
@@ -245,9 +253,14 @@ func (s *AdaptiveStore) AssignBankTask(ctx context.Context, j domain.CourseJob)
|
||||
return t, err
|
||||
}
|
||||
}
|
||||
rows, err := tx.QueryContext(ctx, `SELECT b.data,COALESCE(t.id,''),COALESCE((SELECT (a.evaluation->>'score')::float8 FROM course_v2_attempts a WHERE a.task_id=t.id AND a.user_id=$1 AND a.status='graded' AND NOT a.demo ORDER BY a.created_at DESC,a.id DESC LIMIT 1),-1),COALESCE(extract(epoch from t.last_presented_at)::bigint,0)
|
||||
FROM course_v2_bank b LEFT JOIN course_v2_tasks t ON t.bank_entry_id=b.id AND t.owner_id=$1 AND t.exam_id IS NULL
|
||||
WHERE b.active AND b.language=$2 AND b.version=$3 AND b.module_id=$4 AND ($5='' OR b.skill=$5) AND ($6=false OR b.data->'task'->>'kind'='choice')`, j.UserID, j.Language, domain.CourseVersion, j.ModuleID, j.Skill, j.Kind == "legacy_next")
|
||||
instructionLanguage := valueOr(j.InstructionLanguage, "de-DE")
|
||||
rows, err := tx.QueryContext(ctx, availableBank+`
|
||||
SELECT av.entry,COALESCE(t.id,''),COALESCE(graded.score,-1),COALESCE(extract(epoch from previous.last_presented_at)::bigint,0),av.base_id,av.variant_id,COALESCE(previous.id,'')
|
||||
FROM available av
|
||||
LEFT JOIN course_v2_tasks t ON t.bank_entry_id=av.base_id AND COALESCE(t.variant_id,'')=av.variant_id AND t.owner_id=$1 AND t.exam_id IS NULL
|
||||
LEFT JOIN LATERAL (SELECT r.id,r.last_presented_at FROM course_v2_tasks r WHERE r.owner_id=$1 AND r.language=$2 AND r.version=$3 AND r.exam_id IS NULL AND COALESCE(NULLIF(r.data->>'canonical_task_id',''),r.bank_entry_id)=av.canonical_id ORDER BY r.last_presented_at DESC NULLS LAST,r.id LIMIT 1) previous ON true
|
||||
LEFT JOIN LATERAL (SELECT (a.evaluation->>'score')::float8 AS score FROM course_v2_attempts a JOIN course_v2_tasks r ON r.id=a.task_id WHERE a.user_id=$1 AND r.owner_id=$1 AND r.language=$2 AND r.version=$3 AND r.exam_id IS NULL AND COALESCE(NULLIF(r.data->>'canonical_task_id',''),r.bank_entry_id)=av.canonical_id AND a.status='graded' AND NOT a.demo ORDER BY a.created_at DESC,a.id DESC LIMIT 1) graded ON true
|
||||
WHERE av.module_id=$5 AND ($6='' OR av.skill=$6) AND ($7=false OR av.entry->'task'->>'kind'='choice')`, j.UserID, j.Language, domain.CourseVersion, instructionLanguage, j.ModuleID, j.Skill, j.Kind == "legacy_next")
|
||||
if err != nil {
|
||||
return domain.AdaptiveTask{}, err
|
||||
}
|
||||
@@ -255,7 +268,7 @@ func (s *AdaptiveStore) AssignBankTask(ctx context.Context, j domain.CourseJob)
|
||||
for rows.Next() {
|
||||
var c bankCandidate
|
||||
var data []byte
|
||||
if err = rows.Scan(&data, &c.taskID, &c.score, &c.presented); err != nil {
|
||||
if err = rows.Scan(&data, &c.taskID, &c.score, &c.presented, &c.bankEntryID, &c.variantID, &c.previousID); err != nil {
|
||||
rows.Close()
|
||||
return domain.AdaptiveTask{}, err
|
||||
}
|
||||
@@ -263,7 +276,7 @@ func (s *AdaptiveStore) AssignBankTask(ctx context.Context, j domain.CourseJob)
|
||||
rows.Close()
|
||||
return domain.AdaptiveTask{}, err
|
||||
}
|
||||
c.seen = c.taskID != ""
|
||||
c.seen = c.previousID != ""
|
||||
candidates = append(candidates, c)
|
||||
}
|
||||
err = rows.Err()
|
||||
@@ -272,6 +285,9 @@ func (s *AdaptiveStore) AssignBankTask(ctx context.Context, j domain.CourseJob)
|
||||
return domain.AdaptiveTask{}, err
|
||||
}
|
||||
if len(candidates) == 0 {
|
||||
if instructionLanguage != "de-DE" {
|
||||
return domain.AdaptiveTask{}, ErrCourseVariantUnavailable
|
||||
}
|
||||
return domain.AdaptiveTask{}, ErrNotFound
|
||||
}
|
||||
type recent struct {
|
||||
@@ -281,7 +297,7 @@ func (s *AdaptiveStore) AssignBankTask(ctx context.Context, j domain.CourseJob)
|
||||
difficulty int
|
||||
}
|
||||
recentScores := []recent{}
|
||||
rows, err = tx.QueryContext(ctx, `SELECT b.goal,(a.evaluation->>'score')::float8,t.id,b.difficulty FROM course_v2_attempts a JOIN course_v2_tasks t ON t.id=a.task_id JOIN course_v2_bank b ON b.id=t.bank_entry_id WHERE a.user_id=$1 AND t.language=$2 AND t.version=$3 AND t.module_id=$4 AND ($5='' OR t.skill=$5) AND a.status='graded' AND NOT a.demo AND a.exam_id IS NULL ORDER BY a.created_at DESC,a.id DESC LIMIT 5`, j.UserID, j.Language, domain.CourseVersion, j.ModuleID, j.Skill)
|
||||
rows, err = tx.QueryContext(ctx, `SELECT b.goal,(a.evaluation->>'score')::float8,COALESCE(NULLIF(t.data->>'evidence_task_id',''),t.id),b.difficulty FROM course_v2_attempts a JOIN course_v2_tasks t ON t.id=a.task_id JOIN course_v2_bank b ON b.id=t.bank_entry_id WHERE a.user_id=$1 AND t.language=$2 AND t.version=$3 AND t.module_id=$4 AND ($5='' OR t.skill=$5) AND a.status='graded' AND NOT a.demo AND a.exam_id IS NULL ORDER BY a.created_at DESC,a.id DESC LIMIT 5`, j.UserID, j.Language, domain.CourseVersion, j.ModuleID, j.Skill)
|
||||
if err != nil {
|
||||
return domain.AdaptiveTask{}, err
|
||||
}
|
||||
@@ -334,15 +350,15 @@ func (s *AdaptiveStore) AssignBankTask(ctx context.Context, j domain.CourseJob)
|
||||
}
|
||||
sort.Slice(candidates, func(i, k int) bool {
|
||||
a, b := candidates[i], candidates[k]
|
||||
if a.seen && b.seen && (a.taskID == lastID) != (b.taskID == lastID) {
|
||||
return b.taskID == lastID
|
||||
if a.seen && b.seen && (a.previousID == lastID) != (b.previousID == lastID) {
|
||||
return b.previousID == lastID
|
||||
}
|
||||
if rank(a) != rank(b) {
|
||||
return rank(a) < rank(b)
|
||||
}
|
||||
if a.seen && b.seen {
|
||||
if (a.taskID == lastID) != (b.taskID == lastID) {
|
||||
return b.taskID == lastID
|
||||
if (a.previousID == lastID) != (b.previousID == lastID) {
|
||||
return b.previousID == lastID
|
||||
}
|
||||
if a.presented != b.presented {
|
||||
return a.presented < b.presented
|
||||
@@ -362,22 +378,46 @@ func (s *AdaptiveStore) AssignBankTask(ctx context.Context, j domain.CourseJob)
|
||||
hb := sha256.Sum256([]byte(j.UserID + b.entry.ID))
|
||||
return strings.Compare(hex.EncodeToString(ha[:]), hex.EncodeToString(hb[:])) < 0
|
||||
})
|
||||
chosen := candidates[0]
|
||||
selection, index, err := selectSequence(ctx, tx, j, candidates)
|
||||
if err != nil {
|
||||
return domain.AdaptiveTask{}, err
|
||||
}
|
||||
chosen := candidates[index]
|
||||
t := chosen.entry.Task
|
||||
t.Source = "curated"
|
||||
t.Review = chosen.seen
|
||||
t.ID = chosen.taskID
|
||||
if !chosen.seen {
|
||||
if chosen.taskID == "" {
|
||||
t.ID = NewID("a2")
|
||||
if t.InstructionLanguage == "" {
|
||||
t.InstructionLanguage = "de-DE"
|
||||
}
|
||||
if t.CanonicalTaskID == "" {
|
||||
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 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 {
|
||||
return t, err
|
||||
}
|
||||
data, _ := json.Marshal(t)
|
||||
_, err = tx.ExecContext(ctx, `INSERT INTO course_v2_tasks(id,module_id,language,version,owner_id,source,skill,kind,data,fingerprint,bank_entry_id,last_presented_at,presentation_count) VALUES($1,$2,$3,$4,$5,'curated',$6,$7,$8,$9,$10,now(),1)`, t.ID, t.ModuleID, t.TargetLanguage, t.CourseVersion, j.UserID, t.Skill, t.Kind, data, "bank:"+chosen.entry.ID, chosen.entry.ID)
|
||||
_, err = tx.ExecContext(ctx, `INSERT INTO course_v2_tasks(id,module_id,language,version,owner_id,source,skill,kind,data,fingerprint,bank_entry_id,variant_id,last_presented_at,presentation_count) VALUES($1,$2,$3,$4,$5,'curated',$6,$7,$8,$9,$10,NULLIF($11,''),now(),1)`, t.ID, t.ModuleID, t.TargetLanguage, t.CourseVersion, j.UserID, t.Skill, t.Kind, data, "bank:"+chosen.entry.ID, chosen.bankEntryID, chosen.variantID)
|
||||
} else {
|
||||
_, err = tx.ExecContext(ctx, `UPDATE course_v2_tasks SET last_presented_at=now(),presentation_count=presentation_count+1 WHERE id=$1`, t.ID)
|
||||
}
|
||||
if err != nil {
|
||||
return domain.AdaptiveTask{}, err
|
||||
}
|
||||
data, _ := json.Marshal(map[string]any{"task_id": t.ID, "source": "curated", "review": chosen.seen})
|
||||
if err = saveSequenceSelection(ctx, tx, j, selection, t.ID); err != nil {
|
||||
return domain.AdaptiveTask{}, err
|
||||
}
|
||||
var recommendation *domain.SequenceRecommendation
|
||||
if selection != nil {
|
||||
recommendation = selection.Recommendation
|
||||
}
|
||||
data, _ := json.Marshal(map[string]any{"task_id": t.ID, "source": "curated", "review": chosen.seen, "recommendation": recommendation})
|
||||
if _, err = tx.ExecContext(ctx, `UPDATE course_v2_jobs SET result=$2 WHERE id=$1`, j.ID, data); err != nil {
|
||||
return domain.AdaptiveTask{}, err
|
||||
}
|
||||
@@ -389,8 +429,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
|
||||
@@ -402,7 +446,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
|
||||
}
|
||||
@@ -416,6 +460,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)
|
||||
}
|
||||
}
|
||||
@@ -434,7 +484,11 @@ type BankInventoryItem struct {
|
||||
}
|
||||
|
||||
func (s *AdaptiveStore) BankInventory(ctx context.Context, user, language string) ([]BankInventoryItem, error) {
|
||||
rows, err := s.db.QueryContext(ctx, `SELECT b.module_id,b.skill,count(*),count(*) FILTER(WHERE t.id IS NULL) FROM course_v2_bank b LEFT JOIN course_v2_tasks t ON t.bank_entry_id=b.id AND t.owner_id=$1 AND t.exam_id IS NULL WHERE b.active AND b.language=$2 AND b.version=$3 GROUP BY b.module_id,b.skill ORDER BY b.module_id,b.skill`, user, language, domain.CourseVersion)
|
||||
var instructionLanguage string
|
||||
if err := s.db.QueryRowContext(ctx, `SELECT instruction_language FROM users WHERE id=$1`, user).Scan(&instructionLanguage); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
rows, err := s.db.QueryContext(ctx, availableBank+` SELECT av.module_id,av.skill,count(*),count(*) FILTER(WHERE NOT EXISTS(SELECT 1 FROM course_v2_tasks t WHERE t.owner_id=$1 AND t.language=$2 AND t.version=$3 AND t.exam_id IS NULL AND COALESCE(NULLIF(t.data->>'canonical_task_id',''),t.bank_entry_id)=av.canonical_id)) FROM available av GROUP BY av.module_id,av.skill ORDER BY av.module_id,av.skill`, user, language, domain.CourseVersion, instructionLanguage)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -453,6 +507,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
|
||||
}
|
||||
|
||||
@@ -0,0 +1,136 @@
|
||||
package store
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"time"
|
||||
|
||||
"speech-learning-api/internal/domain"
|
||||
)
|
||||
|
||||
const foundationFreshness = 7 * 24 * time.Hour
|
||||
const foundationCooldown = 30 * time.Minute
|
||||
|
||||
type foundationAttempt struct {
|
||||
BankID string
|
||||
Goal string
|
||||
Status string
|
||||
Score float64
|
||||
At time.Time
|
||||
}
|
||||
type foundationHistory struct {
|
||||
Attempts map[string][]foundationAttempt
|
||||
Assigned map[string]bool
|
||||
}
|
||||
|
||||
// Only real, graded evidence can reduce practice. Pending/ungraded latest
|
||||
// answers remain in the history so older good scores cannot silently overrule them.
|
||||
func readFoundationHistory(ctx context.Context, tx *sql.Tx, j domain.CourseJob, now time.Time) (foundationHistory, error) {
|
||||
history := foundationHistory{Attempts: map[string][]foundationAttempt{}, Assigned: map[string]bool{}}
|
||||
rows, err := tx.QueryContext(ctx, `SELECT b.id,b.goal,a.status,COALESCE((a.evaluation->>'score')::float8,-1),a.created_at FROM course_v2_attempts a JOIN course_v2_tasks t ON t.id=a.task_id JOIN course_v2_bank b ON b.id=COALESCE(NULLIF(t.data->>'canonical_task_id',''),t.bank_entry_id) LEFT JOIN course_v2_exams e ON e.id=a.exam_id WHERE a.user_id=$1 AND t.owner_id=$1 AND t.language=$2 AND t.version=$3 AND b.module_id=$4 AND NOT a.demo AND (a.exam_id IS NULL OR (e.status='completed' AND e.user_id=$1 AND e.language=$2 AND e.version=$3)) AND a.created_at >= $5 AND a.created_at <= $6 ORDER BY a.created_at DESC,a.id DESC LIMIT 2000`, j.UserID, j.Language, domain.CourseVersion, j.ModuleID, now.Add(-30*24*time.Hour), now)
|
||||
if err != nil {
|
||||
return history, err
|
||||
}
|
||||
for rows.Next() {
|
||||
var attempt foundationAttempt
|
||||
if err = rows.Scan(&attempt.BankID, &attempt.Goal, &attempt.Status, &attempt.Score, &attempt.At); err != nil {
|
||||
rows.Close()
|
||||
return history, err
|
||||
}
|
||||
history.Attempts[attempt.BankID] = append(history.Attempts[attempt.BankID], attempt)
|
||||
}
|
||||
err = rows.Err()
|
||||
rows.Close()
|
||||
if err != nil {
|
||||
return history, err
|
||||
}
|
||||
// Even an unfinished exam assignment is not a new transfer example. Its hidden
|
||||
// grades are excluded above and must never influence this recommendation.
|
||||
rows, err = tx.QueryContext(ctx, `SELECT DISTINCT COALESCE(NULLIF(data->>'canonical_task_id',''),bank_entry_id) FROM course_v2_tasks WHERE owner_id=$1 AND language=$2 AND version=$3 AND module_id=$4 AND COALESCE(NULLIF(data->>'canonical_task_id',''),bank_entry_id) IS NOT NULL`, j.UserID, j.Language, domain.CourseVersion, j.ModuleID)
|
||||
if err != nil {
|
||||
return history, err
|
||||
}
|
||||
defer rows.Close()
|
||||
for rows.Next() {
|
||||
var id string
|
||||
if err = rows.Scan(&id); err != nil {
|
||||
return history, err
|
||||
}
|
||||
history.Assigned[id] = true
|
||||
}
|
||||
return history, rows.Err()
|
||||
}
|
||||
func (h foundationHistory) recentGood(id string, now time.Time) bool {
|
||||
attempts := h.Attempts[id]
|
||||
if len(attempts) == 0 {
|
||||
return false
|
||||
}
|
||||
last := attempts[0]
|
||||
return last.Status == "graded" && last.Score >= 85 && !last.At.After(now) && now.Sub(last.At) <= foundationFreshness
|
||||
}
|
||||
func (h foundationHistory) reusable(step domain.LearningSequenceStep, now time.Time) bool {
|
||||
if !h.recentGood(step.BankEntryID, now) {
|
||||
return false
|
||||
}
|
||||
attempts := h.Attempts[step.BankEntryID]
|
||||
latest := attempts[0]
|
||||
// Avoid immediate massed repetition of the exact same item. This is a short
|
||||
// cooldown, not a declaration of mastery or another successful attempt.
|
||||
if now.Sub(latest.At) <= foundationCooldown {
|
||||
return true
|
||||
}
|
||||
// Repeated clicks/locale variants on the same day do not establish density.
|
||||
for _, attempt := range attempts[1:] {
|
||||
if attempt.Status != "graded" || attempt.Score < 85 {
|
||||
break
|
||||
}
|
||||
if latest.At.Sub(attempt.At) >= 24*time.Hour {
|
||||
return true
|
||||
}
|
||||
}
|
||||
// Only editorially approved sentence-pattern alternatives support transfer;
|
||||
// a different word meaning/preposition with the same broad goal does not.
|
||||
if step.Phase == "grammar" {
|
||||
good := 1
|
||||
for _, id := range step.Alternatives {
|
||||
if h.recentGood(id, now) {
|
||||
good++
|
||||
}
|
||||
}
|
||||
return good >= 3
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// Returns an actual candidate or reuses earlier evidence for this scaffold step.
|
||||
// Listening, reading and all production stages always keep their thematic task.
|
||||
func chooseFoundation(step domain.LearningSequenceStep, candidates []bankCandidate, history foundationHistory, now time.Time) (index int, reuse bool, reason string) {
|
||||
index = -1
|
||||
byID := map[string]int{}
|
||||
for n, c := range candidates {
|
||||
byID[c.bankEntryID] = n
|
||||
}
|
||||
original, ok := byID[step.BankEntryID]
|
||||
if !ok {
|
||||
return -1, false, ""
|
||||
}
|
||||
if step.Phase != "grammar" && step.Phase != "vocabulary" {
|
||||
return original, false, "foundation"
|
||||
}
|
||||
if !history.recentGood(step.BankEntryID, now) {
|
||||
reason = "foundation"
|
||||
if len(history.Attempts[step.BankEntryID]) > 0 {
|
||||
reason = "refresh"
|
||||
}
|
||||
return original, false, reason
|
||||
}
|
||||
for _, id := range step.Alternatives {
|
||||
if n, available := byID[id]; available && !history.Assigned[id] {
|
||||
return n, false, "transfer"
|
||||
}
|
||||
}
|
||||
if history.reusable(step, now) {
|
||||
return original, true, "recent_practice"
|
||||
}
|
||||
return original, false, "refresh"
|
||||
}
|
||||
@@ -0,0 +1,115 @@
|
||||
package store
|
||||
|
||||
import (
|
||||
"speech-learning-api/internal/domain"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestFoundationRepetitionPolicy(t *testing.T) {
|
||||
now := time.Date(2026, 11, 11, 12, 0, 0, 0, time.UTC)
|
||||
step := domain.LearningSequenceStep{Phase: "grammar", BankEntryID: "base", Alternatives: []string{"other", "third"}}
|
||||
candidates := []bankCandidate{{bankEntryID: "base"}, {bankEntryID: "other"}, {bankEntryID: "third"}}
|
||||
attempt := func(id, status string, score float64, age time.Duration) foundationAttempt {
|
||||
return foundationAttempt{BankID: id, Status: status, Score: score, At: now.Add(-age)}
|
||||
}
|
||||
history := func(attempts ...foundationAttempt) foundationHistory {
|
||||
h := foundationHistory{Attempts: map[string][]foundationAttempt{}, Assigned: map[string]bool{}}
|
||||
for _, a := range attempts {
|
||||
h.Attempts[a.BankID] = append(h.Attempts[a.BankID], a)
|
||||
h.Assigned[a.BankID] = true
|
||||
}
|
||||
return h
|
||||
}
|
||||
t.Run("new pattern starts with its own foundation", func(t *testing.T) {
|
||||
h := history(attempt("other", "graded", 100, time.Minute))
|
||||
n, reuse, _ := chooseFoundation(step, candidates, h, now)
|
||||
if n != 0 || reuse {
|
||||
t.Fatal(n, reuse)
|
||||
}
|
||||
})
|
||||
t.Run("a new approved example checks transfer", func(t *testing.T) {
|
||||
h := history(attempt("base", "graded", 100, time.Hour))
|
||||
n, reuse, reason := chooseFoundation(step, candidates, h, now)
|
||||
if n != 1 || reuse || reason != "transfer" {
|
||||
t.Fatal(n, reuse, reason)
|
||||
}
|
||||
})
|
||||
t.Run("assigned exam or locale variant is not new", func(t *testing.T) {
|
||||
h := history(attempt("base", "graded", 100, time.Hour))
|
||||
h.Assigned["other"] = true
|
||||
n, _, _ := chooseFoundation(step, candidates, h, now)
|
||||
if n != 2 {
|
||||
t.Fatal(n)
|
||||
}
|
||||
})
|
||||
t.Run("a newer mistake defeats older good scores", func(t *testing.T) {
|
||||
h := history(attempt("base", "graded", 0, time.Minute), attempt("base", "graded", 100, 48*time.Hour))
|
||||
n, reuse, _ := chooseFoundation(step, candidates, h, now)
|
||||
if n != 0 || reuse {
|
||||
t.Fatal(n, reuse)
|
||||
}
|
||||
})
|
||||
t.Run("ungraded is not successful evidence", func(t *testing.T) {
|
||||
h := history(attempt("base", "ungraded", 100, time.Minute), attempt("base", "graded", 100, time.Hour))
|
||||
n, reuse, _ := chooseFoundation(step, candidates, h, now)
|
||||
if n != 0 || reuse {
|
||||
t.Fatal(n, reuse)
|
||||
}
|
||||
})
|
||||
t.Run("old practice is refreshed", func(t *testing.T) {
|
||||
h := history(attempt("base", "graded", 100, 8*24*time.Hour))
|
||||
n, reuse, reason := chooseFoundation(step, candidates, h, now)
|
||||
if n != 0 || reuse || reason != "refresh" {
|
||||
t.Fatal(n, reuse, reason)
|
||||
}
|
||||
})
|
||||
t.Run("immediate duplicate may be omitted without a mastery claim", func(t *testing.T) {
|
||||
h := history(attempt("base", "graded", 100, 10*time.Minute))
|
||||
h.Assigned["other"] = true
|
||||
h.Assigned["third"] = true
|
||||
_, reuse, reason := chooseFoundation(step, candidates, h, now)
|
||||
if !reuse || reason != "recent_practice" {
|
||||
t.Fatal(reuse, reason)
|
||||
}
|
||||
})
|
||||
t.Run("same-day repetitions cannot manufacture evidence density", func(t *testing.T) {
|
||||
h := history(attempt("base", "graded", 100, time.Hour), attempt("base", "graded", 100, 2*time.Hour), attempt("base", "graded", 100, 3*time.Hour))
|
||||
h.Assigned["other"] = true
|
||||
h.Assigned["third"] = true
|
||||
if h.reusable(step, now) {
|
||||
t.Fatal("repetition count treated as independent evidence")
|
||||
}
|
||||
})
|
||||
t.Run("spaced positives reduce repetitions", func(t *testing.T) {
|
||||
h := history(attempt("base", "graded", 100, time.Hour), attempt("base", "graded", 100, 48*time.Hour))
|
||||
if !h.reusable(step, now) {
|
||||
t.Fatal("spaced practice ignored")
|
||||
}
|
||||
})
|
||||
t.Run("different pattern examples support fewer repetitions", func(t *testing.T) {
|
||||
h := history(attempt("base", "graded", 100, time.Hour), attempt("other", "graded", 100, 2*time.Hour), attempt("third", "graded", 100, 3*time.Hour))
|
||||
if !h.reusable(step, now) {
|
||||
t.Fatal("transfer evidence ignored")
|
||||
}
|
||||
})
|
||||
t.Run("unrelated words never replace a meaning", func(t *testing.T) {
|
||||
word := domain.LearningSequenceStep{Phase: "vocabulary", BankEntryID: "base"}
|
||||
h := history(attempt("other", "graded", 100, time.Hour))
|
||||
n, reuse, _ := chooseFoundation(word, candidates, h, now)
|
||||
if n != 0 || reuse {
|
||||
t.Fatal(n, reuse)
|
||||
}
|
||||
})
|
||||
for _, phase := range []string{"listen", "read", "repeat", "write", "compose", "speak"} {
|
||||
t.Run("thematic context preserved/"+phase, func(t *testing.T) {
|
||||
s := step
|
||||
s.Phase = phase
|
||||
h := history(attempt("base", "graded", 100, time.Minute))
|
||||
n, reuse, _ := chooseFoundation(s, candidates, h, now)
|
||||
if n != 0 || reuse {
|
||||
t.Fatal("production/context was bypassed")
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,342 @@
|
||||
package store
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/sha256"
|
||||
"database/sql"
|
||||
_ "embed"
|
||||
"encoding/hex"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"speech-learning-api/internal/domain"
|
||||
)
|
||||
|
||||
//go:embed coursebank/sequences.json
|
||||
var sequenceData []byte
|
||||
|
||||
//go:embed coursebank/sequence_manifest.json
|
||||
var sequenceManifest []byte
|
||||
|
||||
const sequenceSchema = `
|
||||
CREATE TABLE IF NOT EXISTS course_v2_sequence_progress (
|
||||
user_id TEXT NOT NULL REFERENCES users(id),language TEXT NOT NULL,version TEXT NOT NULL,
|
||||
module_id TEXT NOT NULL,revision TEXT NOT NULL,cursor INT NOT NULL DEFAULT 0 CHECK(cursor>=0),
|
||||
active_task_id TEXT REFERENCES course_v2_tasks(id),presented_at TIMESTAMPTZ,
|
||||
skipped_steps INT NOT NULL DEFAULT 0 CHECK(skipped_steps>=0),
|
||||
reviewed BOOLEAN NOT NULL DEFAULT false,
|
||||
PRIMARY KEY(user_id,language,version,module_id,revision));
|
||||
ALTER TABLE course_v2_sequence_progress ADD COLUMN IF NOT EXISTS reviewed BOOLEAN NOT NULL DEFAULT false;
|
||||
ALTER TABLE course_v2_sequence_progress ADD COLUMN IF NOT EXISTS reused_steps INT NOT NULL DEFAULT 0 CHECK(reused_steps>=0);
|
||||
ALTER TABLE course_v2_sequence_progress ADD COLUMN IF NOT EXISTS practice_reason TEXT NOT NULL DEFAULT '';
|
||||
`
|
||||
|
||||
type sequencePack struct {
|
||||
SelectionRevision string `json:"selection_revision"`
|
||||
Revision string `json:"revision"`
|
||||
Review string `json:"editorial_review_sha256"`
|
||||
Sequences []domain.LearningSequence `json:"sequences"`
|
||||
}
|
||||
|
||||
var sequencesOnce sync.Once
|
||||
var sequencesPack sequencePack
|
||||
var sequencesError error
|
||||
|
||||
func bundledSequences() (sequencePack, error) {
|
||||
sequencesOnce.Do(func() {
|
||||
var manifest struct {
|
||||
SHA string `json:"sha256"`
|
||||
}
|
||||
if sequencesError = json.Unmarshal(sequenceManifest, &manifest); sequencesError != nil {
|
||||
return
|
||||
}
|
||||
sum := sha256.Sum256(sequenceData)
|
||||
if hex.EncodeToString(sum[:]) != manifest.SHA {
|
||||
sequencesError = errors.New("sequence checksum mismatch")
|
||||
return
|
||||
}
|
||||
if sequencesError = json.Unmarshal(sequenceData, &sequencesPack); sequencesError != nil {
|
||||
return
|
||||
}
|
||||
base, err := BundledBank()
|
||||
if err != nil {
|
||||
sequencesError = err
|
||||
return
|
||||
}
|
||||
sequencesError = validateSequences(sequencesPack, base)
|
||||
})
|
||||
return sequencesPack, sequencesError
|
||||
}
|
||||
func validateSequences(pack sequencePack, base []domain.BankEntry) error {
|
||||
if pack.Revision == "" || pack.SelectionRevision == "" || len(pack.Review) != 64 || len(pack.Sequences) == 0 {
|
||||
return errors.New("missing sequence review")
|
||||
}
|
||||
entries := map[string]domain.BankEntry{}
|
||||
for _, entry := range base {
|
||||
entries[entry.ID] = entry
|
||||
}
|
||||
seen := map[string]bool{}
|
||||
phases := []string{"listen", "vocabulary", "read", "repeat", "grammar", "write", "compose", "speak"}
|
||||
kinds := []string{"choice", "choice", "choice", "repeat_sentence", "choice", "short_text", "free_text", "free_speech"}
|
||||
skills := []string{"listening", "vocabulary", "reading", "speaking", "grammar", "writing", "writing", "speaking"}
|
||||
for _, seq := range pack.Sequences {
|
||||
if seq.ID == "" || seen[seq.ID] || seq.Titles["de-DE"] == "" || seq.Titles["ru-RU"] == "" {
|
||||
return fmt.Errorf("invalid sequence: %s", seq.ID)
|
||||
}
|
||||
seen[seq.ID] = true
|
||||
phase := -1
|
||||
for _, step := range seq.Steps {
|
||||
entry, ok := entries[step.BankEntryID]
|
||||
next := phase
|
||||
if next < 0 || step.Phase != phases[next] {
|
||||
next++
|
||||
}
|
||||
if next >= len(phases) || step.Phase != phases[next] || !ok || entry.Task.ModuleID != seq.ModuleID || entry.Task.Kind != kinds[next] || entry.Task.Skill != skills[next] {
|
||||
return fmt.Errorf("invalid sequence step: %s/%s", seq.ID, step.BankEntryID)
|
||||
}
|
||||
alternatives := map[string]bool{step.BankEntryID: true}
|
||||
for _, id := range step.Alternatives {
|
||||
alternate, ok := entries[id]
|
||||
if step.Phase != "grammar" || !ok || alternatives[id] || alternate.Goal != entry.Goal || alternate.Task.ModuleID != seq.ModuleID || alternate.Task.Skill != "grammar" || alternate.Task.Kind != "choice" {
|
||||
return fmt.Errorf("invalid transfer alternative: %s/%s", seq.ID, id)
|
||||
}
|
||||
alternatives[id] = true
|
||||
}
|
||||
phase = next
|
||||
}
|
||||
if phase != len(phases)-1 {
|
||||
return fmt.Errorf("incomplete sequence: %s", seq.ID)
|
||||
}
|
||||
last := seq.Steps[len(seq.Steps)-1]
|
||||
previous := seq.Steps[len(seq.Steps)-2]
|
||||
if entries[last.BankEntryID].Task.AnswerKey.ReferenceAnswer != entries[previous.BankEntryID].Task.AnswerKey.ReferenceAnswer {
|
||||
return fmt.Errorf("unrelated final writing/speech: %s", seq.ID)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
type sequencePosition struct {
|
||||
Sequence domain.LearningSequence
|
||||
Step domain.LearningSequenceStep
|
||||
StepIndex int
|
||||
TopicIndex int
|
||||
Topics int
|
||||
}
|
||||
|
||||
func sequencePositions(pack sequencePack, module string) []sequencePosition {
|
||||
out := []sequencePosition{}
|
||||
topics := 0
|
||||
for _, seq := range pack.Sequences {
|
||||
if seq.ModuleID == module {
|
||||
topics++
|
||||
}
|
||||
}
|
||||
topic := 0
|
||||
for _, seq := range pack.Sequences {
|
||||
if seq.ModuleID != module {
|
||||
continue
|
||||
}
|
||||
for n, step := range seq.Steps {
|
||||
out = append(out, sequencePosition{seq, step, n, topic, topics})
|
||||
}
|
||||
topic++
|
||||
}
|
||||
return out
|
||||
}
|
||||
func recommendationAt(pack sequencePack, positions []sequencePosition, cursor, skipped int, task, native string) *domain.SequenceRecommendation {
|
||||
r := &domain.SequenceRecommendation{SelectionRevision: pack.SelectionRevision, Revision: pack.Revision, Complete: cursor >= len(positions), SkippedSteps: skipped}
|
||||
if r.Complete {
|
||||
return r
|
||||
}
|
||||
pos := positions[cursor]
|
||||
r.SequenceID = pos.Sequence.ID
|
||||
r.Title = pos.Sequence.Titles[native]
|
||||
r.Phase = pos.Step.Phase
|
||||
r.Step = pos.StepIndex + 1
|
||||
r.Steps = len(pos.Sequence.Steps)
|
||||
r.Topic = pos.TopicIndex + 1
|
||||
r.Topics = pos.Topics
|
||||
r.TaskID = task
|
||||
return r
|
||||
}
|
||||
|
||||
// This cursor records participation/explicit skipping, never success. It is
|
||||
// independent of native language, variant and grades. Exams never use it.
|
||||
func (s *AdaptiveStore) SequenceRecommendation(ctx context.Context, user, language, module, native string) (*domain.SequenceRecommendation, error) {
|
||||
if language != "en-US" {
|
||||
return nil, nil
|
||||
}
|
||||
pack, err := bundledSequences()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
positions := sequencePositions(pack, module)
|
||||
if len(positions) == 0 {
|
||||
return nil, nil
|
||||
}
|
||||
var cursor, skipped int
|
||||
var reviewed bool
|
||||
var reused int
|
||||
var reason string
|
||||
var task string
|
||||
err = s.db.QueryRowContext(ctx, `SELECT cursor,skipped_steps,COALESCE(active_task_id,''),reviewed,reused_steps,practice_reason FROM course_v2_sequence_progress WHERE user_id=$1 AND language=$2 AND version=$3 AND module_id=$4 AND revision=$5`, user, language, domain.CourseVersion, module, pack.Revision).Scan(&cursor, &skipped, &task, &reviewed, &reused, &reason)
|
||||
if err != nil && !errors.Is(err, sql.ErrNoRows) {
|
||||
return nil, err
|
||||
}
|
||||
r := recommendationAt(pack, positions, cursor, skipped, task, native)
|
||||
r.Review = reviewed
|
||||
r.ReusedSteps = reused
|
||||
r.PracticeReason = reason
|
||||
if task != "" && !r.Complete {
|
||||
answered, err := sequenceAnswered(ctx, s.db, domain.CourseJob{UserID: user, Language: language, ModuleID: module}, pack.Revision)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
r.NeedsAnswer = !answered
|
||||
}
|
||||
return r, nil
|
||||
}
|
||||
|
||||
type sequenceSelection struct {
|
||||
Reused int
|
||||
Reason string
|
||||
Reset bool
|
||||
Reviewed bool
|
||||
Cursor int
|
||||
Skipped int
|
||||
Recommendation *domain.SequenceRecommendation
|
||||
}
|
||||
|
||||
func selectSequence(ctx context.Context, tx *sql.Tx, j domain.CourseJob, candidates []bankCandidate) (*sequenceSelection, int, error) {
|
||||
if j.Language != "en-US" || j.Skill != "" || j.Kind != "next" {
|
||||
return nil, 0, nil
|
||||
}
|
||||
pack, err := bundledSequences()
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
positions := sequencePositions(pack, j.ModuleID)
|
||||
if len(positions) == 0 {
|
||||
if j.SubjectID != "" {
|
||||
return nil, 0, ErrCourseConflict
|
||||
}
|
||||
return nil, 0, nil
|
||||
}
|
||||
_, err = tx.ExecContext(ctx, `INSERT INTO course_v2_sequence_progress(user_id,language,version,module_id,revision) VALUES($1,$2,$3,$4,$5) ON CONFLICT DO NOTHING`, j.UserID, j.Language, domain.CourseVersion, j.ModuleID, pack.Revision)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
var cursor, skipped int
|
||||
var reviewed bool
|
||||
var reused int
|
||||
var reason string
|
||||
reset := false
|
||||
var active string
|
||||
err = tx.QueryRowContext(ctx, `SELECT cursor,skipped_steps,COALESCE(active_task_id,''),reviewed,reused_steps,practice_reason FROM course_v2_sequence_progress WHERE user_id=$1 AND language=$2 AND version=$3 AND module_id=$4 AND revision=$5 FOR UPDATE`, j.UserID, j.Language, domain.CourseVersion, j.ModuleID, pack.Revision).Scan(&cursor, &skipped, &active, &reviewed, &reused, &reason)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
if j.SubjectID != "" && (j.SubjectID != active || cursor >= len(positions)) {
|
||||
return nil, 0, ErrCourseConflict
|
||||
}
|
||||
if cursor < len(positions) && active != "" {
|
||||
answered, err := sequenceAnswered(ctx, tx, j, pack.Revision)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
if answered && !reviewed && j.SubjectID == "" {
|
||||
// One optional review after an actually graded mistake. No pass mark
|
||||
// gates the path; a second answer or explicit skip continues it.
|
||||
var weak bool
|
||||
err = tx.QueryRowContext(ctx, `SELECT COALESCE((SELECT a.status='graded' AND (a.evaluation->>'score')::float8<80 FROM course_v2_attempts a JOIN course_v2_sequence_progress p ON p.active_task_id=a.task_id WHERE p.user_id=$1 AND p.language=$2 AND p.version=$3 AND p.module_id=$4 AND p.revision=$5 AND a.user_id=$1 AND NOT a.demo AND a.exam_id IS NULL AND a.created_at>=p.presented_at ORDER BY a.created_at DESC,a.id DESC LIMIT 1),false)`, j.UserID, j.Language, domain.CourseVersion, j.ModuleID, pack.Revision).Scan(&weak)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
if weak {
|
||||
reviewed = true
|
||||
reset = true
|
||||
answered = false
|
||||
}
|
||||
}
|
||||
if answered || j.SubjectID != "" {
|
||||
cursor++
|
||||
reviewed = false
|
||||
reset = true
|
||||
if !answered {
|
||||
skipped++
|
||||
}
|
||||
active = ""
|
||||
}
|
||||
}
|
||||
index := 0
|
||||
if cursor < len(positions) && active != "" {
|
||||
// Keep a chosen transfer example stable across reload, locale changes,
|
||||
// retries and fresh Next requests; evidence updates never replace it mid-step.
|
||||
var bankID string
|
||||
if err = tx.QueryRowContext(ctx, `SELECT bank_entry_id FROM course_v2_tasks WHERE id=$1 AND owner_id=$2 AND language=$3 AND version=$4 AND exam_id IS NULL`, active, j.UserID, j.Language, domain.CourseVersion).Scan(&bankID); err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
index = -1
|
||||
for n, candidate := range candidates {
|
||||
if candidate.bankEntryID == bankID {
|
||||
index = n
|
||||
break
|
||||
}
|
||||
}
|
||||
if index < 0 {
|
||||
return nil, 0, ErrCourseVariantUnavailable
|
||||
}
|
||||
} else if cursor < len(positions) {
|
||||
now := time.Now().UTC()
|
||||
history, err := readFoundationHistory(ctx, tx, j, now)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
for cursor < len(positions) {
|
||||
var reuse bool
|
||||
index, reuse, reason = chooseFoundation(positions[cursor].Step, candidates, history, now)
|
||||
if index < 0 {
|
||||
return nil, 0, ErrCourseVariantUnavailable
|
||||
}
|
||||
if !reuse {
|
||||
break
|
||||
}
|
||||
cursor++
|
||||
reused++
|
||||
reset = true
|
||||
reviewed = false
|
||||
}
|
||||
}
|
||||
r := recommendationAt(pack, positions, cursor, skipped, active, j.InstructionLanguage)
|
||||
r.Review = reviewed
|
||||
r.ReusedSteps = reused
|
||||
r.PracticeReason = reason
|
||||
selection := &sequenceSelection{Cursor: cursor, Skipped: skipped, Recommendation: r, Reviewed: reviewed, Reset: reset, Reused: reused, Reason: reason}
|
||||
return selection, index, nil
|
||||
}
|
||||
|
||||
func saveSequenceSelection(ctx context.Context, tx *sql.Tx, j domain.CourseJob, selection *sequenceSelection, taskID string) error {
|
||||
if selection == nil {
|
||||
return nil
|
||||
}
|
||||
r := selection.Recommendation
|
||||
if r.Complete {
|
||||
taskID = ""
|
||||
}
|
||||
r.TaskID = taskID
|
||||
r.NeedsAnswer = taskID != ""
|
||||
_, err := tx.ExecContext(ctx, `UPDATE course_v2_sequence_progress SET cursor=$6,skipped_steps=$7,presented_at=CASE WHEN $9 OR active_task_id IS DISTINCT FROM NULLIF($8,'') THEN now() ELSE presented_at END,active_task_id=NULLIF($8,''),reviewed=$10,reused_steps=$11,practice_reason=$12 WHERE user_id=$1 AND language=$2 AND version=$3 AND module_id=$4 AND revision=$5`, j.UserID, j.Language, domain.CourseVersion, j.ModuleID, r.Revision, selection.Cursor, selection.Skipped, taskID, selection.Reset, selection.Reviewed, selection.Reused, selection.Reason)
|
||||
return err
|
||||
}
|
||||
|
||||
func sequenceAnswered(ctx context.Context, db interface {
|
||||
QueryRowContext(context.Context, string, ...any) *sql.Row
|
||||
}, j domain.CourseJob, revision string) (bool, error) {
|
||||
var answered bool
|
||||
err := db.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM course_v2_attempts a JOIN course_v2_sequence_progress p ON p.active_task_id=a.task_id WHERE p.user_id=$1 AND p.language=$2 AND p.version=$3 AND p.module_id=$4 AND p.revision=$5 AND a.user_id=$1 AND a.exam_id IS NULL AND NOT a.demo AND a.status IN ('graded','ungraded','pending') AND a.created_at>=p.presented_at)`, j.UserID, j.Language, domain.CourseVersion, j.ModuleID, revision).Scan(&answered)
|
||||
return answered, err
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
package store
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestReviewedSequencesProtectPreparation(t *testing.T) {
|
||||
pack, err := bundledSequences()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
base, err := BundledBank()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(pack.Sequences) != 60 {
|
||||
t.Fatal(len(pack.Sequences))
|
||||
}
|
||||
copyPack := func() sequencePack {
|
||||
raw, _ := json.Marshal(pack)
|
||||
var copy sequencePack
|
||||
if err := json.Unmarshal(raw, ©); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
return copy
|
||||
}
|
||||
t.Run("no free speech first", func(t *testing.T) {
|
||||
copy := copyPack()
|
||||
copy.Sequences[0].Steps[0] = copy.Sequences[0].Steps[len(copy.Sequences[0].Steps)-1]
|
||||
if validateSequences(copy, base) == nil {
|
||||
t.Fatal("unprepared speaking accepted")
|
||||
}
|
||||
})
|
||||
t.Run("no unrelated writing at the end", func(t *testing.T) {
|
||||
copy := copyPack()
|
||||
n := len(copy.Sequences[0].Steps)
|
||||
other := copy.Sequences[1]
|
||||
copy.Sequences[0].Steps[n-2] = other.Steps[len(other.Steps)-2]
|
||||
if validateSequences(copy, base) == nil {
|
||||
t.Fatal("unrelated writing accepted")
|
||||
}
|
||||
})
|
||||
t.Run("both native titles required", func(t *testing.T) {
|
||||
copy := copyPack()
|
||||
delete(copy.Sequences[0].Titles, "ru-RU")
|
||||
if validateSequences(copy, base) == nil {
|
||||
t.Fatal("missing Russian topic accepted")
|
||||
}
|
||||
})
|
||||
t.Run("transfer stays in the reviewed grammar pattern", func(t *testing.T) {
|
||||
copy := copyPack()
|
||||
for i := range copy.Sequences[0].Steps {
|
||||
if copy.Sequences[0].Steps[i].Phase == "grammar" {
|
||||
copy.Sequences[0].Steps[i].Alternatives = []string{"a1bank_en_v1_introductions_vocabulary_01"}
|
||||
break
|
||||
}
|
||||
}
|
||||
if validateSequences(copy, base) == nil {
|
||||
t.Fatal("unrelated transfer accepted")
|
||||
}
|
||||
})
|
||||
for _, module := range []string{"introductions", "family", "numbers_time", "daily_life", "food_shopping", "home_city"} {
|
||||
positions := sequencePositions(pack, "a1_"+module+"_v1")
|
||||
if len(positions) == 0 || positions[0].Step.Phase != "listen" {
|
||||
t.Fatal("no listening entry", module)
|
||||
}
|
||||
for _, native := range []string{"de-DE", "ru-RU"} {
|
||||
r := recommendationAt(pack, positions, 0, 0, "", native)
|
||||
if r.Topic != 1 || r.Topics != 10 || r.Title == "" || r.Complete {
|
||||
t.Fatal(r)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,275 @@
|
||||
package store
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/sha256"
|
||||
"database/sql"
|
||||
"embed"
|
||||
"encoding/hex"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"speech-learning-api/internal/domain"
|
||||
)
|
||||
|
||||
//go:embed coursebank/variants/*.json
|
||||
var variantFiles embed.FS
|
||||
|
||||
var ErrCourseVariantUnavailable = errors.New("no reviewed exercises are available for this explanation language")
|
||||
|
||||
const variantSchema = `
|
||||
CREATE TABLE IF NOT EXISTS course_v2_bank_variants (
|
||||
id TEXT PRIMARY KEY,base_entry_id TEXT NOT NULL REFERENCES course_v2_bank(id),
|
||||
canonical_task_id TEXT NOT NULL,instruction_language TEXT NOT NULL,revision TEXT NOT NULL,
|
||||
data JSONB NOT NULL,checksum TEXT NOT NULL,active BOOLEAN NOT NULL DEFAULT true);
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS course_v2_variant_active_presentation ON course_v2_bank_variants(base_entry_id,instruction_language) WHERE active;
|
||||
CREATE INDEX IF NOT EXISTS course_v2_variant_lookup ON course_v2_bank_variants(instruction_language,base_entry_id) WHERE active;
|
||||
ALTER TABLE course_v2_tasks ADD COLUMN IF NOT EXISTS variant_id TEXT REFERENCES course_v2_bank_variants(id);
|
||||
CREATE INDEX IF NOT EXISTS course_v2_task_canonical ON course_v2_tasks(owner_id,language,version,(COALESCE(NULLIF(data->>'canonical_task_id',''),bank_entry_id))) WHERE exam_id IS NULL;
|
||||
-- Separate frozen presentations are allowed; their evidence identity is shared
|
||||
-- only when the editorial review classifies them as equivalent translations.
|
||||
DROP INDEX IF EXISTS course_v2_bank_assignment;
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS course_v2_bank_variant_assignment ON course_v2_tasks(owner_id,bank_entry_id,COALESCE(variant_id,'')) WHERE exam_id IS NULL AND bank_entry_id IS NOT NULL;
|
||||
`
|
||||
|
||||
func BundledVariants(base []domain.BankEntry) ([]domain.BankVariant, error) {
|
||||
manifestData, err := variantFiles.ReadFile("coursebank/variants/manifest.json")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var manifest struct {
|
||||
Total int `json:"total"`
|
||||
Files map[string]string `json:"files"`
|
||||
}
|
||||
if err = json.Unmarshal(manifestData, &manifest); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
variants := []domain.BankVariant{}
|
||||
for name, digest := range manifest.Files {
|
||||
if strings.ContainsAny(name, "/\\") || name == "manifest.json" {
|
||||
return nil, errors.New("invalid variant manifest path")
|
||||
}
|
||||
data, err := variantFiles.ReadFile("coursebank/variants/" + name)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
sum := sha256.Sum256(data)
|
||||
if hex.EncodeToString(sum[:]) != digest {
|
||||
return nil, fmt.Errorf("variant checksum mismatch: %s", name)
|
||||
}
|
||||
var batch []domain.BankVariant
|
||||
dec := json.NewDecoder(strings.NewReader(string(data)))
|
||||
dec.DisallowUnknownFields()
|
||||
if err = dec.Decode(&batch); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
variants = append(variants, batch...)
|
||||
}
|
||||
if len(variants) != manifest.Total || manifest.Total == 0 {
|
||||
return nil, errors.New("invalid variant count")
|
||||
}
|
||||
return variants, ValidateVariants(base, variants)
|
||||
}
|
||||
|
||||
func ValidateVariants(base []domain.BankEntry, variants []domain.BankVariant) error {
|
||||
entries := map[string]domain.BankEntry{}
|
||||
for _, entry := range base {
|
||||
entries[entry.ID] = entry
|
||||
}
|
||||
seen := map[string]bool{}
|
||||
presentations := map[string]bool{}
|
||||
moduleLabels := map[string]string{}
|
||||
for _, v := range variants {
|
||||
original, ok := entries[v.BaseEntryID]
|
||||
t := v.Task
|
||||
b := original.Task
|
||||
if !ok || v.ID == "" || seen[v.ID] || !v.Reviewed || v.Revision == "" || v.InstructionLanguage == "" || t.ID != "" || t.Source != "" || t.ExamID != "" || t.EvidenceTaskID != "" || t.VariantID != v.ID || t.ContentRevision != v.Revision || t.CanonicalTaskID != v.CanonicalTaskID || t.InstructionLanguage != v.InstructionLanguage || t.SchemaVersion != b.SchemaVersion || t.ModuleID != b.ModuleID || t.TargetLanguage != b.TargetLanguage || t.CourseVersion != b.CourseVersion || t.CEFRLevel != b.CEFRLevel || t.Skill != b.Skill || t.Kind != b.Kind || t.AnswerKey == nil || t.Instruction == "" || len([]rune(t.Prompt)) > 2000 || strings.Contains(t.Prompt, "<") {
|
||||
return fmt.Errorf("invalid task variant: %s", v.ID)
|
||||
}
|
||||
if _, exists := entries[v.ID]; exists {
|
||||
return fmt.Errorf("variant identity collides with a base entry: %s", v.ID)
|
||||
}
|
||||
if v.ModuleTitle == "" || v.ModuleDescription == "" {
|
||||
return fmt.Errorf("variant module labels missing: %s", v.ID)
|
||||
}
|
||||
labelKey := t.ModuleID + ":" + v.InstructionLanguage
|
||||
labelValue := v.ModuleTitle + "\n" + v.ModuleDescription
|
||||
if previous, exists := moduleLabels[labelKey]; exists && previous != labelValue {
|
||||
return fmt.Errorf("inconsistent module labels: %s", v.ID)
|
||||
}
|
||||
moduleLabels[labelKey] = labelValue
|
||||
seen[v.ID] = true
|
||||
presentation := v.BaseEntryID + ":" + v.InstructionLanguage
|
||||
if presentations[presentation] {
|
||||
return fmt.Errorf("duplicate active locale presentation: %s", v.ID)
|
||||
}
|
||||
presentations[presentation] = true
|
||||
referenceLanguage := t.TargetLanguage
|
||||
if t.Skill == "vocabulary" {
|
||||
referenceLanguage = t.InstructionLanguage
|
||||
}
|
||||
if t.AnswerKey.ReferenceAnswerLanguage != referenceLanguage {
|
||||
return fmt.Errorf("invalid reference language: %s", v.ID)
|
||||
}
|
||||
if (v.Equivalence != "translation" && v.Equivalence != "adaptation") || (v.Equivalence == "translation" && v.CanonicalTaskID != v.BaseEntryID) || (v.Equivalence == "adaptation" && v.CanonicalTaskID != v.ID) {
|
||||
return fmt.Errorf("invalid variant identity: %s", v.ID)
|
||||
}
|
||||
prompt := t.Instruction
|
||||
if t.Stimulus != nil {
|
||||
stimulus := t.Stimulus
|
||||
if stimulus.Text == "" || stimulus.Language == "" || (stimulus.Role == "target" && stimulus.Language != t.TargetLanguage) || !bankMember(stimulus.Role, []string{"target", "source", "context"}) || (stimulus.Role == "source" && stimulus.Language == t.TargetLanguage) || t.Skill == "listening" {
|
||||
return fmt.Errorf("invalid public stimulus: %s", v.ID)
|
||||
}
|
||||
prompt += " " + stimulus.Text
|
||||
}
|
||||
if t.Prompt != prompt || t.AudioText != b.AudioText || t.Passage != b.Passage || t.ReferenceText != b.ReferenceText || len(t.Options) != len(b.Options) || t.AnswerKey.CorrectOptionID != b.AnswerKey.CorrectOptionID || t.AnswerKey.Explanation == "" || len(t.AnswerKey.Rubric) == 0 || t.AnswerKey.ReferenceAnswerLanguage == "" {
|
||||
return fmt.Errorf("variant changes protected task content: %s", v.ID)
|
||||
}
|
||||
labels := map[string]bool{}
|
||||
for i, option := range t.Options {
|
||||
label := strings.ToLower(strings.TrimSpace(option.Label))
|
||||
expectedRole := "target"
|
||||
expectedLanguage := t.TargetLanguage
|
||||
if t.Skill == "vocabulary" {
|
||||
expectedRole = "meaning"
|
||||
expectedLanguage = t.InstructionLanguage
|
||||
}
|
||||
if option.Role != expectedRole || option.Language != expectedLanguage {
|
||||
return fmt.Errorf("invalid option language role: %s", v.ID)
|
||||
}
|
||||
if expectedRole == "meaning" && v.Equivalence == "translation" && t.InstructionLanguage == t.TargetLanguage {
|
||||
return fmt.Errorf("same-language meanings need a reviewed adaptation: %s", v.ID)
|
||||
}
|
||||
if option.ID != b.Options[i].ID || option.Language == "" || label == "" || labels[label] || (v.Equivalence == "translation" && option.Role == "target" && option.Label != b.Options[i].Label) {
|
||||
return fmt.Errorf("invalid variant options: %s", v.ID)
|
||||
}
|
||||
labels[label] = true
|
||||
if option.ID == t.AnswerKey.CorrectOptionID && option.Label != t.AnswerKey.ReferenceAnswer {
|
||||
return fmt.Errorf("variant reference/key mismatch: %s", v.ID)
|
||||
}
|
||||
}
|
||||
if v.Equivalence == "translation" && t.Skill != "vocabulary" && t.AnswerKey.ReferenceAnswer != b.AnswerKey.ReferenceAnswer {
|
||||
return fmt.Errorf("translation changes reference: %s", v.ID)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *AdaptiveStore) installVariants(ctx context.Context, base []domain.BankEntry) error {
|
||||
variants, err := BundledVariants(base)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if _, err = s.db.ExecContext(ctx, variantSchema); err != nil {
|
||||
return err
|
||||
}
|
||||
tx, err := s.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer tx.Rollback()
|
||||
if _, err = tx.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.language='en-US' AND b.version=$1`, domain.CourseVersion); err != nil {
|
||||
return err
|
||||
}
|
||||
for _, v := range variants {
|
||||
data, err := json.Marshal(v)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
sum := sha256.Sum256(data)
|
||||
checksum := hex.EncodeToString(sum[:])
|
||||
var old string
|
||||
err = tx.QueryRowContext(ctx, `SELECT checksum FROM course_v2_bank_variants WHERE id=$1`, v.ID).Scan(&old)
|
||||
if err == nil && old != checksum {
|
||||
return fmt.Errorf("variant revision is immutable: %s", v.ID)
|
||||
}
|
||||
if err != nil && !errors.Is(err, sql.ErrNoRows) {
|
||||
return err
|
||||
}
|
||||
if _, err = tx.ExecContext(ctx, `INSERT INTO course_v2_bank_variants(id,base_entry_id,canonical_task_id,instruction_language,revision,data,checksum) VALUES($1,$2,$3,$4,$5,$6,$7) ON CONFLICT(id) DO UPDATE SET active=true`, v.ID, v.BaseEntryID, v.CanonicalTaskID, v.InstructionLanguage, v.Revision, data, checksum); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return tx.Commit()
|
||||
}
|
||||
|
||||
// availableBank joins a locale presentation to its original curriculum entry.
|
||||
// Existing German entries are left byte-for-byte intact in the bank.
|
||||
const availableBank = `WITH available AS (
|
||||
SELECT b.id AS base_id,''::text AS variant_id,b.id AS canonical_id,b.data AS entry,b.module_id,b.skill
|
||||
FROM course_v2_bank b WHERE b.active AND b.language=$2 AND b.version=$3 AND $4='de-DE'
|
||||
UNION ALL
|
||||
SELECT b.id,v.id,v.canonical_task_id,jsonb_build_object('id',v.id,'revision',v.revision,'learning_goal_id',b.goal,'difficulty',b.difficulty,'reviewed',true,'task',v.data->'task'),b.module_id,b.skill
|
||||
FROM course_v2_bank_variants v JOIN course_v2_bank b ON b.id=v.base_entry_id
|
||||
WHERE v.active AND b.active AND b.language=$2 AND b.version=$3 AND v.instruction_language=$4
|
||||
)`
|
||||
|
||||
func (s *AdaptiveStore) InstructionLanguages(ctx context.Context, language string) ([]string, error) {
|
||||
rows, err := s.db.QueryContext(ctx, `SELECT 'de-DE' WHERE EXISTS(SELECT 1 FROM course_v2_bank WHERE active AND language=$1 AND version=$2) UNION SELECT DISTINCT v.instruction_language FROM course_v2_bank_variants v JOIN course_v2_bank b ON b.id=v.base_entry_id WHERE v.active AND b.active AND b.language=$1 AND b.version=$2 ORDER BY 1`, language, domain.CourseVersion)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
out := []string{}
|
||||
for rows.Next() {
|
||||
var value string
|
||||
if err = rows.Scan(&value); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out = append(out, value)
|
||||
}
|
||||
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 {
|
||||
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
|
||||
}
|
||||
n, err := result.RowsAffected()
|
||||
if err == nil && n == 0 {
|
||||
return ErrNotFound
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
// A request replay may resume its frozen German exam after the learner has
|
||||
// chosen another explanation language. Availability applies to new sessions.
|
||||
func (s *AdaptiveStore) HasExamRequest(ctx context.Context, user, language, request string) (bool, error) {
|
||||
var exists bool
|
||||
err := s.db.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM course_v2_exams WHERE user_id=$1 AND language=$2 AND version=$3 AND request_id=$4)`, user, language, domain.CourseVersion, request).Scan(&exists)
|
||||
return exists, err
|
||||
}
|
||||
|
||||
// Module labels are derived display content, never a rewrite of stored course
|
||||
// packs, task snapshots or learning-goal identifiers.
|
||||
func (s *AdaptiveStore) localizeModuleLabels(ctx context.Context, language, instruction string, modules []domain.AdaptiveModule) error {
|
||||
if instruction == "" || instruction == "de-DE" {
|
||||
return nil
|
||||
}
|
||||
rows, err := s.db.QueryContext(ctx, `SELECT DISTINCT b.module_id,v.data->>'module_title',v.data->>'module_description' FROM course_v2_bank_variants v JOIN course_v2_bank b ON b.id=v.base_entry_id WHERE v.active AND b.active AND b.language=$1 AND b.version=$2 AND v.instruction_language=$3`, language, domain.CourseVersion, instruction)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer rows.Close()
|
||||
for rows.Next() {
|
||||
var id, title, description string
|
||||
if err = rows.Scan(&id, &title, &description); err != nil {
|
||||
return err
|
||||
}
|
||||
for i := range modules {
|
||||
if modules[i].ID == id {
|
||||
modules[i].Title = title
|
||||
modules[i].Description = description
|
||||
}
|
||||
}
|
||||
}
|
||||
return rows.Err()
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
package store
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"testing"
|
||||
|
||||
"speech-learning-api/internal/domain"
|
||||
)
|
||||
|
||||
func TestReviewedVariantsRejectChangedIdentityAndLeakedMedia(t *testing.T) {
|
||||
base, err := BundledBank()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
variants, err := BundledVariants(base)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(variants) != 840 {
|
||||
t.Fatal("unexpected Russian count", len(variants))
|
||||
}
|
||||
copyVariants := func() []domain.BankVariant {
|
||||
raw, _ := json.Marshal(variants)
|
||||
var out []domain.BankVariant
|
||||
if err := json.Unmarshal(raw, &out); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
return out
|
||||
}
|
||||
t.Run("changed requirement is not a translation", func(t *testing.T) {
|
||||
v := copyVariants()
|
||||
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")
|
||||
}
|
||||
})
|
||||
t.Run("ambiguous options", func(t *testing.T) {
|
||||
v := copyVariants()
|
||||
v[0].Task.Options[1].Label = v[0].Task.Options[0].Label
|
||||
if ValidateVariants(base, v) == nil {
|
||||
t.Fatal("ambiguous options accepted")
|
||||
}
|
||||
})
|
||||
t.Run("private listening content", func(t *testing.T) {
|
||||
v := copyVariants()
|
||||
for i := range v {
|
||||
if v[i].Task.Skill == "listening" {
|
||||
v[i].Task.Stimulus = &domain.TaskStimulus{Role: "target", Language: "en-US", Text: v[i].Task.AudioText}
|
||||
break
|
||||
}
|
||||
}
|
||||
if ValidateVariants(base, v) == nil {
|
||||
t.Fatal("public listening transcript accepted")
|
||||
}
|
||||
})
|
||||
t.Run("identity translation", func(t *testing.T) {
|
||||
v := copyVariants()
|
||||
v[0].Task.Stimulus.Role = "source"
|
||||
if ValidateVariants(base, v) == nil {
|
||||
t.Fatal("source and target identity translation accepted")
|
||||
}
|
||||
})
|
||||
for _, v := range variants {
|
||||
public := v.Task.Public(false)
|
||||
if public.AnswerKey != nil || public.AudioText != "" || public.EvidenceTaskID != "" {
|
||||
t.Fatal("private fields exposed", v.ID)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"revision": "en-A1-bank-v2",
|
||||
"total": 840,
|
||||
"editorial_review_sha256": "4cd23522372690392e0d6eae90ede2c918ed129296464035bf32bed30b8a8b7b",
|
||||
"editorial_review_sha256": "6018e163c0e4a79dd12828c368db42c4382398be51f0c70c3343ba512278a42d",
|
||||
"files": {
|
||||
"introductions.grammar.json": "e166492fa3e9e13760620bda1af2c0bb6472d91216a4c46808360264450c5ebc",
|
||||
"introductions.vocabulary.json": "d72c534e3c7422d85b2aa03f2988b77da31163637c70ac511ca07f278d1fdd81",
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"sha256": "dcba655de48bc8839d26b5f4d858f33a208cae7bd4731c30956aad0567214ae5"
|
||||
}
|
||||
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
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,13 @@
|
||||
{
|
||||
"total": 840,
|
||||
"editorial_review_sha256": "bf482411a30c9e6096e9ab7f34785b844541f40bdb70d725a8a465696d53ee75",
|
||||
"files": {
|
||||
"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"
|
||||
}
|
||||
}
|
||||
@@ -131,7 +131,7 @@ func recordPronunciation(ctx context.Context, tx *sql.Tx, user, source, sourceID
|
||||
// and free speech do not enter the scripted profile. Historical practice rows
|
||||
// without metadata remain untouched and explicitly unverified.
|
||||
func (s *PostgresStore) BackfillPronunciation(ctx context.Context) error {
|
||||
rows, err := s.db.QueryContext(ctx, `SELECT a.id,a.user_id,a.task_id,t.language,COALESCE(a.exam_id,''),a.created_at,a.speech
|
||||
rows, err := s.db.QueryContext(ctx, `SELECT a.id,a.user_id,COALESCE(NULLIF(t.data->>'evidence_task_id',''),a.task_id),t.language,COALESCE(a.exam_id,''),a.created_at,a.speech
|
||||
FROM course_v2_attempts a JOIN course_v2_tasks t ON t.id=a.task_id
|
||||
WHERE a.speech->>'provider'='azure' AND a.demo=false AND a.legacy_id IS NULL AND t.kind='repeat_sentence'
|
||||
AND NOT EXISTS(SELECT 1 FROM pronunciation_assessments p WHERE p.source='course' AND p.source_id=a.id)`)
|
||||
@@ -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 {
|
||||
|
||||
@@ -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, 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.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, 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.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, 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.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
|
||||
}
|
||||
@@ -265,20 +269,48 @@ 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 != "" {
|
||||
if _, err := s.db.ExecContext(ctx, `UPDATE users SET ui_language = $1 WHERE id = $2`, uiLanguage, userID); err != nil {
|
||||
return domain.LearnerProfile{}, err
|
||||
}
|
||||
if uiLanguage != "" && !domain.SupportedUILanguage(uiLanguage) {
|
||||
return domain.LearnerProfile{}, domain.ErrNativeLanguageUnsupported
|
||||
}
|
||||
tx, err := s.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
return domain.LearnerProfile{}, err
|
||||
}
|
||||
defer tx.Rollback()
|
||||
// Lock the account so partial preference updates preserve the active course
|
||||
// and cannot race with another language/profile switch.
|
||||
var accountID string
|
||||
if err = tx.QueryRowContext(ctx, `SELECT id FROM users WHERE id=$1 FOR UPDATE`, userID).Scan(&accountID); err != nil {
|
||||
return domain.LearnerProfile{}, err
|
||||
}
|
||||
var current domain.LearnerProfile
|
||||
err = tx.QueryRowContext(ctx, `SELECT p.target_language,p.cefr_level,p.daily_goal_minutes
|
||||
FROM learner_profiles p JOIN users u ON u.id=p.user_id WHERE p.user_id=$1
|
||||
ORDER BY (p.id=u.active_profile_id) DESC NULLS LAST,p.created_at,p.id LIMIT 1`, userID).Scan(¤t.TargetLanguage, ¤t.CEFRLevel, ¤t.DailyGoalMinutes)
|
||||
if err != nil && !errors.Is(err, sql.ErrNoRows) {
|
||||
return current, err
|
||||
}
|
||||
targetLanguage = valueOr(targetLanguage, valueOr(current.TargetLanguage, "en-US"))
|
||||
cefrLevel = valueOr(cefrLevel, valueOr(current.CEFRLevel, "A1"))
|
||||
if dailyGoalMinutes <= 0 {
|
||||
dailyGoalMinutes = current.DailyGoalMinutes
|
||||
}
|
||||
if dailyGoalMinutes <= 0 {
|
||||
dailyGoalMinutes = 10
|
||||
}
|
||||
profile, err := s.CreateLearnerProfile(ctx, userID, valueOr(targetLanguage, "en-US"), valueOr(cefrLevel, "A1"), dailyGoalMinutes)
|
||||
var profile domain.LearnerProfile
|
||||
err = tx.QueryRowContext(ctx, `INSERT INTO learner_profiles(id,user_id,target_language,cefr_level,daily_goal_minutes)
|
||||
VALUES($1,$2,$3,$4,$5) ON CONFLICT(user_id,target_language) DO UPDATE SET
|
||||
cefr_level=EXCLUDED.cefr_level,daily_goal_minutes=EXCLUDED.daily_goal_minutes
|
||||
RETURNING id,user_id,target_language,cefr_level,daily_goal_minutes,created_at`, NewID("lrn"), userID, targetLanguage, cefrLevel, dailyGoalMinutes).Scan(&profile.ID, &profile.UserID, &profile.TargetLanguage, &profile.CEFRLevel, &profile.DailyGoalMinutes, &profile.CreatedAt)
|
||||
if err != nil {
|
||||
return profile, err
|
||||
}
|
||||
_, err = s.db.ExecContext(ctx, `UPDATE users SET active_profile_id=$2 WHERE id=$1`, userID, profile.ID)
|
||||
return profile, err
|
||||
_, 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
|
||||
}
|
||||
return profile, tx.Commit()
|
||||
}
|
||||
|
||||
func (s *PostgresStore) ListLanguages(ctx context.Context) ([]domain.LanguageProfile, error) {
|
||||
@@ -386,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
|
||||
}
|
||||
@@ -665,6 +697,26 @@ CREATE TABLE IF NOT EXISTS users (
|
||||
ALTER TABLE users ADD COLUMN IF NOT EXISTS role TEXT NOT NULL DEFAULT 'learner'
|
||||
CHECK (role IN ('learner', 'admin'));
|
||||
|
||||
-- Previously ui_language also selected the language of explanations. Preserve
|
||||
-- that preference once, independently of all future interface-language changes.
|
||||
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,
|
||||
user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
||||
|
||||
@@ -6,17 +6,18 @@ type PronunciationResult = { recognized_text: string; overall_score: number; acc
|
||||
|
||||
export const courseSkills = ['grammar', 'vocabulary', 'listening', 'reading', 'speaking', 'writing'] as const;
|
||||
export type CourseSkill = typeof courseSkills[number];
|
||||
export const courseSkillNames: Record<CourseSkill, string> = { grammar: 'Grammatik', vocabulary: 'Wortschatz', listening: 'Hören', reading: 'Lesen', speaking: 'Sprechen', writing: 'Schreiben' };
|
||||
export type AdaptiveModule = { id: string; key: string; title: string; description: string; target_language: string; order: number; goals: string[] };
|
||||
export type AdaptiveTask = {
|
||||
schema_version: 2; id: string; module_id: string; target_language: string; skill: CourseSkill;
|
||||
kind: 'choice' | 'short_text' | 'free_text' | 'repeat_sentence' | 'free_speech'; prompt: string;
|
||||
options?: { id: string; label: string }[]; passage?: string; reference_text?: string; audio_text?: string;
|
||||
instruction_language?: string; instruction?: string; stimulus?: { role: 'target' | 'source' | 'context'; language: string; text: string };
|
||||
variant_id?: string; content_revision?: string; canonical_task_id?: string;
|
||||
options?: { id: string; label: string; language?: string; role?: 'target' | 'meaning' }[]; passage?: string; reference_text?: string; audio_text?: string;
|
||||
source: 'seed' | 'flowise' | 'ai' | 'curated'; exam_id?: string; review?: boolean;
|
||||
answer_key?: { correct_option_id?: string; reference_answer?: string; explanation: string; rubric: string[] };
|
||||
answer_key?: { correct_option_id?: string; reference_answer?: string; reference_answer_language?: string; explanation: string; rubric: string[] };
|
||||
};
|
||||
export type AdaptiveAttempt = {
|
||||
id: string; task_id: string; answer: string; status: 'pending' | 'graded' | 'failed' | 'ungraded'; demo: boolean; exam_id?: string;
|
||||
id: string; created_at?: string; task_id: string; answer: string; status: 'pending' | 'graded' | 'failed' | 'ungraded'; demo: boolean; exam_id?: string;
|
||||
evaluation?: { score: number; verdict: string; feedback: string; issues: string[] };
|
||||
speech?: PronunciationResult;
|
||||
};
|
||||
@@ -24,20 +25,23 @@ export type CourseAnalysis = {
|
||||
summary: string; facts_version: number; recommended_module_id: string;
|
||||
modules: { module_id: string; strengths: string[]; weaknesses: string[]; recommendation: string; reason: string; ready_for_completion: boolean }[];
|
||||
};
|
||||
export type SequenceRecommendation = { selection_revision?: string; practice_reason?: string; reused_steps: number; review: boolean; revision: string; sequence_id?: string; title?: string; phase?: string; step: number; steps: number; topic: number; topics: number; task_id?: string; complete: boolean; skipped_steps: number; needs_answer: boolean };
|
||||
export type CourseCatalog = {
|
||||
sequence_recommendations?: Record<string, SequenceRecommendation>;
|
||||
native_language?: string; native_languages?: string[]; exam_available?: boolean;
|
||||
task_mode?: string; grading_available?: boolean; bank?: {module_id:string;skill:CourseSkill;total:number;unseen:number}[];
|
||||
profile: LearnerProfile; modules: AdaptiveModule[];
|
||||
progress: { module_id: string; skill: CourseSkill; attempts: number; distinct_tasks: number; average_score: number }[];
|
||||
analysis_job?: CourseJob; analysis: CourseAnalysis | null; facts_version: number; enabled_languages: string[]; languages: LanguageProfile[];
|
||||
exams: { id: string; target_language: string; status: string }[];
|
||||
};
|
||||
export type CourseJob = { id: string; kind: string; status: string; stage: string; task_id?: string; subject_id?: string; error?: string; source?: string; review?: boolean };
|
||||
export type CourseJob = { recommendation?: SequenceRecommendation; instruction_language?: string; id: string; kind: string; status: string; stage: string; task_id?: string; subject_id?: string; error?: string; source?: string; review?: boolean };
|
||||
export type AdaptiveExam = { id: string; status: string; target_language: string; tasks: AdaptiveTask[]; attempts: AdaptiveAttempt[]; scores?: Record<CourseSkill, number>; score?: number; summary?: string; summary_status?: string; summary_job_id?: string; preparation_job_id?: string };
|
||||
export function courseRequestID() { return Array.from(crypto.getRandomValues(new Uint8Array(16)), (b) => b.toString(16).padStart(2, '0')).join(''); }
|
||||
export const getCourseCatalog = () => request<CourseCatalog>('/course/catalog');
|
||||
export const getCourseHistory = (module: string, offset = 0) => request<{ tasks: AdaptiveTask[]; has_more: boolean }>(`/course/modules/${encodeURIComponent(module)}/tasks?offset=${offset}`);
|
||||
export const getAdaptiveTask = (id: string) => request<{ task: AdaptiveTask; attempt: AdaptiveAttempt | null }>(`/course/tasks/${encodeURIComponent(id)}`);
|
||||
export const createCourseTask = (module: string, skill: string, requestId: string) => request<CourseJob>(`/course/modules/${encodeURIComponent(module)}/tasks/next`, { method: 'POST', body: JSON.stringify({ skill, request_id: requestId }) });
|
||||
export const createCourseTask = (module: string, skill: string, requestId: string, skipTaskID?: string) => request<CourseJob>(`/course/modules/${encodeURIComponent(module)}/tasks/next`, { method: 'POST', body: JSON.stringify({ skill, request_id: requestId, skip_task_id: skipTaskID }) });
|
||||
export const getCourseJob = (id: string) => request<CourseJob>(`/course/jobs/${encodeURIComponent(id)}`);
|
||||
export const retryCourseJob = (id: string) => request<CourseJob>(`/course/jobs/${encodeURIComponent(id)}/retry`, { method: 'POST' });
|
||||
export const getCourseAttempt = (id: string) => request<AdaptiveAttempt>(`/course/attempts/${encodeURIComponent(id)}`);
|
||||
|
||||
@@ -1,8 +1,4 @@
|
||||
import { request } from './client';
|
||||
export const aiActions: Record<string,string> = {
|
||||
analyze_course_progress:'Lernanalyse', plan_course_task:'Aufgabenplanung', author_course_task:'Aufgabenautor', review_course_task:'Aufgabenprüfung',
|
||||
author_course_exam:'Testautor · 12 Aufgaben', review_course_exam:'Testprüfung · 12 Aufgaben', evaluate_course_attempt:'Antwortbewertung', summarize_course_exam:'Testzusammenfassung', next_exercise:'Aussprachegenerierung'
|
||||
};
|
||||
export type AIProfile={action:string;version:number;enabled:boolean;provider:string;model:string;temperature:number|null;reasoning_effort:string;max_tokens:number;context_tokens:number;timeout_seconds:number;json_schema:boolean;pricing_set:boolean;input_microusd_per_million:number;cached_input_microusd_per_million:number;output_microusd_per_million:number};
|
||||
export type AIBudget={monthly_limit_microusd:number;daily_limit_microusd:number;month_committed_microusd:number;day_committed_microusd:number;open_reservations_microusd:number;warning:boolean;currency:string};
|
||||
export type AISettings={profiles:Record<string,AIProfile>;budget:AIBudget;providers:Record<string,boolean>;prompt_version:string;prompts:Record<string,string>;schemas:Record<string,string>};
|
||||
|
||||
@@ -5,13 +5,13 @@ export function fetchMe() {
|
||||
return request<{ user: User; profile: LearnerProfile }>('/me');
|
||||
}
|
||||
|
||||
export async function register(email: string, password: string) {
|
||||
export async function register(email: string, password: string, nativeLanguage: string) {
|
||||
const result = await request<AuthResult>('/auth/register', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({
|
||||
email,
|
||||
password,
|
||||
ui_language: 'de-DE',
|
||||
native_language: nativeLanguage,
|
||||
target_language: 'en-US',
|
||||
daily_goal_minutes: 10
|
||||
})
|
||||
|
||||
@@ -2,12 +2,15 @@ const API_BASE = import.meta.env.VITE_API_BASE_URL ?? 'http://localhost:8080';
|
||||
|
||||
export class ApiError extends Error {
|
||||
status: number;
|
||||
code: string;
|
||||
requestId: string;
|
||||
payload: unknown;
|
||||
|
||||
constructor(status: number, message: string, requestId = '', payload: unknown = null) {
|
||||
super(message);
|
||||
this.status = status;
|
||||
this.code = typeof payload === 'object' && payload !== null && 'code' in payload && typeof payload.code === 'string'
|
||||
? payload.code : ({ 400: 'invalid_request', 401: 'authentication_required', 403: 'access_denied', 404: 'not_found', 409: 'operation_conflict', 413: 'upload_too_large', 415: 'unsupported_audio_format', 429: 'rate_limited', 502: 'service_unavailable', 503: 'service_unavailable', 504: 'request_timeout' } as Record<number, string>)[status] ?? 'internal_error';
|
||||
this.requestId = requestId;
|
||||
this.payload = payload;
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ import { request } from './client';
|
||||
import type { TeacherResponse } from './types';
|
||||
|
||||
export type ConversationResponse = {
|
||||
session?: { id: string };
|
||||
session?: { id: string; target_language?: string };
|
||||
turn?: { text: string };
|
||||
user_turn?: { text: string };
|
||||
teacher_turn?: { text: string };
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
export type User = {
|
||||
id: string;
|
||||
email: string;
|
||||
native_language: string;
|
||||
ui_language: string;
|
||||
instruction_language: string;
|
||||
role: 'learner' | 'admin';
|
||||
created_at: string;
|
||||
};
|
||||
@@ -47,6 +49,7 @@ export type Lesson = {
|
||||
};
|
||||
|
||||
export type Exercise = {
|
||||
instruction_language?: string;
|
||||
training_reason?: string;
|
||||
training_category?: string;
|
||||
id: string;
|
||||
|
||||
+44
-24
@@ -1,7 +1,8 @@
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { BookOpen, Bug, ChartNoAxesColumnIncreasing, LogOut, Mic, MessageCircle, Shield } from 'lucide-react';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { fetchMe } from '../api/auth';
|
||||
import { ApiError, clearToken, getToken } from '../api/client';
|
||||
import { ApiError, clearToken, getToken, request } from '../api/client';
|
||||
import { fetchDebugStatus } from '../api/debug';
|
||||
import type { Exercise, Lesson, User } from '../api/types';
|
||||
import { AdminPage } from '../pages/AdminPage';
|
||||
@@ -14,12 +15,15 @@ import { ConversationPage } from '../pages/ConversationPage';
|
||||
import { CoursePage } from '../pages/CoursePage';
|
||||
import { DebugPage } from '../pages/DebugPage';
|
||||
import { useHashRoute } from './useHashRoute';
|
||||
import { LanguagePicker } from '../components/LanguagePicker';
|
||||
import { isUILanguage, useI18n, type UILanguage } from '../i18n/I18n';
|
||||
|
||||
export function App() {
|
||||
const { setLanguage, t } = useI18n();
|
||||
const [route, setRoute] = useHashRoute(getToken() ? 'dashboard' : 'login');
|
||||
const [debugAvailable, setDebugAvailable] = useState(false);
|
||||
const [user, setUser] = useState<User | null>(null);
|
||||
const [authError, setAuthError] = useState('');
|
||||
const [authError, setAuthError] = useLocalizedMessage();
|
||||
const [authRevision, setAuthRevision] = useState(0);
|
||||
const [practiceSelection, setPracticeSelection] = useState<{ lesson: Lesson; exercise: Exercise } | null>(null);
|
||||
const authed = Boolean(getToken());
|
||||
@@ -34,6 +38,7 @@ export function App() {
|
||||
fetchMe().then(({ user: currentUser }) => {
|
||||
if (!cancelled) {
|
||||
setUser(currentUser);
|
||||
setLanguage(isUILanguage(currentUser.native_language) ? currentUser.native_language : 'de-DE');
|
||||
setAuthError('');
|
||||
}
|
||||
}).catch((error) => {
|
||||
@@ -42,7 +47,7 @@ export function App() {
|
||||
clearToken();
|
||||
setRoute('login');
|
||||
} else {
|
||||
setAuthError(error instanceof Error ? error.message : 'Konto konnte nicht geladen werden.');
|
||||
setAuthError(errorMessage(error, 'auth.loadError'));
|
||||
}
|
||||
});
|
||||
return () => { cancelled = true; };
|
||||
@@ -76,6 +81,12 @@ export function App() {
|
||||
setRoute('dashboard');
|
||||
}
|
||||
|
||||
async function changeNativeLanguage(next: UILanguage) {
|
||||
await request('/me/preferences', { method: 'PATCH', body: JSON.stringify({ native_language: next }) });
|
||||
setUser((current) => current?.id === user?.id && current ? { ...current, native_language: next, ui_language: next, instruction_language: next } : current);
|
||||
}
|
||||
|
||||
|
||||
function logout() {
|
||||
clearToken();
|
||||
setUser(null);
|
||||
@@ -91,11 +102,14 @@ export function App() {
|
||||
if (!authed) {
|
||||
return (
|
||||
<main className="auth-shell">
|
||||
{route === 'register' ? (
|
||||
<RegisterPage onDone={handleAuthed} onLogin={() => setRoute('login')} />
|
||||
) : (
|
||||
<LoginPage onDone={handleAuthed} onRegister={() => setRoute('register')} />
|
||||
)}
|
||||
<div className="auth-content">
|
||||
<LanguagePicker />
|
||||
{route === 'register' ? (
|
||||
<RegisterPage onDone={handleAuthed} onLogin={() => setRoute('login')} />
|
||||
) : (
|
||||
<LoginPage onDone={handleAuthed} onRegister={() => setRoute('register')} />
|
||||
)}
|
||||
</div>
|
||||
</main>
|
||||
);
|
||||
}
|
||||
@@ -104,14 +118,14 @@ export function App() {
|
||||
return (
|
||||
<main className="auth-shell">
|
||||
<div className="auth-panel">
|
||||
<h1>Konto wird geladen</h1>
|
||||
<h1>{t('auth.loading')}</h1>
|
||||
{authError ? (
|
||||
<>
|
||||
<p className="form-error" role="alert">{authError}</p>
|
||||
<button className="primary-button" onClick={() => setAuthRevision((value) => value + 1)}>Erneut versuchen</button>
|
||||
<button className="link-button" onClick={logout}>Abmelden</button>
|
||||
<button className="primary-button" onClick={() => setAuthRevision((value) => value + 1)}>{t('common.retry')}</button>
|
||||
<button className="link-button" onClick={logout}>{t('auth.logout')}</button>
|
||||
</>
|
||||
) : <p className="muted">Bitte einen Moment warten.</p>}
|
||||
) : <p className="muted">{t('auth.wait')}</p>}
|
||||
</div>
|
||||
</main>
|
||||
);
|
||||
@@ -119,55 +133,61 @@ export function App() {
|
||||
|
||||
return (
|
||||
<div className="app-shell">
|
||||
<aside className="sidebar" aria-label="Navigation">
|
||||
<aside className="sidebar" aria-label={t('nav.label')}>
|
||||
<div>
|
||||
<div className="brand">
|
||||
<div className="brand-mark">SL</div>
|
||||
<div>
|
||||
<strong>Speech Learning</strong>
|
||||
<span>A1 Sprachlernen</span>
|
||||
<strong>{t('app.name')}</strong>
|
||||
<span>{t('app.level')}</span>
|
||||
</div>
|
||||
</div>
|
||||
<nav className="nav-list">
|
||||
<button className={route === 'dashboard' ? 'active' : ''} onClick={() => setRoute('dashboard')}>
|
||||
<BookOpen size={18} /> Heute
|
||||
<BookOpen size={18} /> {t('nav.today')}
|
||||
</button>
|
||||
<button className={route === 'practice' ? 'active' : ''} onClick={() => setRoute('practice')}>
|
||||
<Mic size={18} /> Aussprache
|
||||
<Mic size={18} /> {t('nav.practice')}
|
||||
</button>
|
||||
<button className={route === 'course' ? 'active' : ''} onClick={() => setRoute('course')}>
|
||||
<BookOpen size={18} /> A1-Kurs
|
||||
<BookOpen size={18} /> {t('nav.course')}
|
||||
</button>
|
||||
<button className={route === 'conversation' ? 'active' : ''} onClick={() => setRoute('conversation')}>
|
||||
<MessageCircle size={18} /> Dialog
|
||||
<MessageCircle size={18} /> {t('nav.conversation')}
|
||||
</button>
|
||||
<button className={route === 'progress' ? 'active' : ''} onClick={() => setRoute('progress')}>
|
||||
<ChartNoAxesColumnIncreasing size={18} /> Fortschritt
|
||||
<ChartNoAxesColumnIncreasing size={18} /> {t('nav.progress')}
|
||||
</button>
|
||||
{user.role === 'admin' && (
|
||||
<button className={route === 'admin' ? 'active' : ''} onClick={() => setRoute('admin')}>
|
||||
<Shield size={18} /> Adminbereich
|
||||
<Shield size={18} /> {t('nav.admin')}
|
||||
</button>
|
||||
)}
|
||||
{debugAvailable && (
|
||||
<button className={route === 'debug' ? 'active' : ''} onClick={() => setRoute('debug')}>
|
||||
<Bug size={18} /> Debug
|
||||
<Bug size={18} /> {t('nav.debug')}
|
||||
</button>
|
||||
)}
|
||||
</nav>
|
||||
</div>
|
||||
<button className="ghost-button" onClick={logout}>
|
||||
<LogOut size={18} /> Logout
|
||||
<LogOut size={18} /> {t('auth.logout')}
|
||||
</button>
|
||||
</aside>
|
||||
|
||||
<main className="main-view">
|
||||
<div className="language-settings">
|
||||
<LanguagePicker onChange={changeNativeLanguage} />
|
||||
|
||||
<p className="muted">{t('language.bank')}</p>
|
||||
<p className="muted">{t('language.content')}</p>
|
||||
</div>
|
||||
{route === 'dashboard' && <DashboardPage onLoaded={(lesson, exercise) => setPracticeSelection({ lesson, exercise })} onPractice={openDashboardExercise} />}
|
||||
{route === 'practice' && <PracticePage initialSelection={practiceSelection} />}
|
||||
{route === 'course' && <CoursePage />}
|
||||
{route === 'conversation' && <ConversationPage />}
|
||||
{route === 'progress' && <ProgressPage />}
|
||||
{route === 'admin' && (user.role === 'admin' ? <AdminPage /> : <p className="form-error">Kein Zugriff auf den Adminbereich.</p>)}
|
||||
{route === 'admin' && (user.role === 'admin' ? <AdminPage /> : <p className="form-error">{t('auth.denied')}</p>)}
|
||||
{route === 'debug' && debugAvailable && <DebugPage />}
|
||||
</main>
|
||||
</div>
|
||||
|
||||
@@ -317,6 +317,58 @@ input:focus {
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.audio-monitoring {
|
||||
display: grid;
|
||||
gap: 10px;
|
||||
max-width: 100%;
|
||||
padding: 12px;
|
||||
border: 1px solid #cfd8d3;
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
.monitoring-toggle {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
position: relative;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.monitoring-toggle input {
|
||||
position: absolute;
|
||||
width: 1px;
|
||||
height: 1px;
|
||||
opacity: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.monitoring-switch {
|
||||
width: 42px;
|
||||
height: 24px;
|
||||
flex-shrink: 0;
|
||||
border-radius: 12px;
|
||||
background: #6b776f;
|
||||
}
|
||||
|
||||
.monitoring-switch::before {
|
||||
content: '';
|
||||
display: block;
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
margin: 3px;
|
||||
border-radius: 50%;
|
||||
background: #fff;
|
||||
transition: transform 0.15s;
|
||||
}
|
||||
|
||||
.monitoring-toggle input:checked + .monitoring-switch { background: #0e5f47; }
|
||||
.monitoring-toggle input:checked + .monitoring-switch::before { transform: translateX(18px); }
|
||||
.monitoring-toggle input:focus-visible + .monitoring-switch { outline: 3px solid #0e5f47; outline-offset: 3px; }
|
||||
.monitoring-toggle:has(input:disabled) { cursor: not-allowed; opacity: 0.55; }
|
||||
.monitoring-volume input { padding: 0; accent-color: #0e5f47; }
|
||||
.monitoring-volume input:disabled { opacity: 0.55; }
|
||||
.audio-monitoring p { margin: 0; font-size: 0.85rem; }
|
||||
|
||||
.recording-preview audio {
|
||||
max-width: 100%;
|
||||
}
|
||||
@@ -729,3 +781,30 @@ input:focus {
|
||||
|
||||
.pronunciation-target { border-bottom: 1px solid var(--border, #dce2e8); padding-bottom: 1rem; }
|
||||
.pronunciation-target p { margin: .35rem 0; }
|
||||
|
||||
.language-settings {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
gap: 0.75rem 1.5rem;
|
||||
margin-bottom: 1.5rem;
|
||||
}
|
||||
|
||||
.language-picker label {
|
||||
display: grid;
|
||||
gap: 0.35rem;
|
||||
}
|
||||
|
||||
.language-settings p {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.auth-content {
|
||||
display: grid;
|
||||
gap: 1rem;
|
||||
width: min(100%, 420px);
|
||||
}
|
||||
|
||||
.auth-content .auth-panel {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
@@ -1,20 +1,26 @@
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useAIActionNames } from '../i18n/labels';
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { aiActions, getAISettings, saveAIProfile, saveAIBudget, getAIModels, getAIUsage, getAICall, resolveAICall, testAI, testAIQuality, type AISettings, type AIProfile, type AIUsage, type AICall } from '../api/ai';
|
||||
import { getAISettings, saveAIProfile, saveAIBudget, getAIModels, getAIUsage, getAICall, resolveAICall, testAI, testAIQuality, type AISettings, type AIProfile, type AIUsage, type AICall } from '../api/ai';
|
||||
import { courseRequestID } from '../api/adaptive';
|
||||
const dollars=(micro:number)=>new Intl.NumberFormat('de-DE',{style:'currency',currency:'USD',minimumFractionDigits:4,maximumFractionDigits:6}).format(micro/1000000);
|
||||
|
||||
const micro=(value:string)=>Math.round(Number(value||0)*1000000);
|
||||
export function AIAdmin(){
|
||||
const { t, language } = useI18n();
|
||||
const aiActions = useAIActionNames();
|
||||
const dollars=(micro:number)=>new Intl.NumberFormat(language,{style:'currency',currency:'USD',minimumFractionDigits:4,maximumFractionDigits:6}).format(micro/1000000);
|
||||
const [settings,setSettings]=useState<AISettings|null>(null),[profile,setProfile]=useState<AIProfile|null>(null),[action,setAction]=useState('evaluate_course_attempt');
|
||||
const [error,setError]=useState(''),[notice,setNotice]=useState(''),[busy,setBusy]=useState(false);
|
||||
const [error, setError] = useLocalizedMessage(),[notice, setNotice] = useLocalizedMessage(),[busy,setBusy]=useState(false);
|
||||
const [month,setMonth]=useState(''),[day,setDay]=useState(''),[models,setModels]=useState<{id:string}[]>([]);
|
||||
const [usage,setUsage]=useState<AIUsage|null>(null),[filters,setFilters]=useState({from:'',to:'',provider:'',model:'',user:'',action:''}),[offset,setOffset]=useState(0);
|
||||
const [detail,setDetail]=useState<AICall|null>(null),[input,setInput]=useState(''),[testResult,setTestResult]=useState<unknown>(null),[resolveCost,setResolveCost]=useState(''),[reason,setReason]=useState('');
|
||||
const detailPanel=useRef<HTMLDivElement>(null),detailTrigger=useRef<HTMLButtonElement|null>(null);
|
||||
const [detailLoading,setDetailLoading]=useState(false),[detailError,setDetailError]=useState('');
|
||||
const [detailLoading,setDetailLoading]=useState(false),[detailError, setDetailError] = useLocalizedMessage();
|
||||
useEffect(()=>{if(detail||detailLoading||detailError){detailPanel.current?.focus({preventScroll:true});detailPanel.current?.scrollIntoView({block:'start',behavior:'smooth'});}},[detail,detailLoading,detailError]);
|
||||
function closeDetail(){setDetail(null);setDetailError('');detailTrigger.current?.focus();}
|
||||
async function openDetail(id:string,trigger:HTMLButtonElement){if(busy)return;detailTrigger.current=trigger;setDetail(null);setDetailError('');setDetailLoading(true);await run(async()=>{try{setDetail(await getAICall(id));setResolveCost('');setReason('')}catch(e){setDetailError(e instanceof Error?e.message:'Aufrufdetails konnten nicht geladen werden.')}finally{setDetailLoading(false)}});}
|
||||
const fail=(e:unknown)=>setError(e instanceof Error?e.message:'KI-Verwaltung nicht verfügbar');
|
||||
async function openDetail(id:string,trigger:HTMLButtonElement){if(busy)return;detailTrigger.current=trigger;setDetail(null);setDetailError('');setDetailLoading(true);await run(async()=>{try{setDetail(await getAICall(id));setResolveCost('');setReason('')}catch(e){setDetailError(errorMessage(e, 'ui.unable_to_load_call_details'))}finally{setDetailLoading(false)}});}
|
||||
const fail=(e:unknown)=>setError(errorMessage(e, 'ui.ai_administration_unavailable'));
|
||||
async function refresh(){const s=await getAISettings();setSettings(s);setMonth(String(s.budget.monthly_limit_microusd/1000000));setDay(String(s.budget.daily_limit_microusd/1000000));return s;}
|
||||
async function refreshUsage(){const q=new URLSearchParams({offset:String(offset)});for(const [k,v]of Object.entries(filters)){if(v)q.set(k,k==='from'||k==='to'?new Date(v).toISOString():v);}setUsage(await getAIUsage(q));}
|
||||
useEffect(()=>{let valid=true;getAISettings().then(s=>{if(valid){setSettings(s);setMonth(String(s.budget.monthly_limit_microusd/1000000));setDay(String(s.budget.daily_limit_microusd/1000000));}}).catch(e=>{if(valid)fail(e)});return()=>{valid=false}},[]);
|
||||
@@ -22,50 +28,50 @@ export function AIAdmin(){
|
||||
useEffect(()=>{let valid=true;const q=new URLSearchParams({offset:String(offset)});for(const [k,v]of Object.entries(filters)){if(v)q.set(k,k==='from'||k==='to'?new Date(v).toISOString():v);}getAIUsage(q).then(u=>{if(valid)setUsage(u)}).catch(e=>{if(valid)fail(e)});return()=>{valid=false}},[filters,offset]);
|
||||
async function run(fn:()=>Promise<void>){if(busy)return;setBusy(true);setError('');setNotice('');try{await fn()}catch(e){fail(e)}finally{setBusy(false)}}
|
||||
function field<K extends keyof AIProfile>(key:K,value:AIProfile[K]){setProfile(p=>p?{...p,[key]:value}:p)}
|
||||
return <section className="view-stack ai-admin" aria-label="KI-Verwaltung">
|
||||
<header><h2>KI-Einstellungen und Verbrauch</h2><p>Direkte Modellaufrufe aus Go. Beträge sind Schätzungen in USD; verbindlich ist die Anbieterrechnung. Tages- und Monatsgrenzen gelten in UTC.</p></header>
|
||||
return <section className="view-stack ai-admin" aria-label={t('ui.ai_administration')}>
|
||||
<header><h2>{t('ui.ai_settings_and_usage')}</h2><p>{t('ui.direct_model_calls_from_go_amounts_are_usd_estimates_the')}</p></header>
|
||||
{error&&<p className="form-error" role="alert">{error}</p>}{notice&&<p role="status">{notice}</p>}
|
||||
{!settings?<p>KI-Einstellungen werden geladen…</p>:<>
|
||||
<div className="panel view-stack"><h3>Budget</h3><p>API-Zugänge: DeepSeek {settings.providers.deepseek?'konfiguriert':'nicht konfiguriert'} · Mistral {settings.providers.mistral?'konfiguriert':'nicht konfiguriert'}</p>
|
||||
<p>Monat gebunden: {dollars(settings.budget.month_committed_microusd)} · Tag gebunden: {dollars(settings.budget.day_committed_microusd)} · Offene Reservierungen: {dollars(settings.budget.open_reservations_microusd)}</p>
|
||||
{settings.budget.warning&&<p role="status">Mindestens 80 % eines Budgets sind belegt.</p>}
|
||||
{settings.budget.monthly_limit_microusd===0&&<p>KI-Aufrufe sind gesperrt, bis ein positives Monatsbudget eingerichtet ist.</p>}
|
||||
<div className="ai-form-grid"><label>Monatslimit in USD<input type="number" min="0" step="0.01" value={month} onChange={e=>setMonth(e.target.value)}/></label><label>Tageslimit in USD · 0 = kein Tageslimit<input type="number" min="0" step="0.01" value={day} onChange={e=>setDay(e.target.value)}/></label></div>
|
||||
<button type="button" disabled={busy} onClick={()=>void run(async()=>{await saveAIBudget(micro(month),micro(day));await refresh();setNotice('Budget gespeichert.');})}>Budget speichern</button>
|
||||
<p className="muted">Vor jedem Aufruf wird eine konservative Obergrenze reserviert. Unbekannter Verbrauch bleibt gebunden, bis du ihn mit der Anbieterrechnung abgleichst. Eine neue Aufgabe kann mehrere Aufrufe benötigen.</p></div>
|
||||
<div className="panel view-stack"><h3>Modellprofile</h3><label>Arbeitsschritt<select value={action} disabled={busy} onChange={e=>setAction(e.target.value)}>{Object.entries(aiActions).map(([id,label])=><option key={id} value={id}>{label}</option>)}</select></label>
|
||||
{profile&&<><p className="muted">Version {profile.version}. Änderungen gelten für neue Aufträge; laufende Aufträge behalten ihre Einstellungen.</p>
|
||||
<div className="ai-form-grid"><label>Anbieter<select value={profile.provider} disabled={busy} onChange={e=>{field('provider',e.target.value);field('json_schema',false);field('reasoning_effort','');setModels([])}}><option value="mistral">Mistral</option><option value="deepseek">DeepSeek</option></select></label>
|
||||
<label>Modell-ID<input list="ai-models" value={profile.model} onChange={e=>{field('model',e.target.value);field('reasoning_effort','')}}/><datalist id="ai-models">{models.map(m=><option key={m.id} value={m.id}/>)}</datalist></label>
|
||||
<label>Maximale Ausgabetokens<input type="number" min="128" max="2097152" value={profile.max_tokens} onChange={e=>field('max_tokens',Number(e.target.value))}/></label>
|
||||
<label>Kontextbudget · Ein- und Ausgabe<input type="number" min="128" max="2097152" value={profile.context_tokens} onChange={e=>field('context_tokens',Number(e.target.value))}/></label>
|
||||
<label>Temperatur · leer = nicht senden<input type="number" min="0" max="2" step="0.1" value={profile.temperature??''} onChange={e=>field('temperature',e.target.value===''?null:Number(e.target.value))}/></label>
|
||||
<label>Denkaufwand · nur bei Unterstützung<select value={profile.reasoning_effort} onChange={e=>field('reasoning_effort',e.target.value)}>{['','none','minimal','low','medium','high','xhigh','max'].map(v=><option key={v} value={v}>{v||'Nicht senden'}</option>)}</select></label>
|
||||
<label>Zeitlimit in Sekunden<input type="number" min="5" max="90" value={profile.timeout_seconds} onChange={e=>field('timeout_seconds',Number(e.target.value))}/></label>
|
||||
{!settings?<p>{t('ui.loading_ai_settings')}</p>:<>
|
||||
<div className="panel view-stack"><h3>{t('ui.budget')}</h3><p>{t('ai.access', { deepseek: t(settings.providers.deepseek ? 'ui.configured' : 'ui.not_configured'), mistral: t(settings.providers.mistral ? 'ui.configured' : 'ui.not_configured') })}</p>
|
||||
<p>{t('ai.committed', { month: dollars(settings.budget.month_committed_microusd), day: dollars(settings.budget.day_committed_microusd), open: dollars(settings.budget.open_reservations_microusd) })}</p>
|
||||
{settings.budget.warning&&<p role="status">{t('ui.at_least_80_of_a_budget_is_committed')}</p>}
|
||||
{settings.budget.monthly_limit_microusd===0&&<p>{t('ui.ai_calls_are_blocked_until_a_positive_monthly_budget_is')}</p>}
|
||||
<div className="ai-form-grid"><label>{t('ui.monthly_limit_in_usd')}<input type="number" min="0" step="0.01" value={month} onChange={e=>setMonth(e.target.value)}/></label><label>{t('ui.daily_limit_in_usd_0_no_daily_limit')}<input type="number" min="0" step="0.01" value={day} onChange={e=>setDay(e.target.value)}/></label></div>
|
||||
<button type="button" disabled={busy} onClick={()=>void run(async()=>{await saveAIBudget(micro(month),micro(day));await refresh();setNotice({ key: 'ui.budget_saved' });})}>{t('ui.save_budget')}</button>
|
||||
<p className="muted">{t('ui.a_conservative_upper_limit_is_reserved_before_each_call_unknown')}</p></div>
|
||||
<div className="panel view-stack"><h3>{t('ui.model_profiles')}</h3><label>{t('ui.action')}<select value={action} disabled={busy} onChange={e=>setAction(e.target.value)}>{Object.entries(aiActions).map(([id,label])=><option key={id} value={id}>{label}</option>)}</select></label>
|
||||
{profile&&<><p className="muted">{t('ai.version', { version: profile.version })}</p>
|
||||
<div className="ai-form-grid"><label>{t('ui.provider')}<select value={profile.provider} disabled={busy} onChange={e=>{field('provider',e.target.value);field('json_schema',false);field('reasoning_effort','');setModels([])}}><option value="mistral">Mistral</option><option value="deepseek">DeepSeek</option></select></label>
|
||||
<label>{t('ui.model_id')}<input list="ai-models" value={profile.model} onChange={e=>{field('model',e.target.value);field('reasoning_effort','')}}/><datalist id="ai-models">{models.map(m=><option key={m.id} value={m.id}/>)}</datalist></label>
|
||||
<label>{t('ui.maximum_output_tokens')}<input type="number" min="128" max="2097152" value={profile.max_tokens} onChange={e=>field('max_tokens',Number(e.target.value))}/></label>
|
||||
<label>{t('ui.context_budget_input_and_output')}<input type="number" min="128" max="2097152" value={profile.context_tokens} onChange={e=>field('context_tokens',Number(e.target.value))}/></label>
|
||||
<label>{t('ui.temperature_empty_do_not_send')}<input type="number" min="0" max="2" step="0.1" value={profile.temperature??''} onChange={e=>field('temperature',e.target.value===''?null:Number(e.target.value))}/></label>
|
||||
<label>{t('ui.reasoning_effort_only_when_supported')}<select value={profile.reasoning_effort} onChange={e=>field('reasoning_effort',e.target.value)}>{['','none','minimal','low','medium','high','xhigh','max'].map(v=><option key={v} value={v}>{v||t('ui.do_not_send')}</option>)}</select></label>
|
||||
<label>{t('ui.timeout_in_seconds')}<input type="number" min="5" max="90" value={profile.timeout_seconds} onChange={e=>field('timeout_seconds',Number(e.target.value))}/></label>
|
||||
</div>
|
||||
<button type="button" disabled={busy} onClick={()=>void run(async()=>{const result=await getAIModels(profile.provider);setModels(result.data);setNotice(`${result.data.length} Modelle geladen. Verbindung erfolgreich. Ein Testlauf erzeugt zusätzliche, erfasste Kosten.`)})}>Modellliste laden / Verbindung prüfen</button>
|
||||
<p className="muted">Modellnamen und unterstützte Parameter beim Anbieter prüfen. Das Kontextbudget wird vor dem Versand konservativ begrenzt. Für zwölfteilige Tests ein ausreichend großes Profil konfigurieren.</p>
|
||||
<h4>Preise in USD pro Million Tokens</h4><div className="ai-form-grid">{([['input_microusd_per_million','Eingabe'],['cached_input_microusd_per_million','Gecachte Eingabe'],['output_microusd_per_million','Ausgabe']]as const).map(([key,label])=><label key={key}>{label}<input type="number" min="0" max="1000" step="0.000001" value={profile[key]/1000000} onChange={e=>field(key,micro(e.target.value))}/></label>)}</div>
|
||||
<label><input type="checkbox" checked={profile.pricing_set} onChange={e=>field('pricing_set',e.target.checked)}/>Preise mit aktuellen Anbieterpreisen abgeglichen</label>
|
||||
<label><input type="checkbox" checked={profile.json_schema} disabled={profile.provider!=='mistral'} onChange={e=>field('json_schema',e.target.checked)}/>JSON-Schemamodus · nur bei unterstütztem Mistral-Modell</label>
|
||||
<label><input type="checkbox" checked={profile.enabled} onChange={e=>field('enabled',e.target.checked)}/>Profil für neue KI-Aufträge aktivieren</label>
|
||||
<button type="button" disabled={busy} onClick={()=>void run(async()=>{const result=await getAIModels(profile.provider);setModels(result.data);setNotice({ key: 'ui.value_models_loaded_connection_successful_a_test_run_incurs_additional', parameters: { value0: result.data.length } })})}>{t('ui.load_model_list_check_connection')}</button>
|
||||
<p className="muted">{t('ui.check_model_names_and_supported_parameters_with_the_provider_the')}</p>
|
||||
<h4>{t('ui.prices_in_usd_per_million_tokens')}</h4><div className="ai-form-grid">{([['input_microusd_per_million',t('ui.input')],['cached_input_microusd_per_million',t('ui.cached_input')],['output_microusd_per_million',t('ui.output')]]as const).map(([key,label])=><label key={key}>{label}<input type="number" min="0" max="1000" step="0.000001" value={profile[key]/1000000} onChange={e=>field(key,micro(e.target.value))}/></label>)}</div>
|
||||
<label><input type="checkbox" checked={profile.pricing_set} onChange={e=>field('pricing_set',e.target.checked)}/>{t('ui.prices_checked_against_current_provider_pricing')}</label>
|
||||
<label><input type="checkbox" checked={profile.json_schema} disabled={profile.provider!=='mistral'} onChange={e=>field('json_schema',e.target.checked)}/>{t('ui.json_schema_mode_only_for_supported_mistral_models')}</label>
|
||||
<label><input type="checkbox" checked={profile.enabled} onChange={e=>field('enabled',e.target.checked)}/>{t('ui.enable_profile_for_new_ai_jobs')}</label>
|
||||
{error&&<p className="form-error" role="alert">{error}</p>}
|
||||
<button type="button" className="primary-button" disabled={busy} onClick={()=>void run(async()=>{await saveAIProfile(profile);await refresh();setNotice('Neue Profilversion gespeichert. Vor Freigabe mit richtigen und falschen Antworten testen.');})}>Modellprofil speichern</button>
|
||||
<details><summary>Verwendeter Systemprompt und Ausgabeschema</summary><pre>{settings.prompts[action]}</pre><pre>{settings.schemas[action]||'Kein separates Schema; Vertragsprüfung in Go.'}</pre></details>
|
||||
{action==='evaluate_course_attempt'&&<><button type="button" disabled={busy} onClick={()=>void run(async()=>{setTestResult(await testAIQuality(courseRequestID()));await refreshUsage();await refresh()})}>Bewertungsqualität prüfen · 2 kostenpflichtige Testfälle</button><button type="button" disabled={busy} onClick={()=>void run(async()=>{setTestResult(await testAIQuality(courseRequestID(),'writing'));await refreshUsage();await refresh()})}>Schreibbewertung prüfen · 2 kostenpflichtige Testfälle</button></>}
|
||||
<button type="button" className="primary-button" disabled={busy} onClick={()=>void run(async()=>{await saveAIProfile(profile);await refresh();setNotice({ key: 'ui.new_profile_version_saved_test_with_correct_and_incorrect_answers' });})}>{t('ui.save_model_profile')}</button>
|
||||
<details><summary>{t('ui.system_prompt_and_output_schema')}</summary><pre>{settings.prompts[action]}</pre><pre>{settings.schemas[action]||t('ui.no_separate_schema_contract_validation_in_go')}</pre></details>
|
||||
{action==='evaluate_course_attempt'&&<><button type="button" disabled={busy} onClick={()=>void run(async()=>{setTestResult(await testAIQuality(courseRequestID()));await refreshUsage();await refresh()})}>{t('ui.check_evaluation_quality_2_paid_test_cases')}</button><button type="button" disabled={busy} onClick={()=>void run(async()=>{setTestResult(await testAIQuality(courseRequestID(),'writing'));await refreshUsage();await refresh()})}>{t('ui.check_writing_evaluation_2_paid_test_cases')}</button></>}
|
||||
{testResult!=null&&<pre>{JSON.stringify(testResult,null,2)}</pre>}
|
||||
<details><summary>Gespeichertes Profil testen · erzeugt API-Kosten</summary><p>Hier nur den Inhalt von input einfügen. Der Aufruf verändert keinen Kursfortschritt und wird auch für ein deaktiviertes Profil erfasst. Änderungen am Profil zuerst speichern.</p><textarea rows={8} value={input} onChange={e=>setInput(e.target.value)} aria-label="KI-Testeingabe"/>
|
||||
<button type="button" disabled={busy||!input.trim()} onClick={()=>void run(async()=>{const result=await testAI(action,JSON.parse(input),courseRequestID());setTestResult(result);await refreshUsage();await refresh();})}>Kostenpflichtigen Test ausführen</button></details>
|
||||
<details><summary>{t('ui.test_saved_profile_incurs_api_costs')}</summary><p>{t('ui.paste_only_the_content_of_input_here_this_call_does')}</p><textarea rows={8} value={input} onChange={e=>setInput(e.target.value)} aria-label={t('ui.ai_test_input')}/>
|
||||
<button type="button" disabled={busy||!input.trim()} onClick={()=>void run(async()=>{const result=await testAI(action,JSON.parse(input),courseRequestID());setTestResult(result);await refreshUsage();await refresh();})}>{t('ui.run_paid_test')}</button></details>
|
||||
</>}
|
||||
</div></>}
|
||||
<div className="panel view-stack"><h3>KI-Verbrauch</h3><div className="ai-form-grid">{(['from','to','provider','model','user','action']as const).map(key=><label key={key}>{{from:'Von',to:'Bis',provider:'Anbieter',model:'Modell',user:'Nutzer-ID',action:'Arbeitsschritt'}[key]}{key==='provider'||key==='action'?<select value={filters[key]} onChange={e=>{setOffset(0);setFilters({...filters,[key]:e.target.value})}}><option value="">Alle</option>{Object.entries(key==='provider'?{deepseek:'DeepSeek',mistral:'Mistral'}:aiActions).map(([id,label])=><option key={id} value={id}>{label}</option>)}</select>:<input type={key==='from'||key==='to'?'datetime-local':'text'} value={filters[key]} onChange={e=>{setOffset(0);setFilters({...filters,[key]:e.target.value})}}/>}</label>)}</div>
|
||||
<button type="button" disabled={busy} onClick={()=>void run(async()=>{await refreshUsage();await refresh()})}>Verbrauch aktualisieren</button>
|
||||
{(detail||detailLoading||detailError)&&<div ref={detailPanel} tabIndex={-1} className="panel view-stack" role="region" aria-label="KI-Aufrufdetails" aria-busy={detailLoading}><h3>Aufrufdetails</h3><button type="button" disabled={detailLoading} onClick={closeDetail}>Schließen</button>{detailLoading&&<p role="status">Aufrufdetails werden geladen…</p>}{detailError&&<p className="form-error" role="alert">{detailError}</p>}{detail&&<><pre>{JSON.stringify(detail,null,2)}</pre>
|
||||
{detail.cost_microusd==null&&detail.status!=='running'&&<><p>Unbekannten Verbrauch anhand der Anbieterrechnung abgleichen. Der Eintrag und die Begründung bleiben erhalten.</p><label>Tatsächliche Kosten in USD<input type="number" min="0" step="0.000001" value={resolveCost} onChange={e=>setResolveCost(e.target.value)}/></label><label>Begründung<input value={reason} onChange={e=>setReason(e.target.value)}/></label><button type="button" disabled={busy||resolveCost===''||reason.length<5} onClick={()=>void run(async()=>{await resolveAICall(detail.id,micro(resolveCost),reason);setDetail(null);await refreshUsage();await refresh()})}>Abgleich speichern</button></>}
|
||||
<div className="panel view-stack"><h3>{t('ui.ai_usage')}</h3><div className="ai-form-grid">{(['from','to','provider','model','user','action']as const).map(key=><label key={key}>{{from:t('ui.from'),to:t('ui.to'),provider:t('ui.provider'),model:t('ui.model'),user:t('ui.user_id'),action:t('ui.action')}[key]}{key==='provider'||key==='action'?<select value={filters[key]} onChange={e=>{setOffset(0);setFilters({...filters,[key]:e.target.value})}}><option value="">{t('ui.all')}</option>{Object.entries(key==='provider'?{deepseek:'DeepSeek',mistral:'Mistral'}:aiActions).map(([id,label])=><option key={id} value={id}>{label}</option>)}</select>:<input type={key==='from'||key==='to'?'datetime-local':'text'} value={filters[key]} onChange={e=>{setOffset(0);setFilters({...filters,[key]:e.target.value})}}/>}</label>)}</div>
|
||||
<button type="button" disabled={busy} onClick={()=>void run(async()=>{await refreshUsage();await refresh()})}>{t('ui.refresh_usage')}</button>
|
||||
{(detail||detailLoading||detailError)&&<div ref={detailPanel} tabIndex={-1} className="panel view-stack" role="region" aria-label={t('ui.ai_call_details')} aria-busy={detailLoading}><h3>{t('ui.call_details')}</h3><button type="button" disabled={detailLoading} onClick={closeDetail}>{t('ui.close')}</button>{detailLoading&&<p role="status">{t('ui.loading_call_details')}</p>}{detailError&&<p className="form-error" role="alert">{detailError}</p>}{detail&&<><pre>{JSON.stringify(detail,null,2)}</pre>
|
||||
{detail.cost_microusd==null&&detail.status!=='running'&&<><p>{t('ui.reconcile_unknown_usage_with_the_provider_invoice_the_record_and')}</p><label>{t('ui.actual_cost_in_usd')}<input type="number" min="0" step="0.000001" value={resolveCost} onChange={e=>setResolveCost(e.target.value)}/></label><label>{t('ui.reason')}<input value={reason} onChange={e=>setReason(e.target.value)}/></label><button type="button" disabled={busy||resolveCost===''||reason.length<5} onClick={()=>void run(async()=>{await resolveAICall(detail.id,micro(resolveCost),reason);setDetail(null);await refreshUsage();await refresh()})}>{t('ui.save_reconciliation')}</button></>}
|
||||
</>}</div>}
|
||||
{usage&&<><p>{usage.total} Aufrufe · Eingabe {usage.input_tokens.toLocaleString('de-DE')} · Ausgabe {usage.output_tokens.toLocaleString('de-DE')} Tokens</p><p>Geschätzte Kosten {dollars(usage.estimated_cost_microusd)} · offene Reservierungen {dollars(usage.reserved_microusd)} · Verbrauch unbekannt bei {usage.unknown_usage_calls} Aufrufen</p>
|
||||
<div className="admin-table-wrap"><table className="admin-table"><thead><tr><th>Zeit / Nutzer</th><th>Modell / Schritt</th><th>Status</th><th>Tokens Ein / Aus</th><th>Kosten</th><th>Details</th></tr></thead><tbody>{usage.calls.map(c=><tr key={c.id}><td>{new Date(c.created_at).toLocaleString('de-DE')}<small>{c.user_id}</small></td><td>{c.provider} · {c.model}<small>{aiActions[c.action]??c.action} · Profil v{c.profile.version}{c.test?' · Test':''}</small></td><td>{c.status}<small>{c.duration_ms} ms · Versuch {c.attempt}</small></td><td>{c.usage?`${c.usage.input_tokens} / ${c.usage.output_tokens}`:'Unbekannt'}</td><td>{c.cost_microusd==null?`Reserviert ${dollars(c.reserved_microusd)}`:dollars(c.cost_microusd)}</td><td><button type="button" disabled={busy} onClick={e=>void openDetail(c.id,e.currentTarget)}>Anzeigen</button></td></tr>)}</tbody></table></div>
|
||||
<div className="action-row"><button type="button" disabled={offset===0} onClick={()=>setOffset(Math.max(0,offset-50))}>Zurück</button><span>{offset+1}–{Math.min(offset+50,usage.total)} von {usage.total}</span><button type="button" disabled={offset+50>=usage.total} onClick={()=>setOffset(offset+50)}>Weiter</button></div></>}
|
||||
{usage&&<><p>{t('ai.tokens', { calls: usage.total.toLocaleString(language), input: usage.input_tokens.toLocaleString(language), output: usage.output_tokens.toLocaleString(language) })}</p><p>{t('ai.costs', { cost: dollars(usage.estimated_cost_microusd), reserved: dollars(usage.reserved_microusd), unknown: usage.unknown_usage_calls.toLocaleString(language) })}</p>
|
||||
<div className="admin-table-wrap"><table className="admin-table"><thead><tr><th>{t('ui.time_user')}</th><th>{t('ui.model_action')}</th><th>{t('ui.status')}</th><th>{t('ui.tokens_in_out')}</th><th>{t('ui.cost')}</th><th>{t('ui.details')}</th></tr></thead><tbody>{usage.calls.map(c=><tr key={c.id}><td>{new Date(c.created_at).toLocaleString(language)}<small>{c.user_id}</small></td><td>{c.provider} · {c.model}<small>{aiActions[c.action]??c.action}{t('ai.profileVersion', { version: c.profile.version })}{c.test?t('ui.test'):''}</small></td><td>{c.status}<small>{t('ai.attempt', { ms: c.duration_ms.toLocaleString(language), attempt: c.attempt })}</small></td><td>{c.usage?`${c.usage.input_tokens} / ${c.usage.output_tokens}`:t('ui.unknown')}</td><td>{c.cost_microusd==null?t('ai.reserved', { cost: dollars(c.reserved_microusd) }):dollars(c.cost_microusd)}</td><td><button type="button" disabled={busy} onClick={e=>void openDetail(c.id,e.currentTarget)}>{t('ui.show')}</button></td></tr>)}</tbody></table></div>
|
||||
<div className="action-row"><button type="button" disabled={offset===0} onClick={()=>setOffset(Math.max(0,offset-50))}>{t('ui.back')}</button><span>{t('ai.range', { from: usage.total === 0 ? 0 : offset+1, to: Math.min(offset+50,usage.total), total: usage.total })}</span><button type="button" disabled={offset+50>=usage.total} onClick={()=>setOffset(offset+50)}>{t('ui.next')}</button></div></>}
|
||||
</div>
|
||||
|
||||
</section>
|
||||
|
||||
@@ -1,15 +1,21 @@
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useCourseSkillNames } from '../i18n/labels';
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { answerCourseAudio, answerCourseTask, courseRequestID, courseSkillNames, getAdaptiveAudio, type AdaptiveAttempt, type AdaptiveTask } from '../api/adaptive';
|
||||
import { answerCourseAudio, answerCourseTask, courseRequestID, getAdaptiveAudio, type AdaptiveAttempt, type AdaptiveTask } from '../api/adaptive';
|
||||
import { AudioRecorder } from './AudioRecorder';
|
||||
|
||||
type Props = { task: AdaptiveTask; attempt: AdaptiveAttempt | null; locked: boolean; onAttempt: (attempt: AdaptiveAttempt) => void; onBusy: (value: boolean) => void; onRecording: (value: boolean) => void };
|
||||
export function AdaptiveExercise({ task, attempt, locked, onAttempt, onRecording, onBusy }: Props) {
|
||||
type Props = { previousAttempt?: boolean; task: AdaptiveTask; attempt: AdaptiveAttempt | null; locked: boolean; onAttempt: (attempt: AdaptiveAttempt) => void; onBusy: (value: boolean) => void; onRecording: (value: boolean) => void };
|
||||
export function AdaptiveExercise({ task, attempt, locked, onAttempt, onRecording, onBusy, previousAttempt = false }: Props) {
|
||||
const { t, language } = useI18n();
|
||||
const FeedbackContainer = previousAttempt ? 'details' : 'div';
|
||||
const courseSkillNames = useCourseSkillNames();
|
||||
const [answer, setAnswer] = useState('');
|
||||
const [recording, setRecording] = useState(false);
|
||||
const [audio, setAudio] = useState<Blob | null>(null);
|
||||
const [audioURL, setAudioURL] = useState('');
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [error, setError] = useState('');
|
||||
const [error, setError] = useLocalizedMessage();
|
||||
useEffect(() => { onBusy(busy); return () => onBusy(false); }, [busy, onBusy]);
|
||||
const requestID = useRef<string | null>(null);
|
||||
const playback = useRef<{ audio: HTMLAudioElement; url: string } | null>(null);
|
||||
@@ -21,8 +27,8 @@ export function AdaptiveExercise({ task, attempt, locked, onAttempt, onRecording
|
||||
const disabled = locked || busy || examAnswered || attempt?.status === 'pending';
|
||||
async function play() {
|
||||
setError(''); setBusy(true);
|
||||
try { stopPlayback(); const blob = await getAdaptiveAudio(task.id); const url = URL.createObjectURL(blob); const player = new Audio(url); playback.current = { audio: player, url }; player.onended = stopPlayback; player.onerror = () => { stopPlayback(); setError('Audio konnte nicht abgespielt werden.'); }; await player.play(); }
|
||||
catch (err) { stopPlayback(); setError(err instanceof Error ? err.message : 'Audio nicht verfügbar.'); }
|
||||
try { stopPlayback(); const blob = await getAdaptiveAudio(task.id); const url = URL.createObjectURL(blob); const player = new Audio(url); playback.current = { audio: player, url }; player.onended = stopPlayback; player.onerror = () => { stopPlayback(); setError({ key: 'ui.unable_to_play_audio' }); }; await player.play(); }
|
||||
catch (err) { stopPlayback(); setError(errorMessage(err, 'ui.audio_unavailable')); }
|
||||
finally { setBusy(false); }
|
||||
}
|
||||
async function submit() {
|
||||
@@ -32,31 +38,35 @@ export function AdaptiveExercise({ task, attempt, locked, onAttempt, onRecording
|
||||
requestID.current ??= courseRequestID();
|
||||
const result = isSpeech ? await answerCourseAudio(task.id, audio!, requestID.current) : await answerCourseTask(task.id, answer, requestID.current);
|
||||
requestID.current = null; onAttempt(result.attempt); setAudio(null);
|
||||
} catch (err) { setError(err instanceof Error ? err.message : 'Antwort konnte nicht gespeichert werden.'); }
|
||||
} catch (err) { setError(errorMessage(err, 'ui.unable_to_save_your_answer')); }
|
||||
finally { setBusy(false); }
|
||||
}
|
||||
return <div className="view-stack">
|
||||
<p className="eyebrow">{courseSkillNames[task.skill]} · {task.source === 'curated' ? 'Aus geprüftem Aufgabenbestand' : task.source === 'ai' ? 'Mit KI erstellt' : task.source === 'flowise' ? 'Mit Flowise erstellt' : 'Geprüfte Ersatzaufgabe'}{task.review ? ' · Wiederholung' : ''}</p>
|
||||
<h2>{task.prompt}</h2>
|
||||
{task.kind==='free_speech'&&<p className="muted">Inhalt und Sprache werden von der KI bewertet. Der Azure-Aussprachewert wird getrennt angezeigt.</p>}
|
||||
<p className="eyebrow">{courseSkillNames[task.skill]} · {task.source === 'curated' ? t('ui.from_the_reviewed_exercise_bank') : task.source === 'ai' ? t('ui.created_with_ai') : task.source === 'flowise' ? t('ui.created_with_flowise') : t('ui.reviewed_fallback_exercise')}{task.review ? t('ui.review') : ''}</p>
|
||||
{task.instruction_language && <p className="muted">{t('course.taskLanguage', { language: task.instruction_language === 'de-DE' ? t('language.de-DE') : task.instruction_language === 'ru-RU' ? t('language.ru-RU') : task.instruction_language === 'en-US' ? t('language.en-US') : task.instruction_language })}</p>}
|
||||
<h2 lang={task.instruction_language ?? (task.source === 'curated' ? 'de-DE' : undefined)} dir="auto">{task.instruction ?? task.prompt}</h2>
|
||||
{task.stimulus && <p className="course-passage" lang={task.stimulus.language} dir="auto">{task.stimulus.text}</p>}
|
||||
{task.kind==='free_speech'&&<p className="muted">{t('ui.ai_evaluates_content_and_language_the_azure_pronunciation_score_is')}</p>}
|
||||
{task.passage && <p className="course-passage" lang={task.target_language} dir="auto">{task.passage}</p>}
|
||||
{task.reference_text && <p className="target-text" lang={task.target_language} dir="auto">{task.reference_text}</p>}
|
||||
{(task.skill === 'listening' || task.kind === 'repeat_sentence') && <button type="button" className="ghost-button" disabled={busy || recording} onClick={() => void play()}>Anhören</button>}
|
||||
{task.kind === 'choice' && <div className="course-options" role="group" aria-label="Antwortmöglichkeiten">{task.options?.map((option) => <label key={option.id} className="course-option" dir="auto"><input type="radio" name={task.id} checked={answer === option.id} value={option.id} disabled={disabled} onChange={() => { setAnswer(option.id); requestID.current = null; }} />{option.label}</label>)}</div>}
|
||||
{(task.kind === 'free_text' || task.kind === 'short_text') && <label>Deine Antwort<textarea rows={task.kind === 'free_text' ? 5 : 2} maxLength={10000} lang={task.target_language} dir="auto" disabled={disabled} value={answer} onChange={(event) => { setAnswer(event.target.value); requestID.current = null; }} /></label>}
|
||||
{(task.skill === 'listening' || task.kind === 'repeat_sentence') && <button type="button" className="ghost-button" disabled={busy || recording} onClick={() => void play()}>{t('ui.listen')}</button>}
|
||||
{task.kind === 'choice' && <div className="course-options" role="group" aria-label={t('ui.answer_options')}>{task.options?.map((option) => <label key={option.id} className="course-option" lang={option.language} dir="auto"><input type="radio" name={task.id} checked={answer === option.id} value={option.id} disabled={disabled} onChange={() => { setAnswer(option.id); requestID.current = null; }} />{option.label}</label>)}</div>}
|
||||
{(task.kind === 'free_text' || task.kind === 'short_text') && <label>{t('ui.your_answer')}<textarea rows={task.kind === 'free_text' ? 5 : 2} maxLength={10000} lang={task.target_language} dir="auto" disabled={disabled} value={answer} onChange={(event) => { setAnswer(event.target.value); requestID.current = null; }} /></label>}
|
||||
{isSpeech && <>
|
||||
<p className="muted">Bis zu 30 Sekunden. Du kannst die Aufnahme vor dem Absenden anhören.</p>
|
||||
<p className="muted">{t('ui.up_to_30_seconds_you_can_listen_to_your_recording')}</p>
|
||||
<AudioRecorder maxSeconds={30} disabled={disabled} onRecorded={setAudio} onRecordingStart={() => { setAudio(null); requestID.current = null; stopPlayback(); }} onRecordingChange={(value) => { setRecording(value); onRecording(value); }} />
|
||||
{audioURL && <audio controls src={audioURL} />}
|
||||
</>}
|
||||
<button type="button" className="primary-button" onClick={() => void submit()} disabled={disabled || recording || (isSpeech ? !audio : !answer.trim())}>{busy ? 'Antwort wird verarbeitet…' : task.exam_id ? 'Testantwort speichern' : 'Antwort prüfen'}</button>
|
||||
<button type="button" className="primary-button" onClick={() => void submit()} disabled={disabled || recording || (isSpeech ? !audio : !answer.trim())}>{busy ? t('ui.processing_answer') : task.exam_id ? t('ui.save_test_answer') : t('ui.check_answer')}</button>
|
||||
{error && <p className="form-error" role="alert">{error}</p>}
|
||||
{attempt && <div className="course-feedback" role="status">
|
||||
{attempt.demo && <p>Demo-Messung: zählt nicht als Lernnachweis.</p>}
|
||||
{task.exam_id && !attempt.evaluation ? <p>Testantwort gespeichert. Das Feedback erscheint, sobald alle zwölf Antworten bewertet sind.</p> : attempt.status === 'pending' ? <p>Antwort gespeichert. Der Lehrer-Agent bewertet sie.</p> : attempt.status === 'ungraded' ? <p>Antwort gespeichert – ohne verbindliche Note. Eine KI-Bewertung kann später angefordert werden.</p> : attempt.status === 'failed' ? <p>Die Bewertung steht noch aus. Du kannst sie erneut anfordern.</p> : attempt.evaluation && <><strong>{task.kind==='free_speech'?'Inhalt und Sprache: ':''}{Math.round(attempt.evaluation.score)} / 100 · {attempt.evaluation.verdict === 'correct' ? 'Richtig' : attempt.evaluation.verdict === 'partial' ? 'Teilweise richtig' : 'Noch üben'}</strong><p>{attempt.evaluation.feedback}</p>{attempt.evaluation.issues?.map((issue, i) => <p key={i}>{issue}</p>)}</>}
|
||||
{task.kind==='free_speech'&&<p>Erkannter Text: {attempt.answer}</p>}
|
||||
{attempt.speech && <p>Aussprache: {Math.round(attempt.speech.overall_score)} / 100</p>}
|
||||
{task.answer_key && <><p>{task.answer_key.explanation}</p>{attempt?.status === 'ungraded' && <><p>Zum Selbstvergleich, ohne Benotung:</p><ul>{task.answer_key.rubric?.map((rule,i)=><li key={i}>{rule}</li>)}</ul></>}{task.answer_key.reference_answer && <p lang={task.target_language} dir="auto">Beispiel: {task.answer_key.reference_answer}</p>}{task.audio_text && <p lang={task.target_language} dir="auto">Hörtext: {task.audio_text}</p>}</>}
|
||||
</div>}
|
||||
{attempt && <FeedbackContainer className="course-feedback" role={previousAttempt ? undefined : 'status'}>
|
||||
{previousAttempt && <summary>{t('sequence.previousAttempt', { date: attempt.created_at ? new Date(attempt.created_at).toLocaleString(language) : '' })}</summary>}
|
||||
{previousAttempt && <p>{t('sequence.previousNotice')}</p>}
|
||||
{attempt.demo && <p>{t('ui.demo_measurement_does_not_count_as_learning_evidence')}</p>}
|
||||
{task.exam_id && !attempt.evaluation ? <p>{t('ui.test_answer_saved_feedback_appears_once_all_twelve_answers_have')}</p> : attempt.status === 'pending' ? <p>{t('ui.answer_saved_the_teacher_agent_is_evaluating_it')}</p> : attempt.status === 'ungraded' ? <p>{t('ui.answer_saved_without_a_grade_you_can_request_an_ai')}</p> : attempt.status === 'failed' ? <p>{t('ui.evaluation_is_still_pending_you_can_request_it_again')}</p> : attempt.evaluation && <><strong>{task.kind==='free_speech'?t('ui.content_and_language'):''}{Math.round(attempt.evaluation.score)} / 100 · {attempt.evaluation.verdict === 'correct' ? t('ui.correct') : attempt.evaluation.verdict === 'partial' ? t('ui.partially_correct') : t('ui.keep_practising')}</strong><p>{attempt.evaluation.feedback}</p>{attempt.evaluation.issues?.map((issue, i) => <p key={i}>{issue}</p>)}</>}
|
||||
{task.kind==='free_speech'&&<p>{t('ui.recognised_text')} {attempt.answer}</p>}
|
||||
{attempt.speech && <p>{t('ui.pronunciation')} {Math.round(attempt.speech.overall_score)} / 100</p>}
|
||||
{task.answer_key && <><p>{task.answer_key.explanation}</p>{attempt?.status === 'ungraded' && <><p>{t('ui.for_self_comparison_without_grading')}</p><ul>{task.answer_key.rubric?.map((rule,i)=><li key={i}>{rule}</li>)}</ul></>}{task.answer_key.reference_answer && <p>{t('ui.example')} <span lang={task.answer_key.reference_answer_language ?? task.target_language} dir="auto">{task.answer_key.reference_answer}</span></p>}{task.audio_text && <p>{t('ui.listening_transcript')} <span lang={task.target_language} dir="auto">{task.audio_text}</span></p>}</>}
|
||||
</FeedbackContainer>}
|
||||
</div>;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import { Mic, Square } from 'lucide-react';
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { useEffect, useId, useRef, useState } from 'react';
|
||||
|
||||
type Props = {
|
||||
onRecorded: (blob: Blob) => void;
|
||||
@@ -9,12 +11,17 @@ type Props = {
|
||||
buttonLabel?: string;
|
||||
secondary?: boolean;
|
||||
maxSeconds?: number;
|
||||
enableMonitoring?: boolean;
|
||||
};
|
||||
|
||||
export function AudioRecorder({ onRecorded, onRecordingStart, onRecordingChange, disabled, buttonLabel = 'Aufnehmen', secondary, maxSeconds }: Props) {
|
||||
export function AudioRecorder({ onRecorded, onRecordingStart, onRecordingChange, disabled, buttonLabel, secondary, maxSeconds, enableMonitoring = false }: Props) {
|
||||
const { t } = useI18n();
|
||||
const [recording, setRecording] = useState(false);
|
||||
const [starting, setStarting] = useState(false);
|
||||
const [error, setError] = useState('');
|
||||
const [error, setError] = useLocalizedMessage();
|
||||
const [monitoring, setMonitoring] = useState(false);
|
||||
const [monitorVolume, setMonitorVolume] = useState(50);
|
||||
const monitoringHintID = useId();
|
||||
const startingRef = useRef(false);
|
||||
const recordingRef = useRef(false);
|
||||
const mountedRef = useRef(true);
|
||||
@@ -22,6 +29,8 @@ export function AudioRecorder({ onRecorded, onRecordingStart, onRecordingChange,
|
||||
const contextRef = useRef<AudioContext | null>(null);
|
||||
const processorRef = useRef<ScriptProcessorNode | null>(null);
|
||||
const sourceRef = useRef<MediaStreamAudioSourceNode | null>(null);
|
||||
const monitorRef = useRef<GainNode | null>(null);
|
||||
const monitorLevel = useRef(0);
|
||||
const stopTimer = useRef<number | undefined>(undefined);
|
||||
const chunks = useRef<Float32Array[]>([]);
|
||||
const sampleRate = useRef(44100);
|
||||
@@ -31,11 +40,20 @@ export function AudioRecorder({ onRecorded, onRecordingStart, onRecordingChange,
|
||||
return () => {
|
||||
mountedRef.current = false;
|
||||
window.clearTimeout(stopTimer.current);
|
||||
monitorRef.current?.disconnect();
|
||||
streamRef.current?.getTracks().forEach((track) => track.stop());
|
||||
void contextRef.current?.close();
|
||||
};
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
monitorLevel.current = enableMonitoring && monitoring ? monitorVolume / 100 : 0;
|
||||
const context = contextRef.current;
|
||||
if (context && monitorRef.current) {
|
||||
monitorRef.current.gain.setTargetAtTime(monitorLevel.current, context.currentTime, 0.01);
|
||||
}
|
||||
}, [enableMonitoring, monitoring, monitorVolume]);
|
||||
|
||||
async function start() {
|
||||
if (startingRef.current || recordingRef.current || disabled) return;
|
||||
startingRef.current = true;
|
||||
@@ -51,9 +69,23 @@ export function AudioRecorder({ onRecorded, onRecordingStart, onRecordingChange,
|
||||
onRecordingChange?.(false);
|
||||
return;
|
||||
}
|
||||
audioContext = new AudioContext();
|
||||
audioContext = new AudioContext({ latencyHint: 'interactive' });
|
||||
await audioContext.resume();
|
||||
if (!mountedRef.current) {
|
||||
stream.getTracks().forEach((track) => track.stop());
|
||||
void audioContext.close();
|
||||
onRecordingChange?.(false);
|
||||
return;
|
||||
}
|
||||
const source = audioContext.createMediaStreamSource(stream);
|
||||
const processor = audioContext.createScriptProcessor(4096, 1, 1);
|
||||
// Monitor the microphone on a separate path: its volume must never change the recorded samples.
|
||||
const monitor = enableMonitoring ? audioContext.createGain() : null;
|
||||
if (monitor) {
|
||||
monitor.gain.value = monitorLevel.current;
|
||||
source.connect(monitor);
|
||||
monitor.connect(audioContext.destination);
|
||||
}
|
||||
chunks.current = [];
|
||||
sampleRate.current = audioContext.sampleRate;
|
||||
processor.onaudioprocess = (event) => {
|
||||
@@ -66,6 +98,7 @@ export function AudioRecorder({ onRecorded, onRecordingStart, onRecordingChange,
|
||||
contextRef.current = audioContext;
|
||||
processorRef.current = processor;
|
||||
sourceRef.current = source;
|
||||
monitorRef.current = monitor;
|
||||
recordingRef.current = true;
|
||||
setRecording(true);
|
||||
onRecordingStart?.();
|
||||
@@ -73,7 +106,7 @@ export function AudioRecorder({ onRecorded, onRecordingStart, onRecordingChange,
|
||||
} catch (err) {
|
||||
stream?.getTracks().forEach((track) => track.stop());
|
||||
if (audioContext) void audioContext.close();
|
||||
setError(err instanceof Error ? err.message : 'Mikrofon nicht verfuegbar');
|
||||
setError(errorMessage(err, 'ui.microphone_unavailable'));
|
||||
onRecordingChange?.(false);
|
||||
} finally {
|
||||
startingRef.current = false;
|
||||
@@ -87,17 +120,19 @@ export function AudioRecorder({ onRecorded, onRecordingStart, onRecordingChange,
|
||||
window.clearTimeout(stopTimer.current);
|
||||
processorRef.current?.disconnect();
|
||||
sourceRef.current?.disconnect();
|
||||
monitorRef.current?.disconnect();
|
||||
streamRef.current?.getTracks().forEach((track) => track.stop());
|
||||
void contextRef.current?.close();
|
||||
processorRef.current = null;
|
||||
sourceRef.current = null;
|
||||
monitorRef.current = null;
|
||||
streamRef.current = null;
|
||||
contextRef.current = null;
|
||||
setRecording(false);
|
||||
onRecordingChange?.(false);
|
||||
const merged = mergeBuffers(chunks.current);
|
||||
if (merged.length === 0) {
|
||||
setError('Keine Aufnahme erkannt. Bitte erneut versuchen.');
|
||||
setError({ key: 'ui.no_recording_detected_please_try_again' });
|
||||
return;
|
||||
}
|
||||
const downsampled = downsampleBuffer(merged, sampleRate.current, 16000);
|
||||
@@ -109,13 +144,27 @@ export function AudioRecorder({ onRecorded, onRecordingStart, onRecordingChange,
|
||||
<div className="recorder">
|
||||
{recording ? (
|
||||
<button className="danger-button" onClick={stop} type="button">
|
||||
<Square size={18} /> Stoppen
|
||||
</button>
|
||||
<Square size={18} /> {t('ui.stop')} </button>
|
||||
) : (
|
||||
<button className={secondary ? 'ghost-button' : 'primary-button'} onClick={start} type="button" disabled={disabled || starting}>
|
||||
<Mic size={18} /> {starting ? 'Mikrofon wird gestartet...' : buttonLabel}
|
||||
<Mic size={18} /> {starting ? t('ui.starting_microphone') : (buttonLabel ?? t('ui.record'))}
|
||||
</button>
|
||||
)}
|
||||
{enableMonitoring && <div className="audio-monitoring" role="group" aria-label={t('ui.audio_monitoring')}>
|
||||
<label className="monitoring-toggle">
|
||||
<input type="checkbox" role="switch" checked={monitoring}
|
||||
onChange={(event) => setMonitoring(event.target.checked)} disabled={disabled || starting}
|
||||
aria-describedby={monitoringHintID} />
|
||||
<span className="monitoring-switch" aria-hidden="true" />{t('ui.monitor_your_own_voice')} </label>
|
||||
<label className="monitoring-volume">
|
||||
<span>{t('recorder.volume', { volume: monitorVolume })}</span>
|
||||
<input type="range" min="0" max="100" step="1" value={monitorVolume}
|
||||
onChange={(event) => setMonitorVolume(Number(event.target.value))}
|
||||
disabled={!monitoring || disabled || starting} aria-label={t('ui.monitoring_volume_2')}
|
||||
aria-valuetext={t('recorder.percent', { volume: monitorVolume })} />
|
||||
</label>
|
||||
<p className="muted" id={monitoringHintID}>{t('ui.use_headphones_while_recording_you_may_hear_your_voice_with')}</p>
|
||||
</div>}
|
||||
{error && <span className="inline-error">{error}</span>}
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { uiLanguages, useI18n, type UILanguage } from '../i18n/I18n';
|
||||
|
||||
type Props = { onChange?: (language: UILanguage) => Promise<void> };
|
||||
|
||||
export function LanguagePicker({ onChange }: Props) {
|
||||
const { language, setLanguage, t } = useI18n();
|
||||
const [saving, setSaving] = useState(false);
|
||||
const [failed, setFailed] = useState(false);
|
||||
const active = useRef(true);
|
||||
useEffect(() => { active.current = true; return () => { active.current = false; }; }, []);
|
||||
async function change(next: UILanguage) {
|
||||
setSaving(true);
|
||||
setFailed(false);
|
||||
try {
|
||||
await onChange?.(next);
|
||||
if (active.current) setLanguage(next);
|
||||
} catch { if (active.current) setFailed(true); }
|
||||
finally { if (active.current) setSaving(false); }
|
||||
}
|
||||
return <div className="language-picker" aria-busy={saving}>
|
||||
<label>{t('language.label')}
|
||||
<select value={language} disabled={saving} onChange={(event) => void change(event.target.value as UILanguage)}>
|
||||
{uiLanguages.map((code) => <option key={code} value={code} lang={code}>{code === 'de-DE' ? 'Deutsch' : 'Русский'}</option>)}
|
||||
</select>
|
||||
</label>
|
||||
{failed && <p className="form-error" role="alert">{t('language.saveError')}</p>}
|
||||
</div>;
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import type { WordScore } from '../api/types';
|
||||
|
||||
type Props = {
|
||||
@@ -5,16 +6,17 @@ type Props = {
|
||||
};
|
||||
|
||||
export function PhonemeAnalysis({ words }: Props) {
|
||||
const { t } = useI18n();
|
||||
const scoredWords = words.filter((word) => word.error_type?.toLowerCase() !== 'omission' && (word.phoneme_scores?.length ?? 0) > 0);
|
||||
|
||||
return (
|
||||
<section className="panel result-panel phoneme-panel">
|
||||
<h2>Lautanalyse</h2>
|
||||
<h2>{t('ui.sound_analysis')}</h2>
|
||||
{scoredWords.length === 0 ? (
|
||||
<p className="muted">Für diese Aufnahme sind keine Lautwerte verfügbar.</p>
|
||||
<p className="muted">{t('ui.no_sound_scores_are_available_for_this_recording')}</p>
|
||||
) : (
|
||||
<>
|
||||
<p className="muted">Azure bewertet jeden Laut von 0 bis 100. Werte unter 75 markieren hier Übungsbedarf.</p>
|
||||
<p className="muted">{t('ui.azure_scores_each_sound_from_0_to_100_scores_below')}</p>
|
||||
{scoredWords.map((word, wordIndex) => (
|
||||
<div className="phoneme-row" key={`${word.word}-${wordIndex}`}>
|
||||
<strong>{word.word}</strong>
|
||||
@@ -22,7 +24,7 @@ export function PhonemeAnalysis({ words }: Props) {
|
||||
{word.phoneme_scores?.map((phoneme, phonemeIndex) => (
|
||||
<span
|
||||
className={`word word-${phoneme.highlight}`}
|
||||
title={`${word.word}: Laut /${phoneme.phoneme}/, ${Math.round(phoneme.accuracy)} von 100 Punkten`}
|
||||
title={t('phoneme.tooltip', { word: word.word, phoneme: phoneme.phoneme, score: Math.round(phoneme.accuracy) })}
|
||||
key={`${phoneme.phoneme}-${phonemeIndex}`}
|
||||
>
|
||||
/{phoneme.phoneme}/ {Math.round(phoneme.accuracy)}
|
||||
|
||||
@@ -1,28 +1,53 @@
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { fetchPronunciationProfile, type PronunciationProfile, type PronunciationTarget } from '../api/pronunciation';
|
||||
const states:Record<string,string>={limited:'Wenige Nachweise – nachprüfen',observed:'Noch uneinheitlich',needs_practice:'Wiederholt schwierig',improved:'Verbessert',stable:'Stabil mit Wiederholung'};
|
||||
const trends:Record<string,string>={insufficient:'Entwicklung noch nicht ausreichend belegt',improving:'Entwicklung verbessert',declining:'Zuletzt wieder schwieriger',steady:'Zuletzt ähnlich'};
|
||||
export function PronunciationOverview(){
|
||||
const [profile,setProfile]=useState<PronunciationProfile|null>(null),[error,setError]=useState(''),[all,setAll]=useState(false);
|
||||
useEffect(()=>{let valid=true;fetchPronunciationProfile().then(p=>{if(valid)setProfile(p)}).catch(e=>{if(valid)setError(e instanceof Error?e.message:'Ausspracheprofil nicht verfügbar')});return()=>{valid=false}},[]);
|
||||
if(error)return <section className="panel result-panel" aria-label="Ausspracheprofil"><h2>Ausspracheprofil</h2><p className="form-error" role="alert">{error}</p></section>;
|
||||
if(!profile)return <section className="panel result-panel" aria-label="Ausspracheprofil"><p>Lautprofil wird geladen…</p></section>;
|
||||
function group(kind:PronunciationTarget['kind'],title:string){
|
||||
const targets=profile!.targets.filter(t=>t.kind===kind);
|
||||
return <section className="panel result-panel"><h3>{title}</h3>{!targets.length?<p className="muted">Noch keine bestätigten Messungen in diesem Bereich.</p>:<div className="view-stack">{(all?targets:targets.slice(0,6)).map(t=><article className="pronunciation-target" key={t.key}>
|
||||
<strong>{kind==='phoneme'?`/${t.symbol}/`:t.symbol}</strong> <span>{states[t.state]??t.state}</span>
|
||||
<p>{kind==='omission'?`${100-Math.round(t.mean)} % gewichteter Auslassungsanteil`:`${Math.round(t.mean)} / 100`} · {t.samples} unabhängige Beobachtung{t.samples===1?'':'en'} · {t.words} Wortkontext{t.words===1?'':'e'} · {t.tasks} Aufgabe{t.tasks===1?'':'n'}</p>
|
||||
<p className="muted">{trends[t.trend]??t.trend}. Zuletzt: {new Date(t.last_seen).toLocaleDateString('de-DE')}.</p>
|
||||
{kind==='phoneme'&&<p>Beispielwörter: {t.examples.slice(0,5).map(e=>`${e.word} (${Math.round(e.mean)} / 100)`).join(', ')}</p>}
|
||||
{t.next_review&&<p>{t.review_due?'Wiederholung fällig':'Nächste Wiederholung'}: {new Date(t.next_review).toLocaleDateString('de-DE')}</p>}
|
||||
</article>)}</div>}</section>;
|
||||
}
|
||||
return <section className="view-stack" aria-label="Ausspracheprofil"><header><h2>Dein Ausspracheprofil · {profile.language}</h2><p>Echte Azure-Nachsprechmessungen aus Aussprache und Kurs werden zusammen betrachtet. Neuere Ergebnisse zählen stärker; ein einzelner Ausreißer ergibt noch kein sicheres Lautproblem.</p><p>{profile.confirmed_recordings} berücksichtigte Aufnahmen im Zeitfenster von {profile.window_days} Tagen. Wiederholungen derselben Aufgabe am selben Tag zählen je Wort oder Laut als eine Beobachtung.</p></header>
|
||||
{profile.unverified_history>0&&<p className="muted">{profile.unverified_history} ältere Versuche bleiben im Verlauf erhalten. Ihre Messherkunft ist nicht belegt; sie bestimmen dieses Profil nicht.</p>}
|
||||
{!profile.targets.length&&<p>Für dein neues Lautprofil fehlen noch bestätigte Messungen. Sprich einen Satz im Aussprachebereich nach, um zu beginnen.</p>}
|
||||
{group('phoneme','Laute über verschiedene Wörter hinweg')}{group('word','Wörter')}
|
||||
{profile.targets.some(t=>t.kind==='omission')&&group('omission','Vollständigkeit – ausgelassene Wörter')}
|
||||
{profile.targets.length>6&&<button type="button" onClick={()=>setAll(!all)}>{all?'Weniger anzeigen':'Alle Beobachtungen anzeigen'}</button>}
|
||||
<p className="muted">Die Zustände sind Lernhilfen, keine Zertifizierung. Wortgenauigkeit und Lautwerte sind keine statistischen Wahrscheinlichkeiten.</p>
|
||||
</section>;
|
||||
import { useI18n, type MessageKey } from '../i18n/I18n';
|
||||
|
||||
const states: Record<string, MessageKey> = {
|
||||
limited: 'profile.state.limited', observed: 'profile.state.observed', needs_practice: 'profile.state.needs_practice',
|
||||
improved: 'profile.state.improved', stable: 'profile.state.stable'
|
||||
};
|
||||
const trends: Record<string, MessageKey> = {
|
||||
insufficient: 'profile.trend.insufficient', improving: 'profile.trend.improving',
|
||||
declining: 'profile.trend.declining', steady: 'profile.trend.steady'
|
||||
};
|
||||
|
||||
export function PronunciationOverview() {
|
||||
const { t, language } = useI18n();
|
||||
const [profile, setProfile] = useState<PronunciationProfile | null>(null);
|
||||
const [error, setError] = useLocalizedMessage();
|
||||
const [all, setAll] = useState(false);
|
||||
useEffect(() => {
|
||||
let valid = true;
|
||||
fetchPronunciationProfile().then((value) => { if (valid) setProfile(value); })
|
||||
.catch((err) => { if (valid) setError(errorMessage(err, 'profile.error')); });
|
||||
return () => { valid = false; };
|
||||
}, []);
|
||||
if (error) return <section className="panel result-panel" aria-label={t('profile.title')}><h2>{t('profile.title')}</h2><p className="form-error" role="alert">{error}</p></section>;
|
||||
if (!profile) return <section className="panel result-panel" aria-label={t('profile.title')}><p>{t('profile.loading')}</p></section>;
|
||||
function count(noun: 'observations' | 'contexts' | 'tasks', value: number) {
|
||||
const category = new Intl.PluralRules(language).select(value);
|
||||
const form = category === 'one' || category === 'few' || category === 'many' ? category : 'other';
|
||||
return t(`profile.${noun}.${form}`, { count: value.toLocaleString(language) });
|
||||
}
|
||||
function group(kind: PronunciationTarget['kind'], title: string) {
|
||||
const targets = profile!.targets.filter((target) => target.kind === kind);
|
||||
return <section className="panel result-panel"><h3>{title}</h3>{!targets.length ? <p className="muted">{t('profile.none')}</p> :
|
||||
<div className="view-stack">{(all ? targets : targets.slice(0, 6)).map((target) => <article className="pronunciation-target" key={target.key}>
|
||||
<strong>{kind === 'phoneme' ? `/${target.symbol}/` : target.symbol}</strong> <span>{states[target.state] ? t(states[target.state]) : target.state}</span>
|
||||
<p>{kind === 'omission' ? t('profile.omission', { count: 100 - Math.round(target.mean) }) : `${Math.round(target.mean)} / 100`} · {count('observations', target.samples)} · {count('contexts', target.words)} · {count('tasks', target.tasks)}</p>
|
||||
<p className="muted">{t('profile.last', { trend: trends[target.trend] ? t(trends[target.trend]) : target.trend, date: new Date(target.last_seen).toLocaleDateString(language) })}</p>
|
||||
{kind === 'phoneme' && <p>{t('profile.examples', { words: target.examples.slice(0, 5).map((example) => `${example.word} (${Math.round(example.mean)} / 100)`).join(', ') })}</p>}
|
||||
{target.next_review && <p>{t(target.review_due ? 'profile.due' : 'profile.next', { date: new Date(target.next_review).toLocaleDateString(language) })}</p>}
|
||||
</article>)}</div>}</section>;
|
||||
}
|
||||
return <section className="view-stack" aria-label={t('profile.title')}>
|
||||
<header><h2>{t('profile.yours', { language: profile.language })}</h2><p>{t('profile.intro')}</p><p>{t('profile.evidence', { recordings: profile.confirmed_recordings.toLocaleString(language), days: profile.window_days.toLocaleString(language) })}</p></header>
|
||||
{profile.unverified_history > 0 && <p className="muted">{t('profile.history', { count: profile.unverified_history.toLocaleString(language) })}</p>}
|
||||
{!profile.targets.length && <p>{t('profile.start')}</p>}
|
||||
{group('phoneme', t('profile.sounds'))}{group('word', t('profile.words'))}
|
||||
{profile.targets.some((target) => target.kind === 'omission') && group('omission', t('profile.completeness'))}
|
||||
{profile.targets.length > 6 && <button type="button" onClick={() => setAll(!all)}>{t(all ? 'profile.less' : 'profile.all')}</button>}
|
||||
<p className="muted">{t('profile.limits')}</p>
|
||||
</section>;
|
||||
}
|
||||
|
||||
@@ -2,16 +2,17 @@ import type { WordScore } from '../api/types';
|
||||
|
||||
type Props = {
|
||||
targetText: string;
|
||||
language?: string;
|
||||
words?: WordScore[] | null;
|
||||
};
|
||||
|
||||
export function PronunciationText({ targetText, words }: Props) {
|
||||
export function PronunciationText({ targetText, words, language }: Props) {
|
||||
if (!words || words.length === 0) {
|
||||
return <p className="target-text">{targetText}</p>;
|
||||
return <p className="target-text" lang={language} dir="auto">{targetText}</p>;
|
||||
}
|
||||
|
||||
return (
|
||||
<p className="target-text word-feedback">
|
||||
<p className="target-text word-feedback" lang={language} dir="auto">
|
||||
{words.map((word, index) => (
|
||||
<span
|
||||
className={`word word-${word.highlight}`}
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
import { createContext, useContext, useEffect, useMemo, useState, type ReactNode } from 'react';
|
||||
import de from './de-DE.json';
|
||||
import ru from './ru-RU.json';
|
||||
|
||||
export const uiLanguages = ['de-DE', 'ru-RU'] as const;
|
||||
export type UILanguage = typeof uiLanguages[number];
|
||||
export type MessageKey = keyof typeof de;
|
||||
type Parameters = Record<string, string | number>;
|
||||
const messages: Record<UILanguage, Record<MessageKey, string>> = { 'de-DE': de, 'ru-RU': ru };
|
||||
const storageKey = 'speech_native_language';
|
||||
|
||||
export function isUILanguage(value: string): value is UILanguage {
|
||||
return uiLanguages.some((language) => language === value);
|
||||
}
|
||||
|
||||
function initialLanguage(): UILanguage {
|
||||
try {
|
||||
const saved = localStorage.getItem(storageKey) ?? localStorage.getItem('speech_ui_language');
|
||||
if (saved && isUILanguage(saved)) return saved;
|
||||
} catch { /* Ignore an inaccessible optional language preference. */ }
|
||||
return 'de-DE';
|
||||
}
|
||||
|
||||
const I18nContext = createContext<{
|
||||
language: UILanguage;
|
||||
setLanguage: (language: UILanguage) => void;
|
||||
t: (key: MessageKey, parameters?: Parameters) => string;
|
||||
} | null>(null);
|
||||
|
||||
export function I18nProvider({ children }: { children: ReactNode }) {
|
||||
const [language, setLanguage] = useState<UILanguage>(initialLanguage);
|
||||
useEffect(() => {
|
||||
document.documentElement.lang = language;
|
||||
document.documentElement.dir = 'ltr';
|
||||
try { localStorage.setItem(storageKey, language); } catch { /* Storage is optional. */ }
|
||||
}, [language]);
|
||||
const value = useMemo(() => ({
|
||||
language,
|
||||
setLanguage,
|
||||
t: (key: MessageKey, parameters: Parameters = {}) => messages[language][key].replace(
|
||||
/\{(\w+)\}/g, (placeholder, name: string) => String(parameters[name] ?? placeholder)
|
||||
)
|
||||
}), [language]);
|
||||
return <I18nContext.Provider value={value}>{children}</I18nContext.Provider>;
|
||||
}
|
||||
|
||||
export function useI18n() {
|
||||
const value = useContext(I18nContext);
|
||||
if (!value) throw new Error('I18nProvider is required');
|
||||
return value;
|
||||
}
|
||||
@@ -1,4 +1,467 @@
|
||||
{
|
||||
"appName": "Speech Learning",
|
||||
"targetLevel": "A1 English"
|
||||
"app.name": "Speech Learning",
|
||||
"app.level": "A1 Sprachlernen",
|
||||
"nav.today": "Heute",
|
||||
"nav.practice": "Aussprache",
|
||||
"nav.course": "A1-Kurs",
|
||||
"nav.conversation": "Dialog",
|
||||
"nav.progress": "Fortschritt",
|
||||
"nav.admin": "Adminbereich",
|
||||
"nav.debug": "Debug",
|
||||
"nav.label": "Navigation",
|
||||
"auth.email": "E-Mail",
|
||||
"auth.password": "Passwort",
|
||||
"auth.login": "Einloggen",
|
||||
"auth.register": "Account erstellen",
|
||||
"auth.register.submit": "Registrieren",
|
||||
"auth.back": "Zurück zum Login",
|
||||
"auth.logout": "Abmelden",
|
||||
"auth.loading": "Konto wird geladen",
|
||||
"auth.wait": "Bitte einen Moment warten.",
|
||||
"auth.loadError": "Konto konnte nicht geladen werden.",
|
||||
"auth.loginError": "Login fehlgeschlagen",
|
||||
"auth.registerError": "Registrierung fehlgeschlagen",
|
||||
"auth.busy": "Bitte warten…",
|
||||
"auth.denied": "Kein Zugriff auf den Adminbereich.",
|
||||
"common.retry": "Erneut versuchen",
|
||||
"language.label": "Muttersprache",
|
||||
"language.saveError": "Die Sprache konnte nicht gespeichert werden.",
|
||||
"language.instructions": "Muttersprache: {language}.",
|
||||
"language.de-DE": "Deutsch",
|
||||
"language.en-US": "Englisch",
|
||||
"language.registerInfo": "Die Muttersprache bestimmt Bedienung und Erklärungen. Du lernst Englisch.",
|
||||
"dashboard.error": "Dashboard konnte nicht geladen werden",
|
||||
"dashboard.loading": "Lade Dashboard…",
|
||||
"dashboard.title": "A1 Aussprachetraining",
|
||||
"dashboard.next": "Nächste Übung",
|
||||
"dashboard.dailyGoal": "Tagesziel",
|
||||
"dashboard.average": "Durchschnitt",
|
||||
"dashboard.attempts": "Versuche",
|
||||
"dashboard.minutes": "{count} min",
|
||||
"progress.error": "Fortschritt konnte nicht geladen werden",
|
||||
"progress.loading": "Lade Fortschritt…",
|
||||
"progress.overview": "Lernübersicht",
|
||||
"progress.average": "Historischer Durchschnitt",
|
||||
"progress.recent": "Letzte Versuche",
|
||||
"language.bank": "Neue Aufgaben und Erklärungen verwenden deine Muttersprache. Die Lernsprache bleibt unverändert.",
|
||||
"profile.title": "Ausspracheprofil",
|
||||
"profile.yours": "Dein Ausspracheprofil · {language}",
|
||||
"profile.error": "Ausspracheprofil nicht verfügbar",
|
||||
"profile.loading": "Lautprofil wird geladen…",
|
||||
"profile.state.limited": "Wenige Nachweise – nachprüfen",
|
||||
"profile.state.observed": "Noch uneinheitlich",
|
||||
"profile.state.needs_practice": "Wiederholt schwierig",
|
||||
"profile.state.improved": "Verbessert",
|
||||
"profile.state.stable": "Stabil mit Wiederholung",
|
||||
"profile.trend.insufficient": "Entwicklung noch nicht ausreichend belegt",
|
||||
"profile.trend.improving": "Entwicklung verbessert",
|
||||
"profile.trend.declining": "Zuletzt wieder schwieriger",
|
||||
"profile.trend.steady": "Zuletzt ähnlich",
|
||||
"profile.none": "Noch keine bestätigten Messungen in diesem Bereich.",
|
||||
"profile.omission": "{count} % gewichteter Auslassungsanteil",
|
||||
"profile.observations.one": "{count} unabhängige Beobachtung",
|
||||
"profile.observations.other": "{count} unabhängige Beobachtungen",
|
||||
"profile.contexts.one": "{count} Wortkontext",
|
||||
"profile.contexts.other": "{count} Wortkontexte",
|
||||
"profile.tasks.one": "{count} Aufgabe",
|
||||
"profile.tasks.other": "{count} Aufgaben",
|
||||
"profile.last": "{trend}. Zuletzt: {date}.",
|
||||
"profile.examples": "Beispielwörter: {words}",
|
||||
"profile.due": "Wiederholung fällig: {date}",
|
||||
"profile.next": "Nächste Wiederholung: {date}",
|
||||
"profile.intro": "Echte Azure-Nachsprechmessungen aus Aussprache und Kurs werden zusammen betrachtet. Neuere Ergebnisse zählen stärker; ein einzelner Ausreißer ergibt noch kein sicheres Lautproblem.",
|
||||
"profile.evidence": "{recordings} berücksichtigte Aufnahmen im Zeitfenster von {days} Tagen. Wiederholungen derselben Aufgabe am selben Tag zählen je Wort oder Laut als eine Beobachtung.",
|
||||
"profile.history": "{count} ältere Versuche bleiben im Verlauf erhalten. Ihre Messherkunft ist nicht belegt; sie bestimmen dieses Profil nicht.",
|
||||
"profile.start": "Für dein neues Lautprofil fehlen noch bestätigte Messungen. Sprich einen Satz im Aussprachebereich nach, um zu beginnen.",
|
||||
"profile.sounds": "Laute über verschiedene Wörter hinweg",
|
||||
"profile.words": "Wörter",
|
||||
"profile.completeness": "Vollständigkeit – ausgelassene Wörter",
|
||||
"profile.less": "Weniger anzeigen",
|
||||
"profile.all": "Alle Beobachtungen anzeigen",
|
||||
"profile.limits": "Die Zustände sind Lernhilfen, keine Zertifizierung. Wortgenauigkeit und Lautwerte sind keine statistischen Wahrscheinlichkeiten.",
|
||||
"ui.job_saved": "Auftrag gespeichert",
|
||||
"ui.preparing": "Vorbereitung",
|
||||
"ui.analysing_learning_progress": "Lernstand wird analysiert",
|
||||
"ui.planning_an_exercise": "Lernauftrag wird erstellt",
|
||||
"ui.creating_and_reviewing_an_exercise": "Aufgabe wird erstellt und fachlich geprüft",
|
||||
"ui.evaluating_your_answer": "Antwort wird bewertet",
|
||||
"ui.creating_and_reviewing_twelve_test_questions": "Zwölf Testaufgaben werden erstellt und geprüft",
|
||||
"ui.unable_to_load_the_course": "Der Kurs konnte nicht geladen werden.",
|
||||
"ui.unable_to_complete_the_job": "Der Auftrag konnte nicht abgeschlossen werden.",
|
||||
"ui.back_to_the_adaptive_course": "Zurück zum adaptiven Kurs",
|
||||
"ui.loading_a1_course": "Lade A1-Kurs…",
|
||||
"ui.reload": "Erneut laden",
|
||||
"ui.adaptive_language_course_a1": "Adaptiver Sprachkurs · A1",
|
||||
"ui.your_a1_course": "Dein A1-Kurs",
|
||||
"ui.seven_modules_six_learning_areas_and_new_exercises_suited_to": "Sieben Module, sechs Lernbereiche und neue Aufgaben passend zu deinem Lernstand.",
|
||||
"ui.learning_language": "Lernsprache",
|
||||
"ui.course_not_yet_available": " – Kurs noch nicht verfügbar",
|
||||
"ui.a_reviewed_a1_course_pack_is_not_yet_available_for": "Für diese Zielsprache ist noch kein geprüftes A1-Sprachpaket freigeschaltet. Dein bisheriger Lernstand bleibt gespeichert.",
|
||||
"ui.your_learning_progress": "Dein Lernstand",
|
||||
"ui.exercises_are_selected_using_your_saved_evaluations_new_exercises_come": "Der empfohlene Lernweg verbindet Hören, Wortschatz, Lesen, Nachsprechen, Grammatik und Schreiben bis zum freien Sprechen. Einzelne Lernbereiche bleiben direkt wählbar.",
|
||||
"ui.no_ai_learning_analysis_yet_the_teacher_agent_creates_it": "Noch keine KI-Lernanalyse vorhanden. Der Lehrer-Agent erstellt sie aus deinen gespeicherten Antworten.",
|
||||
"ui.the_learning_analysis_is_being_updated_after_your_latest_answer": "Die Lernanalyse wird nach deiner letzten Antwort aktualisiert.",
|
||||
"ui.request_learning_analysis_again": "Lernanalyse erneut anfordern",
|
||||
"ui.ai_assessment_based_on_saved_learning_evidence_all_modules_remain": "KI-Einschätzung auf Basis gespeicherter Lernnachweise. Alle Module bleiben frei zugänglich.",
|
||||
"ui.module": "Modul",
|
||||
"ui.recommended": " · Empfohlen",
|
||||
"ui.learning_objective_achieved_according_to_ai_and_evidence_across_learning": "Lernziel laut KI und Bereichsnachweisen erreicht",
|
||||
"ui.continue_learning": "Weiterlernen",
|
||||
"ui.more_practice": "Noch üben:",
|
||||
"ui.learning_area": "Lernbereich",
|
||||
"ui.ai_recommendation": "KI-Empfehlung",
|
||||
"ui.preparing_exercise": "Aufgabe wird vorbereitet…",
|
||||
"ui.next_exercise": "Nächste Aufgabe",
|
||||
"ui.start_a_new_a1_test_12_questions": "Neuen A1-Test starten · 12 Aufgaben",
|
||||
"ui.you_can_keep_practising_the_number_of_generated_exercises_does": "Du kannst beliebig weiterüben. Die Anzahl erzeugter Aufgaben entscheidet nicht über den Modulabschluss.",
|
||||
"ui.retry_job": "Auftrag erneut versuchen",
|
||||
"ui.no_graded_learning_evidence_yet": "Noch kein bewerteter Lernnachweis",
|
||||
"ui.a1_test": "A1-Test",
|
||||
"ui.test_completed": "Test abgeschlossen",
|
||||
"ui.submitted_evaluation_pending_an_overall_score_appears_once_all_open": "Abgegeben – Bewertung ausstehend. Eine Gesamtnote erscheint nach der Bewertung aller offenen Antworten.",
|
||||
"ui.value_of_12_answers_saved_feedback_appears_at_the_end": "{value0} von 12 Antworten gespeichert. Feedback erscheint am Ende.",
|
||||
"ui.evaluate_pending_answers": "Ausstehende Antworten bewerten",
|
||||
"ui.ai_evaluation_is_currently_unavailable_all_answers_remain_saved": "KI-Bewertung derzeit nicht verfügbar. Alle Antworten bleiben gespeichert.",
|
||||
"ui.overall_result": "Gesamtergebnis:",
|
||||
"ui.request_ai_overall_assessment_again": "KI-Gesamteinschätzung erneut anfordern",
|
||||
"ui.internal_a1_learning_assessment": "Interne A1-Lerneinschätzung.",
|
||||
"ui.saved_exercises": "Gespeicherte Aufgaben",
|
||||
"ui.your_exercises": "Deine Aufgaben",
|
||||
"ui.your_selected_exercises_are_saved_here": "Deine ausgewählten Aufgaben werden hier gespeichert.",
|
||||
"ui.load_more_exercises": "Weitere Aufgaben laden",
|
||||
"ui.a1_test_2": "A1-Test ·",
|
||||
"ui.result": "Ergebnis",
|
||||
"ui.resume": "Fortsetzen",
|
||||
"ui.current_course_exercise": "Aktuelle Kursaufgabe",
|
||||
"ui.request_evaluation": "Bewertung anfordern",
|
||||
"ui.request_evaluation_again": "Bewertung erneut anfordern",
|
||||
"ui.ai_evaluation_is_currently_unavailable_you_can_compare_your_answer": "Die KI-Bewertung ist derzeit nicht verfügbar. Du kannst deine Antwort ohne Benotung mit dem Beispiel vergleichen.",
|
||||
"ui.your_answer_remains_saved_even_if_you_leave_this_page": "Die Antwort bleibt gespeichert, auch wenn du die Seite verlässt.",
|
||||
"ui.choose_a_module_and_request_your_next_exercise": "Wähle ein Modul und fordere deine nächste Aufgabe an.",
|
||||
"ui.open_the_original_fixed_course": "Bisherigen festen Kurs öffnen",
|
||||
"ui.unable_to_play_audio": "Audio konnte nicht abgespielt werden.",
|
||||
"ui.audio_unavailable": "Audio nicht verfügbar.",
|
||||
"ui.unable_to_save_your_answer": "Antwort konnte nicht gespeichert werden.",
|
||||
"ui.from_the_reviewed_exercise_bank": "Aus geprüftem Aufgabenbestand",
|
||||
"ui.created_with_ai": "Mit KI erstellt",
|
||||
"ui.created_with_flowise": "Mit Flowise erstellt",
|
||||
"ui.reviewed_fallback_exercise": "Geprüfte Ersatzaufgabe",
|
||||
"ui.review": " · Wiederholung",
|
||||
"ui.ai_evaluates_content_and_language_the_azure_pronunciation_score_is": "Inhalt und Sprache werden von der KI bewertet. Der Azure-Aussprachewert wird getrennt angezeigt.",
|
||||
"ui.listen": "Anhören",
|
||||
"ui.answer_options": "Antwortmöglichkeiten",
|
||||
"ui.your_answer": "Deine Antwort",
|
||||
"ui.up_to_30_seconds_you_can_listen_to_your_recording": "Bis zu 30 Sekunden. Du kannst die Aufnahme vor dem Absenden anhören.",
|
||||
"ui.processing_answer": "Antwort wird verarbeitet…",
|
||||
"ui.save_test_answer": "Testantwort speichern",
|
||||
"ui.check_answer": "Antwort prüfen",
|
||||
"ui.demo_measurement_does_not_count_as_learning_evidence": "Demo-Messung: zählt nicht als Lernnachweis.",
|
||||
"ui.test_answer_saved_feedback_appears_once_all_twelve_answers_have": "Testantwort gespeichert. Das Feedback erscheint, sobald alle zwölf Antworten bewertet sind.",
|
||||
"ui.answer_saved_the_teacher_agent_is_evaluating_it": "Antwort gespeichert. Der Lehrer-Agent bewertet sie.",
|
||||
"ui.answer_saved_without_a_grade_you_can_request_an_ai": "Antwort gespeichert – ohne verbindliche Note. Eine KI-Bewertung kann später angefordert werden.",
|
||||
"ui.evaluation_is_still_pending_you_can_request_it_again": "Die Bewertung steht noch aus. Du kannst sie erneut anfordern.",
|
||||
"ui.content_and_language": "Inhalt und Sprache: ",
|
||||
"ui.correct": "Richtig",
|
||||
"ui.partially_correct": "Teilweise richtig",
|
||||
"ui.keep_practising": "Noch üben",
|
||||
"ui.recognised_text": "Erkannter Text:",
|
||||
"ui.pronunciation": "Aussprache:",
|
||||
"ui.for_self_comparison_without_grading": "Zum Selbstvergleich, ohne Benotung:",
|
||||
"ui.example": "Beispiel:",
|
||||
"ui.listening_transcript": "Hörtext:",
|
||||
"ui.unable_to_play_the_sentence_please_try_again": "Satz konnte nicht abgespielt werden. Bitte erneut versuchen.",
|
||||
"ui.the_agent_generated_the_same_sentence_again_please_try_once": "Der Agent hat denselben Satz erneut erzeugt. Bitte versuche es noch einmal.",
|
||||
"ui.unable_to_load_exercise": "Uebung konnte nicht geladen werden",
|
||||
"ui.evaluation_failed": "Bewertung fehlgeschlagen",
|
||||
"ui.loading_exercise": "Lade Uebung...",
|
||||
"ui.loading_new_exercise": "Lade neue Uebung...",
|
||||
"ui.different_exercise": "Andere Uebung",
|
||||
"ui.why_this_exercise": "Warum diese Übung:",
|
||||
"ui.loading_sentence": "Satz wird geladen...",
|
||||
"ui.listen_to_sentence": "Satz anhören",
|
||||
"ui.listen_slowly": "Langsam anhören",
|
||||
"ui.listen_to_these_practice_words": "Diese Wörter kannst du gezielt anhören:",
|
||||
"ui.loading_word": "Wort wird geladen...",
|
||||
"ui.practise_value_slowly": "{value0} langsam üben",
|
||||
"ui.evaluating": "Bewertung läuft...",
|
||||
"ui.record_again": "Erneut aufnehmen",
|
||||
"ui.record": "Aufnehmen",
|
||||
"ui.evaluate": "Bewerten",
|
||||
"ui.recording_not_yet_submitted_listen_record_again_or_request_evaluation": "Aufnahme noch nicht gesendet. Anhören, erneut aufnehmen oder bewerten.",
|
||||
"ui.listen_to_your_recording": "Eigene Aufnahme anhören",
|
||||
"ui.evaluating_pronunciation": "Die Aussprache wird bewertet...",
|
||||
"ui.evaluation": "Bewertung",
|
||||
"ui.overall": "Gesamt",
|
||||
"ui.accuracy": "Genauigkeit",
|
||||
"ui.fluency": "Flüssigkeit",
|
||||
"ui.completeness": "Vollständigkeit",
|
||||
"ui.teacher_feedback": "Lehrerfeedback",
|
||||
"ui.microphone_unavailable": "Mikrofon nicht verfuegbar",
|
||||
"ui.no_recording_detected_please_try_again": "Keine Aufnahme erkannt. Bitte erneut versuchen.",
|
||||
"ui.stop": "Stoppen",
|
||||
"ui.starting_microphone": "Mikrofon wird gestartet...",
|
||||
"ui.audio_monitoring": "Audio-Monitoring",
|
||||
"ui.monitor_your_own_voice": "Eigene Stimme mithören",
|
||||
"ui.monitoring_volume": "Mithörlautstärke:",
|
||||
"ui.monitoring_volume_2": "Mithörlautstärke",
|
||||
"ui.use_headphones_while_recording_you_may_hear_your_voice_with": "Während der Aufnahme mit Kopfhörern nutzen. Die eigene Stimme kann leicht verzögert sein.",
|
||||
"ui.sound_analysis": "Lautanalyse",
|
||||
"ui.no_sound_scores_are_available_for_this_recording": "Für diese Aufnahme sind keine Lautwerte verfügbar.",
|
||||
"ui.azure_scores_each_sound_from_0_to_100_scores_below": "Azure bewertet jeden Laut von 0 bis 100. Werte unter 75 markieren hier Übungsbedarf.",
|
||||
"ui.unable_to_start_conversation": "Dialog konnte nicht gestartet werden",
|
||||
"ui.reply_failed": "Antwort fehlgeschlagen",
|
||||
"ui.a1_role_play": "A1 Rollenspiel",
|
||||
"ui.start": "Start",
|
||||
"ui.start_a_short_a1_conversation": "Starte einen kurzen A1-Dialog.",
|
||||
"ui.teacher": "Lehrer",
|
||||
"ui.you": "Du",
|
||||
"ui.send": "Senden",
|
||||
"ui.play_audio": "Audio abspielen",
|
||||
"ui.no_attempts_yet": "Noch kein Versuch",
|
||||
"ui.unable_to_load_metrics": "Kennzahlen konnten nicht geladen werden.",
|
||||
"ui.unable_to_load_users": "Nutzer konnten nicht geladen werden.",
|
||||
"ui.administration": "Verwaltung",
|
||||
"ui.an_overview_of_users_and_learning_activity": "Nutzer und Lernaktivität im Blick.",
|
||||
"ui.product_metrics": "Produktkennzahlen",
|
||||
"ui.total_users": "Nutzer gesamt",
|
||||
"ui.active_in_7_days": "Aktiv in 7 Tagen",
|
||||
"ui.speaking_attempts": "Sprechversuche",
|
||||
"ui.ai_pronunciation_exercises": "KI-Ausspracheübungen",
|
||||
"ui.average_score": "Ø Bewertung",
|
||||
"ui.users": "Nutzer",
|
||||
"ui.accounts_and_learning_activity_search_by_email_address": "Konten und Lernaktivität. Suche nach E-Mail-Adresse.",
|
||||
"ui.search_email": "E-Mail suchen",
|
||||
"ui.search": "Suchen",
|
||||
"ui.role": "Rolle",
|
||||
"ui.registered": "Registriert",
|
||||
"ui.latest_attempt": "Letzter Versuch",
|
||||
"ui.admin": "Admin",
|
||||
"ui.learners": "Lernende",
|
||||
"ui.no_matching_users_found": "Keine passenden Nutzer gefunden.",
|
||||
"ui.loading_users": "Lade Nutzer...",
|
||||
"ui.back": "Zurück",
|
||||
"ui.next": "Weiter",
|
||||
"ui.product_operations": "Produktbetrieb",
|
||||
"ui.sales_and_access": "Verkauf und Zugänge",
|
||||
"ui.plans_payments_and_access_to_purchased_content_are_not_connected": "Tarife, Zahlungen und Berechtigungen für gekaufte Inhalte sind noch nicht angeschlossen. Deshalb zeigt dieser Bereich keine erfundenen Umsatz- oder Abozahlen.",
|
||||
"ui.next_product_catalogue": "Als Nächstes: Produktkatalog",
|
||||
"ui.then_payment_provider_and_webhooks": "Dann: Zahlungsanbieter und Webhooks",
|
||||
"ui.after_that_access_rights_per_purchase": "Danach: Zugangsrechte pro Kauf",
|
||||
"ui.unable_to_load_call_details": "Aufrufdetails konnten nicht geladen werden.",
|
||||
"ui.ai_administration_unavailable": "KI-Verwaltung nicht verfügbar",
|
||||
"ui.ai_administration": "KI-Verwaltung",
|
||||
"ui.ai_settings_and_usage": "KI-Einstellungen und Verbrauch",
|
||||
"ui.direct_model_calls_from_go_amounts_are_usd_estimates_the": "Direkte Modellaufrufe aus Go. Beträge sind Schätzungen in USD; verbindlich ist die Anbieterrechnung. Tages- und Monatsgrenzen gelten in UTC.",
|
||||
"ui.loading_ai_settings": "KI-Einstellungen werden geladen…",
|
||||
"ui.budget": "Budget",
|
||||
"ui.configured": "konfiguriert",
|
||||
"ui.not_configured": "nicht konfiguriert",
|
||||
"ui.at_least_80_of_a_budget_is_committed": "Mindestens 80 % eines Budgets sind belegt.",
|
||||
"ui.ai_calls_are_blocked_until_a_positive_monthly_budget_is": "KI-Aufrufe sind gesperrt, bis ein positives Monatsbudget eingerichtet ist.",
|
||||
"ui.monthly_limit_in_usd": "Monatslimit in USD",
|
||||
"ui.daily_limit_in_usd_0_no_daily_limit": "Tageslimit in USD · 0 = kein Tageslimit",
|
||||
"ui.budget_saved": "Budget gespeichert.",
|
||||
"ui.save_budget": "Budget speichern",
|
||||
"ui.a_conservative_upper_limit_is_reserved_before_each_call_unknown": "Vor jedem Aufruf wird eine konservative Obergrenze reserviert. Unbekannter Verbrauch bleibt gebunden, bis du ihn mit der Anbieterrechnung abgleichst. Eine neue Aufgabe kann mehrere Aufrufe benötigen.",
|
||||
"ui.model_profiles": "Modellprofile",
|
||||
"ui.action": "Arbeitsschritt",
|
||||
"ui.provider": "Anbieter",
|
||||
"ui.model_id": "Modell-ID",
|
||||
"ui.maximum_output_tokens": "Maximale Ausgabetokens",
|
||||
"ui.context_budget_input_and_output": "Kontextbudget · Ein- und Ausgabe",
|
||||
"ui.temperature_empty_do_not_send": "Temperatur · leer = nicht senden",
|
||||
"ui.reasoning_effort_only_when_supported": "Denkaufwand · nur bei Unterstützung",
|
||||
"ui.do_not_send": "Nicht senden",
|
||||
"ui.timeout_in_seconds": "Zeitlimit in Sekunden",
|
||||
"ui.value_models_loaded_connection_successful_a_test_run_incurs_additional": "{value0} Modelle geladen. Verbindung erfolgreich. Ein Testlauf erzeugt zusätzliche, erfasste Kosten.",
|
||||
"ui.load_model_list_check_connection": "Modellliste laden / Verbindung prüfen",
|
||||
"ui.check_model_names_and_supported_parameters_with_the_provider_the": "Modellnamen und unterstützte Parameter beim Anbieter prüfen. Das Kontextbudget wird vor dem Versand konservativ begrenzt. Für zwölfteilige Tests ein ausreichend großes Profil konfigurieren.",
|
||||
"ui.prices_in_usd_per_million_tokens": "Preise in USD pro Million Tokens",
|
||||
"ui.input": "Eingabe",
|
||||
"ui.cached_input": "Gecachte Eingabe",
|
||||
"ui.output": "Ausgabe",
|
||||
"ui.prices_checked_against_current_provider_pricing": "Preise mit aktuellen Anbieterpreisen abgeglichen",
|
||||
"ui.json_schema_mode_only_for_supported_mistral_models": "JSON-Schemamodus · nur bei unterstütztem Mistral-Modell",
|
||||
"ui.enable_profile_for_new_ai_jobs": "Profil für neue KI-Aufträge aktivieren",
|
||||
"ui.new_profile_version_saved_test_with_correct_and_incorrect_answers": "Neue Profilversion gespeichert. Vor Freigabe mit richtigen und falschen Antworten testen.",
|
||||
"ui.save_model_profile": "Modellprofil speichern",
|
||||
"ui.system_prompt_and_output_schema": "Verwendeter Systemprompt und Ausgabeschema",
|
||||
"ui.no_separate_schema_contract_validation_in_go": "Kein separates Schema; Vertragsprüfung in Go.",
|
||||
"ui.check_evaluation_quality_2_paid_test_cases": "Bewertungsqualität prüfen · 2 kostenpflichtige Testfälle",
|
||||
"ui.check_writing_evaluation_2_paid_test_cases": "Schreibbewertung prüfen · 2 kostenpflichtige Testfälle",
|
||||
"ui.test_saved_profile_incurs_api_costs": "Gespeichertes Profil testen · erzeugt API-Kosten",
|
||||
"ui.paste_only_the_content_of_input_here_this_call_does": "Hier nur den Inhalt von input einfügen. Der Aufruf verändert keinen Kursfortschritt und wird auch für ein deaktiviertes Profil erfasst. Änderungen am Profil zuerst speichern.",
|
||||
"ui.ai_test_input": "KI-Testeingabe",
|
||||
"ui.run_paid_test": "Kostenpflichtigen Test ausführen",
|
||||
"ui.ai_usage": "KI-Verbrauch",
|
||||
"ui.from": "Von",
|
||||
"ui.to": "Bis",
|
||||
"ui.model": "Modell",
|
||||
"ui.user_id": "Nutzer-ID",
|
||||
"ui.all": "Alle",
|
||||
"ui.refresh_usage": "Verbrauch aktualisieren",
|
||||
"ui.ai_call_details": "KI-Aufrufdetails",
|
||||
"ui.call_details": "Aufrufdetails",
|
||||
"ui.close": "Schließen",
|
||||
"ui.loading_call_details": "Aufrufdetails werden geladen…",
|
||||
"ui.reconcile_unknown_usage_with_the_provider_invoice_the_record_and": "Unbekannten Verbrauch anhand der Anbieterrechnung abgleichen. Der Eintrag und die Begründung bleiben erhalten.",
|
||||
"ui.actual_cost_in_usd": "Tatsächliche Kosten in USD",
|
||||
"ui.reason": "Begründung",
|
||||
"ui.save_reconciliation": "Abgleich speichern",
|
||||
"ui.time_user": "Zeit / Nutzer",
|
||||
"ui.model_action": "Modell / Schritt",
|
||||
"ui.status": "Status",
|
||||
"ui.tokens_in_out": "Tokens Ein / Aus",
|
||||
"ui.cost": "Kosten",
|
||||
"ui.details": "Details",
|
||||
"ui.unknown": "Unbekannt",
|
||||
"ui.show": "Anzeigen",
|
||||
"ui.test": " · Test",
|
||||
"ui.system_diagnostics": "Systemdiagnose",
|
||||
"ui.check_again": "Neu pruefen",
|
||||
"ui.error": "Fehler",
|
||||
"ui.no_http_status": "Kein HTTP-Status",
|
||||
"ui.request_id_value": "Request-ID {value0}",
|
||||
"ui.database": "Datenbank",
|
||||
"ui.ai_connection": "KI-Anbindung",
|
||||
"ui.azure_speech": "Azure Speech",
|
||||
"ui.runtime": "Runtime",
|
||||
"ui.configuration": "Konfiguration",
|
||||
"ui.problem": "Problem",
|
||||
"ui.not_checked_yet": "Noch nicht geprueft.",
|
||||
"ui.no_data": "Keine Daten.",
|
||||
"ui.unknown_error": "Unbekannter Fehler",
|
||||
"ui.check_value": "{value0} pruefen",
|
||||
"ui.vocabulary": "Wortschatz",
|
||||
"ui.listening": "Hören",
|
||||
"ui.reading": "Lesen",
|
||||
"ui.grammar": "Grammatik",
|
||||
"ui.writing": "Schreiben",
|
||||
"ui.speaking": "Sprechen",
|
||||
"ui.unable_to_load_course": "Kurs konnte nicht geladen werden.",
|
||||
"ui.an_exercise_from_the_reviewed_bank_is_ready": "Eine Aufgabe aus dem geprüften Bestand ist bereit.",
|
||||
"ui.an_additional_ai_exercise_is_ready": "Eine mit KI erstellte Zusatzaufgabe ist bereit.",
|
||||
"ui.a_fixed_course_exercise_is_ready_for_review": "Du erhältst eine feste Kursaufgabe zur Wiederholung.",
|
||||
"ui.unable_to_load_additional_exercise": "Zusatzaufgabe konnte nicht geladen werden.",
|
||||
"ui.unable_to_play_audio_please_try_again": "Audio konnte nicht abgespielt werden. Bitte erneut versuchen.",
|
||||
"ui.unable_to_evaluate_your_answer": "Antwort konnte nicht bewertet werden.",
|
||||
"ui.unable_to_evaluate_pronunciation": "Aussprache konnte nicht bewertet werden.",
|
||||
"ui.no_course_module_is_available_for_your_current_language_and": "Für deine aktuelle Sprache und Lernstufe ist noch kein Kursmodul verfügbar.",
|
||||
"ui.loading_a1_course_2": "Lade A1-Kurs...",
|
||||
"ui.guided_a1_course": "Geführter A1-Kurs",
|
||||
"ui.module_progress": "Modulfortschritt",
|
||||
"ui.additional_practice": "Zusätzlich üben",
|
||||
"ui.review_vocabulary_and_grammar_your_progress_in_the_fixed_course": "Wortschatz und Grammatik wiederholen. Dein Fortschritt im festen Kurs bleibt davon getrennt.",
|
||||
"ui.new_additional_exercise": "Neue Zusatzaufgabe",
|
||||
"ui.loading_additional_exercises": "Zusatzaufgaben werden geladen…",
|
||||
"ui.preparing_a_suitable_exercise_this_can_take_up_to_25": "Eine passende Aufgabe wird vorbereitet. Das kann bis zu 25 Sekunden dauern.",
|
||||
"ui.unable_to_load_additional_exercise_2": "Zusatzaufgabe konnte nicht geladen werden:",
|
||||
"ui.course_exercises": "Kursaufgaben",
|
||||
"ui.your_additional_exercises": "Deine Zusatzaufgaben",
|
||||
"ui.exercise": "Aufgabe",
|
||||
"ui.from_the_reviewed_exercise_bank_2": "Aus geprüftem Aufgabenbestand · ",
|
||||
"ui.created_with_ai_2": "Mit KI erstellt · ",
|
||||
"ui.created_with_flowise_2": "Mit Flowise erstellt · ",
|
||||
"ui.fixed_course_exercise_for_review": "Feste Kursaufgabe zur Wiederholung · ",
|
||||
"ui.additional_practice_2": "Zusätzlich üben · ",
|
||||
"ui.listen_first_the_spoken_text_appears_after_your_answer": "Höre zuerst zu. Der gesprochene Text erscheint nach deiner Antwort.",
|
||||
"ui.checking": "Wird geprüft...",
|
||||
"ui.you_can_listen_to_your_recording_or_record_again_before": "Du kannst die Aufnahme vor dem Bewerten anhören oder erneut aufnehmen.",
|
||||
"ui.correct_2": "Richtig!",
|
||||
"ui.not_correct_yet": "Noch nicht richtig.",
|
||||
"ui.example_answer": "Musterantwort:",
|
||||
"ui.listening_transcript_2": "Gehörter Text:",
|
||||
"action.analyze_course_progress": "Lernanalyse",
|
||||
"action.plan_course_task": "Aufgabenplanung",
|
||||
"action.author_course_task": "Aufgabenautor",
|
||||
"action.review_course_task": "Aufgabenprüfung",
|
||||
"action.author_course_exam": "Testautor · 12 Aufgaben",
|
||||
"action.review_course_exam": "Testprüfung · 12 Aufgaben",
|
||||
"action.evaluate_course_attempt": "Antwortbewertung",
|
||||
"action.summarize_course_exam": "Testzusammenfassung",
|
||||
"action.next_exercise": "Aussprachegenerierung",
|
||||
"course.modulesLabel": "A1-Module",
|
||||
"course.inventory": "Geprüfter Aufgabenbestand: {total} Aufgaben · {unseen} noch neu. Danach stehen Wiederholungen bereit.",
|
||||
"course.progress": "{tasks} Aufgaben · {attempts} Antworten · Ø {score}/100",
|
||||
"admin.matches": "{count} Treffer",
|
||||
"admin.page": "Seite {page} von {total}",
|
||||
"ai.access": "API-Zugänge: DeepSeek {deepseek} · Mistral {mistral}",
|
||||
"ai.committed": "Monat gebunden: {month} · Tag gebunden: {day} · Offene Reservierungen: {open}",
|
||||
"ai.version": "Version {version}. Änderungen gelten für neue Aufträge; laufende Aufträge behalten ihre Einstellungen.",
|
||||
"ai.tokens": "{calls} Aufrufe · Eingabe {input} · Ausgabe {output} Tokens",
|
||||
"ai.costs": "Geschätzte Kosten {cost} · offene Reservierungen {reserved} · Verbrauch unbekannt bei {unknown} Aufrufen",
|
||||
"ai.profileVersion": " · Profil v{version}",
|
||||
"ai.attempt": "{ms} ms · Versuch {attempt}",
|
||||
"ai.reserved": "Reserviert {cost}",
|
||||
"ai.range": "{from}–{to} von {total}",
|
||||
"legacy.completed": "{done} von {total} Aufgaben bearbeitet",
|
||||
"legacy.correct": "{count} Aufgaben richtig gelöst. „Bearbeitet“ bedeutet nicht „A1 bestanden“.",
|
||||
"legacy.areaProgress": "{done}/{total} bearbeitet · {correct} Ziel erreicht",
|
||||
"recorder.percent": "{volume} Prozent",
|
||||
"recorder.volume": "Mithörlautstärke: {volume} %",
|
||||
"phoneme.tooltip": "{word}: Laut /{phoneme}/, {score} von 100 Punkten",
|
||||
"language.content": "Lerninhalte und gespeicherte Rückmeldungen behalten ihre ursprüngliche Sprache.",
|
||||
"conversation.answer": "Deine Dialogantwort",
|
||||
"conversation.audioError": "Audio konnte nicht abgespielt werden.",
|
||||
"course.noVariant": "Für diese Lernsprache ist noch kein vollständiger Aufgabenbestand in deiner Muttersprache verfügbar. Dein bisheriger Verlauf bleibt zugänglich.",
|
||||
"course.examUnavailable": "Für den A1-Test fehlt noch ein vollständiger Bestand in dieser Muttersprache. Bereits begonnene Tests behalten ihre Aufgaben.",
|
||||
"course.taskLanguage": "Sprache dieser Aufgabe: {language}",
|
||||
"api.courseVariantUnavailable": "Für diese Muttersprache ist hier noch kein geprüfter Aufgabenbestand verfügbar.",
|
||||
"language.ru-RU": "Russisch",
|
||||
"api.native_language_unsupported": "Diese Muttersprache wird noch nicht unterstützt.",
|
||||
"api.native_language_conflict": "Oberfläche und Erklärungen müssen dieselbe Muttersprache verwenden.",
|
||||
"api.invalid_credentials": "E-Mail oder Passwort ist falsch.",
|
||||
"api.invalid_email": "Bitte gib eine gültige E-Mail-Adresse ein.",
|
||||
"api.password_too_short": "Das Passwort muss mindestens acht Zeichen enthalten.",
|
||||
"api.email_in_use": "Diese E-Mail-Adresse ist bereits registriert.",
|
||||
"api.invalid_request": "Die Anfrage ist ungültig. Bitte prüfe deine Eingaben.",
|
||||
"api.authentication_required": "Bitte melde dich erneut an.",
|
||||
"api.access_denied": "Du hast keinen Zugriff auf diese Funktion.",
|
||||
"api.not_found": "Der angeforderte Inhalt wurde nicht gefunden.",
|
||||
"api.operation_conflict": "Die Aktion ist im aktuellen Zustand nicht möglich. Bitte lade die Daten neu.",
|
||||
"api.upload_too_large": "Die hochgeladene Datei ist zu groß.",
|
||||
"api.unsupported_audio_format": "Dieses Audioformat wird nicht unterstützt.",
|
||||
"api.rate_limited": "Zu viele Anfragen. Bitte versuche es später erneut.",
|
||||
"api.service_unavailable": "Der Dienst ist vorübergehend nicht verfügbar.",
|
||||
"api.request_timeout": "Die Anfrage hat zu lange gedauert. Bitte versuche es erneut.",
|
||||
"api.internal_error": "Die Anfrage konnte nicht verarbeitet werden. Bitte versuche es später erneut.",
|
||||
"api.network_error": "Die Verbindung zum Server ist fehlgeschlagen.",
|
||||
"api.invalid_json": "Die JSON-Daten sind ungültig.",
|
||||
"api.microphone_permission_denied": "Bitte erlaube den Mikrofonzugriff im Browser.",
|
||||
"profile.observations.few": "{count} unabhängige Beobachtungen",
|
||||
"profile.observations.many": "{count} unabhängige Beobachtungen",
|
||||
"profile.contexts.few": "{count} Wortkontexte",
|
||||
"profile.contexts.many": "{count} Wortkontexte",
|
||||
"profile.tasks.few": "{count} Aufgaben",
|
||||
"profile.tasks.many": "{count} Aufgaben",
|
||||
"seed.hello": "Sprich den Satz klar nach.",
|
||||
"seed.from": "Achte auf den Rhythmus im Satz.",
|
||||
"seed.coffee": "Sprich langsam und deutlich.",
|
||||
"seed.water": "Achte auf die Endlaute.",
|
||||
"seed.phone": "Sprich jede Zahl einzeln sauber.",
|
||||
"seed.intro.title": "Sich vorstellen",
|
||||
"seed.cafe.title": "Im Café",
|
||||
"seed.numbers.title": "Zahlen",
|
||||
"seed.generated.title": "Ausspracheübung",
|
||||
"seed.historical": "Historischer fester Kurs: Die gespeicherten Aufgaben und Erklärungen bleiben in ihrer ursprünglichen Sprache. Für neue Aufgaben in deiner Muttersprache nutze den aktuellen A1-Kurs.",
|
||||
"sequence.default": "Empfohlener Lernweg",
|
||||
"sequence.title": "Dein thematischer Lernweg",
|
||||
"sequence.intro": "Die Übungen bauen zum selben Thema aufeinander auf. Antworte und wähle dann „Nächste Aufgabe“. Du kannst einen Schritt überspringen oder einen Lernbereich direkt wählen. Bearbeitet bedeutet noch nicht beherrscht.",
|
||||
"sequence.position": "Thema {topic} von {topics} · Schritt {step} von {steps}",
|
||||
"sequence.skip": "Diesen Schritt überspringen",
|
||||
"sequence.complete": "Die Schritte dieses Lernwegs sind bearbeitet, anhand früherer Übung berücksichtigt oder ausdrücklich übersprungen. Weitere Aufgaben richten sich nach deinen gespeicherten Bewertungen. Das ist noch kein Nachweis, dass du alles beherrschst.",
|
||||
"sequence.phase.listen": "Zuerst hören",
|
||||
"sequence.phase.vocabulary": "Wörter im Zusammenhang verstehen",
|
||||
"sequence.phase.read": "Ein passendes Beispiel lesen",
|
||||
"sequence.phase.repeat": "Mit Vorlage nachsprechen",
|
||||
"sequence.phase.grammar": "Das Satzmuster üben",
|
||||
"sequence.phase.write": "Mit Vorgabe schreiben",
|
||||
"sequence.phase.compose": "Selbstständig formulieren",
|
||||
"sequence.phase.speak": "Das Thema frei sprechen",
|
||||
"sequence.review": "Bei der letzten Antwort gab es einen Fehler. Übe diesen Schritt noch einmal oder überspringe ihn. Danach geht der Lernweg weiter, unabhängig von der Punktzahl.",
|
||||
"sequence.transfer": "Du hast die Grundlage bereits gut geübt. Prüfe dasselbe Satzmuster jetzt an einem neuen Beispiel.",
|
||||
"sequence.refresh": "Diese Grundlage wird noch einmal aufgefrischt: Die bisherigen Ergebnisse sind älter oder reichen für weniger Wiederholungen noch nicht aus.",
|
||||
"sequence.reused": "Bereits gut bearbeitete Grundlagen berücksichtigt: {count}. Dafür entstehen keine neuen Antworten oder Leistungsnachweise.",
|
||||
"sequence.previousAttempt": "Bewertung deines vorherigen Versuchs · {date}",
|
||||
"sequence.previousNotice": "Diese Bewertung gehört zu einer früheren Antwort. Für diesen Übungsdurchgang kannst du erneut antworten; die frühere Bewertung bleibt gespeichert."
|
||||
}
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"appName": "Speech Learning",
|
||||
"targetLevel": "A1 English"
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
import type { Exercise, Lesson } from '../api/types';
|
||||
import { useI18n, type MessageKey } from './I18n';
|
||||
|
||||
const seedPrompts: Record<string, MessageKey> = {
|
||||
ex_a1_hello: 'seed.hello', ex_a1_from: 'seed.from', ex_a1_coffee: 'seed.coffee',
|
||||
ex_a1_water: 'seed.water', ex_a1_phone: 'seed.phone'
|
||||
};
|
||||
const seedLessons: Record<string, MessageKey> = {
|
||||
les_a1_intro: 'seed.intro.title', les_a1_cafe: 'seed.cafe.title', les_a1_numbers: 'seed.numbers.title'
|
||||
};
|
||||
|
||||
// Only the fixed recorder instructions are interface templates. Generated prompts
|
||||
// and stored feedback retain their content and recorded language.
|
||||
export function useExercisePresentation() {
|
||||
const { t, language } = useI18n();
|
||||
return (lesson: Lesson, exercise: Exercise) => {
|
||||
const seed = exercise.source === 'seed' && seedPrompts[exercise.id];
|
||||
return {
|
||||
prompt: seed ? t(seed) : exercise.prompt_text,
|
||||
promptLanguage: seed ? language : exercise.instruction_language ?? 'de-DE',
|
||||
title: seedLessons[lesson.id] ? t(seedLessons[lesson.id]) : lesson.title === 'Agent generated practice' ? t('seed.generated.title') : lesson.title
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
import { useI18n } from './I18n';
|
||||
import type { CourseSkill } from '../api/adaptive';
|
||||
|
||||
export function useCourseSkillNames(): Record<CourseSkill, string> {
|
||||
const { t } = useI18n();
|
||||
return {grammar:t('ui.grammar'),vocabulary:t('ui.vocabulary'),listening:t('ui.listening'),reading:t('ui.reading'),speaking:t('ui.speaking'),writing:t('ui.writing')};
|
||||
}
|
||||
|
||||
export function useAIActionNames(): Record<string, string> {
|
||||
const { t } = useI18n();
|
||||
return {
|
||||
analyze_course_progress:t('action.analyze_course_progress'),
|
||||
plan_course_task:t('action.plan_course_task'),
|
||||
author_course_task:t('action.author_course_task'),
|
||||
review_course_task:t('action.review_course_task'),
|
||||
author_course_exam:t('action.author_course_exam'),
|
||||
review_course_exam:t('action.review_course_exam'),
|
||||
evaluate_course_attempt:t('action.evaluate_course_attempt'),
|
||||
summarize_course_exam:t('action.summarize_course_exam'),
|
||||
next_exercise:t('action.next_exercise'),
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,467 @@
|
||||
{
|
||||
"app.name": "Speech Learning",
|
||||
"app.level": "Изучение языков — A1",
|
||||
"nav.today": "Сегодня",
|
||||
"nav.practice": "Произношение",
|
||||
"nav.course": "Курс A1",
|
||||
"nav.conversation": "Диалог",
|
||||
"nav.progress": "Прогресс",
|
||||
"nav.admin": "Администрирование",
|
||||
"nav.debug": "Диагностика",
|
||||
"nav.label": "Навигация",
|
||||
"auth.email": "Электронная почта",
|
||||
"auth.password": "Пароль",
|
||||
"auth.login": "Войти",
|
||||
"auth.register": "Создать аккаунт",
|
||||
"auth.register.submit": "Зарегистрироваться",
|
||||
"auth.back": "Вернуться ко входу",
|
||||
"auth.logout": "Выйти",
|
||||
"auth.loading": "Загрузка аккаунта",
|
||||
"auth.wait": "Пожалуйста, подождите.",
|
||||
"auth.loadError": "Не удалось загрузить аккаунт.",
|
||||
"auth.loginError": "Не удалось войти",
|
||||
"auth.registerError": "Не удалось зарегистрироваться",
|
||||
"auth.busy": "Подождите…",
|
||||
"auth.denied": "Нет доступа к администрированию.",
|
||||
"common.retry": "Повторить",
|
||||
"language.label": "Родной язык",
|
||||
"language.saveError": "Не удалось сохранить язык.",
|
||||
"language.instructions": "Родной язык: {language}.",
|
||||
"language.de-DE": "Немецкий",
|
||||
"language.en-US": "Английский",
|
||||
"language.registerInfo": "Родной язык используется в интерфейсе и объяснениях. Вы изучаете английский язык.",
|
||||
"dashboard.error": "Не удалось загрузить главную страницу",
|
||||
"dashboard.loading": "Загрузка главной страницы…",
|
||||
"dashboard.title": "Тренировка произношения — A1",
|
||||
"dashboard.next": "Следующее упражнение",
|
||||
"dashboard.dailyGoal": "Цель на день",
|
||||
"dashboard.average": "Средний балл",
|
||||
"dashboard.attempts": "Попытки",
|
||||
"dashboard.minutes": "{count} мин",
|
||||
"progress.error": "Не удалось загрузить прогресс",
|
||||
"progress.loading": "Загрузка прогресса…",
|
||||
"progress.overview": "Обзор обучения",
|
||||
"progress.average": "Средний балл за всё время",
|
||||
"progress.recent": "Последние попытки",
|
||||
"language.bank": "Новые задания и объяснения используют ваш родной язык. Изучаемый язык не меняется.",
|
||||
"profile.title": "Профиль произношения",
|
||||
"profile.yours": "Ваш профиль произношения · {language}",
|
||||
"profile.error": "Профиль произношения недоступен",
|
||||
"profile.loading": "Загрузка профиля произношения…",
|
||||
"profile.state.limited": "Мало данных — нужна повторная проверка",
|
||||
"profile.state.observed": "Результаты пока неоднородны",
|
||||
"profile.state.needs_practice": "Повторяющиеся трудности",
|
||||
"profile.state.improved": "Есть улучшение",
|
||||
"profile.state.stable": "Стабильный результат с повторением",
|
||||
"profile.trend.insufficient": "Недостаточно данных для оценки динамики",
|
||||
"profile.trend.improving": "Результаты улучшаются",
|
||||
"profile.trend.declining": "В последнее время снова труднее",
|
||||
"profile.trend.steady": "Последние результаты похожи",
|
||||
"profile.none": "В этом разделе пока нет подтверждённых измерений.",
|
||||
"profile.omission": "Взвешенная доля пропусков: {count} %",
|
||||
"profile.observations.one": "{count} наблюдение",
|
||||
"profile.observations.other": "{count} независимых наблюдений",
|
||||
"profile.contexts.one": "{count} слово",
|
||||
"profile.contexts.other": "{count} словесных контекстов",
|
||||
"profile.tasks.one": "{count} задание",
|
||||
"profile.tasks.other": "{count} заданий",
|
||||
"profile.last": "{trend}. Последнее измерение: {date}.",
|
||||
"profile.examples": "Примеры слов: {words}",
|
||||
"profile.due": "Пора повторить: {date}",
|
||||
"profile.next": "Следующее повторение: {date}",
|
||||
"profile.intro": "Настоящие измерения Azure при повторении фраз в тренировке произношения и в курсе рассматриваются вместе. Более свежие результаты имеют больший вес; одного отклонения недостаточно, чтобы установить проблему со звуком.",
|
||||
"profile.evidence": "Учтено записей: {recordings}, период: {days} дней. Повторения одного задания в один день считаются одним наблюдением для каждого слова или звука.",
|
||||
"profile.history": "Старые попытки ({count}) сохранены в истории. Источник их измерений не подтверждён, поэтому они не определяют этот профиль.",
|
||||
"profile.start": "Для нового профиля произношения пока не хватает подтверждённых измерений. Начните с повторения фразы в разделе произношения.",
|
||||
"profile.sounds": "Звуки в разных словах",
|
||||
"profile.words": "Слова",
|
||||
"profile.completeness": "Полнота — пропущенные слова",
|
||||
"profile.less": "Показать меньше",
|
||||
"profile.all": "Показать все наблюдения",
|
||||
"profile.limits": "Эти состояния помогают учиться и не являются сертификацией. Баллы точности слов и звуков не являются статистическими вероятностями.",
|
||||
"ui.job_saved": "Запрос сохранён",
|
||||
"ui.preparing": "Подготовка",
|
||||
"ui.analysing_learning_progress": "Анализ прогресса",
|
||||
"ui.planning_an_exercise": "Подготовка учебного задания",
|
||||
"ui.creating_and_reviewing_an_exercise": "Создание и проверка задания",
|
||||
"ui.evaluating_your_answer": "Оценка ответа",
|
||||
"ui.creating_and_reviewing_twelve_test_questions": "Создание и проверка двенадцати заданий теста",
|
||||
"ui.unable_to_load_the_course": "Не удалось загрузить курс.",
|
||||
"ui.unable_to_complete_the_job": "Не удалось выполнить запрос.",
|
||||
"ui.back_to_the_adaptive_course": "Вернуться к адаптивному курсу",
|
||||
"ui.loading_a1_course": "Загрузка курса A1…",
|
||||
"ui.reload": "Загрузить заново",
|
||||
"ui.adaptive_language_course_a1": "Адаптивный языковой курс · A1",
|
||||
"ui.your_a1_course": "Ваш курс A1",
|
||||
"ui.seven_modules_six_learning_areas_and_new_exercises_suited_to": "Семь модулей, шесть направлений и новые задания с учётом вашего прогресса.",
|
||||
"ui.learning_language": "Изучаемый язык",
|
||||
"ui.course_not_yet_available": " — Курс пока недоступен",
|
||||
"ui.a_reviewed_a1_course_pack_is_not_yet_available_for": "Для этого изучаемого языка пока нет проверенного курса A1. Ваш прежний прогресс сохранён.",
|
||||
"ui.your_learning_progress": "Ваш прогресс в обучении",
|
||||
"ui.exercises_are_selected_using_your_saved_evaluations_new_exercises_come": "Рекомендуемый учебный путь связывает аудирование, лексику, чтение, повторение вслух, грамматику и письмо, подготавливая к самостоятельной речи. Любое направление можно выбрать напрямую.",
|
||||
"ui.no_ai_learning_analysis_yet_the_teacher_agent_creates_it": "Анализа ИИ пока нет. Учитель создаёт его на основе ваших сохранённых ответов.",
|
||||
"ui.the_learning_analysis_is_being_updated_after_your_latest_answer": "Анализ прогресса обновляется после последнего ответа.",
|
||||
"ui.request_learning_analysis_again": "Запросить анализ прогресса повторно",
|
||||
"ui.ai_assessment_based_on_saved_learning_evidence_all_modules_remain": "Оценка ИИ основана на сохранённых результатах обучения. Все модули остаются доступными.",
|
||||
"ui.module": "Модуль",
|
||||
"ui.recommended": " · Рекомендуется",
|
||||
"ui.learning_objective_achieved_according_to_ai_and_evidence_across_learning": "По оценке ИИ и результатам по направлениям цель достигнута",
|
||||
"ui.continue_learning": "Продолжить обучение",
|
||||
"ui.more_practice": "Ещё потренировать:",
|
||||
"ui.learning_area": "Направление обучения",
|
||||
"ui.ai_recommendation": "Рекомендация ИИ",
|
||||
"ui.preparing_exercise": "Подготовка задания…",
|
||||
"ui.next_exercise": "Следующее задание",
|
||||
"ui.start_a_new_a1_test_12_questions": "Начать новый тест A1 · 12 заданий",
|
||||
"ui.you_can_keep_practising_the_number_of_generated_exercises_does": "Вы можете продолжать заниматься. Количество созданных заданий не определяет завершение модуля.",
|
||||
"ui.retry_job": "Повторить запрос",
|
||||
"ui.no_graded_learning_evidence_yet": "Пока нет оценённых результатов обучения",
|
||||
"ui.a1_test": "Тест A1",
|
||||
"ui.test_completed": "Тест завершён",
|
||||
"ui.submitted_evaluation_pending_an_overall_score_appears_once_all_open": "Ответы отправлены — ожидается оценка. Итоговый балл появится после оценки всех открытых ответов.",
|
||||
"ui.value_of_12_answers_saved_feedback_appears_at_the_end": "Сохранено ответов: {value0} из 12. Обратная связь появится в конце.",
|
||||
"ui.evaluate_pending_answers": "Оценить ожидающие ответы",
|
||||
"ui.ai_evaluation_is_currently_unavailable_all_answers_remain_saved": "Оценка ИИ сейчас недоступна. Все ответы сохранены.",
|
||||
"ui.overall_result": "Итоговый результат:",
|
||||
"ui.request_ai_overall_assessment_again": "Запросить итоговую оценку ИИ повторно",
|
||||
"ui.internal_a1_learning_assessment": "Внутренняя оценка уровня A1.",
|
||||
"ui.saved_exercises": "Сохранённые задания",
|
||||
"ui.your_exercises": "Ваши задания",
|
||||
"ui.your_selected_exercises_are_saved_here": "Выбранные задания сохраняются здесь.",
|
||||
"ui.load_more_exercises": "Загрузить ещё задания",
|
||||
"ui.a1_test_2": "Тест A1 ·",
|
||||
"ui.result": "Результат",
|
||||
"ui.resume": "Продолжить",
|
||||
"ui.current_course_exercise": "Текущее задание курса",
|
||||
"ui.request_evaluation": "Запросить оценку",
|
||||
"ui.request_evaluation_again": "Запросить оценку повторно",
|
||||
"ui.ai_evaluation_is_currently_unavailable_you_can_compare_your_answer": "Оценка ИИ сейчас недоступна. Вы можете сравнить ответ с примером без выставления балла.",
|
||||
"ui.your_answer_remains_saved_even_if_you_leave_this_page": "Ответ останется сохранённым, даже если вы уйдёте со страницы.",
|
||||
"ui.choose_a_module_and_request_your_next_exercise": "Выберите модуль и запросите следующее задание.",
|
||||
"ui.open_the_original_fixed_course": "Открыть прежний фиксированный курс",
|
||||
"ui.unable_to_play_audio": "Не удалось воспроизвести аудио.",
|
||||
"ui.audio_unavailable": "Аудио недоступно.",
|
||||
"ui.unable_to_save_your_answer": "Не удалось сохранить ответ.",
|
||||
"ui.from_the_reviewed_exercise_bank": "Из проверенного банка заданий",
|
||||
"ui.created_with_ai": "Создано с помощью ИИ",
|
||||
"ui.created_with_flowise": "Создано с помощью Flowise",
|
||||
"ui.reviewed_fallback_exercise": "Проверенное резервное задание",
|
||||
"ui.review": " · Повторение",
|
||||
"ui.ai_evaluates_content_and_language_the_azure_pronunciation_score_is": "ИИ оценивает содержание и язык. Балл произношения Azure показывается отдельно.",
|
||||
"ui.listen": "Прослушать",
|
||||
"ui.answer_options": "Варианты ответа",
|
||||
"ui.your_answer": "Ваш ответ",
|
||||
"ui.up_to_30_seconds_you_can_listen_to_your_recording": "До 30 секунд. Перед отправкой запись можно прослушать.",
|
||||
"ui.processing_answer": "Обработка ответа…",
|
||||
"ui.save_test_answer": "Сохранить ответ теста",
|
||||
"ui.check_answer": "Проверить ответ",
|
||||
"ui.demo_measurement_does_not_count_as_learning_evidence": "Демонстрационное измерение: не считается результатом обучения.",
|
||||
"ui.test_answer_saved_feedback_appears_once_all_twelve_answers_have": "Ответ теста сохранён. Обратная связь появится после оценки всех двенадцати ответов.",
|
||||
"ui.answer_saved_the_teacher_agent_is_evaluating_it": "Ответ сохранён. Учитель оценивает его.",
|
||||
"ui.answer_saved_without_a_grade_you_can_request_an_ai": "Ответ сохранён без оценки. Позже можно запросить оценку ИИ.",
|
||||
"ui.evaluation_is_still_pending_you_can_request_it_again": "Оценка ещё ожидается. Вы можете запросить её повторно.",
|
||||
"ui.content_and_language": "Содержание и язык: ",
|
||||
"ui.correct": "Верно",
|
||||
"ui.partially_correct": "Частично верно",
|
||||
"ui.keep_practising": "Нужно ещё потренироваться",
|
||||
"ui.recognised_text": "Распознанный текст:",
|
||||
"ui.pronunciation": "Произношение:",
|
||||
"ui.for_self_comparison_without_grading": "Для самостоятельного сравнения, без оценки:",
|
||||
"ui.example": "Пример:",
|
||||
"ui.listening_transcript": "Текст аудиозаписи:",
|
||||
"ui.unable_to_play_the_sentence_please_try_again": "Не удалось воспроизвести фразу. Повторите попытку.",
|
||||
"ui.the_agent_generated_the_same_sentence_again_please_try_once": "Учитель снова создал ту же фразу. Попробуйте ещё раз.",
|
||||
"ui.unable_to_load_exercise": "Не удалось загрузить упражнение",
|
||||
"ui.evaluation_failed": "Не удалось выполнить оценку",
|
||||
"ui.loading_exercise": "Загрузка упражнения…",
|
||||
"ui.loading_new_exercise": "Загрузка нового упражнения…",
|
||||
"ui.different_exercise": "Другое упражнение",
|
||||
"ui.why_this_exercise": "Почему это упражнение:",
|
||||
"ui.loading_sentence": "Загрузка фразы…",
|
||||
"ui.listen_to_sentence": "Прослушать фразу",
|
||||
"ui.listen_slowly": "Прослушать медленно",
|
||||
"ui.listen_to_these_practice_words": "Эти слова можно прослушать отдельно:",
|
||||
"ui.loading_word": "Загрузка слова…",
|
||||
"ui.practise_value_slowly": "Медленно потренировать {value0}",
|
||||
"ui.evaluating": "Выполняется оценка…",
|
||||
"ui.record_again": "Записать заново",
|
||||
"ui.record": "Записать",
|
||||
"ui.evaluate": "Оценить",
|
||||
"ui.recording_not_yet_submitted_listen_record_again_or_request_evaluation": "Запись ещё не отправлена. Прослушайте её, запишите заново или запросите оценку.",
|
||||
"ui.listen_to_your_recording": "Прослушать свою запись",
|
||||
"ui.evaluating_pronunciation": "Оценка произношения…",
|
||||
"ui.evaluation": "Оценка",
|
||||
"ui.overall": "Общий балл",
|
||||
"ui.accuracy": "Точность",
|
||||
"ui.fluency": "Беглость",
|
||||
"ui.completeness": "Полнота",
|
||||
"ui.teacher_feedback": "Обратная связь учителя",
|
||||
"ui.microphone_unavailable": "Микрофон недоступен",
|
||||
"ui.no_recording_detected_please_try_again": "Запись не обнаружена. Повторите попытку.",
|
||||
"ui.stop": "Остановить",
|
||||
"ui.starting_microphone": "Запуск микрофона…",
|
||||
"ui.audio_monitoring": "Мониторинг звука",
|
||||
"ui.monitor_your_own_voice": "Слышать свой голос",
|
||||
"ui.monitoring_volume": "Громкость мониторинга:",
|
||||
"ui.monitoring_volume_2": "Громкость мониторинга",
|
||||
"ui.use_headphones_while_recording_you_may_hear_your_voice_with": "Используйте наушники во время записи. Собственный голос может звучать с небольшой задержкой.",
|
||||
"ui.sound_analysis": "Анализ звуков",
|
||||
"ui.no_sound_scores_are_available_for_this_recording": "Для этой записи нет оценок отдельных звуков.",
|
||||
"ui.azure_scores_each_sound_from_0_to_100_scores_below": "Azure оценивает каждый звук от 0 до 100. Баллы ниже 75 здесь обозначают необходимость практики.",
|
||||
"ui.unable_to_start_conversation": "Не удалось начать диалог",
|
||||
"ui.reply_failed": "Не удалось получить ответ",
|
||||
"ui.a1_role_play": "Ролевая игра A1",
|
||||
"ui.start": "Начать",
|
||||
"ui.start_a_short_a1_conversation": "Начните короткий диалог уровня A1.",
|
||||
"ui.teacher": "Учитель",
|
||||
"ui.you": "Вы",
|
||||
"ui.send": "Отправить",
|
||||
"ui.play_audio": "Воспроизвести аудио",
|
||||
"ui.no_attempts_yet": "Попыток пока нет",
|
||||
"ui.unable_to_load_metrics": "Не удалось загрузить показатели.",
|
||||
"ui.unable_to_load_users": "Не удалось загрузить пользователей.",
|
||||
"ui.administration": "Управление",
|
||||
"ui.an_overview_of_users_and_learning_activity": "Обзор пользователей и учебной активности.",
|
||||
"ui.product_metrics": "Показатели продукта",
|
||||
"ui.total_users": "Всего пользователей",
|
||||
"ui.active_in_7_days": "Активны за 7 дней",
|
||||
"ui.speaking_attempts": "Речевые попытки",
|
||||
"ui.ai_pronunciation_exercises": "Упражнения ИИ на произношение",
|
||||
"ui.average_score": "Средний балл",
|
||||
"ui.users": "Пользователи",
|
||||
"ui.accounts_and_learning_activity_search_by_email_address": "Аккаунты и учебная активность. Поиск по электронной почте.",
|
||||
"ui.search_email": "Найти по электронной почте",
|
||||
"ui.search": "Найти",
|
||||
"ui.role": "Роль",
|
||||
"ui.registered": "Дата регистрации",
|
||||
"ui.latest_attempt": "Последняя попытка",
|
||||
"ui.admin": "Администратор",
|
||||
"ui.learners": "Учащиеся",
|
||||
"ui.no_matching_users_found": "Подходящие пользователи не найдены.",
|
||||
"ui.loading_users": "Загрузка пользователей…",
|
||||
"ui.back": "Назад",
|
||||
"ui.next": "Далее",
|
||||
"ui.product_operations": "Работа продукта",
|
||||
"ui.sales_and_access": "Продажи и доступ",
|
||||
"ui.plans_payments_and_access_to_purchased_content_are_not_connected": "Тарифы, платежи и доступ к купленным материалам пока не подключены. Поэтому выручка и число подписок не показываются.",
|
||||
"ui.next_product_catalogue": "Следующий шаг: каталог продуктов",
|
||||
"ui.then_payment_provider_and_webhooks": "Затем: платёжный провайдер и вебхуки",
|
||||
"ui.after_that_access_rights_per_purchase": "После этого: права доступа по покупке",
|
||||
"ui.unable_to_load_call_details": "Не удалось загрузить сведения о вызове.",
|
||||
"ui.ai_administration_unavailable": "Управление ИИ недоступно",
|
||||
"ui.ai_administration": "Управление ИИ",
|
||||
"ui.ai_settings_and_usage": "Настройки ИИ и расход",
|
||||
"ui.direct_model_calls_from_go_amounts_are_usd_estimates_the": "Прямые вызовы моделей из Go. Суммы указаны как оценки в USD; окончателен счёт провайдера. Суточные и месячные лимиты действуют по UTC.",
|
||||
"ui.loading_ai_settings": "Загрузка настроек ИИ…",
|
||||
"ui.budget": "Бюджет",
|
||||
"ui.configured": "настроен",
|
||||
"ui.not_configured": "не настроен",
|
||||
"ui.at_least_80_of_a_budget_is_committed": "Занято не менее 80 % одного из бюджетов.",
|
||||
"ui.ai_calls_are_blocked_until_a_positive_monthly_budget_is": "Вызовы ИИ заблокированы, пока не задан положительный месячный бюджет.",
|
||||
"ui.monthly_limit_in_usd": "Месячный лимит в USD",
|
||||
"ui.daily_limit_in_usd_0_no_daily_limit": "Суточный лимит в USD · 0 = без суточного лимита",
|
||||
"ui.budget_saved": "Бюджет сохранён.",
|
||||
"ui.save_budget": "Сохранить бюджет",
|
||||
"ui.a_conservative_upper_limit_is_reserved_before_each_call_unknown": "Перед каждым вызовом резервируется консервативная верхняя граница расходов. Неизвестный расход остаётся зарезервированным до сверки со счётом провайдера. Для одного задания может потребоваться несколько вызовов.",
|
||||
"ui.model_profiles": "Профили моделей",
|
||||
"ui.action": "Действие",
|
||||
"ui.provider": "Провайдер",
|
||||
"ui.model_id": "ID модели",
|
||||
"ui.maximum_output_tokens": "Максимум выходных токенов",
|
||||
"ui.context_budget_input_and_output": "Бюджет контекста · ввод и вывод",
|
||||
"ui.temperature_empty_do_not_send": "Температура · пусто = не отправлять",
|
||||
"ui.reasoning_effort_only_when_supported": "Усилие рассуждения · только при поддержке",
|
||||
"ui.do_not_send": "Не отправлять",
|
||||
"ui.timeout_in_seconds": "Тайм-аут в секундах",
|
||||
"ui.value_models_loaded_connection_successful_a_test_run_incurs_additional": "Загружено моделей: {value0}. Соединение установлено. Тестовый запуск создаёт дополнительные учитываемые расходы.",
|
||||
"ui.load_model_list_check_connection": "Загрузить модели / проверить соединение",
|
||||
"ui.check_model_names_and_supported_parameters_with_the_provider_the": "Проверьте названия моделей и поддерживаемые параметры у провайдера. Бюджет контекста консервативно ограничивается перед отправкой. Для тестов из двенадцати заданий настройте достаточно большой профиль.",
|
||||
"ui.prices_in_usd_per_million_tokens": "Цены в USD за миллион токенов",
|
||||
"ui.input": "Ввод",
|
||||
"ui.cached_input": "Кэшированный ввод",
|
||||
"ui.output": "Вывод",
|
||||
"ui.prices_checked_against_current_provider_pricing": "Цены сверены с текущими ценами провайдера",
|
||||
"ui.json_schema_mode_only_for_supported_mistral_models": "Режим JSON Schema · только для поддерживаемых моделей Mistral",
|
||||
"ui.enable_profile_for_new_ai_jobs": "Включить профиль для новых запросов ИИ",
|
||||
"ui.new_profile_version_saved_test_with_correct_and_incorrect_answers": "Новая версия профиля сохранена. Перед включением проверьте правильные и неправильные ответы.",
|
||||
"ui.save_model_profile": "Сохранить профиль модели",
|
||||
"ui.system_prompt_and_output_schema": "Системная инструкция и схема ответа",
|
||||
"ui.no_separate_schema_contract_validation_in_go": "Отдельной схемы нет; контракт проверяется в Go.",
|
||||
"ui.check_evaluation_quality_2_paid_test_cases": "Проверить качество оценки · 2 платных теста",
|
||||
"ui.check_writing_evaluation_2_paid_test_cases": "Проверить письменную оценку · 2 платных теста",
|
||||
"ui.test_saved_profile_incurs_api_costs": "Проверить сохранённый профиль · создаёт расходы API",
|
||||
"ui.paste_only_the_content_of_input_here_this_call_does": "Вставьте только содержимое input. Вызов не меняет прогресс курса и учитывается даже для выключенного профиля. Сначала сохраните изменения профиля.",
|
||||
"ui.ai_test_input": "Тестовый ввод ИИ",
|
||||
"ui.run_paid_test": "Запустить платный тест",
|
||||
"ui.ai_usage": "Расход ИИ",
|
||||
"ui.from": "С",
|
||||
"ui.to": "По",
|
||||
"ui.model": "Модель",
|
||||
"ui.user_id": "ID пользователя",
|
||||
"ui.all": "Все",
|
||||
"ui.refresh_usage": "Обновить расход",
|
||||
"ui.ai_call_details": "Сведения о вызове ИИ",
|
||||
"ui.call_details": "Сведения о вызове",
|
||||
"ui.close": "Закрыть",
|
||||
"ui.loading_call_details": "Загрузка сведений о вызове…",
|
||||
"ui.reconcile_unknown_usage_with_the_provider_invoice_the_record_and": "Сверьте неизвестный расход со счётом провайдера. Запись и обоснование сохраняются.",
|
||||
"ui.actual_cost_in_usd": "Фактическая стоимость в USD",
|
||||
"ui.reason": "Обоснование",
|
||||
"ui.save_reconciliation": "Сохранить сверку",
|
||||
"ui.time_user": "Время / пользователь",
|
||||
"ui.model_action": "Модель / действие",
|
||||
"ui.status": "Статус",
|
||||
"ui.tokens_in_out": "Токены: ввод / вывод",
|
||||
"ui.cost": "Стоимость",
|
||||
"ui.details": "Подробности",
|
||||
"ui.unknown": "Неизвестно",
|
||||
"ui.show": "Показать",
|
||||
"ui.test": " · Тест",
|
||||
"ui.system_diagnostics": "Диагностика системы",
|
||||
"ui.check_again": "Проверить снова",
|
||||
"ui.error": "Ошибка",
|
||||
"ui.no_http_status": "Нет HTTP-статуса",
|
||||
"ui.request_id_value": "ID запроса: {value0}",
|
||||
"ui.database": "База данных",
|
||||
"ui.ai_connection": "Подключение ИИ",
|
||||
"ui.azure_speech": "Azure Speech",
|
||||
"ui.runtime": "Среда выполнения",
|
||||
"ui.configuration": "Конфигурация",
|
||||
"ui.problem": "Проблема",
|
||||
"ui.not_checked_yet": "Ещё не проверено.",
|
||||
"ui.no_data": "Нет данных.",
|
||||
"ui.unknown_error": "Неизвестная ошибка",
|
||||
"ui.check_value": "Проверить: {value0}",
|
||||
"ui.vocabulary": "Лексика",
|
||||
"ui.listening": "Аудирование",
|
||||
"ui.reading": "Чтение",
|
||||
"ui.grammar": "Грамматика",
|
||||
"ui.writing": "Письмо",
|
||||
"ui.speaking": "Говорение",
|
||||
"ui.unable_to_load_course": "Не удалось загрузить курс.",
|
||||
"ui.an_exercise_from_the_reviewed_bank_is_ready": "Задание из проверенного банка готово.",
|
||||
"ui.an_additional_ai_exercise_is_ready": "Дополнительное задание ИИ готово.",
|
||||
"ui.a_fixed_course_exercise_is_ready_for_review": "Подготовлено фиксированное задание курса для повторения.",
|
||||
"ui.unable_to_load_additional_exercise": "Не удалось загрузить дополнительное задание.",
|
||||
"ui.unable_to_play_audio_please_try_again": "Не удалось воспроизвести аудио. Повторите попытку.",
|
||||
"ui.unable_to_evaluate_your_answer": "Не удалось оценить ответ.",
|
||||
"ui.unable_to_evaluate_pronunciation": "Не удалось оценить произношение.",
|
||||
"ui.no_course_module_is_available_for_your_current_language_and": "Для вашего изучаемого языка и уровня пока нет модуля курса.",
|
||||
"ui.loading_a1_course_2": "Загрузка курса A1…",
|
||||
"ui.guided_a1_course": "Учебный курс A1",
|
||||
"ui.module_progress": "Прогресс модуля",
|
||||
"ui.additional_practice": "Дополнительная практика",
|
||||
"ui.review_vocabulary_and_grammar_your_progress_in_the_fixed_course": "Повторите лексику и грамматику. Прогресс фиксированного курса учитывается отдельно.",
|
||||
"ui.new_additional_exercise": "Новое дополнительное задание",
|
||||
"ui.loading_additional_exercises": "Загрузка дополнительных заданий…",
|
||||
"ui.preparing_a_suitable_exercise_this_can_take_up_to_25": "Подготавливается подходящее задание. Это может занять до 25 секунд.",
|
||||
"ui.unable_to_load_additional_exercise_2": "Не удалось загрузить дополнительное задание:",
|
||||
"ui.course_exercises": "Задания курса",
|
||||
"ui.your_additional_exercises": "Ваши дополнительные задания",
|
||||
"ui.exercise": "Задание",
|
||||
"ui.from_the_reviewed_exercise_bank_2": "Из проверенного банка заданий · ",
|
||||
"ui.created_with_ai_2": "Создано с помощью ИИ · ",
|
||||
"ui.created_with_flowise_2": "Создано с помощью Flowise · ",
|
||||
"ui.fixed_course_exercise_for_review": "Фиксированное задание для повторения · ",
|
||||
"ui.additional_practice_2": "Дополнительная практика · ",
|
||||
"ui.listen_first_the_spoken_text_appears_after_your_answer": "Сначала прослушайте запись. Текст появится после ответа.",
|
||||
"ui.checking": "Проверка…",
|
||||
"ui.you_can_listen_to_your_recording_or_record_again_before": "Перед оценкой вы можете прослушать запись или записать её заново.",
|
||||
"ui.correct_2": "Верно!",
|
||||
"ui.not_correct_yet": "Пока неверно.",
|
||||
"ui.example_answer": "Пример ответа:",
|
||||
"ui.listening_transcript_2": "Текст аудиозаписи:",
|
||||
"action.analyze_course_progress": "Анализ прогресса",
|
||||
"action.plan_course_task": "Планирование задания",
|
||||
"action.author_course_task": "Создание задания",
|
||||
"action.review_course_task": "Проверка задания",
|
||||
"action.author_course_exam": "Создание теста · 12 заданий",
|
||||
"action.review_course_exam": "Проверка теста · 12 заданий",
|
||||
"action.evaluate_course_attempt": "Оценка ответа",
|
||||
"action.summarize_course_exam": "Итоги теста",
|
||||
"action.next_exercise": "Создание упражнения на произношение",
|
||||
"course.modulesLabel": "Модули A1",
|
||||
"course.inventory": "Проверенный банк: {total} заданий · новых: {unseen}. После них доступны повторения.",
|
||||
"course.progress": "Заданий: {tasks} · ответов: {attempts} · средний балл: {score}/100",
|
||||
"admin.matches": "Найдено: {count}",
|
||||
"admin.page": "Страница {page} из {total}",
|
||||
"ai.access": "Доступ к API: DeepSeek — {deepseek} · Mistral — {mistral}",
|
||||
"ai.committed": "Занято за месяц: {month} · за сутки: {day} · открытые резервы: {open}",
|
||||
"ai.version": "Версия {version}. Изменения действуют для новых запросов; выполняемые запросы сохраняют свои настройки.",
|
||||
"ai.tokens": "Вызовов: {calls} · ввод: {input} · вывод: {output} токенов",
|
||||
"ai.costs": "Оценка стоимости: {cost} · открытые резервы: {reserved} · неизвестный расход у {unknown} вызовов",
|
||||
"ai.profileVersion": " · профиль v{version}",
|
||||
"ai.attempt": "{ms} мс · попытка {attempt}",
|
||||
"ai.reserved": "Зарезервировано: {cost}",
|
||||
"ai.range": "{from}–{to} из {total}",
|
||||
"legacy.completed": "Выполнено заданий: {done} из {total}",
|
||||
"legacy.correct": "Правильно выполнено заданий: {count}. «Выполнено» не означает «уровень A1 сдан».",
|
||||
"legacy.areaProgress": "Выполнено: {done}/{total} · достигнуто целей: {correct}",
|
||||
"recorder.percent": "{volume} %",
|
||||
"recorder.volume": "Громкость мониторинга: {volume} %",
|
||||
"phoneme.tooltip": "{word}: звук /{phoneme}/, {score} из 100 баллов",
|
||||
"language.content": "Ранее назначенные задания и сохранённая обратная связь сохраняют исходный язык.",
|
||||
"conversation.answer": "Ваш ответ в диалоге",
|
||||
"conversation.audioError": "Не удалось воспроизвести аудио.",
|
||||
"course.noVariant": "Для этого изучаемого языка пока нет полного банка заданий на вашем родном языке. История обучения остаётся доступной.",
|
||||
"course.examUnavailable": "Полный банк для теста A1 на вашем родном языке пока недоступен. Уже начатые тесты сохраняют свои задания.",
|
||||
"course.taskLanguage": "Язык этого сохранённого задания: {language}",
|
||||
"api.courseVariantUnavailable": "Для вашего родного языка здесь пока нет проверенного банка заданий.",
|
||||
"language.ru-RU": "Русский",
|
||||
"api.native_language_unsupported": "Этот родной язык пока не поддерживается.",
|
||||
"api.native_language_conflict": "Интерфейс и объяснения должны использовать один родной язык.",
|
||||
"api.invalid_credentials": "Неверная почта или пароль.",
|
||||
"api.invalid_email": "Введите действительный адрес электронной почты.",
|
||||
"api.password_too_short": "Пароль должен содержать не менее восьми символов.",
|
||||
"api.email_in_use": "Этот адрес электронной почты уже зарегистрирован.",
|
||||
"api.invalid_request": "Некорректный запрос. Проверьте введённые данные.",
|
||||
"api.authentication_required": "Войдите в аккаунт ещё раз.",
|
||||
"api.access_denied": "У вас нет доступа к этой функции.",
|
||||
"api.not_found": "Запрошенный материал не найден.",
|
||||
"api.operation_conflict": "В текущем состоянии действие невозможно. Обновите данные.",
|
||||
"api.upload_too_large": "Загружаемый файл слишком большой.",
|
||||
"api.unsupported_audio_format": "Этот аудиоформат не поддерживается.",
|
||||
"api.rate_limited": "Слишком много запросов. Повторите попытку позже.",
|
||||
"api.service_unavailable": "Сервис временно недоступен.",
|
||||
"api.request_timeout": "Время ожидания истекло. Повторите попытку.",
|
||||
"api.internal_error": "Не удалось обработать запрос. Повторите попытку позже.",
|
||||
"api.network_error": "Не удалось подключиться к серверу.",
|
||||
"api.invalid_json": "Некорректные данные JSON.",
|
||||
"api.microphone_permission_denied": "Разрешите доступ к микрофону в браузере.",
|
||||
"profile.observations.few": "{count} наблюдения",
|
||||
"profile.observations.many": "{count} наблюдений",
|
||||
"profile.contexts.few": "{count} слова",
|
||||
"profile.contexts.many": "{count} слов",
|
||||
"profile.tasks.few": "{count} задания",
|
||||
"profile.tasks.many": "{count} заданий",
|
||||
"seed.hello": "Чётко повторите предложение вслух.",
|
||||
"seed.from": "Обратите внимание на ритм предложения.",
|
||||
"seed.coffee": "Говорите медленно и чётко.",
|
||||
"seed.water": "Обратите внимание на конечные звуки.",
|
||||
"seed.phone": "Чётко произнесите каждую цифру отдельно.",
|
||||
"seed.intro.title": "Знакомство",
|
||||
"seed.cafe.title": "В кафе",
|
||||
"seed.numbers.title": "Числа",
|
||||
"seed.generated.title": "Упражнение на произношение",
|
||||
"seed.historical": "Исторический фиксированный курс: сохранённые задания и объяснения остаются на исходном языке. Новые задания на вашем родном языке доступны в текущем курсе A1.",
|
||||
"sequence.default": "Рекомендуемый учебный путь",
|
||||
"sequence.title": "Ваш тематический учебный путь",
|
||||
"sequence.intro": "Упражнения последовательно раскрывают одну тему. Ответьте и нажмите «Следующее задание». Можно пропустить шаг или выбрать направление обучения напрямую. Выполненное задание ещё не означает освоение материала.",
|
||||
"sequence.position": "Тема {topic} из {topics} · Шаг {step} из {steps}",
|
||||
"sequence.skip": "Пропустить этот шаг",
|
||||
"sequence.complete": "Шаги этого учебного пути выполнены, учтены по предыдущей практике или явно пропущены. Дальнейшие задания подбираются по сохранённым оценкам. Это ещё не подтверждает освоение всего материала.",
|
||||
"sequence.phase.listen": "Сначала послушать",
|
||||
"sequence.phase.vocabulary": "Понять слова в контексте",
|
||||
"sequence.phase.read": "Прочитать пример по теме",
|
||||
"sequence.phase.repeat": "Повторить вслух по образцу",
|
||||
"sequence.phase.grammar": "Потренировать структуру предложения",
|
||||
"sequence.phase.write": "Написать по заданию",
|
||||
"sequence.phase.compose": "Самостоятельно составить текст",
|
||||
"sequence.phase.speak": "Самостоятельно рассказать по теме",
|
||||
"sequence.review": "В последнем ответе была ошибка. Повторите этот шаг ещё раз или пропустите его. После этого учебный путь продолжится независимо от балла.",
|
||||
"sequence.transfer": "Вы уже хорошо потренировали эту основу. Теперь проверьте ту же структуру предложения на новом примере.",
|
||||
"sequence.refresh": "Повторим эту основу: предыдущие результаты устарели или их пока недостаточно, чтобы сократить повторения.",
|
||||
"sequence.reused": "Учтены ранее хорошо выполненные базовые шаги: {count}. Новые ответы или подтверждения освоения при этом не создаются.",
|
||||
"sequence.previousAttempt": "Оценка предыдущей попытки · {date}",
|
||||
"sequence.previousNotice": "Эта оценка относится к предыдущему ответу. В текущем упражнении можно ответить заново; прежняя оценка сохраняется."
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
import { useState } from 'react';
|
||||
import { ApiError } from '../api/client';
|
||||
import { useI18n, type MessageKey } from './I18n';
|
||||
|
||||
type Message = string | { key: MessageKey; parameters?: Record<string, string | number> };
|
||||
|
||||
// Store local notices as keys so a language switch updates them immediately.
|
||||
// API codes are localized; saved feedback retains its original language.
|
||||
export function useLocalizedMessage() {
|
||||
const { t } = useI18n();
|
||||
const [message, setMessage] = useState<Message>('');
|
||||
return [typeof message === 'string' ? message : t(message.key, message.parameters), setMessage] as const;
|
||||
}
|
||||
|
||||
export function errorMessage(error: unknown, fallback: MessageKey): Message {
|
||||
if (error instanceof ApiError) {
|
||||
const key = apiErrors[error.code];
|
||||
return { key: key ?? fallback };
|
||||
}
|
||||
if (error instanceof TypeError) return { key: 'api.network_error' };
|
||||
if (error instanceof SyntaxError) return { key: 'api.invalid_json' };
|
||||
if (error instanceof DOMException && ['NotAllowedError', 'PermissionDeniedError'].includes(error.name)) return { key: 'api.microphone_permission_denied' };
|
||||
return { key: fallback };
|
||||
}
|
||||
|
||||
const apiErrors: Record<string, MessageKey> = {
|
||||
course_variant_unavailable: 'api.courseVariantUnavailable',
|
||||
native_language_unsupported: 'api.native_language_unsupported',
|
||||
native_language_conflict: 'api.native_language_conflict',
|
||||
invalid_credentials: 'api.invalid_credentials',
|
||||
invalid_email: 'api.invalid_email',
|
||||
password_too_short: 'api.password_too_short',
|
||||
email_in_use: 'api.email_in_use',
|
||||
invalid_request: 'api.invalid_request',
|
||||
authentication_required: 'api.authentication_required',
|
||||
access_denied: 'api.access_denied',
|
||||
not_found: 'api.not_found',
|
||||
operation_conflict: 'api.operation_conflict',
|
||||
upload_too_large: 'api.upload_too_large',
|
||||
unsupported_audio_format: 'api.unsupported_audio_format',
|
||||
rate_limited: 'api.rate_limited',
|
||||
service_unavailable: 'api.service_unavailable',
|
||||
request_timeout: 'api.request_timeout',
|
||||
internal_error: 'api.internal_error',
|
||||
};
|
||||
@@ -2,9 +2,10 @@ import React from 'react';
|
||||
import ReactDOM from 'react-dom/client';
|
||||
import { App } from './app/App';
|
||||
import './app/styles.css';
|
||||
import { I18nProvider } from './i18n/I18n';
|
||||
|
||||
ReactDOM.createRoot(document.getElementById('root')!).render(
|
||||
<React.StrictMode>
|
||||
<App />
|
||||
<I18nProvider><App /></I18nProvider>
|
||||
</React.StrictMode>
|
||||
);
|
||||
|
||||
@@ -1,26 +1,28 @@
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import { AIAdmin } from '../components/AIAdmin';
|
||||
import { useEffect, useState, type FormEvent } from 'react';
|
||||
import { fetchAdminOverview, fetchAdminUsers } from '../api/admin';
|
||||
import type { AdminOverview, AdminUserPage } from '../api/types';
|
||||
|
||||
function formatDate(value?: string) {
|
||||
return value ? new Date(value).toLocaleDateString('de-DE') : 'Noch kein Versuch';
|
||||
}
|
||||
|
||||
export function AdminPage() {
|
||||
const { t, language } = useI18n();
|
||||
function formatDate(value?: string) {
|
||||
return value ? new Date(value).toLocaleDateString(language) : t('ui.no_attempts_yet');
|
||||
}
|
||||
const [overview, setOverview] = useState<AdminOverview | null>(null);
|
||||
const [users, setUsers] = useState<AdminUserPage | null>(null);
|
||||
const [searchInput, setSearchInput] = useState('');
|
||||
const [search, setSearch] = useState('');
|
||||
const [page, setPage] = useState(1);
|
||||
const [overviewError, setOverviewError] = useState('');
|
||||
const [usersError, setUsersError] = useState('');
|
||||
const [overviewError, setOverviewError] = useLocalizedMessage();
|
||||
const [usersError, setUsersError] = useLocalizedMessage();
|
||||
|
||||
useEffect(() => {
|
||||
let cancelled = false;
|
||||
fetchAdminOverview()
|
||||
.then((data) => { if (!cancelled) setOverview(data); })
|
||||
.catch((error) => { if (!cancelled) setOverviewError(error instanceof Error ? error.message : 'Kennzahlen konnten nicht geladen werden.'); });
|
||||
.catch((error) => { if (!cancelled) setOverviewError(errorMessage(error, 'ui.unable_to_load_metrics')); });
|
||||
return () => { cancelled = true; };
|
||||
}, []);
|
||||
|
||||
@@ -28,7 +30,7 @@ export function AdminPage() {
|
||||
let cancelled = false;
|
||||
fetchAdminUsers(search, page)
|
||||
.then((data) => { if (!cancelled) { setUsers(data); setUsersError(''); } })
|
||||
.catch((error) => { if (!cancelled) setUsersError(error instanceof Error ? error.message : 'Nutzer konnten nicht geladen werden.'); });
|
||||
.catch((error) => { if (!cancelled) setUsersError(errorMessage(error, 'ui.unable_to_load_users')); });
|
||||
return () => { cancelled = true; };
|
||||
}, [search, page]);
|
||||
|
||||
@@ -42,46 +44,46 @@ export function AdminPage() {
|
||||
<div className="view-stack admin-view">
|
||||
<header className="view-header">
|
||||
<div>
|
||||
<p className="eyebrow">Verwaltung</p>
|
||||
<h1>Adminbereich</h1>
|
||||
<p className="muted">Nutzer und Lernaktivität im Blick.</p>
|
||||
<p className="eyebrow">{t('ui.administration')}</p>
|
||||
<h1>{t('nav.admin')}</h1>
|
||||
<p className="muted">{t('ui.an_overview_of_users_and_learning_activity')}</p>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
{overviewError && <p className="form-error" role="alert">{overviewError}</p>}
|
||||
<section className="admin-metrics" aria-label="Produktkennzahlen">
|
||||
<div className="panel metric"><span>Nutzer gesamt</span><strong>{overview?.users_total ?? '–'}</strong></div>
|
||||
<div className="panel metric"><span>Aktiv in 7 Tagen</span><strong>{overview?.users_active_7_days ?? '–'}</strong></div>
|
||||
<div className="panel metric"><span>Sprechversuche</span><strong>{overview?.attempts_total ?? '–'}</strong></div>
|
||||
<div className="panel metric"><span>KI-Ausspracheübungen</span><strong>{overview?.exercises_generated ?? '–'}</strong></div>
|
||||
<div className="panel metric"><span>Ø Bewertung</span><strong>{overview ? Math.round(overview.average_score) : '–'}</strong></div>
|
||||
<section className="admin-metrics" aria-label={t('ui.product_metrics')}>
|
||||
<div className="panel metric"><span>{t('ui.total_users')}</span><strong>{overview?.users_total ?? '–'}</strong></div>
|
||||
<div className="panel metric"><span>{t('ui.active_in_7_days')}</span><strong>{overview?.users_active_7_days ?? '–'}</strong></div>
|
||||
<div className="panel metric"><span>{t('ui.speaking_attempts')}</span><strong>{overview?.attempts_total ?? '–'}</strong></div>
|
||||
<div className="panel metric"><span>{t('ui.ai_pronunciation_exercises')}</span><strong>{overview?.exercises_generated ?? '–'}</strong></div>
|
||||
<div className="panel metric"><span>{t('ui.average_score')}</span><strong>{overview ? Math.round(overview.average_score) : '–'}</strong></div>
|
||||
</section>
|
||||
|
||||
<section className="panel admin-users">
|
||||
<div className="admin-section-head">
|
||||
<div>
|
||||
<h2>Nutzer</h2>
|
||||
<p className="muted">Konten und Lernaktivität. Suche nach E-Mail-Adresse.</p>
|
||||
<h2>{t('ui.users')}</h2>
|
||||
<p className="muted">{t('ui.accounts_and_learning_activity_search_by_email_address')}</p>
|
||||
</div>
|
||||
<span className="admin-count">{users?.total ?? '–'} Treffer</span>
|
||||
<span className="admin-count">{t('admin.matches', { count: users?.total.toLocaleString(language) ?? '–' })}</span>
|
||||
</div>
|
||||
<form className="admin-search" onSubmit={submitSearch}>
|
||||
<label htmlFor="admin-user-search">E-Mail suchen</label>
|
||||
<label htmlFor="admin-user-search">{t('ui.search_email')}</label>
|
||||
<div className="action-row">
|
||||
<input id="admin-user-search" type="search" value={searchInput} maxLength={100}
|
||||
onChange={(event) => setSearchInput(event.target.value)} placeholder="name@beispiel.de" />
|
||||
<button className="primary-button" type="submit">Suchen</button>
|
||||
<button className="primary-button" type="submit">{t('ui.search')}</button>
|
||||
</div>
|
||||
</form>
|
||||
{usersError && <p className="form-error" role="alert">{usersError}</p>}
|
||||
<div className="admin-table-wrap">
|
||||
<table className="admin-table">
|
||||
<thead><tr><th>Nutzer</th><th>Rolle</th><th>Registriert</th><th>Versuche</th><th>Ø Bewertung</th><th>Letzter Versuch</th></tr></thead>
|
||||
<thead><tr><th>{t('ui.users')}</th><th>{t('ui.role')}</th><th>{t('ui.registered')}</th><th>{t('dashboard.attempts')}</th><th>{t('ui.average_score')}</th><th>{t('ui.latest_attempt')}</th></tr></thead>
|
||||
<tbody>
|
||||
{(users?.users ?? []).map((user) => (
|
||||
<tr key={user.id}>
|
||||
<td><strong>{user.email}</strong><small>{user.id}</small></td>
|
||||
<td><span className={user.role === 'admin' ? 'admin-role admin-role-staff' : 'admin-role'}>{user.role === 'admin' ? 'Admin' : 'Lernende'}</span></td>
|
||||
<td><span className={user.role === 'admin' ? 'admin-role admin-role-staff' : 'admin-role'}>{user.role === 'admin' ? t('ui.admin') : t('ui.learners')}</span></td>
|
||||
<td>{formatDate(user.created_at)}</td>
|
||||
<td>{user.attempts}</td>
|
||||
<td>{user.attempts > 0 ? Math.round(user.average_score) : '–'}</td>
|
||||
@@ -90,27 +92,27 @@ export function AdminPage() {
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
{users && users.users.length === 0 && <p className="muted admin-empty">Keine passenden Nutzer gefunden.</p>}
|
||||
{!users && !usersError && <p className="muted admin-empty">Lade Nutzer...</p>}
|
||||
{users && users.users.length === 0 && <p className="muted admin-empty">{t('ui.no_matching_users_found')}</p>}
|
||||
{!users && !usersError && <p className="muted admin-empty">{t('ui.loading_users')}</p>}
|
||||
</div>
|
||||
<div className="admin-pagination">
|
||||
<button className="ghost-button" disabled={page <= 1} onClick={() => setPage(page - 1)}>Zurück</button>
|
||||
<span>Seite {page} von {Math.max(1, Math.ceil((users?.total ?? 0) / 25))}</span>
|
||||
<button className="ghost-button" disabled={!users || page * 25 >= users.total} onClick={() => setPage(page + 1)}>Weiter</button>
|
||||
<button className="ghost-button" disabled={page <= 1} onClick={() => setPage(page - 1)}>{t('ui.back')}</button>
|
||||
<span>{t('admin.page', { page, total: Math.max(1, Math.ceil((users?.total ?? 0) / 25)) })}</span>
|
||||
<button className="ghost-button" disabled={!users || page * 25 >= users.total} onClick={() => setPage(page + 1)}>{t('ui.next')}</button>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<AIAdmin />
|
||||
<section className="panel admin-product">
|
||||
<div>
|
||||
<p className="eyebrow">Produktbetrieb</p>
|
||||
<h2>Verkauf und Zugänge</h2>
|
||||
<p>Tarife, Zahlungen und Berechtigungen für gekaufte Inhalte sind noch nicht angeschlossen. Deshalb zeigt dieser Bereich keine erfundenen Umsatz- oder Abozahlen.</p>
|
||||
<p className="eyebrow">{t('ui.product_operations')}</p>
|
||||
<h2>{t('ui.sales_and_access')}</h2>
|
||||
<p>{t('ui.plans_payments_and_access_to_purchased_content_are_not_connected')}</p>
|
||||
</div>
|
||||
<div className="admin-next-steps">
|
||||
<span>Als Nächstes: Produktkatalog</span>
|
||||
<span>Dann: Zahlungsanbieter und Webhooks</span>
|
||||
<span>Danach: Zugangsrechte pro Kauf</span>
|
||||
<span>{t('ui.next_product_catalogue')}</span>
|
||||
<span>{t('ui.then_payment_provider_and_webhooks')}</span>
|
||||
<span>{t('ui.after_that_access_rights_per_purchase')}</span>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
@@ -1,13 +1,17 @@
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import { Play, Send } from 'lucide-react';
|
||||
import { FormEvent, useState } from 'react';
|
||||
import { sendConversationTurn, startConversation, type ConversationResponse } from '../api/conversation';
|
||||
|
||||
export function ConversationPage() {
|
||||
const { t } = useI18n();
|
||||
const [sessionId, setSessionId] = useState('');
|
||||
const [targetLanguage, setTargetLanguage] = useState<string | undefined>();
|
||||
const [input, setInput] = useState('');
|
||||
const [turns, setTurns] = useState<Array<{ speaker: string; text: string }>>([]);
|
||||
const [lastAudio, setLastAudio] = useState<ConversationResponse['audio']>(null);
|
||||
const [error, setError] = useState('');
|
||||
const [error, setError] = useLocalizedMessage();
|
||||
const [loading, setLoading] = useState(false);
|
||||
|
||||
async function start() {
|
||||
@@ -16,10 +20,11 @@ export function ConversationPage() {
|
||||
try {
|
||||
const response = await startConversation();
|
||||
setSessionId(response.session?.id ?? '');
|
||||
setTargetLanguage(response.session?.target_language);
|
||||
setLastAudio(response.audio);
|
||||
setTurns([{ speaker: 'teacher', text: response.teacher.tts_text || response.teacher.target_text }]);
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Dialog konnte nicht gestartet werden');
|
||||
setError(errorMessage(err, 'ui.unable_to_start_conversation'));
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
@@ -37,7 +42,7 @@ export function ConversationPage() {
|
||||
setLastAudio(response.audio);
|
||||
setTurns((current) => [...current, { speaker: 'teacher', text: response.teacher.tts_text || response.teacher.target_text }]);
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Antwort fehlgeschlagen');
|
||||
setError(errorMessage(err, 'ui.reply_failed'));
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
@@ -53,35 +58,33 @@ export function ConversationPage() {
|
||||
<div className="view-stack">
|
||||
<header className="view-header">
|
||||
<div>
|
||||
<p className="eyebrow">A1 Rollenspiel</p>
|
||||
<h1>Dialog</h1>
|
||||
<p className="eyebrow">{t('ui.a1_role_play')}</p>
|
||||
<h1>{t('nav.conversation')}</h1>
|
||||
</div>
|
||||
<button className="primary-button" onClick={start} disabled={loading}>
|
||||
<Play size={18} /> Start
|
||||
</button>
|
||||
<Play size={18} /> {t('ui.start')} </button>
|
||||
</header>
|
||||
|
||||
{error && <p className="form-error">{error}</p>}
|
||||
|
||||
<section className="panel dialogue-panel">
|
||||
{turns.length === 0 ? (
|
||||
<p className="muted">Starte einen kurzen A1-Dialog.</p>
|
||||
<p className="muted">{t('ui.start_a_short_a1_conversation')}</p>
|
||||
) : (
|
||||
turns.map((turn, index) => (
|
||||
<div className={`bubble ${turn.speaker}`} key={`${turn.speaker}-${index}`}>
|
||||
<span>{turn.speaker === 'teacher' ? 'Teacher' : 'You'}</span>
|
||||
<p>{turn.text}</p>
|
||||
<span>{turn.speaker === 'teacher' ? t('ui.teacher') : t('ui.you')}</span>
|
||||
<p lang={targetLanguage} dir="auto">{turn.text}</p>
|
||||
</div>
|
||||
))
|
||||
)}
|
||||
</section>
|
||||
|
||||
<form className="chat-form" onSubmit={submit}>
|
||||
<input value={input} onChange={(event) => setInput(event.target.value)} placeholder="My name is ..." disabled={!sessionId || loading} />
|
||||
<input value={input} onChange={(event) => setInput(event.target.value)} aria-label={t('conversation.answer')} placeholder="My name is ..." lang={targetLanguage} dir="auto" disabled={!sessionId || loading} />
|
||||
<button className="primary-button" disabled={!sessionId || loading || !input.trim()} type="submit">
|
||||
<Send size={18} /> Senden
|
||||
</button>
|
||||
<button className="ghost-button icon-only" disabled={!lastAudio} onClick={playAudio} type="button" aria-label="Audio abspielen" title="Audio abspielen">
|
||||
<Send size={18} /> {t('ui.send')} </button>
|
||||
<button className="ghost-button icon-only" disabled={!lastAudio} onClick={playAudio} type="button" aria-label={t('ui.play_audio')} title={t('ui.play_audio')}>
|
||||
<Play size={18} />
|
||||
</button>
|
||||
</form>
|
||||
|
||||
@@ -1,16 +1,21 @@
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useCourseSkillNames } from '../i18n/labels';
|
||||
import { useI18n, type MessageKey } from '../i18n/I18n';
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { request } from '../api/client';
|
||||
import {
|
||||
courseSkills, courseSkillNames, courseRequestID, getCourseCatalog, getCourseHistory, getAdaptiveTask,
|
||||
courseSkills, courseRequestID, getCourseCatalog, getCourseHistory, getAdaptiveTask,
|
||||
createCourseTask, getCourseJob, retryCourseJob, getCourseAttempt, retryCourseAttempt, createCourseExam, getCourseExam,
|
||||
type CourseCatalog, type CourseJob, type AdaptiveTask, type AdaptiveAttempt, type AdaptiveExam
|
||||
} from '../api/adaptive';
|
||||
import { AdaptiveExercise } from '../components/AdaptiveExercise';
|
||||
import { LegacyCoursePage } from './LegacyCoursePage';
|
||||
|
||||
const stageNames: Record<string, string> = { queued: 'Auftrag gespeichert', starting: 'Vorbereitung', analyzing: 'Lernstand wird analysiert', planning: 'Lernauftrag wird erstellt', generating_and_reviewing: 'Aufgabe wird erstellt und fachlich geprüft', evaluating: 'Antwort wird bewertet', generating_and_reviewing_exam: 'Zwölf Testaufgaben werden erstellt und geprüft' };
|
||||
type SavedView = { module: string; task?: string; job?: string; exam?: string };
|
||||
export function CoursePage() {
|
||||
const { t, language } = useI18n();
|
||||
const courseSkillNames = useCourseSkillNames();
|
||||
const stageNames: Record<string, string> = { queued: t('ui.job_saved'), starting: t('ui.preparing'), analyzing: t('ui.analysing_learning_progress'), planning: t('ui.planning_an_exercise'), generating_and_reviewing: t('ui.creating_and_reviewing_an_exercise'), evaluating: t('ui.evaluating_your_answer'), generating_and_reviewing_exam: t('ui.creating_and_reviewing_twelve_test_questions') };
|
||||
const [catalog, setCatalog] = useState<CourseCatalog | null>(null);
|
||||
const [moduleID, setModuleID] = useState('');
|
||||
const [skill, setSkill] = useState('');
|
||||
@@ -23,18 +28,19 @@ export function CoursePage() {
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [recording, setRecording] = useState(false);
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
const [error, setError] = useState('');
|
||||
const [error, setError] = useLocalizedMessage();
|
||||
const [legacy, setLegacy] = useState(false);
|
||||
const [restored, setRestored] = useState(false);
|
||||
const [revision, setRevision] = useState(0);
|
||||
const generationID = useRef<string | null>(null);
|
||||
const generationSkipID = useRef<string | undefined>(undefined);
|
||||
const examRequestID = useRef<string | null>(null);
|
||||
const exerciseRef = useRef<HTMLElement | null>(null);
|
||||
const active = useRef(true);
|
||||
const jobRunning = Boolean(job && (job.status === 'queued' || job.status === 'running'));
|
||||
const locked = busy || recording || submitting || jobRunning;
|
||||
const storeKey = catalog ? `speech_course_v2:${catalog.profile.id}` : '';
|
||||
function showError(err: unknown) { if (active.current) setError(err instanceof Error ? err.message : 'Der Kurs konnte nicht geladen werden.'); }
|
||||
function showError(err: unknown) { if (active.current) setError(errorMessage(err, 'ui.unable_to_load_the_course')); }
|
||||
async function openTask(id: string) {
|
||||
const result = await getAdaptiveTask(id);
|
||||
if (!active.current) return;
|
||||
@@ -43,6 +49,10 @@ export function CoursePage() {
|
||||
async function refreshCatalog() {
|
||||
const result = await getCourseCatalog(); if (active.current) setCatalog(result);
|
||||
}
|
||||
useEffect(() => {
|
||||
generationID.current = null; examRequestID.current = null;
|
||||
if (catalog) void refreshCatalog().catch(showError);
|
||||
}, [language]);
|
||||
useEffect(() => { active.current = true; return () => { active.current = false; }; }, []);
|
||||
useEffect(() => {
|
||||
let valid = true; setRestored(false); setError('');
|
||||
@@ -87,7 +97,7 @@ export function CoursePage() {
|
||||
if (current.kind === 'exam' && current.subject_id) { const result = await getCourseExam(current.subject_id); if (!valid) return; setExam(result); if (result.tasks[0]) { setTask(result.tasks[0]); setAttempt(null); } }
|
||||
setJob(null); await refreshCatalog();
|
||||
if (valid) requestAnimationFrame(() => exerciseRef.current?.scrollIntoView({ block: 'center', behavior: 'smooth' }));
|
||||
} else if (current.status === 'failed') { setError(current.error ?? 'Der Auftrag konnte nicht abgeschlossen werden.'); }
|
||||
} else if (current.status === 'failed') { setError({ key: 'ui.unable_to_complete_the_job' }); }
|
||||
else { timer = window.setTimeout(poll, 1200); }
|
||||
} catch (err) { if (valid) { showError(err); timer = window.setTimeout(poll, 4000); } }
|
||||
}
|
||||
@@ -128,9 +138,12 @@ export function CoursePage() {
|
||||
const timer = window.setTimeout(() => { void refreshCatalog().catch(showError); }, 3000);
|
||||
return () => window.clearTimeout(timer);
|
||||
}, [catalog]);
|
||||
async function generate() {
|
||||
async function generate(skip = false) {
|
||||
if (locked || !moduleID) return; setBusy(true); setError('');
|
||||
try { generationID.current ??= courseRequestID(); const next = await createCourseTask(moduleID, skill, generationID.current); generationID.current = null; setExam(null); setJob(next); }
|
||||
try { const skipID = skip ? task?.id : undefined;
|
||||
if (generationSkipID.current !== skipID) generationID.current = null;
|
||||
generationSkipID.current = skipID;
|
||||
generationID.current ??= courseRequestID(); const next = await createCourseTask(moduleID, skill, generationID.current, skipID); generationID.current = null; setExam(null); setJob(next); }
|
||||
catch (err) { showError(err); } finally { setBusy(false); }
|
||||
}
|
||||
async function changeLanguage(language: string) {
|
||||
@@ -154,44 +167,64 @@ export function CoursePage() {
|
||||
try { if ((value.status === 'graded' || value.status === 'ungraded') && !value.exam_id) await openTask(value.task_id); await refreshCatalog(); if (exam) setExam(await getCourseExam(exam.id)); }
|
||||
catch (err) { showError(err); }
|
||||
}
|
||||
if (legacy) return <><button type="button" className="ghost-button" onClick={() => setLegacy(false)}>Zurück zum adaptiven Kurs</button><LegacyCoursePage /></>;
|
||||
if (!catalog) return <section className="panel"><p>{error || 'Lade A1-Kurs…'}</p>{error && <button type="button" onClick={() => setRevision((n) => n + 1)}>Erneut laden</button>}</section>;
|
||||
if (legacy) return <><button type="button" className="ghost-button" onClick={() => setLegacy(false)}>{t('ui.back_to_the_adaptive_course')}</button><LegacyCoursePage /></>;
|
||||
if (!catalog) return <section className="panel"><p>{error || t('ui.loading_a1_course')}</p>{error && <button type="button" onClick={() => setRevision((n) => n + 1)}>{t('ui.reload')}</button>}</section>;
|
||||
const selected = catalog.modules.find((m) => m.id === moduleID);
|
||||
const recommendation = catalog.sequence_recommendations?.[moduleID];
|
||||
const phases: Record<string, MessageKey> = { listen: 'sequence.phase.listen', vocabulary: 'sequence.phase.vocabulary', read: 'sequence.phase.read', repeat: 'sequence.phase.repeat', grammar: 'sequence.phase.grammar', write: 'sequence.phase.write', compose: 'sequence.phase.compose', speak: 'sequence.phase.speak' };
|
||||
const practiceReasons: Record<string, MessageKey> = { transfer: 'sequence.transfer', refresh: 'sequence.refresh' };
|
||||
const previousAttempt = Boolean(task && !task.exam_id && catalog.sequence_recommendations?.[task.module_id]?.task_id === task.id && catalog.sequence_recommendations?.[task.module_id]?.needs_answer);
|
||||
const analysis = catalog.analysis?.modules.find((m) => m.module_id === moduleID);
|
||||
const progress = catalog.progress.filter((p) => p.module_id === moduleID);
|
||||
const inventory=(catalog.bank??[]).filter(p=>p.module_id===moduleID && (!skill||p.skill===skill));
|
||||
const evaluating = attempt?.status === 'pending';
|
||||
const noVariant = catalog.task_mode === 'bank' && inventory.reduce((sum, item) => sum + item.total, 0) === 0;
|
||||
return <div className="view-stack">
|
||||
<header className="view-header"><div><p className="eyebrow">Adaptiver Sprachkurs · A1</p><h1>Dein A1-Kurs</h1><p className="muted">Sieben Module, sechs Lernbereiche und neue Aufgaben passend zu deinem Lernstand.</p></div>
|
||||
<label>Kurssprache<select disabled={locked} value={catalog.profile.target_language} onChange={(event) => void changeLanguage(event.target.value)}>{catalog.languages.map((l) => <option key={l.code} value={l.code}>{l.display_name}{catalog.enabled_languages.includes(l.code) ? '' : ' – Kurs noch nicht verfügbar'}</option>)}</select></label>
|
||||
<header className="view-header"><div><p className="eyebrow">{t('ui.adaptive_language_course_a1')}</p><h1>{t('ui.your_a1_course')}</h1><p className="muted">{t('ui.seven_modules_six_learning_areas_and_new_exercises_suited_to')}</p></div>
|
||||
<label>{t('ui.learning_language')}<select disabled={locked} value={catalog.profile.target_language} onChange={(event) => void changeLanguage(event.target.value)}>{catalog.languages.map((l) => <option key={l.code} value={l.code}>{l.display_name}{catalog.enabled_languages.includes(l.code) ? '' : t('ui.course_not_yet_available')}</option>)}</select></label>
|
||||
</header>
|
||||
{catalog.modules.length === 0 ? <section className="panel"><p>Für diese Zielsprache ist noch kein geprüftes A1-Sprachpaket freigeschaltet. Dein bisheriger Lernstand bleibt gespeichert.</p></section> : <>
|
||||
<section className="panel course-analysis"><h2>Dein Lernstand</h2><p>{catalog.task_mode === 'bank' ? 'Die Auswahl nutzt deine gespeicherten Bewertungen. Noch neue Aufgaben haben Vorrang; bei Lernbedarf folgen passende Übungen und Wiederholungen. Unbenotete Antworten zählen nicht als bewerteter Lernnachweis.' : catalog.analysis?.summary ?? 'Noch keine KI-Lernanalyse vorhanden. Der Lehrer-Agent erstellt sie aus deinen gespeicherten Antworten.'}</p>
|
||||
{catalog.analysis && catalog.analysis.facts_version < catalog.facts_version && <p className="muted" role="status">Die Lernanalyse wird nach deiner letzten Antwort aktualisiert.</p>}
|
||||
{catalog.analysis_job?.status === 'failed' && <button type="button" onClick={() => void retryCourseJob(catalog.analysis_job!.id).then(refreshCatalog).catch(showError)}>Lernanalyse erneut anfordern</button>}
|
||||
{catalog.analysis && <p className="muted">KI-Einschätzung auf Basis gespeicherter Lernnachweise. Alle Module bleiben frei zugänglich.</p>}
|
||||
|
||||
{catalog.modules.length === 0 ? <section className="panel"><p>{t('ui.a_reviewed_a1_course_pack_is_not_yet_available_for')}</p></section> : <>
|
||||
<section className="panel course-analysis"><h2>{t('ui.your_learning_progress')}</h2><p>{catalog.task_mode === 'bank' ? t('ui.exercises_are_selected_using_your_saved_evaluations_new_exercises_come') : catalog.analysis?.summary ?? t('ui.no_ai_learning_analysis_yet_the_teacher_agent_creates_it')}</p>
|
||||
{catalog.analysis && catalog.analysis.facts_version < catalog.facts_version && <p className="muted" role="status">{t('ui.the_learning_analysis_is_being_updated_after_your_latest_answer')}</p>}
|
||||
{catalog.analysis_job?.status === 'failed' && <button type="button" onClick={() => void retryCourseJob(catalog.analysis_job!.id).then(refreshCatalog).catch(showError)}>{t('ui.request_learning_analysis_again')}</button>}
|
||||
{catalog.analysis && <p className="muted">{t('ui.ai_assessment_based_on_saved_learning_evidence_all_modules_remain')}</p>}
|
||||
</section>
|
||||
<nav className="course-module-grid" aria-label="A1-Module">{catalog.modules.map((m) => <button type="button" key={m.id} disabled={locked} className={`panel course-module-card${moduleID === m.id ? ' selected' : ''}`} onClick={() => { setModuleID(m.id); setTask(null); setAttempt(null); setExam(null); setJob(null); setError(''); generationID.current = null; }}>
|
||||
<span className="eyebrow">Modul {m.order}{catalog.analysis?.recommended_module_id === m.id ? ' · Empfohlen' : ''}</span><strong>{m.title}</strong><span className="muted">{catalog.analysis?.modules.some((a) => a.module_id === m.id && a.ready_for_completion) ? 'Lernziel laut KI und Bereichsnachweisen erreicht' : 'Weiterlernen'}</span>
|
||||
<nav className="course-module-grid" aria-label={t('course.modulesLabel')}>{catalog.modules.map((m) => <button type="button" key={m.id} disabled={locked} className={`panel course-module-card${moduleID === m.id ? ' selected' : ''}`} onClick={() => { setModuleID(m.id); setTask(null); setAttempt(null); setExam(null); setJob(null); setError(''); generationID.current = null; }}>
|
||||
<span className="eyebrow">{t('ui.module')} {m.order}{catalog.analysis?.recommended_module_id === m.id ? t('ui.recommended') : ''}</span><strong>{m.title}</strong><span className="muted">{catalog.analysis?.modules.some((a) => a.module_id === m.id && a.ready_for_completion) ? t('ui.learning_objective_achieved_according_to_ai_and_evidence_across_learning') : t('ui.continue_learning')}</span>
|
||||
</button>)}</nav>
|
||||
{selected && <section className="panel view-stack"><div><p className="eyebrow">Modul {selected.order}</p><h2>{selected.title}</h2><p className="muted">{selected.description}</p></div>
|
||||
{analysis && <div><p>{analysis.recommendation}</p><p className="muted">{analysis.reason}</p>{analysis.weaknesses?.map((weakness, i) => <p key={i}>Noch üben: {weakness}</p>)}</div>}
|
||||
<div className="course-area-grid" role="group" aria-label="Lernbereich"><button type="button" disabled={locked} className={skill === '' ? 'course-task active' : 'course-task'} onClick={() => setSkill('')}>KI-Empfehlung</button>{courseSkills.map((area) => <button type="button" disabled={locked} key={area} className={skill === area ? 'course-task active' : 'course-task'} onClick={() => { setSkill(area); generationID.current = null; }}>{courseSkillNames[area]}</button>)}</div>
|
||||
<div className="action-row"><button type="button" className="primary-button" disabled={locked} onClick={() => void generate()}>{jobRunning ? 'Aufgabe wird vorbereitet…' : 'Nächste Aufgabe'}</button>{selected.key === 'review_test' && <button type="button" className="ghost-button" disabled={locked} onClick={() => void startExam()}>Neuen A1-Test starten · 12 Aufgaben</button>}</div>
|
||||
<p className="muted">Du kannst beliebig weiterüben. Die Anzahl erzeugter Aufgaben entscheidet nicht über den Modulabschluss.</p>
|
||||
{job && <div role="status"><p>{stageNames[job.stage] ?? job.stage}</p>{job.status === 'failed' && <button type="button" disabled={busy} onClick={() => { setError(''); void retryCourseJob(job.id).then(setJob).catch(showError); }}>Auftrag erneut versuchen</button>}</div>}
|
||||
{selected && <section className="panel view-stack"><div><p className="eyebrow">{t('ui.module')} {selected.order}</p><h2>{selected.title}</h2><p className="muted">{selected.description}</p></div>
|
||||
{analysis && <div><p>{analysis.recommendation}</p><p className="muted">{analysis.reason}</p>{analysis.weaknesses?.map((weakness, i) => <p key={i}>{t('ui.more_practice')} {weakness}</p>)}</div>}
|
||||
<div className="course-area-grid" role="group" aria-label={t('ui.learning_area')}><button type="button" disabled={locked} className={skill === '' ? 'course-task active' : 'course-task'} onClick={() => { setSkill(''); generationID.current = null; }}>{t(catalog.task_mode === 'bank' ? 'sequence.default' : 'ui.ai_recommendation')}</button>{courseSkills.map((area) => <button type="button" disabled={locked} key={area} className={skill === area ? 'course-task active' : 'course-task'} onClick={() => { setSkill(area); generationID.current = null; }}>{courseSkillNames[area]}</button>)}</div>
|
||||
{skill === '' && recommendation && !exam && <div className="view-stack" role="region" aria-label={t('sequence.title')}>
|
||||
<h3>{t('sequence.title')}</h3>
|
||||
{recommendation.complete ? <p>{t('sequence.complete')}</p> : <>
|
||||
<strong>{recommendation.title}</strong>
|
||||
<p>{t('sequence.position', { topic: recommendation.topic, topics: recommendation.topics, step: recommendation.step, steps: recommendation.steps })} · {recommendation.phase && phases[recommendation.phase] ? t(phases[recommendation.phase]) : ''}</p>
|
||||
<p className="muted">{t('sequence.intro')}</p>
|
||||
{recommendation.review && <p role="status">{t('sequence.review')}</p>}
|
||||
{!recommendation.review && recommendation.practice_reason && practiceReasons[recommendation.practice_reason] && <p role="status">{t(practiceReasons[recommendation.practice_reason])}</p>}
|
||||
{recommendation.task_id === task?.id && recommendation.needs_answer && <button type="button" className="ghost-button" disabled={locked} onClick={() => void generate(true)}>{t('sequence.skip')}</button>}
|
||||
</>}
|
||||
{recommendation.reused_steps > 0 && <p className="muted">{t('sequence.reused', { count: recommendation.reused_steps })}</p>}
|
||||
</div>}
|
||||
<div className="action-row"><button type="button" className="primary-button" disabled={locked || noVariant} onClick={() => void generate()}>{jobRunning ? t('ui.preparing_exercise') : t('ui.next_exercise')}</button>{selected.key === 'review_test' && <button type="button" className="ghost-button" disabled={locked || catalog.exam_available === false} onClick={() => void startExam()}>{t('ui.start_a_new_a1_test_12_questions')}</button>}</div>
|
||||
{noVariant && <p role="status">{t('course.noVariant')}</p>}
|
||||
{selected.key === 'review_test' && catalog.exam_available === false && <p>{t('course.examUnavailable')}</p>}
|
||||
<p className="muted">{t('ui.you_can_keep_practising_the_number_of_generated_exercises_does')}</p>
|
||||
{job && <div role="status"><p>{stageNames[job.stage] ?? job.stage}</p>{job.status === 'failed' && <button type="button" disabled={busy} onClick={() => { setError(''); void retryCourseJob(job.id).then(setJob).catch(showError); }}>{t('ui.retry_job')}</button>}</div>}
|
||||
{error && <p className="form-error" role="alert">{error}</p>}
|
||||
{catalog.task_mode==='bank' && <p>Geprüfter Aufgabenbestand: {inventory.reduce((n,p)=>n+p.total,0)} Aufgaben · {inventory.reduce((n,p)=>n+p.unseen,0)} noch neu. Danach stehen Wiederholungen bereit.</p>}<div className="course-progress-grid">{courseSkills.map((area) => { const p = progress.find((x) => x.skill === area); return <div key={area}><strong>{courseSkillNames[area]}</strong><p>{p ? `${p.distinct_tasks} Aufgaben · ${p.attempts} Antworten · Ø ${Math.round(p.average_score)}/100` : 'Noch kein bewerteter Lernnachweis'}</p></div>; })}</div>
|
||||
{catalog.task_mode==='bank' && <p>{t('course.inventory', { total: inventory.reduce((n,p)=>n+p.total,0).toLocaleString(language), unseen: inventory.reduce((n,p)=>n+p.unseen,0).toLocaleString(language) })}</p>}<div className="course-progress-grid">{courseSkills.map((area) => { const p = progress.find((x) => x.skill === area); return <div key={area}><strong>{courseSkillNames[area]}</strong><p>{p ? t('course.progress', { tasks: p.distinct_tasks.toLocaleString(language), attempts: p.attempts.toLocaleString(language), score: Math.round(p.average_score) }) : t('ui.no_graded_learning_evidence_yet')}</p></div>; })}</div>
|
||||
</section>}
|
||||
{exam && <section className="panel view-stack" aria-label="A1-Test"><h2>A1-Test</h2><p>{exam.status === 'completed' ? 'Test abgeschlossen' : exam.status === 'submitted' ? 'Abgegeben – Bewertung ausstehend. Eine Gesamtnote erscheint nach der Bewertung aller offenen Antworten.' : `${exam.attempts.length} von 12 Antworten gespeichert. Feedback erscheint am Ende.`}</p>
|
||||
{exam.status === 'submitted' && <><button type="button" disabled={!catalog.grading_available || locked} onClick={() => { void (async()=>{try{ for(const a of exam.attempts.filter(a=>a.status==='ungraded'||a.status==='failed')) await retryCourseAttempt(a.id); }catch(err){showError(err);}finally{setExam(await getCourseExam(exam.id));}})().catch(showError); }}>Ausstehende Antworten bewerten</button>{!catalog.grading_available && <p>KI-Bewertung derzeit nicht verfügbar. Alle Antworten bleiben gespeichert.</p>}</>}
|
||||
{exam.status === 'completed' && <><div className="course-progress-grid">{courseSkills.map((area) => <p key={area}>{courseSkillNames[area]}: {Math.round(exam.scores?.[area] ?? 0)} / 100</p>)}</div><strong>Gesamtergebnis: {Math.round(exam.score ?? 0)} / 100</strong><p>{exam.summary}</p>{exam.summary_status === 'failed' && exam.summary_job_id && <button type="button" onClick={() => void retryCourseJob(exam.summary_job_id!).then(() => setExam({ ...exam, summary_status: 'pending' })).catch(showError)}>KI-Gesamteinschätzung erneut anfordern</button>}<p className="muted">Interne A1-Lerneinschätzung.</p></>}
|
||||
{exam && <section className="panel view-stack" aria-label={t('ui.a1_test')}><h2>{t('ui.a1_test')}</h2><p>{exam.status === 'completed' ? t('ui.test_completed') : exam.status === 'submitted' ? t('ui.submitted_evaluation_pending_an_overall_score_appears_once_all_open') : t('ui.value_of_12_answers_saved_feedback_appears_at_the_end', { value0: exam.attempts.length })}</p>
|
||||
{exam.status === 'submitted' && <><button type="button" disabled={!catalog.grading_available || locked} onClick={() => { void (async()=>{try{ for(const a of exam.attempts.filter(a=>a.status==='ungraded'||a.status==='failed')) await retryCourseAttempt(a.id); }catch(err){showError(err);}finally{setExam(await getCourseExam(exam.id));}})().catch(showError); }}>{t('ui.evaluate_pending_answers')}</button>{!catalog.grading_available && <p>{t('ui.ai_evaluation_is_currently_unavailable_all_answers_remain_saved')}</p>}</>}
|
||||
{exam.status === 'completed' && <><div className="course-progress-grid">{courseSkills.map((area) => <p key={area}>{courseSkillNames[area]}: {Math.round(exam.scores?.[area] ?? 0)} / 100</p>)}</div><strong>{t('ui.overall_result')} {Math.round(exam.score ?? 0)} / 100</strong><p>{exam.summary}</p>{exam.summary_status === 'failed' && exam.summary_job_id && <button type="button" onClick={() => void retryCourseJob(exam.summary_job_id!).then(() => setExam({ ...exam, summary_status: 'pending' })).catch(showError)}>{t('ui.request_ai_overall_assessment_again')}</button>}<p className="muted">{t('ui.internal_a1_learning_assessment')}</p></>}
|
||||
<div className="course-area-grid">{exam.tasks.map((t, i) => <button type="button" key={t.id} disabled={recording || submitting || busy} className={task?.id === t.id ? 'course-task active' : 'course-task'} onClick={() => void openTask(t.id).catch(showError)}>{i + 1}. {courseSkillNames[t.skill]} {exam.attempts.some((a) => a.task_id === t.id) ? '✓' : ''}</button>)}</div>
|
||||
</section>}
|
||||
<div className="course-layout"><nav className="panel course-task-list" aria-label="Gespeicherte Aufgaben"><h2>Deine Aufgaben</h2>{history.length === 0 && <p className="muted">Deine ausgewählten Aufgaben werden hier gespeichert.</p>}{history.map((item) => <button type="button" className={task?.id === item.id ? 'course-task active' : 'course-task'} key={item.id} disabled={recording || submitting || busy} onClick={() => { setExam(null); void openTask(item.id).catch(showError); }}><span>{courseSkillNames[item.skill]} · {item.prompt.slice(0, 65)}</span></button>)}{hasMore && <button type="button" disabled={busy} onClick={() => void loadMore()}>Weitere Aufgaben laden</button>}
|
||||
{catalog.exams.map((item) => <button type="button" key={item.id} disabled={locked} className="course-task" onClick={() => void getCourseExam(item.id).then((value) => { setExam(value); if (value.tasks[0]) void openTask(value.tasks[0].id).catch(showError); }).catch(showError)}>A1-Test · {item.status === 'completed' ? 'Ergebnis' : 'Fortsetzen'}</button>)}
|
||||
</nav><section ref={exerciseRef} className="panel course-exercise" aria-label="Aktuelle Kursaufgabe" aria-live="polite">{task ? <><AdaptiveExercise key={task.id} task={task} attempt={attempt} locked={jobRunning} onAttempt={(a) => void receivedAttempt(a)} onRecording={setRecording} onBusy={setSubmitting} />{(attempt?.status === 'failed' || attempt?.status === 'ungraded') && <button type="button" disabled={catalog.task_mode === 'bank' && !catalog.grading_available} onClick={() => void retryCourseAttempt(attempt.id).then(() => setAttempt({ ...attempt, status: 'pending' })).catch(showError)}>{attempt.status === 'ungraded' ? 'Bewertung anfordern' : 'Bewertung erneut anfordern'}</button>}{attempt?.status === 'ungraded' && !catalog.grading_available && <p className="muted">Die KI-Bewertung ist derzeit nicht verfügbar. Du kannst deine Antwort ohne Benotung mit dem Beispiel vergleichen.</p>}{evaluating && <p className="muted">Die Antwort bleibt gespeichert, auch wenn du die Seite verlässt.</p>}</> : <p className="muted">Wähle ein Modul und fordere deine nächste Aufgabe an.</p>}</section></div>
|
||||
<div className="course-layout"><nav className="panel course-task-list" aria-label={t('ui.saved_exercises')}><h2>{t('ui.your_exercises')}</h2>{history.length === 0 && <p className="muted">{t('ui.your_selected_exercises_are_saved_here')}</p>}{history.map((item) => <button type="button" className={task?.id === item.id ? 'course-task active' : 'course-task'} key={item.id} disabled={recording || submitting || busy} onClick={() => { setExam(null); void openTask(item.id).catch(showError); }}><span>{courseSkillNames[item.skill]} · {item.prompt.slice(0, 65)}</span></button>)}{hasMore && <button type="button" disabled={busy} onClick={() => void loadMore()}>{t('ui.load_more_exercises')}</button>}
|
||||
{catalog.exams.map((item) => <button type="button" key={item.id} disabled={locked} className="course-task" onClick={() => void getCourseExam(item.id).then((value) => { setExam(value); if (value.tasks[0]) void openTask(value.tasks[0].id).catch(showError); }).catch(showError)}>{t('ui.a1_test_2')} {item.status === 'completed' ? t('ui.result') : t('ui.resume')}</button>)}
|
||||
</nav><section ref={exerciseRef} className="panel course-exercise" aria-label={t('ui.current_course_exercise')} aria-live="polite">{task ? <><AdaptiveExercise key={task.id} previousAttempt={previousAttempt} task={task} attempt={attempt} locked={jobRunning} onAttempt={(a) => void receivedAttempt(a)} onRecording={setRecording} onBusy={setSubmitting} />{(attempt?.status === 'failed' || attempt?.status === 'ungraded') && <button type="button" disabled={catalog.task_mode === 'bank' && !catalog.grading_available} onClick={() => void retryCourseAttempt(attempt.id).then(() => setAttempt({ ...attempt, status: 'pending' })).catch(showError)}>{attempt.status === 'ungraded' ? t('ui.request_evaluation') : t('ui.request_evaluation_again')}</button>}{attempt?.status === 'ungraded' && !catalog.grading_available && <p className="muted">{t('ui.ai_evaluation_is_currently_unavailable_you_can_compare_your_answer')}</p>}{evaluating && <p className="muted">{t('ui.your_answer_remains_saved_even_if_you_leave_this_page')}</p>}</> : <p className="muted">{t('ui.choose_a_module_and_request_your_next_exercise')}</p>}</section></div>
|
||||
</>}
|
||||
<button type="button" className="link-button" disabled={locked} onClick={() => setLegacy(true)}>Bisherigen festen Kurs öffnen</button>
|
||||
<button type="button" className="link-button" disabled={locked} onClick={() => setLegacy(true)}>{t('ui.open_the_original_fixed_course')}</button>
|
||||
</div>;
|
||||
}
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
import { useExercisePresentation } from '../i18n/exercisePresentation';
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import { ArrowRight, Clock, Gauge } from 'lucide-react';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { fetchDashboard } from '../api/lessons';
|
||||
@@ -9,8 +12,10 @@ type Props = {
|
||||
};
|
||||
|
||||
export function DashboardPage({ onPractice, onLoaded }: Props) {
|
||||
const presentation = useExercisePresentation();
|
||||
const { t } = useI18n();
|
||||
const [dashboard, setDashboard] = useState<Dashboard | null>(null);
|
||||
const [error, setError] = useState('');
|
||||
const [error, setError] = useLocalizedMessage();
|
||||
|
||||
useEffect(() => {
|
||||
let cancelled = false;
|
||||
@@ -21,40 +26,40 @@ export function DashboardPage({ onPractice, onLoaded }: Props) {
|
||||
onLoaded(data.next_lesson, data.next_exercise);
|
||||
})
|
||||
.catch((err) => {
|
||||
if (!cancelled) setError(err instanceof Error ? err.message : 'Dashboard konnte nicht geladen werden');
|
||||
if (!cancelled) setError(errorMessage(err, 'dashboard.error'));
|
||||
});
|
||||
return () => { cancelled = true; };
|
||||
}, []);
|
||||
|
||||
if (error) return <p className="form-error">{error}</p>;
|
||||
if (!dashboard) return <p className="muted">Lade Dashboard...</p>;
|
||||
if (!dashboard) return <p className="muted">{t('dashboard.loading')}</p>;
|
||||
|
||||
return (
|
||||
<div className="view-stack">
|
||||
<header className="view-header">
|
||||
<div>
|
||||
<p className="eyebrow">Heute</p>
|
||||
<h1>A1 Aussprachetraining</h1>
|
||||
<p className="eyebrow">{t('nav.today')}</p>
|
||||
<h1>{t('dashboard.title')}</h1>
|
||||
</div>
|
||||
<button className="primary-button" onClick={() => onPractice(dashboard.next_lesson, dashboard.next_exercise)}>
|
||||
<ArrowRight size={18} /> Naechste Uebung
|
||||
<ArrowRight size={18} /> {t('dashboard.next')}
|
||||
</button>
|
||||
</header>
|
||||
|
||||
<section className="metric-grid">
|
||||
<div className="panel metric">
|
||||
<Clock size={22} />
|
||||
<span>Tagesziel</span>
|
||||
<strong>{dashboard.profile.daily_goal_minutes} min</strong>
|
||||
<span>{t('dashboard.dailyGoal')}</span>
|
||||
<strong>{t('dashboard.minutes', { count: dashboard.profile.daily_goal_minutes })}</strong>
|
||||
</div>
|
||||
<div className="panel metric">
|
||||
<Gauge size={22} />
|
||||
<span>Durchschnitt</span>
|
||||
<span>{t('dashboard.average')}</span>
|
||||
<strong>{Math.round(dashboard.progress.average_score || 0)}</strong>
|
||||
</div>
|
||||
<div className="panel metric">
|
||||
<ArrowRight size={22} />
|
||||
<span>Versuche</span>
|
||||
<span>{t('dashboard.attempts')}</span>
|
||||
<strong>{dashboard.progress.total_attempts}</strong>
|
||||
</div>
|
||||
</section>
|
||||
@@ -62,10 +67,10 @@ export function DashboardPage({ onPractice, onLoaded }: Props) {
|
||||
<section className="panel lesson-panel">
|
||||
<div>
|
||||
<p className="eyebrow">{dashboard.next_lesson.topic}</p>
|
||||
<h2>{dashboard.next_lesson.title}</h2>
|
||||
<p className="target-text">{dashboard.next_exercise.target_text}</p>
|
||||
<h2>{presentation(dashboard.next_lesson, dashboard.next_exercise).title}</h2>
|
||||
<p className="target-text" lang={dashboard.next_exercise.target_language} dir="auto">{dashboard.next_exercise.target_text}</p>
|
||||
</div>
|
||||
<p className="muted">{dashboard.next_exercise.prompt_text}</p>
|
||||
<p className="muted" lang={presentation(dashboard.next_lesson, dashboard.next_exercise).promptLanguage} dir="auto">{presentation(dashboard.next_lesson, dashboard.next_exercise).prompt}</p>
|
||||
</section>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import { Activity, Database, RefreshCw, Server, Settings, Waves } from 'lucide-react';
|
||||
import type { ReactNode } from 'react';
|
||||
import { useEffect, useState } from 'react';
|
||||
@@ -20,6 +21,7 @@ type DebugError = {
|
||||
};
|
||||
|
||||
export function DebugPage() {
|
||||
const { t } = useI18n();
|
||||
const [status, setStatus] = useState<DebugStatus | null>(null);
|
||||
const [db, setDB] = useState<DebugDB | null>(null);
|
||||
const [ai, setAI] = useState<DebugCheck | null>(null);
|
||||
@@ -44,7 +46,7 @@ export function DebugPage() {
|
||||
const runtimeResponse = await fetchDebugRuntime();
|
||||
setRuntime(runtimeResponse.runtime);
|
||||
} catch (err) {
|
||||
setError(toDebugError(err));
|
||||
setError(toDebugError(err, t('ui.unknown_error')));
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
@@ -68,7 +70,7 @@ export function DebugPage() {
|
||||
try {
|
||||
await fn();
|
||||
} catch (err) {
|
||||
setError(toDebugError(err));
|
||||
setError(toDebugError(err, t('ui.unknown_error')));
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
@@ -78,35 +80,34 @@ export function DebugPage() {
|
||||
<div className="view-stack">
|
||||
<header className="view-header">
|
||||
<div>
|
||||
<p className="eyebrow">Systemdiagnose</p>
|
||||
<h1>Debug</h1>
|
||||
<p className="eyebrow">{t('ui.system_diagnostics')}</p>
|
||||
<h1>{t('nav.debug')}</h1>
|
||||
</div>
|
||||
<button className="primary-button" onClick={refreshAll} disabled={loading}>
|
||||
<RefreshCw size={18} /> Neu pruefen
|
||||
</button>
|
||||
<RefreshCw size={18} /> {t('ui.check_again')} </button>
|
||||
</header>
|
||||
|
||||
{error && (
|
||||
<section className="panel result-panel debug-error">
|
||||
<h2>Fehler</h2>
|
||||
<h2>{t('ui.error')}</h2>
|
||||
<p>{error.message}</p>
|
||||
<p className="muted">
|
||||
{error.status ? `HTTP ${error.status}` : 'Kein HTTP-Status'} {error.requestId ? `Request-ID ${error.requestId}` : ''}
|
||||
{error.status ? `HTTP ${error.status}` : t('ui.no_http_status')} {error.requestId ? t('ui.request_id_value', { value0: error.requestId }) : ''}
|
||||
</p>
|
||||
</section>
|
||||
)}
|
||||
|
||||
<section className="debug-grid">
|
||||
<DebugCheckCard icon={<Database size={21} />} title="Datenbank" check={dbToCheck(db)} onRefresh={runDB} />
|
||||
<DebugCheckCard icon={<Waves size={21} />} title="Azure Speech" check={azure} onRefresh={runAzure} />
|
||||
<DebugCheckCard icon={<Activity size={21} />} title="KI-Anbindung" check={ai} onRefresh={runAI} />
|
||||
<DebugObjectCard icon={<Server size={21} />} title="Runtime" value={runtime} />
|
||||
<DebugCheckCard icon={<Database size={21} />} title={t('ui.database')} check={dbToCheck(db)} onRefresh={runDB} />
|
||||
<DebugCheckCard icon={<Waves size={21} />} title={t('ui.azure_speech')} check={azure} onRefresh={runAzure} />
|
||||
<DebugCheckCard icon={<Activity size={21} />} title={t('ui.ai_connection')} check={ai} onRefresh={runAI} />
|
||||
<DebugObjectCard icon={<Server size={21} />} title={t('ui.runtime')} value={runtime} />
|
||||
</section>
|
||||
|
||||
<section className="panel result-panel">
|
||||
<div className="debug-title">
|
||||
<Settings size={21} />
|
||||
<h2>Konfiguration</h2>
|
||||
<h2>{t('ui.configuration')}</h2>
|
||||
</div>
|
||||
<DebugObject value={status?.config ?? null} />
|
||||
</section>
|
||||
@@ -115,6 +116,7 @@ export function DebugPage() {
|
||||
}
|
||||
|
||||
function DebugCheckCard({ icon, title, check, onRefresh }: { icon: ReactNode; title: string; check: DebugCheck | null; onRefresh: () => void }) {
|
||||
const { t } = useI18n();
|
||||
const tone = check?.ok ? 'good' : 'weak';
|
||||
return (
|
||||
<section className={`panel debug-card debug-${tone}`}>
|
||||
@@ -123,13 +125,13 @@ function DebugCheckCard({ icon, title, check, onRefresh }: { icon: ReactNode; ti
|
||||
{icon}
|
||||
<h2>{title}</h2>
|
||||
</div>
|
||||
<button className="ghost-button icon-only" onClick={onRefresh} aria-label={`${title} pruefen`} title={`${title} pruefen`}>
|
||||
<button className="ghost-button icon-only" onClick={onRefresh} aria-label={t('ui.check_value', { value0: title })} title={t('ui.check_value', { value0: title })}>
|
||||
<RefreshCw size={17} />
|
||||
</button>
|
||||
</div>
|
||||
{check ? (
|
||||
<>
|
||||
<strong>{check.ok ? 'OK' : 'Problem'}</strong>
|
||||
<strong>{check.ok ? 'OK' : t('ui.problem')}</strong>
|
||||
<span>{check.status}</span>
|
||||
{check.http_status ? <span>HTTP {check.http_status}</span> : null}
|
||||
{check.duration_ms ? <span>{check.duration_ms} ms</span> : null}
|
||||
@@ -137,7 +139,7 @@ function DebugCheckCard({ icon, title, check, onRefresh }: { icon: ReactNode; ti
|
||||
<DebugObject value={check.details ?? null} />
|
||||
</>
|
||||
) : (
|
||||
<p className="muted">Noch nicht geprueft.</p>
|
||||
<p className="muted">{t('ui.not_checked_yet')}</p>
|
||||
)}
|
||||
</section>
|
||||
);
|
||||
@@ -156,7 +158,8 @@ function DebugObjectCard({ icon, title, value }: { icon: ReactNode; title: strin
|
||||
}
|
||||
|
||||
function DebugObject({ value }: { value: Record<string, unknown> | null }) {
|
||||
if (!value) return <p className="muted">Keine Daten.</p>;
|
||||
const { t } = useI18n();
|
||||
if (!value) return <p className="muted">{t('ui.no_data')}</p>;
|
||||
return (
|
||||
<dl className="debug-object">
|
||||
{Object.entries(value).map(([key, val]) => (
|
||||
@@ -190,12 +193,12 @@ function formatValue(value: unknown) {
|
||||
return String(value ?? '');
|
||||
}
|
||||
|
||||
function toDebugError(err: unknown): DebugError {
|
||||
function toDebugError(err: unknown, fallback: string): DebugError {
|
||||
if (err instanceof ApiError) {
|
||||
return { message: err.message, status: err.status, requestId: err.requestId };
|
||||
}
|
||||
if (err instanceof Error) {
|
||||
return { message: err.message };
|
||||
}
|
||||
return { message: 'Unbekannter Fehler' };
|
||||
return { message: fallback };
|
||||
}
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { fetchCourseAudio, fetchCourseModule, fetchCourseModules, fetchCoursePractice, nextCoursePractice, submitCourseAnswer } from '../api/course';
|
||||
import { fetchExerciseAudio } from '../api/lessons';
|
||||
@@ -5,17 +7,17 @@ import { submitAttempt } from '../api/practice';
|
||||
import type { AttemptResponse, CourseAttemptResult, CourseModuleDetail, CourseTask } from '../api/types';
|
||||
import { AudioRecorder } from '../components/AudioRecorder';
|
||||
|
||||
const skillNames: Record<CourseTask['skill'], string> = {
|
||||
vocabulary: 'Wortschatz', listening: 'Hören', reading: 'Lesen', grammar: 'Grammatik',
|
||||
writing: 'Schreiben', pronunciation: 'Aussprache'
|
||||
};
|
||||
|
||||
export function LegacyCoursePage() {
|
||||
const { t, language } = useI18n();
|
||||
const skillNames: Record<CourseTask['skill'], string> = {
|
||||
vocabulary: t('ui.vocabulary'), listening: t('ui.listening'), reading: t('ui.reading'), grammar: t('ui.grammar'),
|
||||
writing: t('ui.writing'), pronunciation: t('nav.practice')
|
||||
};
|
||||
const [detail, setDetail] = useState<CourseModuleDetail | null>(null);
|
||||
const [practiceTasks, setPracticeTasks] = useState<CourseTask[]>([]);
|
||||
const [practiceTask, setPracticeTask] = useState<CourseTask | null>(null);
|
||||
const [practiceNotice, setPracticeNotice] = useState('');
|
||||
const [practiceError, setPracticeError] = useState('');
|
||||
const [practiceNotice, setPracticeNotice] = useLocalizedMessage();
|
||||
const [practiceError, setPracticeError] = useLocalizedMessage();
|
||||
const exerciseRef = useRef<HTMLElement | null>(null);
|
||||
const [practiceLoading, setPracticeLoading] = useState(true);
|
||||
const [generating, setGenerating] = useState(false);
|
||||
@@ -29,8 +31,8 @@ export function LegacyCoursePage() {
|
||||
const [recordedUrl, setRecordedUrl] = useState('');
|
||||
const [recording, setRecording] = useState(false);
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [error, setError] = useState('');
|
||||
const [audioError, setAudioError] = useState('');
|
||||
const [error, setError] = useLocalizedMessage();
|
||||
const [audioError, setAudioError] = useLocalizedMessage();
|
||||
const playbackRef = useRef<{ player: HTMLAudioElement; url: string } | null>(null);
|
||||
|
||||
function stopPlayback() {
|
||||
@@ -51,7 +53,7 @@ export function LegacyCoursePage() {
|
||||
if (active) { setDetail(loaded); setSelectedId(loaded.tasks.find((task) => !task.attempted)?.id ?? loaded.tasks[0]?.id ?? ''); setLoaded(true); }
|
||||
const practice = await fetchCoursePractice(loaded.module.id);
|
||||
if (active) setPracticeTasks(practice.tasks);
|
||||
}).catch((err) => { if (active) { setError(err instanceof Error ? err.message : 'Kurs konnte nicht geladen werden.'); setLoaded(true); } }).finally(() => { if (active) setPracticeLoading(false); });
|
||||
}).catch((err) => { if (active) { setError(errorMessage(err, 'ui.unable_to_load_course')); setLoaded(true); } }).finally(() => { if (active) setPracticeLoading(false); });
|
||||
return () => { active = false; };
|
||||
}, []);
|
||||
|
||||
@@ -103,16 +105,16 @@ export function LegacyCoursePage() {
|
||||
setAnswer(''); setResult(null); setPronResult(null); setRecorded(null); setAudioError('');
|
||||
if ((response.source === 'flowise' || response.source === 'ai' || response.source === 'curated')) {
|
||||
setPracticeTasks((current) => [receivedTask, ...current.filter((item) => item.id !== response.task.id)].slice(0, 50));
|
||||
setPracticeNotice(response.source === 'curated' ? 'Eine Aufgabe aus dem geprüften Bestand ist bereit.' : 'Eine mit KI erstellte Zusatzaufgabe ist bereit.');
|
||||
setPracticeNotice(response.source === 'curated' ? { key: 'ui.an_exercise_from_the_reviewed_bank_is_ready' } : { key: 'ui.an_additional_ai_exercise_is_ready' });
|
||||
} else {
|
||||
setPracticeNotice('Du erhältst eine feste Kursaufgabe zur Wiederholung.');
|
||||
setPracticeNotice({ key: 'ui.a_fixed_course_exercise_is_ready_for_review' });
|
||||
}
|
||||
requestAnimationFrame(() => {
|
||||
exerciseRef.current?.focus({ preventScroll: true });
|
||||
exerciseRef.current?.scrollIntoView({ block: 'start', behavior: 'smooth' });
|
||||
});
|
||||
} catch (err) {
|
||||
setPracticeError(err instanceof Error ? err.message : 'Zusatzaufgabe konnte nicht geladen werden.');
|
||||
setPracticeError(errorMessage(err, 'ui.unable_to_load_additional_exercise'));
|
||||
} finally { setBusy(false); setGenerating(false); }
|
||||
}
|
||||
|
||||
@@ -128,9 +130,9 @@ export function LegacyCoursePage() {
|
||||
const player = new Audio(url);
|
||||
playbackRef.current = { player, url };
|
||||
player.onended = () => { if (playbackRef.current?.player === player) stopPlayback(); };
|
||||
player.onerror = () => { if (playbackRef.current?.player === player) stopPlayback(); setAudioError('Audio konnte nicht abgespielt werden.'); };
|
||||
player.onerror = () => { if (playbackRef.current?.player === player) stopPlayback(); setAudioError({ key: 'ui.unable_to_play_audio' }); };
|
||||
await player.play();
|
||||
} catch { stopPlayback(); setAudioError('Audio konnte nicht abgespielt werden. Bitte erneut versuchen.'); }
|
||||
} catch { stopPlayback(); setAudioError({ key: 'ui.unable_to_play_audio_please_try_again' }); }
|
||||
finally { setBusy(false); }
|
||||
}
|
||||
|
||||
@@ -141,7 +143,7 @@ export function LegacyCoursePage() {
|
||||
const response = await submitCourseAnswer(task.id, answer);
|
||||
setResult(response);
|
||||
await refresh();
|
||||
} catch (err) { setError(err instanceof Error ? err.message : 'Antwort konnte nicht bewertet werden.'); }
|
||||
} catch (err) { setError(errorMessage(err, 'ui.unable_to_evaluate_your_answer')); }
|
||||
finally { setBusy(false); }
|
||||
}
|
||||
|
||||
@@ -153,40 +155,41 @@ export function LegacyCoursePage() {
|
||||
setPronResult(response);
|
||||
setRecorded(null);
|
||||
await refresh();
|
||||
} catch (err) { setError(err instanceof Error ? err.message : 'Aussprache konnte nicht bewertet werden.'); }
|
||||
} catch (err) { setError(errorMessage(err, 'ui.unable_to_evaluate_pronunciation')); }
|
||||
finally { setBusy(false); }
|
||||
}
|
||||
|
||||
if (error && !detail) return <p className="form-error">{error}</p>;
|
||||
if (loaded && !detail) return <p className="muted">Für deine aktuelle Sprache und Lernstufe ist noch kein Kursmodul verfügbar.</p>;
|
||||
if (!detail) return <p className="muted">Lade A1-Kurs...</p>;
|
||||
if (loaded && !detail) return <p className="muted">{t('ui.no_course_module_is_available_for_your_current_language_and')}</p>;
|
||||
if (!detail) return <p className="muted">{t('ui.loading_a1_course_2')}</p>;
|
||||
const task = practiceTask ?? detail.tasks.find((item) => item.id === selectedId);
|
||||
const skills = Object.entries(skillNames) as [CourseTask['skill'], string][];
|
||||
|
||||
return (
|
||||
<div className="view-stack">
|
||||
<p className="muted">{t('seed.historical')}</p>
|
||||
<header className="view-header">
|
||||
<div><p className="eyebrow">Geführter A1-Kurs</p><h1>{detail.module.title}</h1><p className="muted">{detail.module.description}</p></div>
|
||||
<div><p className="eyebrow">{t('ui.guided_a1_course')}</p><h1>{detail.module.title}</h1><p className="muted">{detail.module.description}</p></div>
|
||||
</header>
|
||||
<section className="panel course-progress" aria-label="Modulfortschritt">
|
||||
<strong>{detail.module.attempted_count} von {detail.module.task_count} Aufgaben bearbeitet</strong>
|
||||
<p className="muted">{detail.module.correct_count} Aufgaben richtig gelöst. „Bearbeitet“ bedeutet nicht „A1 bestanden“.</p>
|
||||
<section className="panel course-progress" aria-label={t('ui.module_progress')}>
|
||||
<strong>{t('legacy.completed', { done: detail.module.attempted_count.toLocaleString(language), total: detail.module.task_count.toLocaleString(language) })}</strong>
|
||||
<p className="muted">{t('legacy.correct', { count: detail.module.correct_count.toLocaleString(language) })}</p>
|
||||
<progress max={detail.module.task_count || 1} value={detail.module.attempted_count} />
|
||||
</section>
|
||||
<section className="panel course-additional" aria-label="Zusätzlich üben">
|
||||
<div><h2>Zusätzlich üben</h2><p className="muted">Wortschatz und Grammatik wiederholen. Dein Fortschritt im festen Kurs bleibt davon getrennt.</p></div>
|
||||
<section className="panel course-additional" aria-label={t('ui.additional_practice')}>
|
||||
<div><h2>{t('ui.additional_practice')}</h2><p className="muted">{t('ui.review_vocabulary_and_grammar_your_progress_in_the_fixed_course')}</p></div>
|
||||
<button type="button" className="primary-button" disabled={busy || recording || practiceLoading} onClick={() => void generatePractice()}>
|
||||
{generating ? 'Aufgabe wird vorbereitet…' : 'Neue Zusatzaufgabe'}
|
||||
{generating ? t('ui.preparing_exercise') : t('ui.new_additional_exercise')}
|
||||
</button>
|
||||
{practiceLoading && <p className="course-practice-status muted" role="status">Zusatzaufgaben werden geladen…</p>}
|
||||
{generating && <p className="course-practice-status muted" role="status">Eine passende Aufgabe wird vorbereitet. Das kann bis zu 25 Sekunden dauern.</p>}
|
||||
{practiceError && <p className="course-practice-status form-error" role="alert">Zusatzaufgabe konnte nicht geladen werden: {practiceError}</p>}
|
||||
{practiceLoading && <p className="course-practice-status muted" role="status">{t('ui.loading_additional_exercises')}</p>}
|
||||
{generating && <p className="course-practice-status muted" role="status">{t('ui.preparing_a_suitable_exercise_this_can_take_up_to_25')}</p>}
|
||||
{practiceError && <p className="course-practice-status form-error" role="alert">{t('ui.unable_to_load_additional_exercise_2')} {practiceError}</p>}
|
||||
{practiceNotice && <p className="course-practice-status muted" role="status">{practiceNotice}</p>}
|
||||
</section>
|
||||
<div className="course-layout">
|
||||
<nav className="panel course-task-list" aria-label="Kursaufgaben">
|
||||
<nav className="panel course-task-list" aria-label={t('ui.course_exercises')}>
|
||||
{practiceTasks.length > 0 && <div className="course-skill-group">
|
||||
<h2>Deine Zusatzaufgaben</h2>
|
||||
<h2>{t('ui.your_additional_exercises')}</h2>
|
||||
{practiceTasks.map((item, index) => <button key={item.id} type="button" disabled={busy || recording}
|
||||
className={practiceTask?.id === item.id ? 'course-task active' : 'course-task'} onClick={() => selectTask(item, true)}>
|
||||
<span>{skillNames[item.skill]} · {index + 1}</span><span>{item.correct ? '✓' : item.attempted ? '↻' : '○'}</span>
|
||||
@@ -195,46 +198,45 @@ export function LegacyCoursePage() {
|
||||
{skills.map(([skill, name]) => {
|
||||
const tasks = detail.tasks.filter((item) => item.skill === skill);
|
||||
return tasks.length > 0 && <div key={skill} className="course-skill-group">
|
||||
<h2>{name} <small>{tasks.filter((item) => item.attempted).length}/{tasks.length} bearbeitet · {tasks.filter((item) => item.correct).length} Ziel erreicht</small></h2>
|
||||
<h2>{name} <small>{t('legacy.areaProgress', { done: tasks.filter((item) => item.attempted).length, total: tasks.length, correct: tasks.filter((item) => item.correct).length })}</small></h2>
|
||||
{tasks.map((item, index) => <button key={item.id} type="button" disabled={recording || busy}
|
||||
className={!practiceTask && item.id === selectedId ? 'course-task active' : 'course-task'} onClick={() => selectTask(item)}>
|
||||
<span>Aufgabe {index + 1}</span><span>{item.correct ? '✓' : item.attempted ? '↻' : '○'}</span>
|
||||
<span>{t('ui.exercise')} {index + 1}</span><span>{item.correct ? '✓' : item.attempted ? '↻' : '○'}</span>
|
||||
</button>)}
|
||||
</div>;
|
||||
})}
|
||||
</nav>
|
||||
<section ref={exerciseRef} tabIndex={-1} className="panel course-exercise" aria-live="polite" aria-label="Aktuelle Kursaufgabe">
|
||||
<section ref={exerciseRef} tabIndex={-1} className="panel course-exercise" aria-live="polite" aria-label={t('ui.current_course_exercise')}>
|
||||
{task && <>
|
||||
<p className="eyebrow">{practiceTask ? (practiceTask.source === 'curated' ? 'Aus geprüftem Aufgabenbestand · ' : practiceTask.source === 'ai' ? 'Mit KI erstellt · ' : practiceTask.source === 'flowise' ? 'Mit Flowise erstellt · ' : practiceTask.source === 'seed' ? 'Feste Kursaufgabe zur Wiederholung · ' : 'Zusätzlich üben · ') : ''}{skillNames[task.skill]}</p>
|
||||
<p className="eyebrow">{practiceTask ? (practiceTask.source === 'curated' ? t('ui.from_the_reviewed_exercise_bank_2') : practiceTask.source === 'ai' ? t('ui.created_with_ai_2') : practiceTask.source === 'flowise' ? t('ui.created_with_flowise_2') : practiceTask.source === 'seed' ? t('ui.fixed_course_exercise_for_review') : t('ui.additional_practice_2')) : ''}{skillNames[task.skill]}</p>
|
||||
<h2>{task.prompt}</h2>
|
||||
{task.passage && <p className="course-passage">{task.passage}</p>}
|
||||
{task.skill === 'listening' && <p className="muted">Höre zuerst zu. Der gesprochene Text erscheint nach deiner Antwort.</p>}
|
||||
{task.skill === 'listening' && <p className="muted">{t('ui.listen_first_the_spoken_text_appears_after_your_answer')}</p>}
|
||||
{(task.skill === 'listening' || task.skill === 'pronunciation') && <button type="button" className="ghost-button" disabled={busy || recording}
|
||||
onClick={() => void playAudio(task)}>Anhören</button>}
|
||||
onClick={() => void playAudio(task)}>{t('ui.listen')}</button>}
|
||||
{audioError && <p className="form-error">{audioError}</p>}
|
||||
{task.kind === 'choice' && <div className="course-options" role="group" aria-label="Antwortmöglichkeiten">
|
||||
{task.kind === 'choice' && <div className="course-options" role="group" aria-label={t('ui.answer_options')}>
|
||||
{(task.options ?? []).map((option) => <label key={option} className="course-option">
|
||||
<input type="radio" name={`answer-${task.id}`} value={option} checked={answer === option} onChange={() => setAnswer(option)} disabled={busy} /> {option}
|
||||
</label>)}
|
||||
</div>}
|
||||
{task.kind === 'short_text' && <label>Deine Antwort
|
||||
<input type="text" maxLength={200} value={answer} onChange={(event) => setAnswer(event.target.value)} disabled={busy} autoComplete="off" />
|
||||
{task.kind === 'short_text' && <label>{t('ui.your_answer')} <input type="text" maxLength={200} value={answer} onChange={(event) => setAnswer(event.target.value)} disabled={busy} autoComplete="off" />
|
||||
</label>}
|
||||
{task.kind !== 'pronunciation' && <button type="button" className="primary-button" disabled={busy || !answer.trim()} onClick={() => void submit(task)}>
|
||||
{busy ? 'Wird geprüft...' : 'Antwort prüfen'}
|
||||
{busy ? t('ui.checking') : t('ui.check_answer')}
|
||||
</button>}
|
||||
{task.kind === 'pronunciation' && task.pronunciation_exercise && <div className="course-pronunciation">
|
||||
<p className="target-text">{task.pronunciation_exercise.target_text}</p>
|
||||
<div className="action-row"><AudioRecorder key={task.id} onRecorded={setRecorded} onRecordingChange={setRecording}
|
||||
onRecordingStart={() => { setRecorded(null); setPronResult(null); }} disabled={busy} buttonLabel={recorded ? 'Erneut aufnehmen' : 'Aufnehmen'} secondary={Boolean(recorded)} />
|
||||
{recorded && !recording && <button type="button" className="primary-button" disabled={busy} onClick={() => void assess(task)}>Bewerten</button>}</div>
|
||||
{recordedUrl && !recording && <div className="recording-preview"><p className="muted">Du kannst die Aufnahme vor dem Bewerten anhören oder erneut aufnehmen.</p><audio controls src={recordedUrl} /></div>}
|
||||
{pronResult && <div className="course-feedback"><strong>Aussprache: {Math.round(pronResult.attempt.overall_score)} / 100</strong><p>{pronResult.teacher.teacher_feedback}</p></div>}
|
||||
onRecordingStart={() => { setRecorded(null); setPronResult(null); }} disabled={busy} buttonLabel={recorded ? t('ui.record_again') : t('ui.record')} secondary={Boolean(recorded)} />
|
||||
{recorded && !recording && <button type="button" className="primary-button" disabled={busy} onClick={() => void assess(task)}>{t('ui.evaluate')}</button>}</div>
|
||||
{recordedUrl && !recording && <div className="recording-preview"><p className="muted">{t('ui.you_can_listen_to_your_recording_or_record_again_before')}</p><audio controls src={recordedUrl} /></div>}
|
||||
{pronResult && <div className="course-feedback"><strong>{t('ui.pronunciation')} {Math.round(pronResult.attempt.overall_score)} / 100</strong><p>{pronResult.teacher.teacher_feedback}</p></div>}
|
||||
</div>}
|
||||
{result?.task_id === task.id && <div className={result.correct ? 'course-feedback correct' : 'course-feedback'} role="status">
|
||||
<strong>{result.correct ? 'Richtig!' : 'Noch nicht richtig.'}</strong>
|
||||
<p>{result.explanation}</p><p>Musterantwort: {result.solution}</p>
|
||||
{result.transcript && <p>Gehörter Text: {result.transcript}</p>}
|
||||
<strong>{result.correct ? t('ui.correct_2') : t('ui.not_correct_yet')}</strong>
|
||||
<p>{result.explanation}</p><p>{t('ui.example_answer')} {result.solution}</p>
|
||||
{result.transcript && <p>{t('ui.listening_transcript_2')} {result.transcript}</p>}
|
||||
</div>}
|
||||
|
||||
</>}
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import { LogIn } from 'lucide-react';
|
||||
import { FormEvent, useState } from 'react';
|
||||
import { login } from '../api/auth';
|
||||
@@ -8,9 +10,10 @@ type Props = {
|
||||
};
|
||||
|
||||
export function LoginPage({ onDone, onRegister }: Props) {
|
||||
const { t } = useI18n();
|
||||
const [email, setEmail] = useState('');
|
||||
const [password, setPassword] = useState('');
|
||||
const [error, setError] = useState('');
|
||||
const [error, setError] = useLocalizedMessage();
|
||||
const [loading, setLoading] = useState(false);
|
||||
|
||||
async function submit(event: FormEvent) {
|
||||
@@ -21,7 +24,7 @@ export function LoginPage({ onDone, onRegister }: Props) {
|
||||
await login(email, password);
|
||||
onDone();
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Login fehlgeschlagen');
|
||||
setError(errorMessage(err, 'auth.loginError'));
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
@@ -31,24 +34,24 @@ export function LoginPage({ onDone, onRegister }: Props) {
|
||||
<section className="auth-panel">
|
||||
<div className="auth-heading">
|
||||
<div className="brand-mark">SL</div>
|
||||
<h1>Einloggen</h1>
|
||||
<h1>{t('auth.login')}</h1>
|
||||
</div>
|
||||
<form onSubmit={submit} className="form-grid">
|
||||
<label>
|
||||
E-Mail
|
||||
{t('auth.email')}
|
||||
<input value={email} onChange={(event) => setEmail(event.target.value)} type="email" autoComplete="email" required />
|
||||
</label>
|
||||
<label>
|
||||
Passwort
|
||||
{t('auth.password')}
|
||||
<input value={password} onChange={(event) => setPassword(event.target.value)} type="password" autoComplete="current-password" required />
|
||||
</label>
|
||||
{error && <p className="form-error">{error}</p>}
|
||||
<button className="primary-button" disabled={loading} type="submit">
|
||||
<LogIn size={18} /> Login
|
||||
<LogIn size={18} /> {t(loading ? 'auth.busy' : 'auth.login')}
|
||||
</button>
|
||||
</form>
|
||||
<button className="link-button" onClick={onRegister} type="button">
|
||||
Account erstellen
|
||||
{t('auth.register')}
|
||||
</button>
|
||||
</section>
|
||||
);
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
import { useExercisePresentation } from '../i18n/exercisePresentation';
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import { RotateCcw, Send, Volume2 } from 'lucide-react';
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { fetchExerciseAudio, fetchNextLesson, type ExerciseAudioMode } from '../api/lessons';
|
||||
@@ -13,6 +16,8 @@ type Props = {
|
||||
};
|
||||
|
||||
export function PracticePage({ initialSelection }: Props) {
|
||||
const presentation = useExercisePresentation();
|
||||
const { t } = useI18n();
|
||||
const [lesson, setLesson] = useState<Lesson | null>(initialSelection?.lesson ?? null);
|
||||
const [exercise, setExercise] = useState<Exercise | null>(initialSelection?.exercise ?? null);
|
||||
const [audio, setAudio] = useState<Blob | null>(null);
|
||||
@@ -22,9 +27,9 @@ export function PracticePage({ initialSelection }: Props) {
|
||||
const [loadingNext, setLoadingNext] = useState(false);
|
||||
const [recording, setRecording] = useState(false);
|
||||
const [audioLoadingKey, setAudioLoadingKey] = useState<string | null>(null);
|
||||
const [audioError, setAudioError] = useState('');
|
||||
const [error, setError] = useState('');
|
||||
const [notice, setNotice] = useState('');
|
||||
const [audioError, setAudioError] = useLocalizedMessage();
|
||||
const [error, setError] = useLocalizedMessage();
|
||||
const [notice, setNotice] = useLocalizedMessage();
|
||||
const submittingRef = useRef(false);
|
||||
const referenceAudioRef = useRef<{ exerciseId: string; urls: Map<string, string>; player: HTMLAudioElement | null } | null>(null);
|
||||
const audioRequestRef = useRef<AbortController | null>(null);
|
||||
@@ -81,7 +86,7 @@ export function PracticePage({ initialSelection }: Props) {
|
||||
await player.play();
|
||||
} catch {
|
||||
if (audioGenerationRef.current !== generation || controller?.signal.aborted) return;
|
||||
setAudioError('Satz konnte nicht abgespielt werden. Bitte erneut versuchen.');
|
||||
setAudioError({ key: 'ui.unable_to_play_the_sentence_please_try_again' });
|
||||
} finally {
|
||||
if (audioGenerationRef.current === generation) setAudioLoadingKey(null);
|
||||
if (audioRequestRef.current === controller) audioRequestRef.current = null;
|
||||
@@ -104,7 +109,7 @@ export function PracticePage({ initialSelection }: Props) {
|
||||
try {
|
||||
const next = await fetchNextLesson(fresh, fresh ? recentExerciseIds.current : []);
|
||||
if (fresh && exercise?.target_text.trim().toLowerCase() === next.exercise.target_text.trim().toLowerCase()) {
|
||||
setNotice('Der Agent hat denselben Satz erneut erzeugt. Bitte versuche es noch einmal.');
|
||||
setNotice({ key: 'ui.the_agent_generated_the_same_sentence_again_please_try_once' });
|
||||
}
|
||||
setLesson(next.lesson);
|
||||
setExercise(next.exercise);
|
||||
@@ -112,7 +117,7 @@ export function PracticePage({ initialSelection }: Props) {
|
||||
recentExerciseIds.current = [...recentExerciseIds.current, next.exercise.id].slice(-3);
|
||||
}
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Uebung konnte nicht geladen werden');
|
||||
setError(errorMessage(err, 'ui.unable_to_load_exercise'));
|
||||
} finally {
|
||||
setLoadingNext(false);
|
||||
}
|
||||
@@ -127,7 +132,7 @@ export function PracticePage({ initialSelection }: Props) {
|
||||
try {
|
||||
setResult(await submitAttempt(exercise.id, audio));
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Bewertung fehlgeschlagen');
|
||||
setError(errorMessage(err, 'ui.evaluation_failed'));
|
||||
} finally {
|
||||
submittingRef.current = false;
|
||||
setLoading(false);
|
||||
@@ -137,8 +142,8 @@ export function PracticePage({ initialSelection }: Props) {
|
||||
if (!lesson || !exercise) {
|
||||
return (
|
||||
<div className="view-stack">
|
||||
<p className={error ? 'form-error' : 'muted'}>{error || 'Lade Uebung...'}</p>
|
||||
{error && <button className="ghost-button" disabled={loadingNext} onClick={() => void loadNext(true)}>Erneut versuchen</button>}
|
||||
<p className={error ? 'form-error' : 'muted'}>{error || t('ui.loading_exercise')}</p>
|
||||
{error && <button className="ghost-button" disabled={loadingNext} onClick={() => void loadNext(true)}>{t('common.retry')}</button>}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -149,11 +154,11 @@ export function PracticePage({ initialSelection }: Props) {
|
||||
<div className="view-stack">
|
||||
<header className="view-header">
|
||||
<div>
|
||||
<p className="eyebrow">{lesson.title}</p>
|
||||
<h1>Aussprache</h1>
|
||||
<p className="eyebrow">{presentation(lesson, exercise).title}</p>
|
||||
<h1>{t('nav.practice')}</h1>
|
||||
</div>
|
||||
<button className="ghost-button" disabled={loadingNext || loading || recording} onClick={() => void loadNext(true)}>
|
||||
<RotateCcw size={18} /> {loadingNext ? 'Lade neue Uebung...' : 'Andere Uebung'}
|
||||
<RotateCcw size={18} /> {loadingNext ? t('ui.loading_new_exercise') : t('ui.different_exercise')}
|
||||
</button>
|
||||
</header>
|
||||
|
||||
@@ -161,24 +166,24 @@ export function PracticePage({ initialSelection }: Props) {
|
||||
{notice && <p className="muted">{notice}</p>}
|
||||
|
||||
<section className="panel practice-panel">
|
||||
<p className="muted">{exercise.prompt_text}</p>
|
||||
{exercise.training_reason&&<p className="muted" role="note">Warum diese Übung: {exercise.training_reason}</p>}
|
||||
<PronunciationText targetText={exercise.target_text} words={result?.attempt.word_scores} />
|
||||
<p className="muted" lang={presentation(lesson, exercise).promptLanguage} dir="auto">{presentation(lesson, exercise).prompt}</p>
|
||||
{exercise.training_reason&&<p className="muted" role="note">{t('ui.why_this_exercise')} {exercise.training_reason}</p>}
|
||||
<PronunciationText language={exercise.target_language} targetText={exercise.target_text} words={result?.attempt.word_scores} />
|
||||
<div className="action-row">
|
||||
<button className="ghost-button" type="button" disabled={loadingNext || audioLoadingKey !== null || recording} onClick={() => void playReference('normal')}>
|
||||
<Volume2 size={18} /> {audioLoadingKey === 'normal:' ? 'Satz wird geladen...' : 'Satz anhören'}
|
||||
<Volume2 size={18} /> {audioLoadingKey === 'normal:' ? t('ui.loading_sentence') : t('ui.listen_to_sentence')}
|
||||
</button>
|
||||
<button className="ghost-button" type="button" disabled={loadingNext || audioLoadingKey !== null || recording} onClick={() => void playReference('slow')}>
|
||||
<Volume2 size={18} /> {audioLoadingKey === 'slow:' ? 'Satz wird geladen...' : 'Langsam anhören'}
|
||||
<Volume2 size={18} /> {audioLoadingKey === 'slow:' ? t('ui.loading_sentence') : t('ui.listen_slowly')}
|
||||
</button>
|
||||
</div>
|
||||
{focusWords.length > 0 && (
|
||||
<div className="recording-preview">
|
||||
<p className="muted">Diese Wörter kannst du gezielt anhören:</p>
|
||||
<p className="muted">{t('ui.listen_to_these_practice_words')}</p>
|
||||
<div className="action-row">
|
||||
{focusWords.map((word) => (
|
||||
<button className="ghost-button" type="button" key={word} disabled={loadingNext || audioLoadingKey !== null || recording} onClick={() => void playReference('focus', word)}>
|
||||
<Volume2 size={18} /> {audioLoadingKey === `focus:${word.toLocaleLowerCase()}` ? 'Wort wird geladen...' : `${word} langsam üben`}
|
||||
<Volume2 size={18} /> {audioLoadingKey === `focus:${word.toLocaleLowerCase()}` ? t('ui.loading_word') : t('ui.practise_value_slowly', { value0: word })}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
@@ -201,37 +206,36 @@ export function PracticePage({ initialSelection }: Props) {
|
||||
}}
|
||||
onRecordingChange={setRecording}
|
||||
disabled={loading || loadingNext}
|
||||
buttonLabel={loading ? 'Bewertung läuft...' : audio || result ? 'Erneut aufnehmen' : 'Aufnehmen'}
|
||||
buttonLabel={loading ? t('ui.evaluating') : audio || result ? t('ui.record_again') : t('ui.record')}
|
||||
secondary={Boolean(audio)}
|
||||
/>
|
||||
{audio && !recording && (
|
||||
<button className="primary-button" disabled={loading || loadingNext} onClick={() => void evaluateRecording()} type="button">
|
||||
<Send size={18} /> Bewerten
|
||||
</button>
|
||||
<Send size={18} /> {t('ui.evaluate')} </button>
|
||||
)}
|
||||
</div>
|
||||
{audio && !recording && (
|
||||
<div className="recording-preview">
|
||||
<p className="muted">Aufnahme noch nicht gesendet. Anhören, erneut aufnehmen oder bewerten.</p>
|
||||
{audioUrl && <audio controls src={audioUrl} aria-label="Eigene Aufnahme anhören" />}
|
||||
<p className="muted">{t('ui.recording_not_yet_submitted_listen_record_again_or_request_evaluation')}</p>
|
||||
{audioUrl && <audio controls src={audioUrl} aria-label={t('ui.listen_to_your_recording')} />}
|
||||
</div>
|
||||
)}
|
||||
{loading && <p className="muted">Die Aussprache wird bewertet...</p>}
|
||||
{loading && <p className="muted">{t('ui.evaluating_pronunciation')}</p>}
|
||||
</section>
|
||||
|
||||
{result && (
|
||||
<section className="result-grid">
|
||||
<div className="panel result-panel">
|
||||
<h2>Bewertung</h2>
|
||||
<h2>{t('ui.evaluation')}</h2>
|
||||
<div className="score-grid">
|
||||
<ScoreBadge label="Gesamt" value={result.attempt.overall_score} />
|
||||
<ScoreBadge label="Accuracy" value={result.attempt.accuracy_score} />
|
||||
<ScoreBadge label="Fluency" value={result.attempt.fluency_score} />
|
||||
<ScoreBadge label="Completeness" value={result.attempt.completeness_score} />
|
||||
<ScoreBadge label={t('ui.overall')} value={result.attempt.overall_score} />
|
||||
<ScoreBadge label={t('ui.accuracy')} value={result.attempt.accuracy_score} />
|
||||
<ScoreBadge label={t('ui.fluency')} value={result.attempt.fluency_score} />
|
||||
<ScoreBadge label={t('ui.completeness')} value={result.attempt.completeness_score} />
|
||||
</div>
|
||||
</div>
|
||||
<div className="panel result-panel">
|
||||
<h2>Lehrerfeedback</h2>
|
||||
<h2>{t('ui.teacher_feedback')}</h2>
|
||||
<p>{result.teacher.teacher_feedback}</p>
|
||||
<p className="muted">{result.teacher.next_recommendation}</p>
|
||||
</div>
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { fetchProgress } from '../api/lessons';
|
||||
import type { ProgressSummary } from '../api/types';
|
||||
@@ -5,31 +7,32 @@ import { PronunciationOverview } from '../components/PronunciationOverview';
|
||||
import { ScoreBadge } from '../components/ScoreBadge';
|
||||
|
||||
export function ProgressPage() {
|
||||
const { t, language } = useI18n();
|
||||
const [progress, setProgress] = useState<ProgressSummary | null>(null);
|
||||
const [error, setError] = useState('');
|
||||
const [error, setError] = useLocalizedMessage();
|
||||
|
||||
useEffect(() => {
|
||||
fetchProgress().then(setProgress).catch((err) => setError(err instanceof Error ? err.message : 'Fortschritt konnte nicht geladen werden'));
|
||||
fetchProgress().then(setProgress).catch((err) => setError(errorMessage(err, 'progress.error')));
|
||||
}, []);
|
||||
|
||||
if (error) return <p className="form-error">{error}</p>;
|
||||
if (!progress) return <p className="muted">Lade Fortschritt...</p>;
|
||||
if (!progress) return <p className="muted">{t('progress.loading')}</p>;
|
||||
|
||||
return (
|
||||
<div className="view-stack">
|
||||
<header className="view-header">
|
||||
<div>
|
||||
<p className="eyebrow">Lernübersicht</p>
|
||||
<h1>Fortschritt</h1>
|
||||
<p className="eyebrow">{t('progress.overview')}</p>
|
||||
<h1>{t('nav.progress')}</h1>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
<section className="metric-grid">
|
||||
<div className="panel result-panel">
|
||||
<ScoreBadge label="Historischer Durchschnitt" value={progress.average_score} />
|
||||
<ScoreBadge label={t('progress.average')} value={progress.average_score} />
|
||||
</div>
|
||||
<div className="panel metric">
|
||||
<span>Versuche</span>
|
||||
<span>{t('dashboard.attempts')}</span>
|
||||
<strong>{progress.total_attempts}</strong>
|
||||
</div>
|
||||
</section>
|
||||
@@ -37,11 +40,11 @@ export function ProgressPage() {
|
||||
<PronunciationOverview />
|
||||
|
||||
<section className="panel result-panel">
|
||||
<h2>Letzte Versuche</h2>
|
||||
<h2>{t('progress.recent')}</h2>
|
||||
<div className="attempt-list">
|
||||
{(progress.recent_attempts ?? []).map((attempt) => (
|
||||
<div className="attempt-row" key={attempt.id}>
|
||||
<span>{new Date(attempt.created_at).toLocaleString()}</span>
|
||||
<span>{new Date(attempt.created_at).toLocaleString(language)}</span>
|
||||
<strong>{Math.round(attempt.overall_score)}</strong>
|
||||
</div>
|
||||
))}
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import { UserPlus } from 'lucide-react';
|
||||
import { FormEvent, useState } from 'react';
|
||||
import { register } from '../api/auth';
|
||||
@@ -8,9 +10,10 @@ type Props = {
|
||||
};
|
||||
|
||||
export function RegisterPage({ onDone, onLogin }: Props) {
|
||||
const { t, language } = useI18n();
|
||||
const [email, setEmail] = useState('');
|
||||
const [password, setPassword] = useState('');
|
||||
const [error, setError] = useState('');
|
||||
const [error, setError] = useLocalizedMessage();
|
||||
const [loading, setLoading] = useState(false);
|
||||
|
||||
async function submit(event: FormEvent) {
|
||||
@@ -18,10 +21,10 @@ export function RegisterPage({ onDone, onLogin }: Props) {
|
||||
setLoading(true);
|
||||
setError('');
|
||||
try {
|
||||
await register(email, password);
|
||||
await register(email, password, language);
|
||||
onDone();
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Registrierung fehlgeschlagen');
|
||||
setError(errorMessage(err, 'auth.registerError'));
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
@@ -31,24 +34,25 @@ export function RegisterPage({ onDone, onLogin }: Props) {
|
||||
<section className="auth-panel">
|
||||
<div className="auth-heading">
|
||||
<div className="brand-mark">SL</div>
|
||||
<h1>Account erstellen</h1>
|
||||
<h1>{t('auth.register')}</h1>
|
||||
</div>
|
||||
<p className="muted">{t('language.registerInfo')}</p>
|
||||
<form onSubmit={submit} className="form-grid">
|
||||
<label>
|
||||
E-Mail
|
||||
{t('auth.email')}
|
||||
<input value={email} onChange={(event) => setEmail(event.target.value)} type="email" autoComplete="email" required />
|
||||
</label>
|
||||
<label>
|
||||
Passwort
|
||||
{t('auth.password')}
|
||||
<input value={password} onChange={(event) => setPassword(event.target.value)} type="password" autoComplete="new-password" minLength={8} required />
|
||||
</label>
|
||||
{error && <p className="form-error">{error}</p>}
|
||||
<button className="primary-button" disabled={loading} type="submit">
|
||||
<UserPlus size={18} /> Registrieren
|
||||
<UserPlus size={18} /> {t(loading ? 'auth.busy' : 'auth.register.submit')}
|
||||
</button>
|
||||
</form>
|
||||
<button className="link-button" onClick={onLogin} type="button">
|
||||
Zurueck zum Login
|
||||
{t('auth.back')}
|
||||
</button>
|
||||
</section>
|
||||
);
|
||||
|
||||
@@ -1,5 +1,24 @@
|
||||
# Browserprüfungen für Aufgabenbestand und KI-Anbindung
|
||||
|
||||
`audio-monitoring.e2e.cjs` prüft die gemeinsame Aufnahme-Komponente mit einem
|
||||
synthetischen Mikrofonsignal: standardmäßig keine Mithörbedienung und kein
|
||||
Mithörpfad; nach expliziter Freigabe über `enableMonitoring` zunächst ausgeschaltetes Mithören, Schalter und
|
||||
Lautstärke während der Aufnahme, tatsächliche Signalpegel, unveränderte
|
||||
WAV-Aufnahme, Stoppen und Unmount, Mikrofonfehler mit erneutem Versuch sowie
|
||||
automatisches Zeitlimit und schmale Ansicht. Ein Wechsel Deutsch → Russisch
|
||||
→ Deutsch während einer Aufnahme darf keinen neuen Stream starten oder die
|
||||
Aufnahme abbrechen; auch russische Aufnahme- und Monitoringbeschriftungen werden
|
||||
geprüft. Benötigt Web-Abhängigkeiten und
|
||||
Playwright mit Chromium, aber keine API oder Datenbank. Aus `apps/web`:
|
||||
|
||||
```bash
|
||||
PLAYWRIGHT_MODULE=/pfad/zu/playwright node tests/audio-monitoring.e2e.cjs
|
||||
```
|
||||
|
||||
Auch diese Prüfung verwendet Port 15175 und muss separat laufen. Sie bestätigt
|
||||
keine echte Kopfhörerqualität oder Gerätelatenz; diese müssen mit echter
|
||||
Hardware geprüft werden.
|
||||
|
||||
`pronunciation-profile.e2e.cjs` prüft das gemeinsame Lautprofil über echte lokale
|
||||
API-/PostgreSQL-Aufnahmen mit ausdrücklich simulierten Speech-Messungen: leerer
|
||||
Einstieg, Nachweise speichern, Wort-/Phonemübersicht, geringe Evidenz,
|
||||
@@ -18,11 +37,33 @@ go test ./internal/httpapi -run TestPronunciationBrowserSmoke -v -count=1
|
||||
Auch diese Fixture benötigt den freien Port 15175. Alle drei Browser-Smokes
|
||||
nacheinander ausführen, nicht parallel.
|
||||
|
||||
`course-bank.e2e.cjs` prüft den Kurs mit 840 Aufgaben, sieben Modulen, allen sechs
|
||||
Lernbereichen und den fünf Darstellungsformen. Geprüft werden außerdem neue
|
||||
Aufgabenzuweisungen, Neuladen, unbewertete offene Antworten mit Selbstvergleich
|
||||
und ein vollständig abgegebener Test ohne vorzeitige Note oder Lösungsausgabe.
|
||||
Die Prüfung bestätigt, dass dabei keine Modellaufrufe erfasst werden.
|
||||
`languages.e2e.cjs` prüft deutsche/russische Kataloge und Platzhalter, die beiden
|
||||
Muttersprachen vor dem Login, Registrierung, Kontosprache nach Anmeldung/Reload,
|
||||
gekoppelte Kompatibilitätsfelder, abgewiesene Konflikte und fehlgeschlagene
|
||||
Speicherung. Ein Sprachwechsel erhält Lernsprache, A2-Niveau und Tagesziel.
|
||||
API-Fehler wechseln anhand ihrer Codes mit der Oberfläche die Sprache.
|
||||
|
||||
`course-variants.e2e.cjs` verwendet ein neues reguläres Konto. Es prüft den
|
||||
russischen Bestand mit 840 Aufgaben, sieben Modulen und sechs Lernbereichen,
|
||||
Sprachrollen, private Hörtexte/Lösungen, unbenotete Antworten sowie eingefrorene
|
||||
Aufgaben nach Sprachwechsel und Reload. Ein russischer Test mit zwölf Aufgaben
|
||||
bleibt nach einem Wechsel über dieselbe Request-ID unverändert abrufbar.
|
||||
|
||||
`course-sequences.e2e.cjs` prüft auf Deutsch und Russisch den empfohlenen
|
||||
Lernweg mit Höreinstieg, Wiederaufnahme nach Reload, unveränderten Schritt bei
|
||||
bloßem Weiterklicken, explizites Überspringen, freie Bereichswahl, klar eingeklappte Bewertungen vorheriger Versuche, Fortsetzung
|
||||
nach einer Antwort und Erhalt beim Wechsel der Muttersprache. Die Kursbank-Fixture
|
||||
startet ihn sequenziell nach dem Varianten-Smoke. Keine Modellaufrufe.
|
||||
Die Go-Datenbanktests prüfen zusätzlich den Weg bis zur gemeldeten Aufgabe über
|
||||
zwei Freunde: passendes Schreiben vor freiem Sprechen, unbenotete Antworten ohne
|
||||
falschen Leistungsnachweis, einmaliges Wiederholungsangebot, Request-Replay,
|
||||
abgewiesene fremde/veraltete Skip-IDs und unveränderte historische Aufgaben.
|
||||
|
||||
`course-bank.e2e.cjs` läuft vollständig mit deutscher und russischer Muttersprache:
|
||||
Aufgabenzuweisung, Bedienung aller fünf Darstellungen, Antwort/Reload, Eingabeerhalt
|
||||
beim Sprachwechsel und vollständig abgegebener Test ohne vorzeitige Note oder
|
||||
Lösungsausgabe. Alle Konten leben im zufälligen lokalen Testschema. Audio und
|
||||
Modelle sind Fixtures; kein Test bestätigt Live-Modell- oder echte Audioqualität.
|
||||
|
||||
Aus `apps/api` mit den unten beschriebenen Voraussetzungen:
|
||||
|
||||
@@ -67,3 +108,12 @@ Azure-Audiofunktion. Live-Tests müssen im Adminbereich bewusst ausgelöst werde
|
||||
`adaptive-course.e2e.cjs` und `course-agent.fixture.py` sind historische
|
||||
Flowise-Smokes des früheren Stands. Die neue API verwendet deren Flowise-Endpunkt
|
||||
nicht mehr; für den aktuellen Arbeitsbaum die obige Prüfung verwenden.
|
||||
|
||||
Die Tests `TestFoundationRepetitionPolicy` und
|
||||
`TestLearningPathAdaptsOnlyFromOwnedGradedEvidence` prüfen unmittelbare
|
||||
Doppelwiederholung, zeitversetzte gute Antworten, unbekannte freigegebene
|
||||
Grammatikbeispiele, ältere/neuerdings falsche Ergebnisse, unbenotete und
|
||||
Demoantworten sowie Nutzertrennung. Derselbe gewählte Transfer bleibt bei neuen
|
||||
Anfragen und beim Wechsel der Muttersprache erhalten. Die Anzahl bewerteter
|
||||
Antworten darf durch die Auswahl nie steigen. Unveränderte thematische
|
||||
Vorbereitung bis zur Zwei-Freunde-Aufgabe wird weiterhin separat geprüft.
|
||||
|
||||
@@ -42,7 +42,7 @@ const assert=require('node:assert/strict');
|
||||
// A failed detail request must be visible at the same place as successful details.
|
||||
await page.route('**/admin/ai/calls/*',route=>route.fulfill({status:503,contentType:'application/json',body:JSON.stringify({error:'Details-Testfehler'})}));
|
||||
await admin.getByRole('button',{name:'Anzeigen',exact:true}).first().click();
|
||||
await details.getByRole('alert').filter({hasText:'Details-Testfehler'}).waitFor();
|
||||
await details.getByRole('alert').filter({hasText:'Der Dienst ist vorübergehend nicht verfügbar.'}).waitFor();
|
||||
await details.getByRole('button',{name:'Schließen',exact:true}).click();
|
||||
await page.unroute('**/admin/ai/calls/*');
|
||||
await page.getByRole('button',{name:'A1-Kurs',exact:true}).click();
|
||||
|
||||
@@ -0,0 +1,171 @@
|
||||
// Local component fixture with a synthetic microphone; no API, Azure or real microphone.
|
||||
const assert = require('node:assert/strict');
|
||||
const path = require('node:path');
|
||||
const { pathToFileURL } = require('node:url');
|
||||
const { chromium } = require(process.env.PLAYWRIGHT_MODULE || 'playwright');
|
||||
|
||||
(async () => {
|
||||
const web = path.resolve(__dirname, '..');
|
||||
const { createServer } = await import(pathToFileURL(path.join(web, 'node_modules/vite/dist/node/index.js')));
|
||||
const server = await createServer({
|
||||
root: web, configFile: false,
|
||||
plugins: [{ name: 'recorder-fixture', configureServer(dev) { dev.middlewares.use('/__recorder-test', recorderFixture); } }],
|
||||
optimizeDeps: { include: ['react', 'react-dom/client', 'react/jsx-dev-runtime', 'lucide-react'] },
|
||||
server: { host: '127.0.0.1', port: 15175, strictPort: true }
|
||||
});
|
||||
function recorderFixture(_req, res) {
|
||||
res.setHeader('Content-Type', 'text/html');
|
||||
res.end(`<!doctype html><html lang="de"><div id="root"></div><script type="module">
|
||||
import React from '/node_modules/.vite/deps/react.js';
|
||||
import ReactDOM from '/node_modules/.vite/deps/react-dom_client.js';
|
||||
import { AudioRecorder } from '/src/components/AudioRecorder.tsx';
|
||||
import { I18nProvider, useI18n } from '/src/i18n/I18n.tsx';
|
||||
import '/src/app/styles.css';
|
||||
const root = ReactDOM.createRoot(document.getElementById('root'));
|
||||
function RecorderFixture(props) {
|
||||
const { setLanguage } = useI18n();
|
||||
window.setRecorderLanguage = setLanguage;
|
||||
return React.createElement(AudioRecorder, props);
|
||||
}
|
||||
window.blobs = [];
|
||||
window.renderRecorder = (maxSeconds, enableMonitoring = false) => root.render(React.createElement(I18nProvider, null, React.createElement(RecorderFixture, {
|
||||
key: String(maxSeconds) + enableMonitoring, maxSeconds, enableMonitoring, onRecorded: blob => window.blobs.push(blob)
|
||||
})));
|
||||
window.unmountRecorder = () => root.unmount();
|
||||
window.renderRecorder();
|
||||
</script></html>`);
|
||||
}
|
||||
let browser;
|
||||
try {
|
||||
await server.listen();
|
||||
browser = await chromium.launch({ headless: true, args: ['--no-sandbox', '--autoplay-policy=no-user-gesture-required'] });
|
||||
const page = await browser.newPage();
|
||||
const errors = [];
|
||||
page.on('pageerror', error => { errors.push(error.message); console.error(error.message); });
|
||||
await page.addInitScript(() => {
|
||||
const RealContext = window.AudioContext;
|
||||
window.contexts = [];
|
||||
window.captures = [];
|
||||
window.monitors = [];
|
||||
window.streams = [];
|
||||
window.AudioContext = class extends RealContext {
|
||||
constructor(options) { super(options); window.contexts.push(this); }
|
||||
createScriptProcessor(...args) {
|
||||
const processor = super.createScriptProcessor(...args);
|
||||
const capture = { samples: 0, rate: this.sampleRate };
|
||||
window.captures.push(capture);
|
||||
processor.addEventListener('audioprocess', event => { capture.samples += event.inputBuffer.length; });
|
||||
return processor;
|
||||
}
|
||||
createGain() {
|
||||
const gain = super.createGain();
|
||||
const analyser = super.createAnalyser();
|
||||
gain.connect(analyser);
|
||||
window.monitors.push({ gain, analyser });
|
||||
return gain;
|
||||
}
|
||||
};
|
||||
navigator.mediaDevices.getUserMedia = async () => {
|
||||
if (window.rejectMic) throw new Error('Mikrofon nicht verfuegbar');
|
||||
const context = new RealContext();
|
||||
await context.resume();
|
||||
const oscillator = context.createOscillator();
|
||||
oscillator.frequency.value = 440;
|
||||
const destination = context.createMediaStreamDestination();
|
||||
oscillator.connect(destination);
|
||||
oscillator.start();
|
||||
window.streams.push(destination.stream);
|
||||
destination.stream.getTracks()[0].addEventListener('ended', () => context.close());
|
||||
return destination.stream;
|
||||
};
|
||||
window.monitorRMS = () => {
|
||||
const data = new Float32Array(2048);
|
||||
window.monitors.at(-1).analyser.getFloatTimeDomainData(data);
|
||||
return Math.sqrt(data.reduce((sum, value) => sum + value * value, 0) / data.length);
|
||||
};
|
||||
});
|
||||
await page.goto('http://127.0.0.1:15175/__recorder-test');
|
||||
const toggle = page.getByRole('switch', { name: 'Eigene Stimme mithören' });
|
||||
const volume = page.getByRole('slider', { name: 'Mithörlautstärke' });
|
||||
await page.getByRole('button', { name: 'Aufnehmen', exact: true }).waitFor();
|
||||
assert.equal(await toggle.count(), 0);
|
||||
assert.equal(await volume.count(), 0);
|
||||
await page.getByRole('button', { name: 'Aufnehmen', exact: true }).click();
|
||||
await page.getByRole('button', { name: 'Stoppen' }).waitFor();
|
||||
assert.equal(await page.evaluate(() => window.monitors.length), 0);
|
||||
await page.getByRole('button', { name: 'Stoppen' }).click();
|
||||
await page.waitForFunction(() => window.contexts.every(c => c.state === 'closed'));
|
||||
await page.evaluate(() => { window.blobs = []; window.streams = []; window.renderRecorder(undefined, true); });
|
||||
await toggle.waitFor();
|
||||
assert.equal(await toggle.isChecked(), false);
|
||||
assert.equal(await volume.isDisabled(), true);
|
||||
assert.equal(await page.evaluate(() => window.streams.length), 0);
|
||||
await page.getByRole('button', { name: 'Aufnehmen', exact: true }).click();
|
||||
await page.getByRole('button', { name: 'Stoppen' }).waitFor();
|
||||
await page.waitForFunction(() => window.monitorRMS() === 0);
|
||||
await toggle.check();
|
||||
await page.waitForFunction(() => window.monitorRMS() > 0.3);
|
||||
await volume.fill('20');
|
||||
await page.waitForFunction(() => window.monitorRMS() > 0.1 && window.monitorRMS() < 0.2);
|
||||
await toggle.uncheck();
|
||||
await page.waitForFunction(() => window.monitorRMS() < 0.001);
|
||||
// Collect enough real callback frames for the RMS windows checked below.
|
||||
await page.waitForFunction(() => window.captures.at(-1).samples >= window.captures.at(-1).rate * 0.6);
|
||||
await page.getByRole('button', { name: 'Stoppen' }).click();
|
||||
await page.waitForFunction(() => window.contexts.every(c => c.state === 'closed'));
|
||||
assert(await page.evaluate(() => window.streams.every(s => s.getTracks().every(t => t.readyState === 'ended'))));
|
||||
// The WAV must retain microphone amplitude through muted and quiet monitoring segments.
|
||||
const recording = await page.evaluate(async () => {
|
||||
const buffer = await window.blobs[0].arrayBuffer();
|
||||
const view = new DataView(buffer);
|
||||
const rms = [];
|
||||
for (let start = 44; start + 3200 <= buffer.byteLength; start += 3200) {
|
||||
let energy = 0;
|
||||
for (let i = start; i < start + 3200; i += 2) energy += (view.getInt16(i, true) / 32768) ** 2;
|
||||
rms.push(Math.sqrt(energy / 1600));
|
||||
}
|
||||
return { rate: view.getUint32(24, true), channels: view.getUint16(22, true), rms };
|
||||
});
|
||||
assert.equal(recording.rate, 16000);
|
||||
assert.equal(recording.channels, 1);
|
||||
// Ignore the first 200 ms while the synthetic input stream starts delivering frames.
|
||||
assert(recording.rms.length > 2);
|
||||
assert(recording.rms.slice(2).every(rms => rms > 0.6 && rms < 0.8), JSON.stringify(recording.rms));
|
||||
await toggle.check();
|
||||
await page.getByRole('button', { name: 'Aufnehmen', exact: true }).click();
|
||||
await page.waitForFunction(() => window.monitors.length === 2 && window.monitorRMS() > 0.1);
|
||||
await page.evaluate(() => window.unmountRecorder());
|
||||
await page.waitForFunction(() => window.contexts.every(c => c.state === 'closed'));
|
||||
assert(await page.evaluate(() => window.streams.every(s => s.getTracks().every(t => t.readyState === 'ended'))));
|
||||
await page.reload();
|
||||
await page.getByRole('button', { name: 'Aufnehmen', exact: true }).waitFor();
|
||||
await page.evaluate(() => window.rejectMic = true);
|
||||
await page.getByRole('button', { name: 'Aufnehmen', exact: true }).click();
|
||||
await page.getByText('Mikrofon nicht verfuegbar', { exact: true }).waitFor();
|
||||
await page.evaluate(() => { window.rejectMic = false; window.renderRecorder(1); });
|
||||
await page.getByRole('button', { name: 'Aufnehmen', exact: true }).click();
|
||||
await page.waitForFunction(() => window.blobs.length === 1 && window.contexts.every(c => c.state === 'closed'));
|
||||
await page.evaluate(() => { window.renderRecorder(undefined, true); window.setRecorderLanguage('ru-RU'); });
|
||||
await page.getByRole('button', { name: 'Записать', exact: true }).click();
|
||||
await page.getByRole('button', { name: 'Остановить', exact: true }).waitFor();
|
||||
const streamsBefore = await page.evaluate(() => window.streams.length);
|
||||
const blobsBefore = await page.evaluate(() => window.blobs.length);
|
||||
await page.evaluate(() => window.setRecorderLanguage('de-DE'));
|
||||
await page.getByRole('button', { name: 'Stoppen', exact: true }).waitFor();
|
||||
assert.equal(await page.evaluate(() => window.streams.length), streamsBefore);
|
||||
assert.equal(await page.evaluate(() => window.contexts.at(-1).state), 'running');
|
||||
await page.evaluate(() => window.setRecorderLanguage('ru-RU'));
|
||||
await page.getByRole('switch', { name: 'Слышать свой голос' }).waitFor();
|
||||
await page.getByRole('slider', { name: 'Громкость мониторинга', exact: true }).waitFor();
|
||||
await page.waitForFunction(() => window.captures.at(-1).samples > 0);
|
||||
await page.getByRole('button', { name: 'Остановить', exact: true }).click();
|
||||
await page.waitForFunction(count => window.blobs.length === count + 1, blobsBefore);
|
||||
assert.deepEqual(errors, []);
|
||||
await page.setViewportSize({ width: 320, height: 800 });
|
||||
assert(await page.evaluate(() => document.documentElement.scrollWidth <= innerWidth));
|
||||
console.log('PASS: monitoring hidden and no monitor path by default; opt-in live switch/volume and actual signal levels, unchanged WAV, stop/unmount cleanup, microphone error/retry, time limit and mobile width. Synthetic audio only.');
|
||||
} finally {
|
||||
if (browser) await browser.close();
|
||||
await server.close();
|
||||
}
|
||||
})().catch(error => { console.error(error); process.exitCode = 1; });
|
||||
@@ -3,27 +3,30 @@ const assert=require('node:assert/strict');
|
||||
const crypto=require('node:crypto');
|
||||
(async()=>{
|
||||
const api=process.env.AI_E2E_API,token=process.env.AI_E2E_TOKEN,url=process.env.AI_E2E_URL;assert(api&&token&&url);
|
||||
const russian=process.env.UI_E2E_LANGUAGE==='ru-RU';
|
||||
const translations={"A1-Kurs": "Курс A1", "A1-Module": "Модули A1", "Lernbereich": "Направление обучения", "Aktuelle Kursaufgabe": "Текущее задание курса", "Nächste Aufgabe": "Следующее задание", "Aus geprüftem Aufgabenbestand": "Из проверенного банка заданий", "Grammatik": "Грамматика", "Antwort prüfen": "Проверить ответ", "Wortschatz": "Лексика", "Lesen": "Чтение", "Hören": "Аудирование", "Anhören": "Прослушать", "Sprechen": "Говорение", "Schreiben": "Письмо", "Deine Antwort": "Ваш ответ", "Beispiel:": "Пример:", "Bewertung anfordern": "Запросить оценку", "Neuen A1-Test starten · 12 Aufgaben": "Начать новый тест A1 · 12 заданий", "A1-Test": "Тест A1", "Ausstehende Antworten bewerten": "Оценить ожидающие ответы", "100 / 100 · Richtig": "100 / 100 · Верно", "Bis zu 30 Sekunden.": "До 30 секунд.", "Antwort gespeichert – ohne verbindliche Note.": "Ответ сохранён без оценки.", "Abgegeben – Bewertung ausstehend.": "Ответы отправлены — ожидается оценка."};
|
||||
const label=value=>russian?(translations[value]??value):value;
|
||||
const browser=await chromium.launch({headless:true,args:['--no-sandbox']});
|
||||
try{
|
||||
const page=await browser.newPage();page.setDefaultTimeout(15000);const errors=[];page.on('pageerror',e=>errors.push(e.message));const headers={Authorization:`Bearer ${token}`};
|
||||
const get=async path=>{const r=await page.request.get(api+path,{headers});assert.equal(r.status(),200);return r.json()};
|
||||
const post=async(path,data)=>{const r=await page.request.post(api+path,{headers,data});assert(r.status()<300,await r.text());return r.json()};
|
||||
await page.goto(url);await page.evaluate(t=>localStorage.setItem('speech_token',t),token);await page.reload();await page.getByRole('button',{name:'A1-Kurs',exact:true}).click();
|
||||
await page.request.patch(api+'/me/preferences',{headers,data:{native_language:russian?'ru-RU':'de-DE'}});await page.goto(url);await page.evaluate(t=>localStorage.setItem('speech_token',t),token);await page.reload();await page.getByRole('button',{name:label('A1-Kurs'),exact:true}).click();
|
||||
const cat=await get('/course/catalog');assert.equal(cat.task_mode,'bank');assert.equal(cat.grading_available,false);assert.equal(cat.bank.reduce((n,b)=>n+b.total,0),840);
|
||||
const modules=page.getByRole('navigation',{name:'A1-Module'}).getByRole('button');await modules.nth(6).waitFor();assert.equal(await modules.count(),7);await modules.nth(1).click();
|
||||
const areas=page.getByRole('group',{name:'Lernbereich'}),ex=page.getByRole('region',{name:'Aktuelle Kursaufgabe'});
|
||||
async function next(area){await areas.getByRole('button',{name:area,exact:true}).click();const response=page.waitForResponse(r=>r.url().endsWith('/tasks/next')&&r.request().method()==='POST');await page.getByRole('button',{name:'Nächste Aufgabe',exact:true}).click();let j=await(await response).json();for(let n=0;n<40&&j.status!=='succeeded';n++){await page.waitForTimeout(150);j=await get('/course/jobs/'+j.id);if(j.status==='failed')throw new Error(j.error)}assert.equal(j.source,'curated');await ex.getByText('Aus geprüftem Aufgabenbestand',{exact:false}).waitFor();await page.getByRole('button',{name:'Nächste Aufgabe',exact:true}).waitFor({state:'visible'});return get('/course/tasks/'+j.task_id)}
|
||||
let d=await next('Grammatik');const first=d.task.id;assert.equal(d.task.answer_key,undefined);await ex.getByRole('radio').first().check();await ex.getByRole('button',{name:'Antwort prüfen',exact:true}).click();await ex.getByRole('status').waitFor();d=await get('/course/tasks/'+first);await ex.locator('input[value="'+d.task.answer_key.correct_option_id+'"]').check();await ex.getByRole('button',{name:'Antwort prüfen',exact:true}).click();await ex.getByText('100 / 100 · Richtig',{exact:true}).waitFor();
|
||||
await page.reload();await page.getByRole('button',{name:'A1-Kurs',exact:true}).click();await ex.getByText('100 / 100 · Richtig',{exact:true}).waitFor();d=await next('Grammatik');assert.notEqual(d.task.id,first);
|
||||
await next('Wortschatz');await next('Lesen');await ex.locator('.course-passage').waitFor();d=await next('Hören');assert.equal(d.task.audio_text,undefined);await ex.getByRole('button',{name:'Anhören',exact:true}).waitFor();
|
||||
await next('Sprechen');await ex.getByText('Bis zu 30 Sekunden.',{exact:false}).waitFor();d=await next('Schreiben');await ex.getByRole('textbox',{name:'Deine Antwort'}).fill('I have got a sister.');await ex.getByRole('button',{name:'Antwort prüfen',exact:true}).click();await ex.getByText('Antwort gespeichert – ohne verbindliche Note.',{exact:false}).waitFor();await ex.getByText('Beispiel:',{exact:false}).waitFor();
|
||||
await page.reload();await page.getByRole('button',{name:'A1-Kurs',exact:true}).click();await ex.getByText('Antwort gespeichert – ohne verbindliche Note.',{exact:false}).waitFor();assert(await ex.getByRole('button',{name:'Bewertung anfordern',exact:true}).isDisabled());
|
||||
await modules.nth(6).click();await page.getByRole('button',{name:'Neuen A1-Test starten · 12 Aufgaben',exact:true}).click();const examPanel=page.getByRole('region',{name:'A1-Test'});await examPanel.getByRole('button').nth(11).waitFor();let catalog=await get('/course/catalog'),exam=await get('/course/exams/'+catalog.exams[0].id);assert.equal(exam.tasks.length,12);
|
||||
const modules=page.getByRole('navigation',{name:label('A1-Module')}).getByRole('button');await modules.nth(6).waitFor();assert.equal(await modules.count(),7);await modules.nth(1).click();
|
||||
const areas=page.getByRole('group',{name:label('Lernbereich')}),ex=page.getByRole('region',{name:label('Aktuelle Kursaufgabe')});
|
||||
async function next(area){await areas.getByRole('button',{name:label(area),exact:true}).click();const response=page.waitForResponse(r=>r.url().endsWith('/tasks/next')&&r.request().method()==='POST');await page.getByRole('button',{name:label('Nächste Aufgabe'),exact:true}).click();let j=await(await response).json();for(let n=0;n<40&&j.status!=='succeeded';n++){await page.waitForTimeout(150);j=await get('/course/jobs/'+j.id);if(j.status==='failed')throw new Error(j.error)}assert.equal(j.source,'curated');await ex.getByText(label('Aus geprüftem Aufgabenbestand'),{exact:false}).waitFor();await page.getByRole('button',{name:label('Nächste Aufgabe'),exact:true}).waitFor({state:'visible'});return get('/course/tasks/'+j.task_id)}
|
||||
let d=await next('Grammatik');const first=d.task.id;assert.equal(d.task.answer_key,undefined);assert.equal(await ex.getByRole('heading',{level:2}).innerText(),(d.task.instruction||d.task.prompt));assert.deepEqual(await ex.locator('.course-option').allTextContents(),d.task.options.map(o=>o.label));await ex.getByRole('radio').first().check();await ex.getByRole('button',{name:label('Antwort prüfen'),exact:true}).click();await ex.getByRole('status').waitFor();d=await get('/course/tasks/'+first);await ex.locator('input[value="'+d.task.answer_key.correct_option_id+'"]').check();await ex.getByRole('button',{name:label('Antwort prüfen'),exact:true}).click();await ex.getByText(label('100 / 100 · Richtig'),{exact:true}).waitFor();
|
||||
await page.reload();await page.getByRole('button',{name:label('A1-Kurs'),exact:true}).click();await ex.getByText(label('100 / 100 · Richtig'),{exact:true}).waitFor();d=await next('Grammatik');assert.notEqual(d.task.id,first);
|
||||
await next('Wortschatz');await next('Lesen');await ex.locator('.course-passage').waitFor();d=await next('Hören');assert.equal(d.task.audio_text,undefined);await ex.getByRole('button',{name:label('Anhören'),exact:true}).waitFor();
|
||||
await next('Sprechen');await ex.getByText(label('Bis zu 30 Sekunden.'),{exact:false}).waitFor();d=await next('Schreiben');await ex.getByRole('textbox',{name:label('Deine Antwort')}).fill('I have got a sister.');if(russian){await page.getByRole('combobox',{name:'Родной язык'}).selectOption('de-DE');const germanExercise=page.getByRole('region',{name:'Aktuelle Kursaufgabe'});await germanExercise.getByRole('textbox',{name:'Deine Antwort'}).waitFor();assert.equal(await germanExercise.getByRole('textbox',{name:'Deine Antwort'}).inputValue(),'I have got a sister.');assert.equal(await germanExercise.getByRole('heading',{level:2}).innerText(),(d.task.instruction||d.task.prompt));await page.getByRole('combobox',{name:'Muttersprache'}).selectOption('ru-RU');}await ex.getByRole('button',{name:label('Antwort prüfen'),exact:true}).click();await ex.getByText(label('Antwort gespeichert – ohne verbindliche Note.'),{exact:false}).waitFor();await ex.getByText(label('Beispiel:'),{exact:false}).waitFor();
|
||||
await page.reload();await page.getByRole('button',{name:label('A1-Kurs'),exact:true}).click();await ex.getByText(label('Antwort gespeichert – ohne verbindliche Note.'),{exact:false}).waitFor();assert(await ex.getByRole('button',{name:label('Bewertung anfordern'),exact:true}).isDisabled());
|
||||
await modules.nth(6).click();await page.getByRole('button',{name:label('Neuen A1-Test starten · 12 Aufgaben'),exact:true}).click();const examPanel=page.getByRole('region',{name:label('A1-Test')});await examPanel.getByRole('button').nth(11).waitFor();let catalog=await get('/course/catalog'),exam=await get('/course/exams/'+catalog.exams[0].id);assert.equal(exam.tasks.length,12);
|
||||
const wav=Buffer.alloc(44+8000);wav.write('RIFF');wav.writeUInt32LE(wav.length-8,4);wav.write('WAVE',8);wav.write('fmt ',12);wav.writeUInt32LE(16,16);wav.writeUInt16LE(1,20);wav.writeUInt16LE(1,22);wav.writeUInt32LE(16000,24);wav.writeUInt32LE(32000,28);wav.writeUInt16LE(2,32);wav.writeUInt16LE(16,34);wav.write('data',36);wav.writeUInt32LE(8000,40);
|
||||
for(const t of exam.tasks){assert.equal(t.answer_key,undefined);assert.equal(t.audio_text,undefined);const request_id=crypto.randomUUID().replaceAll('-','');if(['repeat_sentence','free_speech'].includes(t.kind)){const r=await page.request.post(api+'/course/tasks/'+t.id+'/audio-attempts',{headers,multipart:{request_id,audio:{name:'fixture.wav',mimeType:'audio/wav',buffer:wav}}});assert.equal(r.status(),202,await r.text())}else await post('/course/tasks/'+t.id+'/attempts',{request_id,answer:t.kind==='choice'?t.options[0].id:'I have got a sister.'})}
|
||||
exam=await get('/course/exams/'+exam.id);assert.equal(exam.status,'submitted');assert.equal(exam.score,undefined);for(const t of exam.tasks){assert.equal(t.answer_key,undefined);assert.equal(t.audio_text,undefined);const detail=await get('/course/tasks/'+t.id);assert.equal(detail.task.answer_key,undefined)}for(const a of exam.attempts)assert.equal(a.evaluation,undefined);
|
||||
await page.reload();await page.getByRole('button',{name:'A1-Kurs',exact:true}).click();await examPanel.getByText('Abgegeben – Bewertung ausstehend.',{exact:false}).waitFor();assert(await examPanel.getByRole('button',{name:'Ausstehende Antworten bewerten',exact:true}).isDisabled());
|
||||
await page.reload();await page.getByRole('button',{name:label('A1-Kurs'),exact:true}).click();await examPanel.getByText(label('Abgegeben – Bewertung ausstehend.'),{exact:false}).waitFor();assert(await examPanel.getByRole('button',{name:label('Ausstehende Antworten bewerten'),exact:true}).isDisabled());
|
||||
const usage=await get('/admin/ai/usage');assert.equal(usage.total,0);assert.deepEqual(errors,[]);
|
||||
console.log('PASS: 840 bank tasks; six renderers; source/privacy; answer/reload; ungraded open answer; submitted frozen exam; no model calls or browser errors. Audio uses an explicit local fixture.');
|
||||
console.log((russian?'Russian: ':'German: ')+'PASS: 840 bank tasks; six renderers; source/privacy; answer/reload; ungraded open answer; submitted frozen exam; no model calls or browser errors. Audio uses an explicit local fixture.');
|
||||
}finally{await browser.close()}
|
||||
})().catch(e=>{console.error(e);process.exitCode=1});
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
// Real local API and disposable database; no paid models or actual microphone.
|
||||
const {chromium}=require(process.env.PLAYWRIGHT_MODULE||'playwright');
|
||||
const assert=require('node:assert/strict'),crypto=require('node:crypto'),fs=require('node:fs');
|
||||
(async()=>{
|
||||
const api=process.env.AI_E2E_API,url=process.env.AI_E2E_URL;
|
||||
const browser=await chromium.launch({headless:true,args:['--no-sandbox']});
|
||||
try {
|
||||
const page=await browser.newPage();page.setDefaultTimeout(15000);const errors=[];page.on('pageerror',e=>errors.push(e.message));
|
||||
for(const native of ['de-DE','ru-RU']) {
|
||||
const labels=JSON.parse(fs.readFileSync(`src/i18n/${native}.json`));
|
||||
const response=await page.request.post(api+'/auth/register',{data:{email:`sequence-${native}-${Date.now()}@example.test`,password:'local-sequence-test-password',native_language:native,target_language:'en-US'}});assert.equal(response.status(),201);
|
||||
const account=await response.json(),headers={Authorization:`Bearer ${account.token}`};
|
||||
const get=async path=>{const r=await page.request.get(api+path,{headers});assert.equal(r.status(),200,await r.text());return r.json()};
|
||||
await page.goto(url);await page.evaluate(t=>localStorage.setItem('speech_token',t),account.token);await page.reload();await page.getByRole('button',{name:labels['nav.course'],exact:true}).click();
|
||||
const path=page.getByRole('region',{name:labels['sequence.title'],exact:true});await path.waitFor();await path.getByText(labels['sequence.phase.listen'],{exact:false}).waitFor();
|
||||
await page.getByRole('button',{name:labels['sequence.default'],exact:true}).waitFor();
|
||||
async function next(skip=false) {
|
||||
const ready=page.waitForResponse(r=>r.url().endsWith('/tasks/next')&&r.request().method()==='POST');
|
||||
await page.getByRole('button',{name:labels[skip?'sequence.skip':'ui.next_exercise'],exact:true}).click();
|
||||
let job=await(await ready).json();for(let n=0;n<100&&['queued','running'].includes(job.status);n++){await page.waitForTimeout(100);job=await get('/course/jobs/'+job.id)}
|
||||
assert.equal(job.status,'succeeded',job.error);
|
||||
await path.getByText(labels['sequence.phase.'+job.recommendation.phase],{exact:false}).waitFor();
|
||||
const current=await get('/course/tasks/'+job.task_id);
|
||||
const exercise=page.getByRole('region',{name:labels['ui.current_course_exercise']});await exercise.getByRole('heading',{name:current.task.instruction||current.task.prompt,exact:true}).waitFor();
|
||||
return {job,...current};
|
||||
}
|
||||
const first=await next();assert.equal(first.task.skill,'listening');assert.equal(first.job.recommendation.step,1);assert.equal(first.task.audio_text,undefined);assert.equal(first.task.answer_key,undefined);
|
||||
const same=await next();assert.equal(same.task.id,first.task.id,'Clicking Next alone must not count as practice');
|
||||
const listeningBank=JSON.parse(fs.readFileSync('../api/internal/store/coursebank/en-US/a1-v2/introductions.listening.json'));
|
||||
const correct=listeningBank.find(e=>e.id===first.task.canonical_task_id).task.answer_key.correct_option_id;
|
||||
const wrong=first.task.options.find(o=>o.id!==correct).id;
|
||||
const graded=await page.request.post(api+'/course/tasks/'+first.task.id+'/attempts',{headers,data:{request_id:crypto.randomUUID().replaceAll('-',''),answer:wrong}});assert.equal(graded.status(),201);
|
||||
const review=await next();assert.equal(review.task.id,first.task.id);assert.equal(review.job.recommendation.review,true);
|
||||
const previous=page.locator('details.course-feedback');await previous.locator('summary').waitFor();assert.equal(await previous.getAttribute('open'),null);assert((await previous.locator('summary').innerText()).includes(labels['sequence.previousAttempt'].split(' · ')[0]));
|
||||
|
||||
await page.reload();await page.getByRole('button',{name:labels['nav.course'],exact:true}).click();await path.getByRole('button',{name:labels['sequence.skip'],exact:true}).waitFor();
|
||||
const skipped=await next(true);assert.equal(skipped.job.recommendation.step,2);assert.equal(skipped.job.recommendation.skipped_steps,1);assert.equal(skipped.task.skill,'vocabulary');
|
||||
const areas=page.getByRole('group',{name:labels['ui.learning_area']});await areas.getByRole('button',{name:labels['ui.speaking'],exact:true}).click();assert.equal(await path.count(),0);
|
||||
await areas.getByRole('button',{name:labels['sequence.default'],exact:true}).click();await path.getByText(labels['sequence.phase.vocabulary'],{exact:false}).waitFor();
|
||||
// Submit a correct choice through the API, then let the browser continue the path.
|
||||
const baseline=JSON.parse(fs.readFileSync('../api/internal/store/coursebank/en-US/a1-v2/introductions.vocabulary.json'));
|
||||
const key=baseline.find(e=>e.id===skipped.task.canonical_task_id).task.answer_key.correct_option_id;
|
||||
const attempt=await page.request.post(api+'/course/tasks/'+skipped.task.id+'/attempts',{headers,data:{request_id:crypto.randomUUID().replaceAll('-',''),answer:key}});assert.equal(attempt.status(),201);
|
||||
const continued=await next();assert.equal(continued.job.recommendation.step,3);
|
||||
const me=await get('/me');assert.deepEqual(me.profile,account.profile);
|
||||
const other=native==='de-DE'?'ru-RU':'de-DE';await page.locator('.language-picker select').selectOption(other);
|
||||
const translated=JSON.parse(fs.readFileSync(`src/i18n/${other}.json`));await page.getByRole('region',{name:translated['sequence.title']}).getByText(translated['sequence.phase.vocabulary'],{exact:false}).waitFor();
|
||||
const catalog=await get('/course/catalog');assert.equal(catalog.sequence_recommendations.a1_introductions_v1.step,3);assert.equal(catalog.sequence_recommendations.a1_introductions_v1.skipped_steps,1);
|
||||
assert.equal((await get('/course/tasks/'+continued.task.id)).task.instruction_language,native);
|
||||
await page.getByRole('button',{name:translated['auth.logout'],exact:true}).click();
|
||||
}
|
||||
const usage=await page.request.get(api+'/admin/ai/usage',{headers:{Authorization:`Bearer ${process.env.AI_E2E_TOKEN}`}});assert.equal((await usage.json()).total,0);assert.deepEqual(errors,[]);
|
||||
console.log('PASS: German/Russian default thematic paths; listening entry; no silent skip; explicit skip and reload; manual areas remain available; submitted answers advance; native change retains path and frozen task; no model calls.');
|
||||
}finally{await browser.close()}
|
||||
})().catch(e=>{console.error(e);process.exitCode=1});
|
||||
@@ -0,0 +1,33 @@
|
||||
// Local API/PostgreSQL fixture only; no paid models or real microphone.
|
||||
const {chromium}=require(process.env.PLAYWRIGHT_MODULE||'playwright');
|
||||
const assert=require('node:assert/strict'),crypto=require('node:crypto'),fs=require('node:fs');
|
||||
(async()=>{
|
||||
const api=process.env.AI_E2E_API,url=process.env.AI_E2E_URL;
|
||||
const ru=JSON.parse(fs.readFileSync('src/i18n/ru-RU.json')),de=JSON.parse(fs.readFileSync('src/i18n/de-DE.json'));
|
||||
const browser=await chromium.launch({headless:true,args:['--no-sandbox']});
|
||||
try{
|
||||
const page=await browser.newPage();page.setDefaultTimeout(15000);const errors=[];page.on('pageerror',e=>errors.push(e.message));
|
||||
const response=await page.request.post(api+'/auth/register',{data:{email:`variants-${Date.now()}@example.test`,password:'local-variant-test-password',native_language:'ru-RU',target_language:'en-US'}});assert.equal(response.status(),201);const account=await response.json(),headers={Authorization:`Bearer ${account.token}`};
|
||||
const get=async path=>{const r=await page.request.get(api+path,{headers});assert.equal(r.status(),200,await r.text());return r.json()};
|
||||
async function waitJob(job){for(let n=0;n<100&&['queued','running'].includes(job.status);n++){await page.waitForTimeout(100);job=await get('/course/jobs/'+job.id)}assert.equal(job.status,'succeeded',job.error);return job}
|
||||
const ex=()=>page.getByRole('region',{name:ru['ui.current_course_exercise']});
|
||||
async function next(skill){await page.getByRole('group',{name:ru['ui.learning_area']}).getByRole('button',{name:ru['ui.'+skill],exact:true}).click();const done=page.waitForResponse(r=>r.url().endsWith('/tasks/next')&&r.request().method()==='POST');await page.getByRole('button',{name:ru['ui.next_exercise'],exact:true}).click();const job=await waitJob(await(await done).json());const detail=await get('/course/tasks/'+job.task_id);await ex().getByRole('heading',{name:detail.task.instruction,exact:true}).waitFor();assert.equal(detail.task.instruction_language,'ru-RU');assert.equal(detail.task.target_language,'en-US');assert(detail.task.variant_id&&detail.task.content_revision);assert.notEqual(detail.task.canonical_task_id,detail.task.variant_id);for(const field of ['answer_key','audio_text','evidence_task_id'])assert.equal(detail.task[field],undefined);return detail.task}
|
||||
await page.goto(url);await page.evaluate(t=>localStorage.setItem('speech_token',t),account.token);await page.reload();await page.getByRole('button',{name:ru['nav.course'],exact:true}).click();
|
||||
const catalog=await get('/course/catalog');assert.equal(catalog.native_language,'ru-RU');assert.equal(catalog.exam_available,true);assert.deepEqual(catalog.native_languages,['de-DE','ru-RU']);assert.equal(catalog.modules.length,7);assert.equal(catalog.modules[0].title,'Знакомство и приветствия');assert.equal(catalog.bank.reduce((n,x)=>n+x.total,0),840);assert(catalog.bank.every(x=>x.total===20));
|
||||
assert.equal(await page.locator('.language-picker select').count(),1);assert.equal(await page.locator('.course-controls select').count(),0);
|
||||
const grammar=await next('grammar');assert.equal(grammar.stimulus.language,'en-US');assert.equal(grammar.stimulus.role,'target');
|
||||
const vocabulary=await next('vocabulary');assert(vocabulary.options.every(o=>o.language==='ru-RU'&&o.role==='meaning'));assert(vocabulary.options.some(o=>/[А-Яа-яЁё]/.test(o.label)));
|
||||
await next('reading');await ex().locator('.course-passage').waitFor();const listening=await next('listening');assert.equal(listening.stimulus,undefined);await ex().getByRole('button',{name:ru['ui.listen'],exact:true}).waitFor();
|
||||
const speaking=await next('speaking');assert(['repeat_sentence','free_speech'].includes(speaking.kind));await ex().getByRole('button',{name:ru['ui.record'],exact:true}).waitFor();
|
||||
const writing=await next('writing');assert.equal(writing.kind,'short_text');assert.equal(writing.stimulus.role,'source');assert.equal(writing.stimulus.language,'ru-RU');assert(/[А-Яа-яЁё]/.test(writing.stimulus.text));
|
||||
await ex().getByRole('textbox',{name:ru['ui.your_answer']}).fill('I am Anna.');await ex().getByRole('button',{name:ru['ui.check_answer'],exact:true}).click();await ex().getByText(ru['ui.answer_saved_without_a_grade_you_can_request_an_ai'],{exact:false}).waitFor();let saved=await get('/course/tasks/'+writing.id);assert.equal(saved.attempt.status,'ungraded');assert.equal(saved.attempt.evaluation,undefined);assert.equal(saved.task.answer_key.reference_answer_language,'en-US');const frozen=saved.task;
|
||||
await page.locator('.language-picker select').selectOption('de-DE');await page.getByRole('button',{name:de['nav.today'],exact:true}).waitFor();assert.equal(await page.getByRole('textbox',{name:de['ui.your_answer']}).inputValue(),'I am Anna.');assert.deepEqual((await get('/course/tasks/'+writing.id)).task,frozen);
|
||||
await page.reload();await page.getByRole('button',{name:de['nav.course'],exact:true}).click();await page.getByRole('heading',{name:writing.instruction,exact:true}).waitFor();assert.deepEqual((await get('/course/tasks/'+writing.id)).task,frozen);const me=await get('/me');assert.equal(me.user.native_language,'de-DE');assert.deepEqual(me.profile,account.profile);
|
||||
await page.locator('.language-picker select').selectOption('ru-RU');await page.getByRole('button',{name:ru['nav.today'],exact:true}).waitFor();
|
||||
// A new exam freezes all Russian presentations; replay survives a native change.
|
||||
const request_id=crypto.randomUUID().replaceAll('-','');const start=await page.request.post(api+'/course/exams',{headers,data:{request_id}});assert.equal(start.status(),202);const created=await start.json();await waitJob(created.job);const exam=await get('/course/exams/'+created.exam.id);assert.equal(exam.tasks.length,12);assert(exam.tasks.every(t=>t.instruction_language==='ru-RU'&&!t.answer_key&&!t.audio_text));assert.equal(exam.score,undefined);
|
||||
await page.request.patch(api+'/me/preferences',{headers,data:{native_language:'de-DE'}});const replay=await page.request.post(api+'/course/exams',{headers,data:{request_id}});const reused=await replay.json();assert.equal(reused.exam.id,exam.id);assert.equal(reused.job.instruction_language,'ru-RU');assert.deepEqual((await get('/course/exams/'+exam.id)).tasks,exam.tasks);
|
||||
const usage=await page.request.get(api+'/admin/ai/usage',{headers:{Authorization:`Bearer ${process.env.AI_E2E_TOKEN}`}});assert.equal((await usage.json()).total,0);assert.deepEqual(errors,[]);
|
||||
console.log('PASS: 840 Russian variants; seven modules/six skills; source/target roles; shared canonical identities; frozen task and ungraded answer; Russian exam and replay; private keys/media protected; no model calls.');
|
||||
}finally{await browser.close()}
|
||||
})().catch(e=>{console.error(e);process.exitCode=1});
|
||||
@@ -0,0 +1,47 @@
|
||||
const { chromium } = require(process.env.PLAYWRIGHT_MODULE || 'playwright');
|
||||
const assert = require('node:assert/strict');
|
||||
const fs = require('node:fs');
|
||||
(async () => {
|
||||
const api=process.env.AI_E2E_API,token=process.env.AI_E2E_TOKEN,url=process.env.AI_E2E_URL;
|
||||
const de=JSON.parse(fs.readFileSync('src/i18n/de-DE.json')),ru=JSON.parse(fs.readFileSync('src/i18n/ru-RU.json'));
|
||||
assert.deepEqual(Object.keys(de).sort(),Object.keys(ru).sort());
|
||||
for(const key of Object.keys(de)) {assert(ru[key]);assert.deepEqual(de[key].match(/\{\w+\}/g)?.sort()??[],ru[key].match(/\{\w+\}/g)?.sort()??[],key)}
|
||||
const browser=await chromium.launch({headless:true,args:['--no-sandbox']});
|
||||
try {
|
||||
const page=await browser.newPage();page.setDefaultTimeout(15000);const errors=[];page.on('pageerror',e=>errors.push(e.message));
|
||||
const headers={Authorization:`Bearer ${token}`};
|
||||
const get=async()=>{const r=await page.request.get(api+'/me',{headers});assert.equal(r.status(),200);return r.json()};
|
||||
const patch=async data=>{const r=await page.request.patch(api+'/me/preferences',{headers,data});assert.equal(r.status(),200,await r.text());return r.json()};
|
||||
const coupled=(user,language)=>{assert.equal(user.native_language,language);assert.equal(user.ui_language,language);assert.equal(user.instruction_language,language)};
|
||||
await page.goto(url);await page.getByRole('heading',{name:'Einloggen',exact:true}).waitFor();
|
||||
const picker=()=>page.locator('.language-picker select');assert.deepEqual(await picker().locator('option').evaluateAll(items=>items.map(x=>x.value)),['de-DE','ru-RU']);
|
||||
await picker().selectOption('ru-RU');await page.getByRole('heading',{name:ru['auth.login'],exact:true}).waitFor();await page.reload();assert.equal(await picker().inputValue(),'ru-RU');
|
||||
await page.getByRole('button',{name:ru['auth.register'],exact:true}).click();
|
||||
await page.setViewportSize({width:360,height:780});assert(await page.evaluate(()=>document.documentElement.scrollWidth<=innerWidth));await page.setViewportSize({width:1280,height:800});
|
||||
const email=`native-${Date.now()}@example.test`,password='local-language-test-password';
|
||||
await page.getByRole('textbox',{name:ru['auth.email'],exact:true}).fill(email);await page.getByLabel(ru['auth.password'],{exact:true}).fill(password);
|
||||
const registration=page.waitForResponse(r=>r.url().endsWith('/auth/register')&&r.request().method()==='POST');await page.getByRole('button',{name:ru['auth.register.submit'],exact:true}).click();
|
||||
const registered=await(await registration).json();coupled(registered.user,'ru-RU');assert.equal(registered.profile.target_language,'en-US');
|
||||
await page.getByRole('button',{name:ru['nav.today'],exact:true}).waitFor();
|
||||
await page.getByRole('button',{name:ru['auth.logout'],exact:true}).click();await picker().selectOption('de-DE');
|
||||
await page.getByRole('textbox',{name:de['auth.email'],exact:true}).fill(email);await page.getByLabel(de['auth.password'],{exact:true}).fill(password);await page.getByRole('button',{name:de['auth.login'],exact:true}).click();await page.getByRole('button',{name:ru['nav.today'],exact:true}).waitFor();
|
||||
await page.getByRole('button',{name:ru['auth.logout'],exact:true}).click();
|
||||
const original=await get();const learning=await patch({native_language:'de-DE',target_language:'es-ES',cefr_level:'A2',daily_goal_minutes:23});
|
||||
await page.evaluate(t=>localStorage.setItem('speech_token',t),token);await page.reload();await page.getByRole('button',{name:de['nav.today'],exact:true}).waitFor();
|
||||
await picker().selectOption('ru-RU');await page.getByRole('button',{name:ru['nav.today'],exact:true}).waitFor();let account=await get();coupled(account.user,'ru-RU');assert.deepEqual(account.profile,learning);
|
||||
await page.reload();await page.getByRole('button',{name:ru['nav.today'],exact:true}).waitFor();assert.equal(await page.locator('html').getAttribute('lang'),'ru-RU');
|
||||
await page.route('**/me/preferences',route=>route.fulfill({status:503,contentType:'application/json',body:'{"error":"fixture unavailable","code":"service_unavailable"}'}));await picker().selectOption('de-DE');await page.getByRole('alert').filter({hasText:ru['language.saveError']}).waitFor();assert.equal(await picker().inputValue(),'ru-RU');account=await get();coupled(account.user,'ru-RU');assert.deepEqual(account.profile,learning);await page.unroute('**/me/preferences');
|
||||
for(const data of [{native_language:'en-US'},{native_language:'de-DE',instruction_language:'ru-RU'}]){const r=await page.request.patch(api+'/me/preferences',{headers,data});assert.equal(r.status(),400);assert.match((await r.json()).code,/native_language_(unsupported|conflict)/)}
|
||||
await patch({native_language:original.user.native_language,target_language:original.profile.target_language,cefr_level:original.profile.cefr_level,daily_goal_minutes:original.profile.daily_goal_minutes});
|
||||
await page.reload();await page.getByRole('button',{name:de['nav.today'],exact:true}).waitFor();await picker().selectOption('ru-RU');
|
||||
await page.getByRole('button',{name:ru['nav.practice'],exact:true}).click();await page.getByRole('button',{name:ru['ui.record'],exact:true}).waitFor();const sentence=await page.locator('.target-text').innerText();
|
||||
await picker().selectOption('de-DE');await page.getByRole('button',{name:de['ui.record'],exact:true}).waitFor();assert.equal(await page.locator('.target-text').innerText(),sentence);await picker().selectOption('ru-RU');
|
||||
await page.getByRole('button',{name:ru['nav.conversation'],exact:true}).click();await page.getByRole('button',{name:ru['ui.start'],exact:true}).click();const reply=page.getByRole('textbox',{name:ru['conversation.answer'],exact:true});await reply.fill('My name is Mira.');
|
||||
await picker().selectOption('de-DE');assert.equal(await page.getByRole('textbox',{name:de['conversation.answer'],exact:true}).inputValue(),'My name is Mira.');await picker().selectOption('ru-RU');
|
||||
await page.getByRole('button',{name:ru['nav.admin'],exact:true}).click();const budget=page.getByLabel(ru['ui.monthly_limit_in_usd'],{exact:true});await budget.fill('0.12');await picker().selectOption('de-DE');assert.equal(await page.getByLabel(de['ui.monthly_limit_in_usd'],{exact:true}).inputValue(),'0.12');await picker().selectOption('ru-RU');assert.equal(await budget.inputValue(),'0.12');const settings=await(await page.request.get(api+'/admin/ai/settings',{headers})).json();assert.equal(settings.budget.monthly_limit_microusd,0);
|
||||
await patch({native_language:original.user.native_language});
|
||||
// Server codes, rather than server diagnostics, appear in the selected native language.
|
||||
await page.getByRole('button',{name:ru['auth.logout'],exact:true}).click();await page.getByRole('textbox',{name:ru['auth.email'],exact:true}).fill(email);await page.getByLabel(ru['auth.password'],{exact:true}).fill('wrong-password');await page.getByRole('button',{name:ru['auth.login'],exact:true}).click();await page.locator('.form-error').filter({hasText:'Неверная почта или пароль.'}).waitFor();await picker().selectOption('de-DE');await page.locator('.form-error').filter({hasText:'E-Mail oder Passwort ist falsch.'}).waitFor();
|
||||
assert.deepEqual(errors,[]);console.log('PASS: German/Russian catalogs and placeholders; registration/login/persistence; exactly two native options; coupled aliases; profile preservation; rejected conflicts and saves; localized errors; pronunciation target, dialog answer and unsaved budget survive native switches.');
|
||||
} finally {await browser.close()}
|
||||
})().catch(e=>{console.error(e);process.exitCode=1});
|
||||
+45
-1
@@ -63,6 +63,23 @@ Transferaufträge (`mode=transfer`) erlauben ein neues Wort, das als `candidate_
|
||||
|
||||
Die bisherigen Kurs-/Ausspracheendpunkte und historischen Antwortfelder bleiben nutzbar. Die neue Statistik entscheidet keine Kursabschlüsse und aktiviert kein Modellprofil. API und Web müssen für diese Änderung gemeinsam neu gebaut werden. Für reine Statistikvorschau ohne neue Auswahl `PRONUNCIATION_STRATEGY=recent` verwenden; das muss der neu gestarteten API übergeben werden.
|
||||
|
||||
## Muttersprache und Aufgabenvarianten
|
||||
|
||||
Muttersprache bezeichnet gemeinsam Oberfläche und Erklärungen. Deutsch und Russisch
|
||||
haben jeweils den vollständigen Bestand von 840 Englischaufgaben in sieben Modulen
|
||||
und den internen A1-Test. Weitere Details: [README](../README.md#mehrsprachigkeit).
|
||||
Die Sprachwahl löst keinen Modellaufruf aus und aktiviert keine Profile.
|
||||
|
||||
Aufträge frieren die Muttersprache beim Einreihen ein. Aufgaben speichern Variante,
|
||||
Revision, Kriterien und Lösung. Sprachwechsel verändern keine historischen Daten.
|
||||
Äquivalente Übersetzungen teilen die Nachweisidentität; Versuche bleiben getrennt.
|
||||
Ein Modell darf keine Varianten- oder Nachweisidentität setzen. Englische Lerntexte
|
||||
und Azure-Messwerte bleiben unverändert. Fehlende Varianten führen zu einem
|
||||
Verfügbarkeitshinweis, ohne deutschen Ersatz. Offene Antworten benötigen weiterhin
|
||||
ein Bewertungsprofil oder bleiben unbenotet. Der alternative KI-Modus erhält die
|
||||
Muttersprache über das kompatible Eingabefeld `ui_language`; seine fachliche
|
||||
Live-Qualität ist durch Fixturetests nicht nachgewiesen.
|
||||
|
||||
## Standardbetrieb mit geprüftem Bestand
|
||||
|
||||
`COURSE_TASK_MODE=bank` ist der Standard; `ai` erhält den bisherigen KI-Generator. Die Compose-Dateien reichen den Wert an die API durch. Für den Bankbetrieb sind keine Modellschlüssel und kein LLM-Budget nötig. Ein eingerichtetes Bewertungsprofil kann offene Antworten optional bewerten; es wird nicht automatisch aktiviert. Der separate Aussprachebereich `next_exercise` ist von dieser Kursauswahl unabhängig.
|
||||
@@ -78,7 +95,34 @@ Beim API-Start werden Manifest, Prüfsummen, Verteilung, Lösungen und Rendererf
|
||||
|
||||
`course_v2_bank` enthält die versionierten Vorlagen, Lernziele und Schwierigkeiten. Die Auswahl erstellt persönliche Kopien in `course_v2_tasks` mit Herkunft `curated`, `bank_entry_id`, Präsentationszeit und Präsentationszähler. Gleichzeitige Auswahlaufträge werden pro Nutzer/Sprachprofil serialisiert. Eine Wiederaufnahme nach Abbruch liefert dieselbe bereits zugewiesene Aufgabe. Der vorhandene Aufgabenverlauf funktioniert weiter.
|
||||
|
||||
Neue Aufgaben haben Vorrang. Innerhalb dieser Gruppe werden passende noch neue Lernziele aus schwachen Bewertungen bevorzugt, ohne dafür über die Zielschwierigkeit hinauszugehen. Die letzten fünf echten bewerteten Antworten steuern die Schwierigkeit: nach mindestens drei verschiedenen Aufgaben ab Ø 85 eine Stufe erhöhen, nach mindestens zwei verschiedenen Aufgaben unter Ø 60 eine Stufe senken, jeweils innerhalb 1–3. Sonst bleibt die zuletzt bearbeitete Stufe. Bei erschöpftem Bestand folgen zuletzt schwach gelöste und länger nicht gezeigte Aufgaben; unmittelbare Wiederholungen werden vermieden, sofern Alternativen existieren. Unbenotete oder Demo-Antworten sind kein Fehlernachweis.
|
||||
Der Standard ohne ausdrückliche Bereichswahl verwendet in den sechs Lernmodulen
|
||||
60 geprüfte thematische Sequenzen. Die getrennte Fortschrittstabelle speichert
|
||||
nur Bearbeitungsposition, aktuelle Aufgabe, Wiederholungsangebot und übersprungene
|
||||
Schritte. Eine Antwort ohne Note bleibt ohne Leistungsnachweis. Unbeantwortete
|
||||
Schritte bleiben empfohlen, sind aber explizit überspringbar; eine tatsächliche
|
||||
bewertete Antwort unter 80 Punkten löst höchstens eine Wiederholung pro Schritt
|
||||
aus. Nach einer weiteren Antwort wird unabhängig von der Note fortgesetzt. Keine
|
||||
zusätzlichen Modellaufrufe, Budgets oder Profile; der A1-Test bleibt unabhängig.
|
||||
Quellen und Verhalten: [README](../README.md#a1-kurs).
|
||||
|
||||
Bei ausdrücklich gewähltem Lernbereich, ausgeschöpftem Lernweg und im
|
||||
Wiederholungsmodul gilt weiterhin: Neue Aufgaben haben Vorrang. Innerhalb dieser Gruppe werden passende noch neue Lernziele aus schwachen Bewertungen bevorzugt, ohne dafür über die Zielschwierigkeit hinauszugehen. Die letzten fünf echten bewerteten Antworten steuern die Schwierigkeit: nach mindestens drei verschiedenen Aufgaben ab Ø 85 eine Stufe erhöhen, nach mindestens zwei verschiedenen Aufgaben unter Ø 60 eine Stufe senken, jeweils innerhalb 1–3. Sonst bleibt die zuletzt bearbeitete Stufe. Bei erschöpftem Bestand folgen zuletzt schwach gelöste und länger nicht gezeigte Aufgaben; unmittelbare Wiederholungen werden vermieden, sofern Alternativen existieren. Unbenotete oder Demo-Antworten sind kein Fehlernachweis.
|
||||
|
||||
### Weniger identische Grundlagenwiederholungen
|
||||
|
||||
Der thematische Lernweg berücksichtigt vorhandene echte Bewertungen, ohne neue
|
||||
Modellaufrufe. Gute aktuelle Grundlagen führen bevorzugt zu einem unbekannten,
|
||||
redaktionell freigegebenen Grammatikbeispiel desselben Satzmusters. Ist keine
|
||||
solche neue Variante vorhanden, können kürzlich gut bearbeitete Grundlagen
|
||||
berücksichtigt werden, statt sie identisch zu wiederholen. Konkrete Wortbedeutungen
|
||||
werden nicht gegeneinander ausgetauscht. Bei älteren/uneinheitlichen Nachweisen
|
||||
wird aufgefrischt; manuelle Bereichswahl und A1-Test bleiben unabhängig.
|
||||
Zeiten, Mindestnachweise und Grenzen: [README](../README.md#a1-kurs).
|
||||
|
||||
Layoutrevision und Lernwegposition bleiben bestehen. Die ergänzten
|
||||
Transferalternativen und ihre eigene Auswahlrevision sind im redaktionellen
|
||||
Sequenz-Prüfvermerk gebunden. Keine Produktionsprofile, Budgets oder Messungen
|
||||
werden verändert; ausgelassene Grundlagen sind keine zusätzlichen Leistungsnachweise.
|
||||
|
||||
### Offene Antworten und A1-Test
|
||||
|
||||
|
||||
@@ -0,0 +1,274 @@
|
||||
# Roadmap für ein verständliches und hilfreiches Lernerlebnis
|
||||
|
||||
Stand: 11. November 2026. Diese Roadmap hält die Erkenntnisse aus positiven
|
||||
Nutzerbewertungen konkurrierender Sprachlernapps fest und übersetzt sie in
|
||||
schrittweise Verbesserungen unserer A1-App. Zuerst werden Aussprachehilfen,
|
||||
Audiovergleich, überschaubare Lerneinheiten und nachvollziehbarer Fortschritt
|
||||
verbessert. Erweiterungen folgen anschließend.
|
||||
|
||||
Die Arbeitspakete sind für spätere Aufträge vorgesehen. Mit dem Anlegen dieser
|
||||
Datei wird keine der folgenden Funktionen neu implementiert. Die Prioritäten
|
||||
sind eine Produktentscheidung für unsere App, keine statistische Rangliste der
|
||||
Konkurrenz. Die ausgewerteten öffentlichen Rezensionen betreffen unterschiedliche
|
||||
Sprachen, Niveaus und Jahre; manche stammen aus 2022. Sie belegen persönliche
|
||||
Präferenzen, keine allgemeine Lernwirksamkeit und keine gesonderte Präferenz
|
||||
russischsprachiger A1-Anfänger.
|
||||
|
||||
## Was Lernende an konkurrierenden Apps schätzen
|
||||
|
||||
| Geschätzter Nutzen | Beobachtungen in positiven Nutzerbewertungen | Übertragung auf unsere App |
|
||||
| --- | --- | --- |
|
||||
| Konkrete Aussprachehilfe | ELSA-Rezensenten loben markierte Probleme und Verbesserungshinweise. Bei BoldVoice werden anschauliche Erklärungen zur Mund- und Zungenposition hervorgehoben. [Q1](#quellen), [Q2](#quellen) | Messwerte verständlich erklären und eine passende, geprüfte Übung anbieten. Paket L01. |
|
||||
| Eigene Aufnahme mit einer Vorlage vergleichen | BoldVoice-Nutzer schätzen Aufnehmen und Vergleichen. Eine ELSA-Bewertung mit fünf Sternen lobt den Vergleich mit korrekter Aussprache und langsames Abspielen. [Q1](#quellen), [Q2](#quellen) | Vorlage und eigene Aufnahme unmittelbar nebeneinander zugänglich machen. Paket L02. |
|
||||
| Grammatik nachvollziehen | Positive Babbel-Bewertungen heben Grammatik hervor; fehlende verständliche Erklärungen werden als Wechselgrund genannt. [Q3](#quellen) | Kurze Regeln, Beispiele und nachvollziehbare Fehlererklärungen in der Muttersprache. Paket L05. |
|
||||
| Führung und Entscheidungsfreiheit | Eine positive Babbel-Rezension lobt den geführten Kurs, das eigene Tempo und gezielte Kategorieauswahl. [Q4](#quellen) | Empfohlenen Lernweg verständlich darstellen und direkte Bereichswahl erhalten. Querschnitt von L03 und L09. |
|
||||
| Sprechen mit Unterstützung | Speak-Nutzer loben angeleitete Antworten und Gesprächsfeedback. Eine Rezension beschreibt positiv, dass anschließend drei konkrete Probleme aufgegriffen werden. [Q5](#quellen) | Sprechaufgaben vorbereiten, freiwillige Hilfen geben und Feedback begrenzen. Paket L06. |
|
||||
| Persönlich relevante Inhalte | Bei Speak werden beruflich passende Lektionen, eigene Themen und gespeicherte nützliche Sätze gelobt. [Q5](#quellen) | Alltagsinteressen und eine persönliche Merkliste ergänzen. Pakete L07 und L08. |
|
||||
| Verbesserungen erkennen | ELSA-Rezensenten schätzen nachvollziehbaren Fortschritt. Bei Babbel werden kurze Lektionen, Wiederholung und Fortschrittsbalken gemeinsam positiv bewertet. [Q1](#quellen), [Q3](#quellen) | Konkrete bearbeitete Inhalte und belegte Veränderungen sichtbar machen. Paket L04. |
|
||||
| Kurze Einheiten und Motivation | Babbel-Nutzer loben kurze hilfreiche Lektionen. Positive Duolingo-Rezensionen beschreiben Freude an kleinen Aufgaben, Bestätigung und regelmäßigen Gewohnheiten. [Q3](#quellen), [Q6](#quellen) | Kleine abgeschlossene Lernabschnitte mit freundlichem Abschluss anbieten. Paket L03. |
|
||||
|
||||
Wiederholung selbst ist ebenfalls erwünscht: Eine positive Speak-Rezension vom
|
||||
30. Juni 2025 lobt Wiederholungen mit kleinen Variationen. [Q5](#quellen)
|
||||
Für uns folgt daraus: den Zweck einer Wiederholung erklären, bekannte Satzmuster
|
||||
in passenden neuen Beispielen anwenden und unnötige identische Wiederholungen
|
||||
vermeiden. Daraus folgt keine Empfehlung, Wiederholungen vollständig abzuschaffen.
|
||||
|
||||
## Bestehende Grundlage
|
||||
|
||||
Diese Punkte sind bereits im Repository angelegt und werden bei den folgenden
|
||||
Paketen geprüft und weiterentwickelt. Sie sind kein Nachweis über den laufenden
|
||||
Produktionsserver oder die Qualität echter Modell- und Speech-Antworten.
|
||||
|
||||
- Gemeinsame Muttersprache für Oberfläche und Erklärungen, derzeit Deutsch und
|
||||
Russisch; Englisch ist die Lernsprache. Referenz: Commit `16cceae`.
|
||||
- Thematische Lernfolgen mit Vorbereitung vor freiem Sprechen, direkter
|
||||
Bereichswahl und ausdrücklichem Überspringen. Referenz: Commit `7499491`.
|
||||
- Auswahl anhand echter Bewertungen, geprüfte Grammatikalternativen und getrennte
|
||||
Kennzeichnung früherer Bewertungen. Referenz: Commit `8d618b7`.
|
||||
- Im Aussprachebereich sind normale und langsame Vorlagen, Fokuswörter und das
|
||||
Anhören der aktuellen eigenen Aufnahme bereits vorhanden. Im A1-Renderer gibt
|
||||
es ebenfalls Aufnahmevorschau und Referenzwiedergabe für geeignete Aufgaben.
|
||||
Paket L02 soll diese Bedienung prüfen und zusammenführen, keine zweite
|
||||
Audioimplementierung daneben aufbauen.
|
||||
- Ein Ausspracheprofil mit Wort- und Phonemwerten, Evidenzzuständen und Entwicklung
|
||||
ist vorhanden. Paket L04 soll dessen Verständlichkeit und Vergleichbarkeit
|
||||
verbessern; neue Fortschrittszahlen dürfen vorhandene Messungen nicht ersetzen.
|
||||
|
||||
## Reihenfolge und Status
|
||||
|
||||
Nächster Umsetzungsschritt: **L01**. L01 bis L04 haben Vorrang vor zusätzlichen
|
||||
Personalisierungsfunktionen. L05 bleibt zunächst zurückgestellt, entsprechend
|
||||
der bisherigen Entscheidung, den Lernweg zuerst ohne „Grammatik erklären“ zu
|
||||
verbessern. L09 prüft das Zusammenspiel mit echten Lernenden nach L01 bis L04;
|
||||
sein Feedback kann die Reihenfolge der späteren Erweiterungen verändern.
|
||||
|
||||
| Paket | Ergebnis | Priorität | Status | Voraussetzung |
|
||||
| --- | --- | --- | --- | --- |
|
||||
| L01 | Verständliche und konkrete Aussprachehilfe | Zuerst | Offen | Bestehende Messungen und Feedback prüfen |
|
||||
| L02 | Bequemer Vergleich von Vorlage und eigener Aufnahme | Zuerst | Offen | Vorhandene Audiobedienung prüfen |
|
||||
| L03 | Kleine abgeschlossene Lernabschnitte | Zuerst | Offen | Bestehenden thematischen Lernweg erhalten |
|
||||
| L04 | Nachvollziehbarer belegter Fortschritt | Zuerst | Offen | Vorhandenes Ausspracheprofil und Bewertungsdaten prüfen |
|
||||
| L09 | Begleiteter Test der ersten Verbesserungen | Nach L01 bis L04 | Offen | Testumfang, Teilnehmende und Live-Kosten ausdrücklich klären |
|
||||
| L05 | Kurze Grammatikregeln und Erklärungshilfe | Später | Zurückgestellt | Eigenen Funktionsauftrag und Hilfestufe festlegen |
|
||||
| L06 | Unterstütztes freies Sprechen | Später | Offen | Thematische Vorbereitung und Bewertungsregeln erhalten |
|
||||
| L07 | Persönlich relevante Alltagsthemen | Später | Offen | Rückmeldungen aus L09 berücksichtigen |
|
||||
| L08 | Persönliche Merkliste für Wörter und Sätze | Später | Offen | Freigegebene Inhalte und Wiederholungslogik prüfen |
|
||||
|
||||
Statuswerte: **Offen**, **In Arbeit**, **Zurückgestellt**, **Erledigt**. Ein Paket
|
||||
wird erst nach Umsetzung, passenden Prüfungen und dokumentiertem Ergebnis als
|
||||
erledigt markiert. Eine vorhandene Teilfunktion allein schließt kein Paket ab.
|
||||
|
||||
## Arbeitspakete und Abnahmekriterien
|
||||
|
||||
### L01 Verständliche Aussprachehilfe
|
||||
|
||||
Ziel: Lernende verstehen nach einer Messung, woran sie üben können. Dafür das
|
||||
bestehende Feedback zunächst an richtigen, schwachen und uneindeutigen lokalen
|
||||
Messfällen prüfen. Anschließend gemessene Stelle, kurze Erklärung und eine
|
||||
konkrete nächste Übung zusammen anzeigen. Fachlich geprüfte Hinweise zur
|
||||
Lautbildung können bekannte Ziellaute ergänzen.
|
||||
|
||||
- [ ] Wort-, Phonem- und Gesamtwerte werden verständlich auseinandergehalten.
|
||||
- [ ] Eine niedrige Messung führt nicht automatisch zu einer sicheren Fehlerdiagnose;
|
||||
Hinweise zur Lautbildung behaupten keinen ungemessenen Ersatzlaut.
|
||||
- [ ] Nach wenigen oder uneinheitlichen Messungen wird zusätzlicher Prüfbedarf erklärt.
|
||||
- [ ] Bei geeigneten Nachweisen ist ein konkreter nächster Übungsschritt erkennbar.
|
||||
- [ ] Deutsch und Russisch sind verständlich; englische Lerntexte bleiben Englisch.
|
||||
- [ ] Gute, schwache, ausgelassene und nicht messbare Fälle sind geprüft. Keine
|
||||
Messung oder erfolgreiche Leistung wird aus einer Modellantwort erfunden.
|
||||
|
||||
### L02 Vorlage und eigene Aufnahme vergleichen
|
||||
|
||||
Ziel: Lernende können einen vorgegebenen Satz hören, selbst sprechen und beide
|
||||
Aufnahmen bequem vergleichen. Zuerst die vorhandenen Abläufe im Aussprachebereich
|
||||
und im A1-Kurs vergleichen und unnötige Bedienunterschiede beseitigen.
|
||||
|
||||
- [ ] Bei Nachsprechaufgaben sind Vorlage und aktuelle eigene Aufnahme leicht erreichbar.
|
||||
- [ ] Normale und langsame Vorlagen sind klar beschriftet; die eigene Aufnahme
|
||||
wird nicht als fremde oder vorbildliche Aussprache ausgegeben.
|
||||
- [ ] Wiederholen, neue Aufnahme, Stoppen und Wiedergabewechsel funktionieren
|
||||
ohne gleichzeitig laufende Audios oder verlorene Eingaben.
|
||||
- [ ] Fehlende Aufnahme, fehlende Vorlage und Wiedergabefehler werden verständlich angezeigt.
|
||||
- [ ] Für freies Sprechen wird kein tatsächlich nicht vorhandener Referenzsatz behauptet.
|
||||
- [ ] Geschützte Hörtexte und Testlösungen bleiben geschützt. Aktuelle Aufnahmen
|
||||
werden ohne gesonderten Auftrag nicht dauerhaft archiviert.
|
||||
|
||||
### L03 Kleine abgeschlossene Lernabschnitte
|
||||
|
||||
Ziel: Ein kurzer Lernbesuch hat einen erkennbaren Umfang und einen verständlichen
|
||||
Abschluss. Als erste Gestaltungshypothese dienen Einheiten von ungefähr fünf bis
|
||||
zehn Minuten; die tatsächliche Dauer ist später mit Lernenden zu prüfen.
|
||||
|
||||
- [ ] Vor dem Start sind Thema und ungefährer Umfang verständlich.
|
||||
- [ ] Eine Einheit enthält zusammenhängende Schritte des vorhandenen Lernwegs;
|
||||
wesentliche Vorbereitung wird nicht nur zur Verkürzung entfernt.
|
||||
- [ ] Am Ende werden bearbeitete Inhalte und ein sinnvoller nächster Schritt gezeigt.
|
||||
- [ ] Pause, Wiederaufnahme, Überspringen und direkte Bereichswahl bleiben möglich.
|
||||
- [ ] Bearbeitung, übersprungene Schritte und benoteter Erfolg werden getrennt angezeigt.
|
||||
- [ ] Freundliche Bestätigung motiviert ohne künstliche Zugangssperren, Strafmechanismen
|
||||
oder die Gleichsetzung einer täglichen Serie mit Sprachbeherrschung.
|
||||
|
||||
### L04 Belegten Fortschritt verständlich darstellen
|
||||
|
||||
Ziel: Lernende erkennen konkrete Veränderungen und verstehen, wo die App noch
|
||||
zu wenig Nachweise hat. Bestehende Profilwerte und Datenherkunft bleiben maßgeblich.
|
||||
|
||||
- [ ] Vergleichbare frühere und aktuelle Werte sind mit Datum und Kontext nachvollziehbar.
|
||||
- [ ] Unterschiedliche Wörter, Phoneme und Messverfahren werden nicht als identische
|
||||
Vergleichsfälle behandelt; ein guter Gesamtwert verdeckt keinen schwachen Einzellaut.
|
||||
- [ ] Bearbeitete Inhalte werden von tatsächlich bewerteten Verbesserungen getrennt.
|
||||
- [ ] Unbenotete, Demo- und unbestätigte Altdaten erzeugen keine positiven Lernnachweise.
|
||||
- [ ] Wiederholte identische Versuche erhöhen die Nachweisdichte nicht beliebig.
|
||||
- [ ] Die Anzeige erklärt sowohl belegte Veränderungen als auch begrenzte Evidenz,
|
||||
ohne offizielle Zertifizierung oder allgemeine Beherrschung zu behaupten.
|
||||
|
||||
### L05 Grammatikregeln und Erklärungshilfe
|
||||
|
||||
Ziel: Lernende verstehen die Regel hinter einer Aufgabe und den Grund für eine
|
||||
Bewertung. Dieses Paket ist zurückgestellt. Vor seiner Umsetzung festlegen, ob
|
||||
vor der Antwort eine Regelhilfe oder nach der Antwort eine Lösungserklärung
|
||||
angeboten wird; diese Funktionen haben unterschiedliche Freigabegrenzen.
|
||||
|
||||
- [ ] Kurze A1-Regel, verständliches englisches Beispiel und Erklärung in der Muttersprache.
|
||||
- [ ] Beispiele vor der Antwort unterstützen die Regelanwendung; private
|
||||
Lösungsschlüssel werden dafür nicht an das Frontend ausgeliefert.
|
||||
- [ ] Aufgaben werden nicht nachträglich verändert und alte Bewertungen nicht umgeschrieben.
|
||||
- [ ] Ein etwaiger KI-Button nutzt ausschließlich den zentralen AIService mit
|
||||
protokolliertem Verbrauch, begrenzten Kosten und Wiederverwendung passender Antworten.
|
||||
- [ ] Neue Hilfen berücksichtigen die aktuell gewählte Muttersprache; gespeicherte
|
||||
historische Inhalte behalten ihre damalige Sprache.
|
||||
- [ ] Im A1-Test wird keine Lösungshilfe vor vollständiger Bewertung freigeschaltet.
|
||||
|
||||
### L06 Unterstütztes freies Sprechen
|
||||
|
||||
Ziel: Anfänger können nach passender Vorbereitung selbst formulieren. Freiwillige
|
||||
Satzanfänge oder kurze Hinweise sollen einen Einstieg ermöglichen; das Feedback
|
||||
konzentriert sich auf wenige wichtige, tatsächlich belegte Punkte.
|
||||
|
||||
- [ ] Hilfen passen zum Thema und sind freiwillig; eigene oder erfundene Angaben bleiben gültig.
|
||||
- [ ] Die Aufgabe ist ohne versteckte Anforderungen lösbar. Fachliche Inhaltsänderungen
|
||||
erhalten neue Aufgabenrevisionen; laufende und historische Aufgaben bleiben unverändert.
|
||||
- [ ] Inhalt und Sprache werden anhand der tatsächlichen Antwort erklärt;
|
||||
Erkennungsunsicherheiten werden berücksichtigt.
|
||||
- [ ] Azure-Aussprache und Inhaltsbewertung bleiben getrennt. Aus einem Transkript
|
||||
werden keine Phonemfehler oder Flüssigkeitswerte abgeleitet.
|
||||
- [ ] Bei fehlendem Bewertungsprofil bleibt die Antwort gespeichert und unbenotet.
|
||||
|
||||
### L07 Persönlich relevante Alltagsthemen
|
||||
|
||||
Ziel: Lernende können passende A1-Situationen wählen, beispielsweise Reisen,
|
||||
Arbeit oder Alltag. Zuerst mit wenigen fachlich geprüften Themen beginnen.
|
||||
|
||||
- [ ] Die Auswahl beeinflusst nachvollziehbar zukünftige geeignete Aufgaben.
|
||||
- [ ] Thema, Niveau und nötige Vorbereitung passen zusammen; der normale Kurs bleibt nutzbar.
|
||||
- [ ] Lernsprache, gemeinsame Muttersprache und bestehender Lernstand bleiben erhalten.
|
||||
- [ ] Personalisierung setzt keine privaten Angaben voraus und verlangt keine
|
||||
Übereinstimmung mit erfundenen Angaben einer Musterlösung.
|
||||
- [ ] Neu erzeugte Inhalte und etwaige Modellkosten verwenden die vorhandenen Verträge.
|
||||
|
||||
### L08 Persönliche Merkliste
|
||||
|
||||
Ziel: Lernende können freigegebene Wörter und Sätze speichern und gezielt wiederholen.
|
||||
|
||||
- [ ] Speichern, Anzeigen und Entfernen funktionieren nachvollziehbar.
|
||||
- [ ] Einträge bleiben nach Nutzer und Lernsprache getrennt; Aufgabenbezüge erhalten
|
||||
Kursversion und gegebenenfalls den eingefrorenen Inhaltsstand.
|
||||
- [ ] Aussprachevorlage und Wort-/Satzkontext sind dort nutzbar, wo Inhalte freigegeben sind.
|
||||
- [ ] Geschützte Hörtexte, Bewertungsschlüssel und laufende Testlösungen gelangen nicht hinein.
|
||||
- [ ] Speichern, Öffnen und Wiederholen allein erzeugen keinen erfolgreichen Leistungsnachweis.
|
||||
|
||||
### L09 Begleiteter Test mit echten Lernenden
|
||||
|
||||
Ziel: Nach L01 bis L04 prüfen, ob die Verbesserungen im Alltag verständlich und
|
||||
nützlich sind. Als Ausgangshypothese sind zehn bis zwanzig A1-Anfänger geeignet;
|
||||
Rekrutierung, Umfang und kostenpflichtige Live-Nutzung benötigen einen eigenen Auftrag.
|
||||
|
||||
- [ ] Zielgruppe, Testablauf und erlaubte Live-Kosten sind vor Beginn festgelegt.
|
||||
- [ ] Beobachten, ob Lernende ohne zusätzliche Erklärung starten, Audio vergleichen,
|
||||
Feedback verstehen und nach einer Pause weiterlernen können.
|
||||
- [ ] Konkrete Schwierigkeiten, freiwillige Wiederkehr und wahrgenommener Nutzen
|
||||
werden getrennt von tatsächlichen Lernleistungen dokumentiert.
|
||||
- [ ] Deutsch- und russischsprachige Lernende werden berücksichtigt, wenn beide
|
||||
Zielgruppen geprüft werden sollen; Aussagen werden nicht pauschal übertragen.
|
||||
- [ ] Aus Ergebnissen die nächsten Verbesserungen ableiten. Keine allgemeine
|
||||
Lernwirksamkeit aus wenigen positiven Rückmeldungen behaupten.
|
||||
|
||||
## Vorgehen bei späteren Umsetzungsaufträgen
|
||||
|
||||
1. Das ausdrücklich beauftragte Paket wählen; bei einem allgemeinen Auftrag zur
|
||||
Fortsetzung dieser Roadmap mit dem nächsten offenen Paket der Reihenfolge beginnen.
|
||||
2. Den aktuellen Code, vorhandene Datenverträge und bestehende Teilfunktionen prüfen.
|
||||
Historische Aussagen in dieser Datei ersetzen diese Prüfung nicht.
|
||||
3. Nur dieses Paket beziehungsweise einen darin klar abgegrenzten Teilschritt
|
||||
umsetzen. Status auf „In Arbeit“ setzen und erledigte Kriterien abhaken.
|
||||
4. Passende lokale Prüfungen nach `AGENTS.md` durchführen. Fixturetests,
|
||||
fachliche Durchsicht und echte Nutzertests getrennt ausweisen.
|
||||
5. Erst nach erfüllten Kriterien „Erledigt“ eintragen. Datum, Änderungen,
|
||||
Prüfungen, Grenzen und gegebenenfalls Commit im Fortschrittsprotokoll ergänzen.
|
||||
6. Bei neuen Erkenntnissen Priorität und Folgearbeiten nachvollziehbar aktualisieren.
|
||||
Offene Kriterien nicht allein wegen eines erfolgreichen Builds abhaken.
|
||||
|
||||
Deployment, Live-Anbieteraufrufe, Kontaktaufnahme mit Testpersonen und Änderungen
|
||||
an produktiven Profilen gehören nicht automatisch zu einem Umsetzungspaket.
|
||||
Bereits ausdrücklich autorisierte Schritte bleiben nach den Repositoryregeln autorisiert.
|
||||
|
||||
## Fortschrittsprotokoll
|
||||
|
||||
| Datum | Paket | Ergebnis und Nachweis | Nächster Schritt |
|
||||
| --- | --- | --- | --- |
|
||||
| 2026-11-11 | Planung | Konkurrenzbeobachtungen, bestehende Grundlage und Abnahmekriterien dokumentiert. Keine neue Produktfunktion umgesetzt. | L01 bei einem entsprechenden Umsetzungsauftrag beginnen. |
|
||||
|
||||
## Quellen
|
||||
|
||||
Die folgenden Links führen zu öffentlichen Nutzerrezensionen. Die Aussagen oben
|
||||
sind sinngemäße Zusammenfassungen positiver Erfahrungen, keine Anbieterwerbung.
|
||||
Sterne und Berichte einzelner Nutzer belegen keine objektive Messgenauigkeit.
|
||||
|
||||
- **Q1 ELSA Speak auf Capterra:** [Nutzerbewertungen](https://www.capterra.com/p/240698/ELSA-Speak/reviews/).
|
||||
Beispielsweise lobt die Fünf-Sterne-Rezension vom 25. März 2022 hervorgehobene
|
||||
Ausspracheprobleme, Audiovergleich und langsames Abspielen; weitere positive
|
||||
Rezensionen nennen Fortschritt und Verbesserungshinweise.
|
||||
- **Q2 BoldVoice im App Store:** [Nutzerbewertungen](https://apps.apple.com/us/app/boldvoice-accent-training/id1567841142?see-all=reviews).
|
||||
Positive Texte beschreiben Aufnahmevergleich und Erklärungen zur Lautbildung,
|
||||
darunter eine Rezension vom 31. März 2025.
|
||||
- **Q3 Babbel auf Trustpilot:** [Nutzerbewertungen](https://www.trustpilot.com/review/babbel.com).
|
||||
Positive Bewertungen nennen Grammatik, kurze Lektionen, Alltagssituationen,
|
||||
Wiederholung und Fortschrittsanzeige. Die betrachteten Beispiele umfassen
|
||||
Fünf-Sterne-Bewertungen vom 5. und 6. November 2026.
|
||||
- **Q4 Babbel im App Store:** [Nutzerbewertungen](https://apps.apple.com/us/app/babbel-language-learning/id829587759?see-all=reviews).
|
||||
Eine positive Rezension vom 13. März 2025 beschreibt geführtes Lernen,
|
||||
eigenes Tempo, freie Kategorieauswahl und kurze Lektionen.
|
||||
- **Q5 Speak im App Store:** [Nutzerbewertungen](https://apps.apple.com/us/app/speak-language-learning/id1286609883?see-all=reviews).
|
||||
Positive Rezensionen nennen angeleitetes Sprechen, Rückmeldung zu konkreten
|
||||
Problemen, beruflich passende Inhalte und gespeicherte Sätze. Die Rezension
|
||||
vom 30. Juni 2025 lobt Wiederholungen mit kleinen Variationen; eine weitere
|
||||
vom 30. November 2025 nennt persönliche Themen und Lesezeichen.
|
||||
- **Q6 Duolingo im App Store:** [Nutzerbewertungen](https://apps.apple.com/us/app/duolingo-learn-languages/id570060128?see-all=reviews).
|
||||
Positive Texte beschreiben kurze Aufgaben, spielerische Bestätigung und
|
||||
tägliche Lerngewohnheiten. Kritische Anmerkungen zu Serien und Kaufdruck
|
||||
sprechen dagegen, Motivation nur über solche Mechanismen zu gestalten.
|
||||
- **Q7 Busuu als ergänzender Vergleich:** [Trustpilot-Rezensionen](https://www.trustpilot.com/review/www.busuu.com)
|
||||
und [App-Store-Rezensionen](https://apps.apple.com/us/app/busuu-language-learning-app/id379968583?see-all=reviews).
|
||||
Positive Texte nennen sinnvolle Sätze, Aussprachefeedback, Kursstruktur und
|
||||
den Austausch in der Community. Eine Community-Funktion ist derzeit kein
|
||||
eigenes Arbeitspaket; der unmittelbare Nutzen für unseren A1-Kurs hat Vorrang.
|
||||
+35
-1
@@ -31,4 +31,38 @@ Important boundaries:
|
||||
|
||||
## Multilingual Design
|
||||
|
||||
The MVP enables only `en-US`, but every exercise and profile stores `target_language` and `cefr_level`. New languages are added through `language_profiles`, seed exercises, Azure voice settings, and Flowise prompt variables.
|
||||
There are exactly two roles: native language (interface and explanations together)
|
||||
and target/learning language. Native catalogs are German and Russian; the complete
|
||||
A1 learning course remains English. See [README](../README.md#mehrsprachigkeit).
|
||||
|
||||
`users.native_language` is canonical. Legacy `ui_language` and
|
||||
`instruction_language` fields are coupled aliases protected by a database check.
|
||||
Registration and preferences reject conflicting aliases. Partial profile updates
|
||||
preserve the active target, level and goal in one transaction. Migration derives
|
||||
the initial native preference from supported legacy UI values, otherwise German.
|
||||
Stored task snapshots, job locales, attempts, audio and feedback remain unchanged.
|
||||
|
||||
Typed frontend catalogs cover all controls, formatting and Russian plural forms.
|
||||
Transient messages retain translation keys; API errors expose stable codes.
|
||||
Technical provider diagnostics stay original data. A native switch updates labels
|
||||
without clearing answers, unsaved fields or an active recording.
|
||||
|
||||
All 840 German base tasks have reviewed Russian presentations across seven modules
|
||||
and six skills, including the twelve-question internal exam. Each presentation
|
||||
separates instruction, stimulus role/language, option role/language and private
|
||||
reference-answer language. English target media and answer IDs remain unchanged;
|
||||
vocabulary meanings and short-writing source sentences are Russian. Combined
|
||||
`prompt` is retained for compatibility. Module labels come from reviewed packages.
|
||||
|
||||
Each Russian translation shares its base canonical identity. Frozen assignments
|
||||
retain variant ID, revision and the earliest owned evidence identity. Distinct-task
|
||||
counts and new scripted speech observations use the shared identity; attempts and
|
||||
historical observations are not rewritten. Reviewed exam assignments also retain
|
||||
these fields. Model outputs cannot declare server-owned evidence metadata.
|
||||
|
||||
`course_v2_jobs.instruction_language` captures native language when enqueued;
|
||||
retries/replays retain it. Existing English pilot variants are retired, not deleted
|
||||
from databases. Missing packages fail explicitly rather than selecting German
|
||||
reserves. Offline authored sources, checksum-bound review and audits accompany the
|
||||
840 Russian translations. New target languages require separate complete course
|
||||
packs and verified speech capabilities. No provider profile or budget is activated.
|
||||
|
||||
@@ -13,3 +13,110 @@ Core tables are created automatically by the Go API at startup:
|
||||
- `conversation_turns`
|
||||
|
||||
The MVP seeds `en-US` A1 lessons and exercises. Additional languages should be added by inserting a new `language_profiles` row and matching lessons/exercises.
|
||||
|
||||
## Language roles
|
||||
|
||||
- `learner_profiles.target_language`: language being learned; evidence is scoped
|
||||
by authenticated learner, target language and course version.
|
||||
- `users.native_language`: shared GUI and explanation language (`de-DE`/`ru-RU`).
|
||||
- `users.ui_language` and `users.instruction_language`: compatibility aliases,
|
||||
constrained to equal `native_language`. No independent preferences remain.
|
||||
|
||||
`PATCH /me/preferences` accepts the canonical native field and preserves omitted
|
||||
profile values atomically. Conflicting aliases fail before writes. Registration,
|
||||
auth responses and `/me` expose the canonical field. The deprecated
|
||||
`PUT /course/instruction-language` updates all aliases together. Initial migration
|
||||
keeps supported old GUI values, otherwise selects German; task and attempt data
|
||||
remain untouched. Repeated startup preserves the canonical preference.
|
||||
|
||||
## Reviewed task presentations
|
||||
|
||||
`course_v2_bank_variants` stores immutable IDs, base-entry references, canonical
|
||||
identity, explanation language, revision, reviewed data and checksum. A partial
|
||||
unique index allows one active presentation per base entry/explanation language;
|
||||
retired rows remain for frozen assignments. `course_v2_tasks.variant_id` links new
|
||||
variant snapshots. Its assignment uniqueness includes the variant, allowing
|
||||
separate frozen language presentations. Original German bank entries and old
|
||||
assigned JSON remain unchanged.
|
||||
|
||||
New task JSON may include `instruction_language`, `instruction`, `stimulus`,
|
||||
`variant_id`, `content_revision`, `canonical_task_id`, option language/role and
|
||||
private reference-answer language. The compatible combined `prompt` remains.
|
||||
`Public(false)` still removes solutions and listening transcripts and always
|
||||
removes the internal `evidence_task_id`.
|
||||
|
||||
New equivalent presentations reuse the earliest matching owned assignment's
|
||||
`evidence_task_id` (or its ID for legacy snapshots). Graded attempts remain
|
||||
separate; distinct-task aggregation uses that identity. New scripted speech
|
||||
observations also use it for repetition grouping. Previously stored observations
|
||||
and historical attempt JSON are unchanged; this does not retrospectively dedupe
|
||||
all old exam copies. Adaptations have new canonical/evidence identities.
|
||||
|
||||
`course_v2_jobs.instruction_language` freezes the effective preference when the
|
||||
job is inserted. Startup fills this additive field once for older jobs; retries
|
||||
and request replays keep it. Both native languages provide 840 task presentations,
|
||||
seven modules and the internal A1 exam. All Russian entries are translations with
|
||||
shared base canonical IDs. Retired English pilot variants remain in existing
|
||||
databases for frozen history but are no longer offered.
|
||||
|
||||
## Thematic learning paths
|
||||
|
||||
`course_v2_sequence_progress` is additive state scoped by user, target language,
|
||||
course version, module and editorial sequence revision. It stores a cursor,
|
||||
current assignment, presentation timestamp, skipped count and bounded review flag.
|
||||
It is navigation/participation state, never mastery evidence or an exam result.
|
||||
Only a new non-demo saved answer for the current presentation or an explicit skip
|
||||
advances the cursor. A known graded error may offer one repeat; grades never gate
|
||||
progress. Native changes share the cursor, while task snapshots remain frozen.
|
||||
Selections and cursor changes commit together under the existing per-user/course
|
||||
advisory lock. Job results retain recommendation metadata across finalization and
|
||||
idempotent replay. Direct skill selection and exams do not move this cursor.
|
||||
|
||||
`GET /course/catalog` adds `sequence_recommendations` by module. Recommendations
|
||||
include localized topic title, current phase and step, topic count, active task,
|
||||
review/answer-needed flags and explicit skipped count. Completed paths indicate
|
||||
only that steps were worked through or skipped. `POST /course/modules/{id}/tasks/next`
|
||||
with empty `skill` uses the path; optional `skip_task_id` explicitly skips the
|
||||
current owned assignment. Stale/foreign skips fail without changing progress.
|
||||
The field is rejected alongside an explicit skill or in AI mode. Request replay
|
||||
must preserve the original skip subject. Existing clients may omit the new field.
|
||||
|
||||
Immutable thematic links are embedded separately from the task/variant banks.
|
||||
Their source and compiler are pinned by a separate editorial review and manifest;
|
||||
changing the path requires a new revision. The 840 base entries and Russian
|
||||
presentations are unchanged. Initial activation begins at the first topic without
|
||||
reinterpreting historical grades or rewriting existing assignments.
|
||||
|
||||
### Evidence-aware scaffold repetition
|
||||
|
||||
The additive `reused_steps` counter distinguishes earlier practice taken into
|
||||
account from explicit skipping. Neither counter is graded evidence. The stored
|
||||
`practice_reason` identifies foundation, transfer or refresh; recommendations
|
||||
expose these fields and `selection_revision`. The step layout remains
|
||||
`thematic-A1-v1`; selection metadata/policy is versioned separately, so this update
|
||||
preserves existing cursors. Already active assignments remain stable, including a
|
||||
chosen transfer example across request retries and native-language changes.
|
||||
|
||||
Editorial `alternatives` are allowed only for grammar choice tasks in the same
|
||||
module and learning goal, with explicitly reviewed comparable sentence patterns.
|
||||
There is no automatic replacement based on broad goal labels alone, nor any
|
||||
replacement of vocabulary meanings. The new chosen example remains an ordinary
|
||||
immutable assignment with its own original canonical/evidence identity.
|
||||
|
||||
Selection reads owned, non-demo answers scoped by target language and course
|
||||
version, at most the latest 2,000 in a 30-day module window. Incomplete exam
|
||||
answers/grades never influence it. The latest answer for each canonical item
|
||||
must be graded and >=85, no older than seven days. Fresh exact-item success has
|
||||
a 30-minute cooldown; after that, fewer repetitions require positive answers at
|
||||
least 24 hours apart or, for grammar, three different approved examples with
|
||||
recent positive latest answers. Locale variants and same-day repetitions do not
|
||||
multiply distinct examples. Newer weak or ungraded answers block the item's
|
||||
positive assumption. Unseen approved grammar examples take priority over reuse;
|
||||
assignments in any exam are also excluded from being called unseen examples.
|
||||
Only grammar/vocabulary scaffold positions may reuse earlier practice. The
|
||||
remaining thematic stages, manual skill selection and exams retain their behavior.
|
||||
No synthetic attempt, grade, progress event or pronunciation measurement is created.
|
||||
|
||||
The frontend folds prior feedback for an active presentation awaiting a new
|
||||
answer into an explicitly labeled previous-attempt disclosure. Stored feedback,
|
||||
answer keys and the existing exam disclosure rules are unchanged.
|
||||
|
||||
@@ -46,3 +46,9 @@ for e in changed:
|
||||
assert len(t['answer_key']['rubric'])>=4 and 'Werte aus der Beispielantwort sind nicht verbindlich.' in ' '.join(t['answer_key']['rubric']),e['id']
|
||||
assert all(e['id'].startswith('a1bank_en_v1_') for e in entries if e not in changed)
|
||||
print('PASS: 144 reviewed grammar keys, 144 contextual vocabulary items, 144 factual scenes; 840 outputs, 42 balanced buckets, media completeness and balanced choice positions.')
|
||||
|
||||
from variants import audit as audit_variants
|
||||
audit_variants()
|
||||
|
||||
from sequences import audit as audit_sequences
|
||||
audit_sequences()
|
||||
|
||||
@@ -75,4 +75,10 @@ def build():
|
||||
name=module+'.'+skill+'.json';data=(json.dumps(entries,ensure_ascii=False,indent=2)+'\n').encode();(DEST/name).write_bytes(data);manifest['files'][name]=hashlib.sha256(data).hexdigest()
|
||||
(DEST/'manifest.json').write_text(json.dumps(manifest,indent=2)+'\n')
|
||||
print('Wrote 840 editorial exercises in 42 files.')
|
||||
if __name__=='__main__':build()
|
||||
if __name__=='__main__':
|
||||
build()
|
||||
from variants import build as build_variants
|
||||
build_variants()
|
||||
|
||||
from sequences import build as build_sequences
|
||||
build_sequences()
|
||||
|
||||
@@ -18,8 +18,8 @@
|
||||
"Open speaking content/language criteria are separated from Azure pronunciation scores."
|
||||
],
|
||||
"sources": {
|
||||
"audit.py": "5c4d78b1f2afe07a3aa6f5fd3fcca98d0fa3caaa1d3086fd8355100c241ea407",
|
||||
"build.py": "7896dac6fecc35f174d0fa3a70249ec3a86cc7c38e48307966a86444d9c2a0da",
|
||||
"audit.py": "fd41c4c6fcd06b5ce764435393c262e1d0f6c510a598a60b5c0c5bef393b38a3",
|
||||
"build.py": "9d44b6ecfb3412d520e8e33197b82a09ce9d7b0e6af8ccf463f386082e3f291a",
|
||||
"daily_life.grammar.txt": "0b84ee5b65e2fdf63add826c372c1438215a48c9731c266601ba9160e0e25192",
|
||||
"daily_life.stories.txt": "62bd24776fd4bbbdf7bf5e926f1452f7720e8b061394dced91ff7cc46aed2e03",
|
||||
"daily_life.vocabulary.txt": "4db8b0cf43b1f154e315cefe82970e32e410e61edb047d517ad7310e5aff23aa",
|
||||
|
||||
@@ -0,0 +1,138 @@
|
||||
4:45 ist eine Viertelstunde vor fünf: a quarter to five.|4:45 — это без четверти пять: a quarter to five.
|
||||
7:30 heißt half past seven.|7:30 по-английски — half past seven, то есть половина восьмого.
|
||||
A ticket ist Singular; das Verb lautet costs.|A ticket — единственное число; нужна форма costs.
|
||||
Always bedeutet immer.|Always означает «всегда».
|
||||
Auch vor not verwenden wir nach I am.|После I употребляется am, в том числе перед not.
|
||||
Behind bedeutet hinter.|Behind означает «за».
|
||||
Bei 3:15 ist eine Viertelstunde nach drei vergangen: a quarter past three.|3:15 — четверть четвёртого: a quarter past three.
|
||||
Bei a bathroom verwenden wir there is not.|С a bathroom употребляется there is not.
|
||||
Bei buses im Plural verwenden wir there are not.|С buses во множественном числе употребляется there are not.
|
||||
Bei der Uhrzeit verwenden wir It is.|Для указания времени употребляется It is.
|
||||
Bei dieser Frage nach einer verfügbaren Menge passt any.|В этом вопросе о наличии некоторого количества подходит any.
|
||||
Bei einem einzelnen Gegenstand verwenden wir there is.|Для одного предмета употребляется there is.
|
||||
Bei mehreren Gegenständen verwenden wir there are.|Для нескольких предметов употребляется there are.
|
||||
Bei milk als nicht zählbarer Menge verwenden wir how much.|Milk — неисчисляемое существительное; о количестве спрашивают how much.
|
||||
Bei shops im Plural fragen wir Are there.|С shops во множественном числе вопрос начинается с Are there.
|
||||
Bei zählbaren Dingen im Plural verwenden wir how many.|О количестве исчисляемых предметов во множественном числе спрашивают how many.
|
||||
Between bezeichnet die Lage zwischen zwei Orten.|Between обозначает положение между двумя местами.
|
||||
Bread wird hier als nicht zählbare Menge mit some verwendet.|Bread здесь неисчисляемое; употребляется some.
|
||||
Can I have ...? ist eine höfliche Bitte.|Can I have ...? — вежливая просьба.
|
||||
Children ist der Plural von child.|Children — множественное число слова child.
|
||||
Das Subjekt my name steht mit is.|С подлежащим my name употребляется is.
|
||||
Der erste Tag heißt the first day.|«Первый день» — the first day.
|
||||
Die Form nach he lautet goes.|После he нужна форма goes.
|
||||
Die Frage bei einem einzelnen Supermarkt beginnt mit Is there.|Вопрос об одном супермаркете начинается с Is there.
|
||||
Die Frage lautet Has she got a brother?|Правильный вопрос: Has she got a brother?
|
||||
Die Frage mit you beginnt hier mit Have.|Здесь вопрос с you начинается с Have.
|
||||
Die Frage nach einer Anzahl beginnt mit How many.|Вопрос о количестве начинается с How many.
|
||||
Die Frage nach einer Vorliebe mit you beginnt mit Do.|Вопрос о предпочтении с you начинается с Do.
|
||||
Die Kurzantwort lautet Yes, I am.|Краткий ответ: Yes, I am.
|
||||
Die Kurzantwort lautet Yes, there is.|Краткий ответ: Yes, there is.
|
||||
Die Kurzantwort zur Frage mit do lautet Yes, I do.|Краткий ответ на вопрос с do: Yes, I do.
|
||||
Die Mengenangabe heißt a cup of coffee.|«Чашка кофе» — a cup of coffee.
|
||||
Die Mengenangabe lautet a bottle of water.|«Бутылка воды» — a bottle of water.
|
||||
Die Ordnungszahl für die zweite Position ist second.|Порядковое числительное «второй» — second.
|
||||
Die Rechnung als Ganzes lautet Two and three is five.|Здесь равенство выражается целиком: Two and three is five.
|
||||
Die Simple-Present-Frage mit she beginnt mit Does.|Вопрос в Simple Present с she начинается с Does.
|
||||
Die Verneinung im Simple Present mit I verwendet do not.|В отрицании в Simple Present с I употребляется do not.
|
||||
Die Verneinung mit he lautet has not got.|Отрицательная форма с he: has not got.
|
||||
Die dritte Position wird mit third bezeichnet.|Третья позиция обозначается словом third.
|
||||
Die passende Kurzantwort lautet Yes, he has.|Подходящий краткий ответ: Yes, he has.
|
||||
Die sprechende Person sagt my sister.|Говорящий говорит о своей сестре: my sister.
|
||||
Die verneinte Kurzantwort verwendet does not.|В отрицательном кратком ответе употребляется does not.
|
||||
Donnerstag folgt auf Mittwoch, daher after.|Четверг идёт после среды, поэтому нужно after.
|
||||
Four chairs ist Plural; daher there are.|Four chairs — множественное число, поэтому there are.
|
||||
From nennt hier die Herkunft.|From здесь указывает происхождение: откуда человек.
|
||||
Für den eigenen Namen verwenden wir my.|Говоря о собственном имени, употребляют my.
|
||||
Für etwas im Kühlschrank verwenden wir in.|Для предмета внутри холодильника употребляется in.
|
||||
Go straight on bedeutet geradeaus gehen.|Go straight on означает «идите прямо».
|
||||
He bezieht sich hier auf den Onkel.|He здесь относится к дяде.
|
||||
He bezieht sich hier auf den Vater.|He здесь относится к отцу.
|
||||
Her bedeutet hier Evas beziehungsweise ihr.|Her здесь означает «её» и относится к Eva.
|
||||
Her bedeutet ihr und bezieht sich hier auf Mia.|Her означает «её» и здесь относится к Mia.
|
||||
His bedeutet hier Toms beziehungsweise sein.|His здесь означает «его» и относится к Tom.
|
||||
His bedeutet sein und bezieht sich hier auf Ben.|His означает «его» и здесь относится к Ben.
|
||||
I would like ist eine höfliche Bitte.|I would like — вежливая просьба.
|
||||
In der Herkunftsfrage steht are mit you.|В вопросе о происхождении с you употребляется are.
|
||||
In der Verneinung mit milk verwenden wir any.|В отрицательном предложении с milk употребляется any.
|
||||
In dieser Frage heißt es What is your name?|Правильный вопрос: What is your name?
|
||||
In dieser Frage verwenden wir is mit he.|В этом вопросе с he употребляется is.
|
||||
In front of bedeutet vor.|In front of означает «перед».
|
||||
Left bedeutet links.|Left означает «налево».
|
||||
Mit What is your name? fragen wir nach dem Namen.|What is your name? — вопрос об имени.
|
||||
Mit Where fragen wir hier nach der Herkunft.|Where здесь используется в вопросе о происхождении.
|
||||
Mit he verwenden wir does not.|С he употребляется does not.
|
||||
Mit they verwenden wir do not.|С they употребляется do not.
|
||||
My aunt ist eine Person in der dritten Person Singular.|My aunt — третье лицо единственного числа.
|
||||
My cousins ist Plural; dazu passt have got.|My cousins — множественное число; подходит have got.
|
||||
My parents steht im Plural; dazu passt are.|My parents — множественное число; подходит are.
|
||||
My sister ist dritte Person Singular; die Form lautet does.|My sister — третье лицо единственного числа; нужна форма does.
|
||||
My sister steht in der dritten Person Singular, daher has got.|My sister — третье лицо единственного числа, поэтому has got.
|
||||
Nach I steht am.|После I употребляется am.
|
||||
Nach I steht die Grundform clean.|После I нужна начальная форма clean.
|
||||
Nach I steht im Simple Present die Grundform eat.|После I в Simple Present нужна начальная форма eat.
|
||||
Nach I verneinen wir want mit do not.|После I отрицание с want образуется при помощи do not.
|
||||
Nach I verwenden wir have got.|После I употребляется have got.
|
||||
Nach does steht die Grundform play.|После does нужна начальная форма play.
|
||||
Nach five steht der Plural minutes.|После five нужно множественное число minutes.
|
||||
Nach he lautet die Verbform cooks.|После he нужна форма cooks.
|
||||
Nach he steht is.|После he употребляется is.
|
||||
Nach he verwenden wir has got.|После he употребляется has got.
|
||||
Nach he verwenden wir is, auch in der Verneinung.|После he употребляется is, в том числе в отрицании.
|
||||
Nach seven steht der Plural days.|После seven нужно множественное число days.
|
||||
Nach she erhält play im Simple Present die Endung s.|После she в Simple Present к play добавляется s.
|
||||
Nach she lautet die Form washes.|После she нужна форма washes.
|
||||
Nach she steht is.|После she употребляется is.
|
||||
Nach she verwenden wir has got.|После she употребляется has got.
|
||||
Nach they steht are.|После they употребляется are.
|
||||
Nach they steht play.|После they употребляется play.
|
||||
Nach they verwenden wir have got.|После they употребляется have got.
|
||||
Nach three benötigen wir den Plural rooms.|После three нужно множественное число rooms.
|
||||
Nach three benötigen wir den Plural tomatoes.|После three нужно множественное число tomatoes.
|
||||
Nach two benötigen wir hier den Plural brothers.|После two здесь нужно множественное число brothers.
|
||||
Nach two steht der Plural apples.|После two нужно множественное число apples.
|
||||
Nach we lautet die Verneinung have not got.|Отрицательная форма после we: have not got.
|
||||
Nach we steht are.|После we употребляется are.
|
||||
Nach we steht die Grundform read.|После we нужна начальная форма read.
|
||||
Nach we steht have got.|После we употребляется have got.
|
||||
Nach you steht are.|После you употребляется are.
|
||||
Next to bedeutet neben.|Next to означает «рядом с».
|
||||
On bezeichnet hier die Lage auf dem Tisch.|On здесь обозначает положение на столе.
|
||||
Opposite bedeutet gegenüber.|Opposite означает «напротив».
|
||||
Or bedeutet oder und verbindet die beiden Auswahlmöglichkeiten.|Or означает «или» и соединяет два варианта выбора.
|
||||
Orange beginnt mit einem Vokallaut; davor steht an.|Orange начинается с гласного звука; перед ним употребляется an.
|
||||
Our bezeichnet das Haus der sprechenden Gruppe.|Our указывает, что дом принадлежит группе говорящих: «наш».
|
||||
Parents bezeichnet mehrere Personen; dazu passt they.|Parents обозначает нескольких людей; подходит they.
|
||||
Right bedeutet rechts.|Right означает «направо».
|
||||
Sandwich beginnt mit einem Konsonantenlaut; dazu passt a.|Sandwich начинается с согласного звука; подходит a.
|
||||
Sandwiches ist zählbar und steht im Plural; daher many.|Sandwiches — исчисляемое существительное во множественном числе; поэтому many.
|
||||
School ist Singular; finish wird zu finishes.|School — единственное число; finish превращается в finishes.
|
||||
She bezieht sich hier auf die Mutter.|She здесь относится к матери.
|
||||
Study wird nach he zu studies.|После he глагол study получает форму studies.
|
||||
These apples ist Plural; dazu passt are.|These apples — множественное число; подходит are.
|
||||
These shoes ist Plural; dazu passt are.|These shoes — множественное число; подходит are.
|
||||
This bezeichnet hier einen einzelnen nahen Gegenstand.|This здесь обозначает один близкий предмет.
|
||||
This sandwich ist Singular; dazu passt is.|This sandwich — единственное число; подходит is.
|
||||
Two days ist Plural; dazu passt are.|Two days — множественное число; подходит are.
|
||||
Under bedeutet unter.|Under означает «под».
|
||||
Vor August steht in.|Перед August употребляется in.
|
||||
Vor Sunday steht on.|Перед Sunday употребляется on.
|
||||
Vor bananas im Plural passt these.|Перед bananas во множественном числе подходит these.
|
||||
Vor dem Vokallaut in apple steht an.|Перед гласным звуком в apple употребляется an.
|
||||
Vor der Uhrzeit verwenden wir at.|Перед временем на часах употребляется at.
|
||||
Vor einem Monat verwenden wir in.|Перед названием месяца употребляется in.
|
||||
Vor einem Wochentag verwenden wir on.|Перед названием дня недели употребляется on.
|
||||
Vor einem konkreten Datum steht on.|Перед конкретной датой употребляется on.
|
||||
Vor einer Jahreszahl verwenden wir in.|Перед указанием года употребляется in.
|
||||
Vor einer genauen Uhrzeit steht at.|Перед точным временем употребляется at.
|
||||
Water wird hier als nicht zählbare Menge mit some verwendet.|Water здесь неисчисляемое; употребляется some.
|
||||
Wenn wir die Person direkt ansprechen, verwenden wir your.|При прямом обращении к человеку употребляется your.
|
||||
What day is it? fragt nach dem Wochentag.|What day is it? — вопрос о дне недели.
|
||||
What time is it? fragt nach der Uhrzeit.|What time is it? — вопрос о времени на часах.
|
||||
When fragt nach dem Zeitpunkt.|When — вопрос о том, когда происходит событие.
|
||||
When fragt nach der Zeit.|When — вопрос о времени.
|
||||
Where fragt nach dem Ort des Zimmers.|Where — вопрос о расположении комнаты.
|
||||
Where fragt nach dem Ort.|Where — вопрос о месте.
|
||||
Who fragt nach einer Person.|Who — вопрос о человеке.
|
||||
Your brother ist Singular; die Frage beginnt mit Has.|Your brother — единственное число; вопрос начинается с Has.
|
||||
Your mother ist Singular; die Frage beginnt mit Does.|Your mother — единственное число; вопрос начинается с Does.
|
||||
|
@@ -0,0 +1,84 @@
|
||||
Berichte vom ersten Schultag. Sage, dass es der erste Tag ist, und nenne ein Datum.|Расскажите о первом учебном дне. Скажите, что это первый день, и назовите дату.
|
||||
Beschreibe Großeltern. Nenne ihren Wohnort und ihre Haustiere.|Расскажите о бабушке и дедушке. Назовите, где они живут и какие домашние животные у них есть.
|
||||
Beschreibe das Angebot eines Restaurants. Nenne verfügbare Speisen und eine Speise, die es nicht gibt.|Опишите меню ресторана. Назовите блюда, которые есть, и одно блюдо, которого нет.
|
||||
Beschreibe das Bezahlen einer Rechnung. Nenne die Zahlungsart und den Betrag.|Расскажите об оплате счёта. Назовите способ оплаты и сумму.
|
||||
Beschreibe das Ende eines Unterrichtstags. Nenne eine Uhrzeit und eine anschließende Aktivität.|Расскажите об окончании учебного дня. Назовите время и занятие после этого.
|
||||
Beschreibe das Fernsehen im Alltag. Sage, wann Personen fernsehen und welche Filme sie mögen.|Расскажите о просмотре телевизора в повседневной жизни. Скажите, когда люди смотрят телевизор и какие фильмы им нравятся.
|
||||
Beschreibe das Hobby Zeichnen. Sage, wer zeichnet und was die Person zeichnet.|Расскажите об увлечении рисованием. Скажите, кто рисует и что именно.
|
||||
Beschreibe dein Mittagessen im Alltag. Sage, wo du gewöhnlich isst und wo du an einem bestimmten Tag isst.|Расскажите о своих обедах. Скажите, где вы обычно обедаете и где обедаете в определённый день.
|
||||
Beschreibe deinen Morgen. Nenne die Uhrzeit zum Aufstehen und die Uhrzeit zum Verlassen des Hauses.|Расскажите о своём утре. Назовите время подъёма и время выхода из дома.
|
||||
Beschreibe den Abwasch nach einer Mahlzeit. Sage, wer wäscht und wer abtrocknet.|Расскажите о мытье посуды после еды. Скажите, кто моет посуду и кто вытирает.
|
||||
Beschreibe den Weg einer Person zur Arbeit. Nenne ein Verkehrsmittel und die Dauer des Weges.|Расскажите о дороге человека на работу. Назовите вид транспорта и время в пути.
|
||||
Beschreibe den Wohnort einer Person über einem Geschäft. Sage auch, was das Geschäft verkauft.|Расскажите о человеке, который живёт над магазином. Скажите также, что продаётся в магазине.
|
||||
Beschreibe die Badezimmer eines Hauses. Nenne ihre Anzahl und die Lage eines Badezimmers.|Опишите ванные комнаты в доме. Назовите их количество и расположение одной из них.
|
||||
Beschreibe die Lage einer Schule und einer Bushaltestelle.|Опишите расположение школы и автобусной остановки.
|
||||
Beschreibe ein Café. Nenne seine Lage und sein Angebot.|Опишите кафе. Назовите его расположение и что в нём предлагают.
|
||||
Beschreibe ein Familienmitglied, das studiert. Sage auch, wo die Person studiert.|Расскажите о члене семьи, который учится в вузе. Скажите также, где он учится.
|
||||
Beschreibe ein Familienmitglied. Nenne ein Interesse und ein Instrument, das die Person spielt.|Расскажите о члене семьи. Назовите одно увлечение и инструмент, на котором этот человек играет.
|
||||
Beschreibe ein Familienmitglied. Nenne eine Augenfarbe und eine Haarfarbe.|Расскажите о члене семьи. Назовите цвет глаз и цвет волос.
|
||||
Beschreibe ein Haus. Nenne ein Merkmal und etwas in seiner Nähe.|Опишите дом. Назовите одну его особенность и что-нибудь поблизости.
|
||||
Beschreibe ein Museum. Nenne seine Lage und seine Öffnungszeit.|Опишите музей. Назовите его расположение и время открытия.
|
||||
Beschreibe ein Paar Schuhe zum Verkauf. Nenne die Größe und den Preis.|Опишите продающуюся пару обуви. Назовите размер и цену.
|
||||
Beschreibe ein Wohnzimmer. Nenne ein Möbelstück und die Position eines weiteren Möbelstücks dazu.|Опишите гостиную. Назовите предмет мебели и положение другого предмета относительно него.
|
||||
Beschreibe eine Familie mit Kindern. Nenne die Zahl der Kinder und das Alter eines Babys.|Расскажите о семье с детьми. Назовите количество детей и возраст младенца.
|
||||
Beschreibe eine Familie. Nenne die Zahl der Personen und ein Haustier.|Расскажите о семье. Назовите количество человек и одно домашнее животное.
|
||||
Beschreibe eine Mittagspause. Nenne die Uhrzeit des Essens und die Uhrzeit einer späteren Handlung.|Расскажите об обеденном перерыве. Назовите время еды и время более позднего действия.
|
||||
Beschreibe eine Person aus einer Familie, die zur Schule geht. Sage auch, in welcher Stadt die Schule ist.|Расскажите о члене семьи, который ходит в школу. Скажите также, в каком городе находится школа.
|
||||
Beschreibe eine Person, die Computerspiele spielt. Sage, wann sie spielt.|Расскажите о человеке, который играет в компьютерные игры. Скажите, когда он играет.
|
||||
Beschreibe eine Person, die laufen geht. Nenne einen Wochentag und einen Ort.|Расскажите о человеке, который ходит бегать. Назовите день недели и место.
|
||||
Beschreibe eine Schulklasse. Nenne die Gesamtzahl der Lernenden und die Zahl einer Gruppe innerhalb der Klasse.|Опишите школьный класс. Назовите общее количество учащихся и количество учащихся в одной группе внутри класса.
|
||||
Beschreibe eine Stadt. Nenne vorhandene Orte und einen Ort, den es dort nicht gibt.|Опишите город. Назовите места, которые там есть, и одно место, которого там нет.
|
||||
Beschreibe eine Tasche zum Verkauf. Sage etwas über ihren Preis und nenne den Betrag.|Опишите продающуюся сумку. Охарактеризуйте её цену и назовите сумму.
|
||||
Beschreibe eine Wohnung. Nenne die Zahl der Zimmer und beschreibe eines davon.|Опишите квартиру. Назовите количество комнат и опишите одну из них.
|
||||
Beschreibe einen Abend. Nenne die Uhrzeit zum Schlafengehen und eine Handlung davor.|Расскажите о вечере. Назовите время отхода ко сну и действие перед этим.
|
||||
Beschreibe einen Ausflug in einen Park. Sage, wann ihr geht und wen oder was ihr mitnehmt.|Расскажите о прогулке в парк. Скажите, когда вы идёте и кого или что берёте с собой.
|
||||
Beschreibe einen Besuch bei einem Familienmitglied. Nenne ein Datum und eine Dauer.|Расскажите о визите к члену семьи. Назовите дату и продолжительность.
|
||||
Beschreibe einen Einkauf. Sage, wann Personen einkaufen und was sie kaufen.|Расскажите о покупках. Скажите, когда люди ходят за покупками и что покупают.
|
||||
Beschreibe einen Garten in einer Familie. Sage, wem er gehört und was dort wächst.|Опишите сад в семье. Скажите, кому он принадлежит и что в нём растёт.
|
||||
Beschreibe einen Konzertbesuch. Nenne den Konzertbeginn und wann die Türen öffnen.|Расскажите о посещении концерта. Назовите время начала и время открытия дверей.
|
||||
Beschreibe einen Lebensmitteleinkauf. Nenne die Menge, den Betrag und die Zahlungsart.|Расскажите о покупке продуктов. Назовите количество, сумму и способ оплаты.
|
||||
Beschreibe einen Morgen vor der Arbeit. Nenne die Frühstückszeit und den Weg zur Arbeit.|Расскажите об утре перед работой. Назовите время завтрака и способ добраться на работу.
|
||||
Beschreibe einen Museumsbesuch. Nenne einen Öffnungstag und einen Eintrittspreis.|Расскажите о посещении музея. Назовите день, когда он открыт, и цену входного билета.
|
||||
Beschreibe einen Musikunterricht. Nenne den Wochentag und das Instrument.|Расскажите о занятии музыкой. Назовите день недели и инструмент.
|
||||
Beschreibe einen Schreibtisch und eine Tasche. Sage, wo beide stehen oder liegen.|Опишите письменный стол и сумку. Скажите, где каждый из этих предметов находится.
|
||||
Beschreibe einen Termin. Nenne eine Uhrzeit und einen Ort.|Расскажите о назначенной встрече. Назовите время и место.
|
||||
Beschreibe einen Urlaub. Nenne den Monat des Beginns und die Dauer.|Расскажите об отпуске. Назовите месяц начала и продолжительность.
|
||||
Beschreibe einen erwachsenen Angehörigen. Nenne etwas, das die Person besitzt, und ihren Arbeitsort.|Расскажите о взрослом родственнике. Назовите что-нибудь, что ему принадлежит, и его место работы.
|
||||
Beschreibe zwei Geschwister, die Zwillinge sind. Sage, wie alt sie sind.|Расскажите о двух братьях или сёстрах, которые являются близнецами. Скажите, сколько им лет.
|
||||
Beschreibe, wie du Englisch lernst. Sage, wie oft du lernst und was du dabei machst.|Расскажите, как вы изучаете английский. Скажите, как часто занимаетесь и что делаете во время занятий.
|
||||
Bestelle Getränke und etwas zu essen. Nenne jeweils eine Menge.|Закажите напитки и что-нибудь поесть. Укажите количество для каждого заказа.
|
||||
Bestelle ein Getränk ohne eine bestimmte Zutat und etwas zu essen.|Закажите напиток без определённого ингредиента и что-нибудь поесть.
|
||||
Bestelle eine Pizza. Nenne ihre Größe und eine Zutat, die du nicht möchtest.|Закажите пиццу. Укажите размер и один ингредиент, который вы не хотите.
|
||||
Bestelle etwas für dich und eine weitere Person. Nenne zwei Speisen.|Закажите еду для себя и ещё одного человека. Назовите два блюда.
|
||||
Erkläre einen kurzen Weg zu einem Park. Nenne eine Abbiegerichtung und die Seite, auf der der Park liegt.|Объясните короткий путь к парку. Укажите направление поворота и сторону, с которой находится парк.
|
||||
Erkläre einen kurzen Weg zu einer Bücherei. Nenne eine Handlung auf dem Weg und die Seite, auf der die Bücherei liegt.|Объясните короткий путь к библиотеке. Назовите действие по пути и сторону, с которой находится библиотека.
|
||||
Erkläre einen kurzen Weg. Nenne zuerst eine gerade Strecke und dann eine Abbiegerichtung.|Объясните короткий маршрут. Сначала укажите прямой участок пути, затем направление поворота.
|
||||
Kündige eine Feier an. Nenne ein Datum und eine Uhrzeit für den Beginn.|Объявите о празднике. Назовите дату и время начала.
|
||||
Nenne Lebensmittel, die ihr braucht, und ein Lebensmittel, das ihr nicht braucht.|Назовите продукты, которые вам нужны, и один продукт, который не нужен.
|
||||
Nenne die Öffnungszeiten einer Bücherei an zwei verschiedenen Wochentagen.|Назовите время открытия библиотеки в два разных дня недели.
|
||||
Nenne ein Getränk, das du nicht trinkst, und ein Getränk, das du trinkst.|Назовите напиток, который вы не пьёте, и напиток, который пьёте.
|
||||
Nenne einen Wochentag, an dem ein Café geschlossen ist, und einen Tag, an dem es wieder öffnet.|Назовите день недели, когда кафе закрыто, и день, когда оно снова открывается.
|
||||
Plane einen Einkauf. Nenne die Schließzeit des Geschäfts und eine frühere Zeit für deinen Besuch.|Запланируйте поход за покупками. Назовите время закрытия магазина и более раннее время вашего визита.
|
||||
Sage, dass du nach einer Aktivität durstig bist, und nenne ein Getränk, das du kaufst.|Скажите, что после какого-либо занятия вы хотите пить, и назовите напиток, который покупаете.
|
||||
Sage, in welchem Raum zwei verschiedene Alltagsgegenstände zu finden sind.|Скажите, в какой комнате находится каждый из двух разных повседневных предметов.
|
||||
Sage, welche Mengen du von zwei Lebensmitteln brauchst.|Скажите, какое количество каждого из двух продуктов вам нужно.
|
||||
Stelle dich in einer neuen Klasse vor. Nenne einen Namen und sage, dass du neu in der Klasse bist.|Представьтесь в новом классе. Назовите имя и скажите, что вы новичок в классе.
|
||||
Stelle dich mit Vor- und Nachnamen vor. Sage außerdem, wie andere dich nennen dürfen.|Представьтесь, назвав имя и фамилию. Скажите также, как к вам можно обращаться.
|
||||
Stelle dich mit deinem Vornamen und deinem Nachnamen vor.|Представьтесь, назвав своё имя и фамилию.
|
||||
Stelle dich und eine weitere Person in einer neuen Klasse vor. Nenne eure Namen und sage, dass ihr neu seid.|Представьте себя и ещё одного человека в новом классе. Назовите ваши имена и скажите, что вы новички.
|
||||
Stelle dich vor. Nenne deinen Namen und einen Rufnamen oder Spitznamen.|Представьтесь. Назовите своё имя и имя для обращения или прозвище.
|
||||
Stelle dich vor. Nenne einen Namen und ein Land, aus dem du kommst.|Представьтесь. Назовите имя и страну, из которой вы родом.
|
||||
Stelle dich vor. Nenne einen Namen und ergänze eine Angabe über deinen Wohnort oder ein Hobby.|Представьтесь. Назовите имя и добавьте информацию о месте жительства или увлечении.
|
||||
Stelle dich vor. Nenne einen Namen und sage, aus welchem Land du kommst und wo du jetzt wohnst.|Представьтесь. Назовите имя и скажите, из какой вы страны и где сейчас живёте.
|
||||
Stelle dich vor. Nenne einen Namen und sage, wo und mit wem du wohnst.|Представьтесь. Назовите имя и скажите, где и с кем вы живёте.
|
||||
Stelle ein Baby aus einer Familie vor. Sage, ob es ein Mädchen oder ein Junge ist, und nenne einen Namen.|Представьте младенца из семьи. Скажите, мальчик это или девочка, и назовите имя.
|
||||
Stelle ein Kind aus einer Familie vor. Nenne seinen Namen und sein Alter.|Представьте ребёнка из семьи. Назовите его имя и возраст.
|
||||
Stelle eine Gruppe vor. Nenne ihr Herkunftsland und mindestens eine Sprache, die sie spricht.|Представьте группу людей. Назовите страну их происхождения и хотя бы один язык, на котором они говорят.
|
||||
Stelle eine Person mit einem Baby vor. Nenne die Familienbeziehung und das Alter des Babys.|Представьте человека с младенцем. Назовите родственную связь и возраст младенца.
|
||||
Stelle eine Person vor. Nenne ihren Namen und sage, wo sie wohnt.|Представьте человека. Назовите его имя и скажите, где он живёт.
|
||||
Stelle eine Person vor. Nenne ihren Namen, ihre Herkunft und eine Sprache, die sie spricht.|Представьте человека. Назовите его имя, происхождение и один язык, на котором он говорит.
|
||||
Stelle einen Freund oder eine Freundin vor. Nenne einen Namen und einen Wohnort.|Представьте друга или подругу. Назовите имя и место жительства.
|
||||
Stelle einen erwachsenen Angehörigen vor. Sage, welche Sprache die Person spricht und woher sie kommt.|Представьте взрослого родственника. Скажите, на каком языке он говорит и откуда родом.
|
||||
Stelle zwei Freunde vor. Nenne ihre Namen und eine Sprache, die sie sprechen.|Представьте двух друзей. Назовите их имена и один язык, на котором они говорят.
|
||||
Vergleiche zwei Busabfahrten. Nenne die Abfahrtszeit des ersten und des zweiten Busses.|Сравните два отправления автобуса. Назовите время отправления первого и второго автобуса.
|
||||
Vergleiche zwei Kleidungsstücke mit unterschiedlichen Farben. Nenne jeweils den Preis.|Сравните два предмета одежды разных цветов. Назовите цену каждого.
|
||||
|
@@ -0,0 +1,273 @@
|
||||
An welchem Datum ist die Feier?|Какого числа состоится праздник?
|
||||
An welchem Tag geht die Person schwimmen?|В какой день человек ходит плавать?
|
||||
An welchem Tag isst sie im Café?|В какой день она ест в кафе?
|
||||
An welchem Tag ist das Café geschlossen?|В какой день кафе закрыто?
|
||||
An welchem Tag ist das Museum geöffnet?|В какой день музей открыт?
|
||||
An welchem Tag ist das Treffen?|В какой день состоится встреча?
|
||||
An welchem Tag ist der Englischunterricht?|В какой день проходит занятие по английскому?
|
||||
An welchem Tag ist der Unterricht?|В какой день проходит занятие?
|
||||
An welchem Tag ist es geöffnet?|В какой день оно открыто?
|
||||
Auf welcher Seite liegt danach der Park?|С какой стороны после этого находится парк?
|
||||
Auf welcher Seite liegt die Bücherei?|С какой стороны находится библиотека?
|
||||
Für wen ist das Obst?|Для кого эти фрукты?
|
||||
In welche Richtung geht es nach der Brücke?|В какую сторону нужно идти после моста?
|
||||
In welchem Land wohnt Alex?|В какой стране живёт Alex?
|
||||
In welchem Monat beginnt der Urlaub?|В каком месяце начинается отпуск?
|
||||
In welchem Monat ist der Geburtstag?|В каком месяце день рождения?
|
||||
In welchem Raum sind sie?|В какой комнате они находятся?
|
||||
In welchem Unterricht sind sie neu?|На каком занятии они новички?
|
||||
In welcher Art Wohnung leben sie?|В какой квартире они живут?
|
||||
In welcher Stadt ist ihre Schule?|В каком городе находится её школа?
|
||||
In welcher Straße liegt die Schule?|На какой улице находится школа?
|
||||
Ist das Baby ein Junge oder ein Mädchen?|Младенец — мальчик или девочка?
|
||||
Mit wem geht sie schwimmen?|С кем она ходит плавать?
|
||||
Mit wem spielt er?|С кем он играет?
|
||||
Um wie viel Uhr treffen sie sich?|В котором часу они встречаются?
|
||||
Von welchem Gleis fährt er ab?|С какого пути он отправляется?
|
||||
Wann beginnt das Konzert?|Когда начинается концерт?
|
||||
Wann beginnt der Film?|Когда начинается фильм?
|
||||
Wann beginnt der Unterricht?|Когда начинается занятие?
|
||||
Wann beginnt die Feier?|Когда начинается праздник?
|
||||
Wann beginnt ihr Unterricht?|Когда начинается её занятие?
|
||||
Wann beginnt seine Arbeit?|Когда начинается его работа?
|
||||
Wann besuchen sie die Tante?|Когда они навещают тётю?
|
||||
Wann endet der Unterricht?|Когда заканчивается занятие?
|
||||
Wann essen sie zu Abend?|Когда они ужинают?
|
||||
Wann essen sie zu Mittag?|Когда они обедают?
|
||||
Wann frühstückt er?|Когда он завтракает?
|
||||
Wann fährt der Zug ab?|Когда отправляется поезд?
|
||||
Wann fährt der erste Bus?|Когда отправляется первый автобус?
|
||||
Wann fährt der zweite Bus?|Когда отправляется второй автобус?
|
||||
Wann gehen sie einkaufen?|Когда они ходят за покупками?
|
||||
Wann geht die Freundin laufen?|Когда подруга ходит бегать?
|
||||
Wann geht die Person dorthin?|Когда человек идёт туда?
|
||||
Wann geht er ins Bett?|Когда он ложится спать?
|
||||
Wann ist der Musikunterricht?|Когда проходит занятие музыкой?
|
||||
Wann ist der Termin?|Когда состоится назначенная встреча?
|
||||
Wann kocht die Mutter?|Когда мать готовит еду?
|
||||
Wann kommt der Bus?|Когда приходит автобус?
|
||||
Wann macht Ben Hausaufgaben?|Когда Ben делает домашние задания?
|
||||
Wann putzen sie die Wohnung?|Когда они убирают квартиру?
|
||||
Wann schließt das Geschäft?|Когда закрывается магазин?
|
||||
Wann schließt es?|Когда оно закрывается?
|
||||
Wann sehen sie fern?|Когда они смотрят телевизор?
|
||||
Wann spielt er?|Когда он играет?
|
||||
Wann steht die Person auf?|Когда человек встаёт?
|
||||
Wann verlässt sie das Haus?|Когда она выходит из дома?
|
||||
Wann wäscht die Person ab?|Когда человек моет посуду?
|
||||
Wann öffnet das Café?|Когда открывается кафе?
|
||||
Wann öffnet das Geschäft?|Когда открывается магазин?
|
||||
Wann öffnet das Museum?|Когда открывается музей?
|
||||
Wann öffnet die Bücherei samstags?|Когда библиотека открывается по субботам?
|
||||
Wann öffnet es wieder?|Когда оно снова открывается?
|
||||
Wann öffnet sie freitags?|Когда она открывается по пятницам?
|
||||
Was befindet sich neben dem Fenster?|Что находится рядом с окном?
|
||||
Was bestellen sie zusätzlich?|Что они заказывают дополнительно?
|
||||
Was bestellt die Person?|Что заказывает человек?
|
||||
Was bestellt die andere Person?|Что заказывает другой человек?
|
||||
Was findet morgen statt?|Что состоится завтра?
|
||||
Was gibt es dort nicht?|Чего там нет?
|
||||
Was gibt es im Café?|Что есть в кафе?
|
||||
Was gibt sie nicht in das Getränk?|Что она не добавляет в напиток?
|
||||
Was hat der Großvater?|Что есть у дедушки?
|
||||
Was hat der Vater?|Что есть у отца?
|
||||
Was isst sie zum Frühstück?|Что она ест на завтрак?
|
||||
Was ist Annas Hobby?|Какое увлечение у Anna?
|
||||
Was ist bereits ausreichend vorhanden?|Чего уже достаточно?
|
||||
Was ist der Bruder?|Кем является брат?
|
||||
Was ist in der Einkaufstasche?|Что находится в сумке для покупок?
|
||||
Was kaufen sie?|Что они покупают?
|
||||
Was kauft sie auf dem Markt?|Что она покупает на рынке?
|
||||
Was kauft sie?|Что она покупает?
|
||||
Was kocht sie gewöhnlich?|Что она обычно готовит?
|
||||
Was lernt die Person jeden Tag?|Что человек изучает каждый день?
|
||||
Was liegt gegenüber dem Bahnhof?|Что находится напротив вокзала?
|
||||
Was liegt gegenüber der Bank?|Что находится напротив банка?
|
||||
Was liegt in der Nähe des Bahnhofs?|Что находится недалеко от вокзала?
|
||||
Was liegt in der Nähe des Hauses?|Что находится недалеко от дома?
|
||||
Was liegt neben der Bank?|Что находится рядом с банком?
|
||||
Was machen sie am Abend?|Что они делают вечером?
|
||||
Was machen sie dabei?|Что они при этом делают?
|
||||
Was machen sie danach?|Что они делают после этого?
|
||||
Was macht der Freund dazu?|Что при этом делает друг?
|
||||
Was macht er vor dem Einschlafen?|Что он делает перед сном?
|
||||
Was mag die Schwester?|Что нравится сестре?
|
||||
Was möchte die Person dazu essen?|Что человек хочет съесть в дополнение к этому?
|
||||
Was möchte die Person essen?|Что человек хочет съесть?
|
||||
Was möchte sie essen?|Что она хочет съесть?
|
||||
Was möchte sie trinken?|Что она хочет выпить?
|
||||
Was soll nicht auf die Pizza?|Чего не должно быть на пицце?
|
||||
Was soll nicht in den Tee?|Чего не должно быть в чае?
|
||||
Was spielt Tom?|Во что играет Tom?
|
||||
Was spielt der Bruder?|Во что играет брат?
|
||||
Was steht im Wohnzimmer?|Что стоит в гостиной?
|
||||
Was steht in der Küche?|Что стоит на кухне?
|
||||
Was steht vor dem Sofa?|Что стоит перед диваном?
|
||||
Was trinkt die Person zum Frühstück?|Что человек пьёт на завтрак?
|
||||
Was trinkt sie morgens?|Что она пьёт по утрам?
|
||||
Was verkauft das Geschäft?|Что продаётся в магазине?
|
||||
Was wächst in seinem Garten?|Что растёт в его саду?
|
||||
Was zeichnet sie?|Что она рисует?
|
||||
Welche Augenfarbe hat der Bruder?|Какого цвета глаза у брата?
|
||||
Welche Begrüßung verwendet Ben?|Какое приветствие использует Ben?
|
||||
Welche Beilage ist verfügbar?|Какой гарнир есть в наличии?
|
||||
Welche Bäume wachsen dort?|Какие деревья там растут?
|
||||
Welche Familienmitglieder sind Zwillinge?|Кто из членов семьи — близнецы?
|
||||
Welche Farbe hat das Auto?|Какого цвета машина?
|
||||
Welche Farbe hat das Dach?|Какого цвета крыша?
|
||||
Welche Farbe hat das teurere Hemd?|Какого цвета более дорогая рубашка?
|
||||
Welche Farbe hat der teurere Mantel?|Какого цвета более дорогое пальто?
|
||||
Welche Farbe hat die Tür?|Какого цвета дверь?
|
||||
Welche Filme mögen sie?|Какие фильмы им нравятся?
|
||||
Welche Flaschengröße möchte sie?|Бутылку какого объёма она хочет?
|
||||
Welche Freizeiteinrichtung wird genannt?|Какое место для досуга упоминается?
|
||||
Welche Größe haben die Schuhe?|Какого размера эта обувь?
|
||||
Welche Haarfarbe hat die Mutter?|Какого цвета волосы у матери?
|
||||
Welche Haarfarbe hat er?|Какого цвета у него волосы?
|
||||
Welche Pizzagröße möchte die Person?|Какого размера пиццу хочет человек?
|
||||
Welche Sprache sprechen sie?|На каком языке они говорят?
|
||||
Welche Sprache spricht Clara?|На каком языке говорит Clara?
|
||||
Welche Sprache spricht Leo?|На каком языке говорит Leo?
|
||||
Welche Sprache spricht Mia?|На каком языке говорит Mia?
|
||||
Welche Sprache spricht die Ehefrau?|На каком языке говорит жена?
|
||||
Welche Sprachen sprechen sie?|На каких языках они говорят?
|
||||
Welche zwei Lebensmittel werden benötigt?|Какие два продукта нужны?
|
||||
Welcher Raum ist groß?|Какая комната большая?
|
||||
Welcher Schultag ist es?|Какой это учебный день по счёту?
|
||||
Welcher Tag ist heute?|Какой сегодня день недели?
|
||||
Welches Datum ist angegeben?|Какая дата указана?
|
||||
Welches Getränk trinkt die Person nie?|Какой напиток человек никогда не пьёт?
|
||||
Welches Haustier hat der Onkel?|Какое домашнее животное есть у дяди?
|
||||
Welches Haustier hat die Familie?|Какое домашнее животное есть у семьи?
|
||||
Welches Instrument lernen sie?|На каком инструменте они учатся играть?
|
||||
Welches Instrument spielt die Person?|На каком инструменте играет человек?
|
||||
Welches Instrument spielt sie?|На каком инструменте она играет?
|
||||
Welches Lebensmittel ist heute nicht verfügbar?|Какого продукта сегодня нет в наличии?
|
||||
Welches Lebensmittel wird nicht benötigt?|Какой продукт не нужен?
|
||||
Welches Tier haben sie?|Какое животное у них есть?
|
||||
Wen begrüßt Tom?|Кого приветствует Tom?
|
||||
Wen nehmen sie mit?|Кого они берут с собой?
|
||||
Wer hat ein Baby?|У кого есть младенец?
|
||||
Wer ist Eva?|Кто такая Eva?
|
||||
Wer ist Mia?|Кто такая Mia?
|
||||
Wer sind Ben und Leo?|Кто такие Ben и Leo?
|
||||
Wer trocknet das Geschirr ab?|Кто вытирает посуду?
|
||||
Wie alt ist Emma?|Сколько лет Emma?
|
||||
Wie alt ist Leo?|Сколько лет Leo?
|
||||
Wie alt ist das Baby?|Каков возраст младенца?
|
||||
Wie alt ist die Großmutter?|Сколько лет бабушке?
|
||||
Wie alt ist die Person?|Сколько лет человеку?
|
||||
Wie alt ist die Tochter?|Сколько лет дочери?
|
||||
Wie alt ist ihr Baby?|Каков возраст её младенца?
|
||||
Wie alt sind die Zwillinge?|Сколько лет близнецам?
|
||||
Wie bezahlt die Person?|Как человек платит?
|
||||
Wie bezahlt sie?|Как она платит?
|
||||
Wie fühlt sich die Person nach dem Spaziergang?|Как человек чувствует себя после прогулки?
|
||||
Wie fühlt sich die Person?|Как человек себя чувствует?
|
||||
Wie heißen die beiden?|Как зовут этих двоих?
|
||||
Wie heißt das Baby?|Как зовут младенца?
|
||||
Wie heißt das Tier?|Как зовут животное?
|
||||
Wie heißt der Bruder?|Как зовут брата?
|
||||
Wie heißt der Sohn?|Как зовут сына?
|
||||
Wie heißt die Freundin?|Как зовут подругу?
|
||||
Wie heißt die Mutter?|Как зовут мать?
|
||||
Wie heißt die Person?|Как зовут человека?
|
||||
Wie heißt die Schwester?|Как зовут сестру?
|
||||
Wie heißt die Tante?|Как зовут тётю?
|
||||
Wie heißt die neue Person?|Как зовут новичка?
|
||||
Wie hoch ist die Rechnung?|Какова сумма счёта?
|
||||
Wie ist das Badezimmer?|Какова ванная комната?
|
||||
Wie kommt Sara zur Arbeit?|Как Sara добирается на работу?
|
||||
Wie kommt er zur Arbeit?|Как он добирается на работу?
|
||||
Wie kommt sie zur Schule?|Как она добирается в школу?
|
||||
Wie lange bleiben sie?|Как долго они остаются?
|
||||
Wie lange dauert der Film?|Сколько длится фильм?
|
||||
Wie lange dauert der Unterricht?|Сколько длится занятие?
|
||||
Wie lange dauert der Weg?|Сколько времени занимает дорога?
|
||||
Wie lange dauert er?|Сколько времени это занимает?
|
||||
Wie lautet Lisas Nachname?|Какая фамилия у Lisa?
|
||||
Wie lautet der Nachname?|Какая фамилия?
|
||||
Wie lautet der Name?|Какое имя?
|
||||
Wie lautet der Vorname?|Какое личное имя?
|
||||
Wie lautet ihr Vorname?|Какое у неё личное имя?
|
||||
Wie möchte die Person genannt werden?|Как человек хочет, чтобы его называли?
|
||||
Wie nennt der Freund die Person?|Как друг называет этого человека?
|
||||
Wie viel kosten sie?|Сколько они стоят?
|
||||
Wie viel kostet das Frühstück?|Сколько стоит завтрак?
|
||||
Wie viel kostet das rote Hemd?|Сколько стоит красная рубашка?
|
||||
Wie viel kostet der Apfel?|Сколько стоит яблоко?
|
||||
Wie viel kostet der grüne Mantel?|Сколько стоит зелёное пальто?
|
||||
Wie viel kostet die Banane?|Сколько стоит банан?
|
||||
Wie viel kostet eine Eintrittskarte?|Сколько стоит входной билет?
|
||||
Wie viel kostet sie?|Сколько она стоит?
|
||||
Wie viele Badezimmer hat das Haus?|Сколько в доме ванных комнат?
|
||||
Wie viele Brüder hat die Person?|Сколько у человека братьев?
|
||||
Wie viele Bücher liegen auf dem Tisch?|Сколько книг лежит на столе?
|
||||
Wie viele Bücher sind blau?|Сколько книг синего цвета?
|
||||
Wie viele Eier werden benötigt?|Сколько яиц нужно?
|
||||
Wie viele Karotten werden benötigt?|Сколько морковок нужно?
|
||||
Wie viele Kartoffeln werden benötigt?|Сколько картофелин нужно?
|
||||
Wie viele Katzen haben sie?|Сколько у них кошек?
|
||||
Wie viele Kinder hat die Familie?|Сколько детей в семье?
|
||||
Wie viele Kinder hat die Tante?|Сколько детей у тёти?
|
||||
Wie viele Lernende sind in der Klasse?|Сколько учащихся в классе?
|
||||
Wie viele Minuten vorher öffnen die Türen?|За сколько минут до начала открываются двери?
|
||||
Wie viele Personen gehören zur Familie?|Сколько человек в семье?
|
||||
Wie viele Personen warten?|Сколько человек ждут?
|
||||
Wie viele Schlafzimmer hat die Wohnung?|Сколько в квартире спален?
|
||||
Wie viele Stühle stehen dort?|Сколько стульев там стоит?
|
||||
Wie viele Söhne hat Nina?|Сколько сыновей у Nina?
|
||||
Wie viele Tassen Kaffee bestellen sie?|Сколько чашек кофе они заказывают?
|
||||
Wie viele Tomaten kauft die Person?|Сколько помидоров покупает человек?
|
||||
Wie viele Zimmer hat die Wohnung?|Сколько комнат в квартире?
|
||||
Wie viele neue Wörter schreibt sie auf?|Сколько новых слов она записывает?
|
||||
Wie viele sind Mädchen?|Сколько из них девочки?
|
||||
Wie wird die Tasche beschrieben?|Как описана сумка?
|
||||
Wo arbeitet der Ehemann?|Где работает муж?
|
||||
Wo arbeitet er?|Где он работает?
|
||||
Wo findet der Termin statt?|Где состоится назначенная встреча?
|
||||
Wo isst die Person gewöhnlich zu Mittag?|Где человек обычно обедает?
|
||||
Wo ist Zoe neu?|Где Zoe — новичок?
|
||||
Wo ist das Schlafzimmer?|Где находится спальня?
|
||||
Wo ist der Hund?|Где собака?
|
||||
Wo ist die Katze?|Где кошка?
|
||||
Wo ist die Tasche?|Где сумка?
|
||||
Wo ist die Tochter?|Где дочь?
|
||||
Wo kauft die Person Brot?|Где человек покупает хлеб?
|
||||
Wo lesen sie?|Где они читают?
|
||||
Wo liegen die Handtücher?|Где лежат полотенца?
|
||||
Wo liegt der Garten?|Где находится сад?
|
||||
Wo liegt die Bushaltestelle?|Где находится автобусная остановка?
|
||||
Wo liegt eines der Badezimmer?|Где находится одна из ванных комнат?
|
||||
Wo läuft sie?|Где она бегает?
|
||||
Wo macht er die Hausaufgaben?|Где он делает домашние задания?
|
||||
Wo sind die Eltern?|Где родители?
|
||||
Wo soll man links abbiegen?|Где нужно повернуть налево?
|
||||
Wo soll man rechts abbiegen?|Где нужно повернуть направо?
|
||||
Wo stehen die Tassen?|Где стоят чашки?
|
||||
Wo steht der Schreibtisch?|Где стоит письменный стол?
|
||||
Wo studiert er?|Где он учится?
|
||||
Wo wohnen die Cousins?|Где живут двоюродные братья?
|
||||
Wo wohnen die Großeltern?|Где живут бабушка и дедушка?
|
||||
Wo wohnen die beiden?|Где живут эти двое?
|
||||
Wo wohnt Ben?|Где живёт Ben?
|
||||
Wo wohnt Jack?|Где живёт Jack?
|
||||
Wo wohnt Paul?|Где живёт Paul?
|
||||
Wo wohnt Rosa?|Где живёт Rosa?
|
||||
Wo wohnt Sara?|Где живёт Sara?
|
||||
Wo wohnt der Freund?|Где живёт друг?
|
||||
Wo wohnt der Vater?|Где живёт отец?
|
||||
Wo wohnt die Großmutter?|Где живёт бабушка?
|
||||
Woher kommen die Personen?|Откуда эти люди?
|
||||
Woher kommt Anna?|Откуда Anna?
|
||||
Woher kommt Ben?|Откуда Ben?
|
||||
Woher kommt Eva?|Откуда Eva?
|
||||
Woher kommt Nina?|Откуда Nina?
|
||||
Woher kommt Olivia?|Откуда Olivia?
|
||||
Woher kommt Sara?|Откуда Sara?
|
||||
Woher kommt sie?|Откуда она?
|
||||
Wohin gehen sie nach der Schule?|Куда они идут после школы?
|
||||
Wohin soll man danach geradeaus gehen?|До какого места затем нужно идти прямо?
|
||||
Wohin soll man zuerst geradeaus gehen?|До какого места сначала нужно идти прямо?
|
||||
Worüber soll man gehen?|Через что нужно пройти?
|
||||
Zwischen welchen Geschäften liegt das Café?|Между какими магазинами находится кафе?
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user