Langsame Hörhilfen für Ausspracheübungen ergänzen
This commit is contained in:
@@ -34,10 +34,13 @@ type audioSpeechService struct {
|
||||
locale string
|
||||
voice string
|
||||
text string
|
||||
mode string
|
||||
word string
|
||||
}
|
||||
|
||||
func (s *audioSpeechService) Synthesize(_ context.Context, locale, voice, text string) ([]byte, string, error) {
|
||||
func (s *audioSpeechService) SynthesizeExercise(_ context.Context, locale, voice, text, mode, word string) ([]byte, string, error) {
|
||||
s.locale, s.voice, s.text = locale, voice, text
|
||||
s.mode, s.word = mode, word
|
||||
return []byte("mp3-data"), "audio/mpeg", nil
|
||||
}
|
||||
|
||||
@@ -58,11 +61,50 @@ func TestExerciseAudioUsesStoredSentenceAndLanguageVoice(t *testing.T) {
|
||||
if recorder.Header().Get("Content-Type") != "audio/mpeg" {
|
||||
t.Fatalf("content type = %q", recorder.Header().Get("Content-Type"))
|
||||
}
|
||||
if lookup.requestedUserID != "usr_current" || speech.locale != "en-US" || speech.voice != "en-US-JennyNeural" || speech.text != "Please pass the water." {
|
||||
if lookup.requestedUserID != "usr_current" || speech.locale != "en-US" || speech.voice != "en-US-JennyNeural" || speech.text != "Please pass the water." || speech.mode != "normal" {
|
||||
t.Fatalf("unexpected synthesis input: user %q, locale %q, voice %q, text %q", lookup.requestedUserID, speech.locale, speech.voice, speech.text)
|
||||
}
|
||||
}
|
||||
|
||||
func TestExerciseAudioSlowAndFocusModes(t *testing.T) {
|
||||
for _, test := range []struct {
|
||||
name string
|
||||
url string
|
||||
mode string
|
||||
word string
|
||||
}{
|
||||
{"slow", "/practice/exercises/ex_1/audio?mode=slow", "slow", ""},
|
||||
{"focus", "/practice/exercises/ex_1/audio?mode=focus&word=water", "focus", "water"},
|
||||
{"focus punctuation", "/practice/exercises/ex_1/audio?mode=focus&word=water.", "focus", "water"},
|
||||
} {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
speech := &audioSpeechService{}
|
||||
server := &Server{store: &audioExerciseStore{}, speech: speech}
|
||||
req := httptest.NewRequest(http.MethodGet, test.url, nil)
|
||||
req.SetPathValue("id", "ex_1")
|
||||
req = req.WithContext(context.WithValue(req.Context(), userIDKey, "usr_current"))
|
||||
recorder := httptest.NewRecorder()
|
||||
server.exerciseAudio(recorder, req)
|
||||
if recorder.Code != http.StatusOK || speech.mode != test.mode || speech.word != test.word {
|
||||
t.Fatalf("status = %d, mode = %q, word = %q", recorder.Code, speech.mode, speech.word)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestExerciseAudioRejectsWordsOutsideSentence(t *testing.T) {
|
||||
speech := &audioSpeechService{}
|
||||
server := &Server{store: &audioExerciseStore{}, speech: speech}
|
||||
req := httptest.NewRequest(http.MethodGet, "/practice/exercises/ex_1/audio?mode=focus&word=unrelated", nil)
|
||||
req.SetPathValue("id", "ex_1")
|
||||
req = req.WithContext(context.WithValue(req.Context(), userIDKey, "usr_current"))
|
||||
recorder := httptest.NewRecorder()
|
||||
server.exerciseAudio(recorder, req)
|
||||
if recorder.Code != http.StatusBadRequest || speech.text != "" {
|
||||
t.Fatalf("status = %d, synthesis text = %q", recorder.Code, speech.text)
|
||||
}
|
||||
}
|
||||
|
||||
func TestExerciseAudioRejectsInaccessibleExercise(t *testing.T) {
|
||||
lookup := &audioExerciseStore{lookupErr: store.ErrNotFound}
|
||||
speech := &audioSpeechService{}
|
||||
|
||||
@@ -9,6 +9,7 @@ import (
|
||||
"net/http"
|
||||
"strings"
|
||||
"time"
|
||||
"unicode"
|
||||
|
||||
"speech-learning-api/internal/config"
|
||||
"speech-learning-api/internal/domain"
|
||||
@@ -306,12 +307,31 @@ func (s *Server) exerciseAudio(w http.ResponseWriter, r *http.Request) {
|
||||
writeError(w, http.StatusNotFound, err)
|
||||
return
|
||||
}
|
||||
mode := r.URL.Query().Get("mode")
|
||||
if mode == "" {
|
||||
mode = "normal"
|
||||
}
|
||||
if mode != "normal" && mode != "slow" && mode != "focus" {
|
||||
writeError(w, http.StatusBadRequest, errors.New("unsupported audio mode"))
|
||||
return
|
||||
}
|
||||
focusWord := r.URL.Query().Get("word")
|
||||
if mode == "focus" {
|
||||
focusWord = exerciseFocusWord(exercise.TargetText, focusWord)
|
||||
if focusWord == "" {
|
||||
writeError(w, http.StatusBadRequest, errors.New("word must occur in the exercise sentence"))
|
||||
return
|
||||
}
|
||||
} else if focusWord != "" {
|
||||
writeError(w, http.StatusBadRequest, errors.New("word is only supported in focus mode"))
|
||||
return
|
||||
}
|
||||
language, err := s.store.GetLanguage(r.Context(), exercise.TargetLanguage)
|
||||
if err != nil {
|
||||
writeError(w, http.StatusInternalServerError, err)
|
||||
return
|
||||
}
|
||||
audio, mime, err := s.speech.Synthesize(r.Context(), language.AzureLocale, language.DefaultTTSVoice, exercise.TargetText)
|
||||
audio, mime, err := s.speech.SynthesizeExercise(r.Context(), language.AzureLocale, language.DefaultTTSVoice, exercise.TargetText, mode, focusWord)
|
||||
if err != nil {
|
||||
writeError(w, http.StatusBadGateway, err)
|
||||
return
|
||||
@@ -326,6 +346,20 @@ func (s *Server) exerciseAudio(w http.ResponseWriter, r *http.Request) {
|
||||
_, _ = w.Write(audio)
|
||||
}
|
||||
|
||||
func exerciseFocusWord(sentence, requested string) string {
|
||||
requested = strings.TrimFunc(strings.TrimSpace(requested), func(r rune) bool { return !unicode.IsLetter(r) && !unicode.IsNumber(r) })
|
||||
if requested == "" {
|
||||
return ""
|
||||
}
|
||||
for _, token := range strings.Fields(sentence) {
|
||||
word := strings.TrimFunc(token, func(r rune) bool { return !unicode.IsLetter(r) && !unicode.IsNumber(r) })
|
||||
if strings.EqualFold(word, requested) {
|
||||
return word
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (s *Server) createAttempt(w http.ResponseWriter, r *http.Request) {
|
||||
if err := r.ParseMultipartForm(24 << 20); err != nil {
|
||||
writeError(w, http.StatusBadRequest, err)
|
||||
|
||||
@@ -22,6 +22,7 @@ import (
|
||||
type SpeechService interface {
|
||||
AssessPronunciation(ctx context.Context, input PronunciationInput) (domain.PronunciationResult, error)
|
||||
Synthesize(ctx context.Context, locale, voice, text string) ([]byte, string, error)
|
||||
SynthesizeExercise(ctx context.Context, locale, voice, text, mode, focusWord string) ([]byte, string, error)
|
||||
}
|
||||
|
||||
type PronunciationInput struct {
|
||||
@@ -98,13 +99,41 @@ func (s *AzureSpeechService) Synthesize(ctx context.Context, locale, voice, text
|
||||
if strings.TrimSpace(text) == "" {
|
||||
return nil, "", errors.New("tts text is required")
|
||||
}
|
||||
if s.cfg.AzureMock || s.cfg.AzureSpeechKey == "" || s.cfg.AzureRegion == "" {
|
||||
return nil, "", nil
|
||||
}
|
||||
|
||||
locale = valueOr(locale, "en-US")
|
||||
voice = valueOr(voice, "en-US-JennyNeural")
|
||||
ssml := fmt.Sprintf(`<speak version="1.0" xml:lang="%s"><voice name="%s">%s</voice></speak>`, locale, voice, xmlEscape(text))
|
||||
return s.synthesizeSSML(ctx, ssml)
|
||||
}
|
||||
|
||||
func (s *AzureSpeechService) SynthesizeExercise(ctx context.Context, locale, voice, text, mode, focusWord string) ([]byte, string, error) {
|
||||
if strings.TrimSpace(text) == "" {
|
||||
return nil, "", errors.New("tts text is required")
|
||||
}
|
||||
if mode == "normal" {
|
||||
return s.Synthesize(ctx, locale, voice, text)
|
||||
}
|
||||
locale = valueOr(locale, "en-US")
|
||||
voice = valueOr(voice, "en-US-JennyNeural")
|
||||
var content string
|
||||
switch mode {
|
||||
case "slow":
|
||||
content = fmt.Sprintf(`<prosody rate="0.8">%s</prosody>`, xmlEscape(text))
|
||||
case "focus":
|
||||
if strings.TrimSpace(focusWord) == "" {
|
||||
return nil, "", errors.New("focus word is required")
|
||||
}
|
||||
content = fmt.Sprintf(`<prosody rate="0.7">%s</prosody><break time="400ms"/><prosody rate="0.8">%s</prosody>`, xmlEscape(focusWord), xmlEscape(text))
|
||||
default:
|
||||
return nil, "", errors.New("unsupported audio mode")
|
||||
}
|
||||
ssml := fmt.Sprintf(`<speak version="1.0" xml:lang="%s"><voice name="%s">%s</voice></speak>`, locale, voice, content)
|
||||
return s.synthesizeSSML(ctx, ssml)
|
||||
}
|
||||
|
||||
func (s *AzureSpeechService) synthesizeSSML(ctx context.Context, ssml string) ([]byte, string, error) {
|
||||
if s.cfg.AzureMock || s.cfg.AzureSpeechKey == "" || s.cfg.AzureRegion == "" {
|
||||
return nil, "", nil
|
||||
}
|
||||
endpoint := fmt.Sprintf("https://%s.tts.speech.microsoft.com/cognitiveservices/v1", s.cfg.AzureRegion)
|
||||
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodPost, endpoint, strings.NewReader(ssml))
|
||||
|
||||
@@ -1,6 +1,72 @@
|
||||
package services
|
||||
|
||||
import "testing"
|
||||
import (
|
||||
"context"
|
||||
"encoding/xml"
|
||||
"io"
|
||||
"net/http"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"speech-learning-api/internal/config"
|
||||
)
|
||||
|
||||
type speechRoundTripFunc func(*http.Request) (*http.Response, error)
|
||||
|
||||
func (fn speechRoundTripFunc) RoundTrip(req *http.Request) (*http.Response, error) {
|
||||
return fn(req)
|
||||
}
|
||||
|
||||
func TestSynthesizeExerciseSendsValidSSML(t *testing.T) {
|
||||
for _, test := range []struct {
|
||||
mode string
|
||||
word string
|
||||
rates []string
|
||||
}{
|
||||
{"slow", "", []string{"0.8"}},
|
||||
{"focus", "chips", []string{"0.7", "0.8"}},
|
||||
} {
|
||||
t.Run(test.mode, func(t *testing.T) {
|
||||
var body string
|
||||
service := &AzureSpeechService{
|
||||
cfg: config.Config{AzureSpeechKey: "test-key", AzureRegion: "test-region"},
|
||||
client: &http.Client{Transport: speechRoundTripFunc(func(req *http.Request) (*http.Response, error) {
|
||||
payload, err := io.ReadAll(req.Body)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
body = string(payload)
|
||||
return &http.Response{StatusCode: http.StatusOK, Body: io.NopCloser(strings.NewReader("mp3")), Header: make(http.Header)}, nil
|
||||
})},
|
||||
}
|
||||
_, _, err := service.SynthesizeExercise(context.Background(), "en-US", "en-US-JennyNeural", "Fish & chips are tasty.", test.mode, test.word)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
decoder := xml.NewDecoder(strings.NewReader(body))
|
||||
for {
|
||||
_, err := decoder.Token()
|
||||
if err == io.EOF {
|
||||
break
|
||||
}
|
||||
if err != nil {
|
||||
t.Fatalf("invalid SSML: %v; body %q", err, body)
|
||||
}
|
||||
}
|
||||
if !strings.Contains(body, "Fish & chips are tasty.") {
|
||||
t.Fatalf("sentence was not XML-escaped: %q", body)
|
||||
}
|
||||
for _, rate := range test.rates {
|
||||
if !strings.Contains(body, `rate="`+rate+`"`) {
|
||||
t.Fatalf("missing rate %s: %q", rate, body)
|
||||
}
|
||||
}
|
||||
if test.mode == "focus" && (!strings.Contains(body, `<break time="400ms"/>`) || !strings.Contains(body, `>chips</prosody>`)) {
|
||||
t.Fatalf("focus clip lacks the word or pause: %q", body)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestMockPronunciationReturnsWordScores(t *testing.T) {
|
||||
result := mockPronunciation("Hello, my name is Anna.")
|
||||
|
||||
Reference in New Issue
Block a user