änderungen von vorherigen Codexnutzung: sollte den Agent lassen die Aufgaben zu erzeugen
This commit is contained in:
@@ -43,6 +43,91 @@ func (s *PostgresStore) Init(ctx context.Context) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *PostgresStore) EnsureGeneratedLesson(ctx context.Context, targetLanguage, cefrLevel string) (domain.Lesson, error) {
|
||||
lesson := domain.Lesson{
|
||||
ID: "les_generated_" + strings.ToLower(strings.ReplaceAll(targetLanguage, "-", "_")) + "_" + strings.ToLower(cefrLevel),
|
||||
TargetLanguage: targetLanguage,
|
||||
CEFRLevel: cefrLevel,
|
||||
Topic: "agent_generated",
|
||||
Title: "Agent generated practice",
|
||||
}
|
||||
row := s.db.QueryRowContext(ctx, `
|
||||
INSERT INTO lessons (id, target_language, cefr_level, topic, title)
|
||||
VALUES ($1, $2, $3, $4, $5)
|
||||
ON CONFLICT (id) DO UPDATE SET
|
||||
target_language = EXCLUDED.target_language,
|
||||
cefr_level = EXCLUDED.cefr_level,
|
||||
topic = EXCLUDED.topic,
|
||||
title = EXCLUDED.title
|
||||
RETURNING id, target_language, cefr_level, topic, title
|
||||
`, lesson.ID, lesson.TargetLanguage, lesson.CEFRLevel, lesson.Topic, lesson.Title)
|
||||
if err := row.Scan(&lesson.ID, &lesson.TargetLanguage, &lesson.CEFRLevel, &lesson.Topic, &lesson.Title); err != nil {
|
||||
return domain.Lesson{}, err
|
||||
}
|
||||
return lesson, nil
|
||||
}
|
||||
|
||||
func (s *PostgresStore) SaveGeneratedExercise(ctx context.Context, userID string, generated domain.GeneratedExercise) (domain.Lesson, domain.Exercise, error) {
|
||||
targetLanguage := valueOr(generated.TargetLanguage, "en-US")
|
||||
cefrLevel := valueOr(generated.CEFRLevel, "A1")
|
||||
lesson, err := s.EnsureGeneratedLesson(ctx, targetLanguage, cefrLevel)
|
||||
if err != nil {
|
||||
return domain.Lesson{}, domain.Exercise{}, err
|
||||
}
|
||||
focusPoints, err := json.Marshal(generated.FocusPoints)
|
||||
if err != nil {
|
||||
return domain.Lesson{}, domain.Exercise{}, err
|
||||
}
|
||||
successCriteria, err := json.Marshal(generated.SuccessCriteria)
|
||||
if err != nil {
|
||||
return domain.Lesson{}, domain.Exercise{}, err
|
||||
}
|
||||
exercise := domain.Exercise{
|
||||
ID: valueOr(generated.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: "flowise",
|
||||
}
|
||||
if strings.TrimSpace(exercise.TargetText) == "" {
|
||||
return domain.Lesson{}, domain.Exercise{}, errors.New("generated exercise reference_text is required")
|
||||
}
|
||||
row := s.db.QueryRowContext(ctx, `
|
||||
INSERT INTO exercises (
|
||||
id, lesson_id, target_language, cefr_level, type, prompt_text, target_text,
|
||||
difficulty, source, created_by_user_id, tts_text, focus_points_json,
|
||||
success_criteria_json, reason_for_choice, agent_context_json
|
||||
)
|
||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, 'flowise', $9, $10, $11, $12, $13, $14)
|
||||
ON CONFLICT (id) DO UPDATE SET
|
||||
lesson_id = EXCLUDED.lesson_id,
|
||||
target_language = EXCLUDED.target_language,
|
||||
cefr_level = EXCLUDED.cefr_level,
|
||||
type = EXCLUDED.type,
|
||||
prompt_text = EXCLUDED.prompt_text,
|
||||
target_text = EXCLUDED.target_text,
|
||||
difficulty = EXCLUDED.difficulty,
|
||||
source = EXCLUDED.source,
|
||||
created_by_user_id = EXCLUDED.created_by_user_id,
|
||||
tts_text = EXCLUDED.tts_text,
|
||||
focus_points_json = EXCLUDED.focus_points_json,
|
||||
success_criteria_json = EXCLUDED.success_criteria_json,
|
||||
reason_for_choice = EXCLUDED.reason_for_choice,
|
||||
agent_context_json = EXCLUDED.agent_context_json
|
||||
RETURNING id, lesson_id, target_language, cefr_level, type, prompt_text, target_text, difficulty, source
|
||||
`, exercise.ID, exercise.LessonID, exercise.TargetLanguage, exercise.CEFRLevel, exercise.Type,
|
||||
exercise.PromptText, exercise.TargetText, exercise.Difficulty, userID, generated.TTSText,
|
||||
string(focusPoints), string(successCriteria), generated.ReasonForChoice, mustJSON(generated))
|
||||
if err := row.Scan(&exercise.ID, &exercise.LessonID, &exercise.TargetLanguage, &exercise.CEFRLevel, &exercise.Type, &exercise.PromptText, &exercise.TargetText, &exercise.Difficulty, &exercise.Source); err != nil {
|
||||
return domain.Lesson{}, domain.Exercise{}, err
|
||||
}
|
||||
return lesson, exercise, nil
|
||||
}
|
||||
|
||||
func (s *PostgresStore) DebugStatus(ctx context.Context) domain.DebugDBStatus {
|
||||
status := domain.DebugDBStatus{
|
||||
Counts: map[string]int{},
|
||||
@@ -210,10 +295,11 @@ func (s *PostgresStore) NextLessonAndExercise(ctx context.Context, profile domai
|
||||
row := s.db.QueryRowContext(ctx, `
|
||||
SELECT l.id, l.target_language, l.cefr_level, l.topic, l.title,
|
||||
e.id, e.lesson_id, e.target_language, e.cefr_level, e.type,
|
||||
e.prompt_text, e.target_text, e.difficulty
|
||||
e.prompt_text, e.target_text, e.difficulty, COALESCE(e.source, 'seed')
|
||||
FROM exercises e
|
||||
JOIN lessons l ON l.id = e.lesson_id
|
||||
WHERE e.target_language = $1 AND e.cefr_level = $2
|
||||
AND (COALESCE(e.source, 'seed') = 'seed' OR e.created_by_user_id = $3)
|
||||
ORDER BY (
|
||||
SELECT COUNT(*)
|
||||
FROM attempts a
|
||||
@@ -224,7 +310,7 @@ func (s *PostgresStore) NextLessonAndExercise(ctx context.Context, profile domai
|
||||
if err := row.Scan(
|
||||
&lesson.ID, &lesson.TargetLanguage, &lesson.CEFRLevel, &lesson.Topic, &lesson.Title,
|
||||
&exercise.ID, &exercise.LessonID, &exercise.TargetLanguage, &exercise.CEFRLevel, &exercise.Type,
|
||||
&exercise.PromptText, &exercise.TargetText, &exercise.Difficulty,
|
||||
&exercise.PromptText, &exercise.TargetText, &exercise.Difficulty, &exercise.Source,
|
||||
); err != nil {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return domain.Lesson{}, domain.Exercise{}, ErrNotFound
|
||||
@@ -237,11 +323,11 @@ func (s *PostgresStore) NextLessonAndExercise(ctx context.Context, profile domai
|
||||
func (s *PostgresStore) GetExercise(ctx context.Context, id 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
|
||||
SELECT id, lesson_id, target_language, cefr_level, type, prompt_text, target_text, difficulty, COALESCE(source, 'seed')
|
||||
FROM exercises
|
||||
WHERE id = $1
|
||||
`, id)
|
||||
if err := row.Scan(&e.ID, &e.LessonID, &e.TargetLanguage, &e.CEFRLevel, &e.Type, &e.PromptText, &e.TargetText, &e.Difficulty); err != nil {
|
||||
if err := row.Scan(&e.ID, &e.LessonID, &e.TargetLanguage, &e.CEFRLevel, &e.Type, &e.PromptText, &e.TargetText, &e.Difficulty, &e.Source); err != nil {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return domain.Exercise{}, ErrNotFound
|
||||
}
|
||||
@@ -401,6 +487,14 @@ func valueOr(value, fallback string) string {
|
||||
return value
|
||||
}
|
||||
|
||||
func mustJSON(value any) string {
|
||||
body, err := json.Marshal(value)
|
||||
if err != nil {
|
||||
return "{}"
|
||||
}
|
||||
return string(body)
|
||||
}
|
||||
|
||||
const schemaSQL = `
|
||||
CREATE TABLE IF NOT EXISTS users (
|
||||
id TEXT PRIMARY KEY,
|
||||
@@ -446,9 +540,26 @@ CREATE TABLE IF NOT EXISTS exercises (
|
||||
type TEXT NOT NULL,
|
||||
prompt_text TEXT NOT NULL,
|
||||
target_text TEXT NOT NULL,
|
||||
difficulty INT NOT NULL DEFAULT 1
|
||||
difficulty INT NOT NULL DEFAULT 1,
|
||||
source TEXT NOT NULL DEFAULT 'seed',
|
||||
created_by_user_id TEXT REFERENCES users(id) ON DELETE SET NULL,
|
||||
tts_text TEXT NOT NULL DEFAULT '',
|
||||
focus_points_json JSONB NOT NULL DEFAULT '[]'::jsonb,
|
||||
success_criteria_json JSONB NOT NULL DEFAULT '[]'::jsonb,
|
||||
reason_for_choice TEXT NOT NULL DEFAULT '',
|
||||
agent_context_json JSONB NOT NULL DEFAULT '{}'::jsonb,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||
);
|
||||
|
||||
ALTER TABLE exercises ADD COLUMN IF NOT EXISTS source TEXT NOT NULL DEFAULT 'seed';
|
||||
ALTER TABLE exercises ADD COLUMN IF NOT EXISTS created_by_user_id TEXT REFERENCES users(id) ON DELETE SET NULL;
|
||||
ALTER TABLE exercises ADD COLUMN IF NOT EXISTS tts_text TEXT NOT NULL DEFAULT '';
|
||||
ALTER TABLE exercises ADD COLUMN IF NOT EXISTS focus_points_json JSONB NOT NULL DEFAULT '[]'::jsonb;
|
||||
ALTER TABLE exercises ADD COLUMN IF NOT EXISTS success_criteria_json JSONB NOT NULL DEFAULT '[]'::jsonb;
|
||||
ALTER TABLE exercises ADD COLUMN IF NOT EXISTS reason_for_choice TEXT NOT NULL DEFAULT '';
|
||||
ALTER TABLE exercises ADD COLUMN IF NOT EXISTS agent_context_json JSONB NOT NULL DEFAULT '{}'::jsonb;
|
||||
ALTER TABLE exercises ADD COLUMN IF NOT EXISTS created_at TIMESTAMPTZ NOT NULL DEFAULT now();
|
||||
|
||||
CREATE TABLE IF NOT EXISTS attempts (
|
||||
id TEXT PRIMARY KEY,
|
||||
user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
||||
|
||||
Reference in New Issue
Block a user