Formerly KrillinAI, VideoTranslation and Dubbing Tool for 120+ Languages. Open-source AI workspace for creators, powered by Codex. Video downloader, video translation, create videos, images, audios, and edits with Agents in one place. For your Social Media like YouTube, TikTok, Instagram, etc.
TypeScript agent-skillscodex-clideskop-appdubbingimage-generationlocalizationskillsttsvideo-editingvideo-generationvideo-transcriptionvideo-translation
feat: improve dubbing and cover generation
wuliend6cf60995785
diff --git a/config/config-example.toml b/config/config-example.tomlindex 7394f6b0..05c2be91 100644--- a/config/config-example.toml+++ b/config/config-example.toml@@ -73,9 +73,9 @@rewrite_max_attempts = 2 # 单条字幕最多改写次数estimator = "statistical" # 估时器,当前支持 statistical-[image]- provider = "openai-compatible"+[image] # 封面生图配置+ provider = "openai-compatible" # 当前支持openai-compatible,使用OpenAI Images API兼容格式[image.openai]- base_url = ""- api_key = ""- model = "gpt-image-1"+ base_url = "" # 生图接口base url,留空使用OpenAI官方接口;自定义转发站通常填写以/v1结尾的地址+ api_key = "" # 生图API密钥+ model = "gpt-image-1" # 生图模型,例如gpt-image-1,或转发站支持的兼容模型diff --git a/internal/cli/commands.go b/internal/cli/commands.goindex 56790d63..ee45892e 100644--- a/internal/cli/commands.go+++ b/internal/cli/commands.go@@ -18,6 +18,7 @@ type Command struct {Subtitle pipeline.SubtitleRequestTTS pipeline.TTSRequestRender pipeline.RenderRequest+ Cover pipeline.CoverRequestPipeline pipeline.PipelineRequest}@@ -40,7 +41,9 @@ func Parse(args []string) (Command, error) {return parseRender(name, args[1:], false)case "pipeline":return parsePipeline(name, args[1:])- case "cover", "status":+ case "cover":+ return parseCover(name, args[1:])+ case "status":if hasHelpArg(args[1:]) {return Command{Name: name, Help: true}, nil}@@ -125,9 +128,15 @@ Flags:`case "cover":return `Usage:- krillinai-cli cover+ krillinai-cli cover --workdir <dir> --prompt <text> [flags]-Cover generation is a reserved/planned CLI surface in the current implementation.+Flags:+ --workdir <dir> Task working directory+ --task-id <id> Optional task id+ --prompt <text> Prompt for GPT image cover generation+ --size <size> Image size, such as 1024x1024 or 1536x1024+ --dry-run Validate and write manifest without external calls+ -h, --help Show this help`case "status":return `Usage:@@ -145,7 +154,7 @@ Commands:render-horizontal Render landscape subtitle or dubbed videosrender-vertical Render portrait subtitle or dubbed videospipeline Plan or run multi-stage workflows when supported- cover Reserved cover generation surface+ cover Generate a cover image from a promptstatus Reserved status query surfaceRun "krillinai-cli <command> --help" for command-specific flags.@@ -167,6 +176,9 @@ func Execute(ctx context.Context, svc pipeline.StageService, cmd Command) pipelicase "render-horizontal", "render-vertical":resp, err := pipeline.Render(ctx, svc, cmd.Render)return responseWithError(resp, err)+ case "cover":+ resp, err := pipeline.GenerateCover(ctx, svc, cmd.Cover)+ return responseWithError(resp, err)default:return pipeline.Response{OK: false,@@ -179,6 +191,34 @@ func Execute(ctx context.Context, svc pipeline.StageService, cmd Command) pipeli}}+func parseCover(name string, args []string) (Command, error) {+ if hasHelpArg(args) {+ return Command{Name: name, Help: true}, nil+ }+ fs := newFlagSet(name)+ workdir := fs.String("workdir", "", "workdir")+ taskID := fs.String("task-id", "", "task id")+ prompt := fs.String("prompt", "", "image prompt")+ size := fs.String("size", "", "image size")+ dryRun := fs.Bool("dry-run", false, "validate command without running external services")+ if err := fs.Parse(args); err != nil {+ return Command{}, err+ }+ if strings.TrimSpace(*prompt) == "" {+ return Command{}, errors.New("cover requires --prompt")+ }+ return Command{+ Name: name,+ DryRun: *dryRun,+ Cover: pipeline.CoverRequest{+ Workdir: *workdir,+ TaskID: *taskID,+ Prompt: *prompt,+ Size: *size,+ },+ }, nil+}+func parseSubtitle(name string, args []string) (Command, error) {if hasHelpArg(args) {return Command{Name: name, Help: true}, nil@@ -332,6 +372,10 @@ func dryRun(cmd Command) pipeline.Response {return dryRunManifest(cmd.Render.Workdir, cmd.Render.TaskID, pipeline.StageRenderHorizontal, nil)case "render-vertical":return dryRunManifest(cmd.Render.Workdir, cmd.Render.TaskID, pipeline.StageRenderVertical, nil)+ case "cover":+ return dryRunManifest(cmd.Cover.Workdir, cmd.Cover.TaskID, pipeline.StageCover, func(m *pipeline.Manifest) {+ m.Outputs.FinalCoverPrompt = m.Outputs.FinalCoverPrompt+ })case "pipeline":return pipeline.Response{OK: true, Stage: pipeline.StagePipeline}default:diff --git a/internal/cli/commands_test.go b/internal/cli/commands_test.goindex 66f2dcbb..6ac812b5 100644--- a/internal/cli/commands_test.go+++ b/internal/cli/commands_test.go@@ -85,7 +85,39 @@ func TestParseSubcommandHelp(t *testing.T) {}}-func TestParseReservedCommandHelp(t *testing.T) {+func TestParseCoverCommand(t *testing.T) {+ cmd, err := Parse([]string{+ "cover",+ "--workdir", "tasks/demo",+ "--task-id", "demo",+ "--prompt", "电影感科技封面,醒目中文标题",+ "--size", "1536x1024",+ })+ if err != nil {+ t.Fatalf("Parse() error = %v", err)+ }+ if cmd.Name != "cover" {+ t.Fatalf("Name = %q, want cover", cmd.Name)+ }+ if cmd.Cover.Workdir != "tasks/demo" {+ t.Fatalf("Workdir = %q", cmd.Cover.Workdir)+ }+ if cmd.Cover.Prompt != "电影感科技封面,醒目中文标题" {+ t.Fatalf("Prompt = %q", cmd.Cover.Prompt)+ }+ if cmd.Cover.Size != "1536x1024" {+ t.Fatalf("Size = %q", cmd.Cover.Size)+ }+}++func TestParseCoverCommandRequiresPrompt(t *testing.T) {+ _, err := Parse([]string{"cover", "--workdir", "tasks/demo"})+ if err == nil {+ t.Fatalf("Parse() error = nil, want error")+ }+}++func TestParseCoverCommandHelp(t *testing.T) {cmd, err := Parse([]string{"cover", "--help"})if err != nil {t.Fatalf("Parse() error = %v", err)@@ -94,8 +126,8 @@ func TestParseReservedCommandHelp(t *testing.T) {t.Fatalf("Command = %#v, want cover help", cmd)}help := Help(cmd)- if !strings.Contains(help, "reserved/planned") {- t.Fatalf("Help() = %q, want reserved command notice", help)+ if !strings.Contains(help, "--prompt") {+ t.Fatalf("Help() = %q, want cover flags", help)}}diff --git a/internal/pipeline/cover.go b/internal/pipeline/cover.goindex 36e108c1..8531d7d7 100644--- a/internal/pipeline/cover.go+++ b/internal/pipeline/cover.go@@ -1,6 +1,25 @@package pipeline-import "strings"+import (+ "context"+ "encoding/base64"+ "errors"+ "fmt"+ "io"+ "krillin-ai/pkg/image"+ "net/http"+ "os"+ "strings"+)++const defaultCoverSize = "1024x1024"++type CoverRequest struct {+ Workdir string+ TaskID string+ Prompt string+ Size string+}type CoverPromptData struct {Title string@@ -20,3 +39,121 @@ func RenderCoverPrompt(tmpl string, data CoverPromptData) string {)return replacer.Replace(tmpl)}++func GenerateCover(ctx context.Context, svc StageService, req CoverRequest) (Response, error) {+ req.Prompt = strings.TrimSpace(req.Prompt)+ if req.Prompt == "" {+ err := errors.New("cover prompt is required")+ return coverFailureResponse(req, nil, ErrorKindUsage, "prompt_required", err), err+ }+ if req.Size == "" {+ req.Size = defaultCoverSize+ }++ manifest, err := coverManifest(req)+ if err != nil {+ return coverFailureResponse(req, nil, ErrorKindInternal, "load_manifest_failed", err), err+ }+ manifest.TaskID = req.TaskID+ manifest.Workdir = req.Workdir+ existingOutputs := manifest.Outputs+ if err := manifest.ApplyDefaultOutputs(); err != nil {+ return coverFailureResponse(req, manifest, ErrorKindInternal, "apply_outputs_failed", err), err+ }+ restoreOutputs(manifest, existingOutputs)++ result, err := svc.GenerateCoverImage(ctx, image.GenerateRequest{+ Prompt: req.Prompt,+ Size: req.Size,+ })+ if err != nil {+ return failCoverStage(req, manifest, "generate_cover_failed", err)+ }+ imageBytes, err := coverImageBytes(ctx, result)+ if err != nil {+ return failCoverStage(req, manifest, "decode_cover_failed", err)+ }+ if err := os.WriteFile(manifest.Outputs.FinalCoverPrompt, []byte(req.Prompt), 0644); err != nil {+ return coverFailureResponse(req, manifest, ErrorKindInternal, "write_prompt_failed", err), err+ }+ if err := os.WriteFile(manifest.Outputs.GeneratedCover, imageBytes, 0644); err != nil {+ return coverFailureResponse(req, manifest, ErrorKindInternal, "write_cover_failed", err), err+ }++ manifest.MarkStage(StageCover, true, "")+ if err := manifest.Save(); err != nil {+ return coverFailureResponse(req, manifest, ErrorKindInternal, "save_manifest_failed", err), err+ }+ return coverResponse(true, req, manifest, nil), nil+}++func coverImageBytes(ctx context.Context, result image.GenerateResult) ([]byte, error) {+ if result.B64JSON != "" {+ return base64.StdEncoding.DecodeString(result.B64JSON)+ }+ if result.URL == "" {+ return nil, fmt.Errorf("cover generation response missing image data")+ }+ req, err := http.NewRequestWithContext(ctx, http.MethodGet, result.URL, nil)+ if err != nil {+ return nil, err+ }+ resp, err := http.DefaultClient.Do(req)+ if err != nil {+ return nil, err+ }+ defer resp.Body.Close()+ if resp.StatusCode < http.StatusOK || resp.StatusCode >= http.StatusMultipleChoices {+ return nil, fmt.Errorf("download generated cover failed: status %d", resp.StatusCode)+ }+ return io.ReadAll(resp.Body)+}++func coverManifest(req CoverRequest) (*Manifest, error) {+ if req.Workdir == "" {+ return nil, fmt.Errorf("cover requires --workdir")+ }+ manifest, err := LoadManifest(req.Workdir)+ if err == nil {+ return manifest, nil+ }+ if errors.Is(err, os.ErrNotExist) {+ return NewManifest(req.TaskID, req.Workdir), nil+ }+ return nil, err+}++func failCoverStage(req CoverRequest, manifest *Manifest, code string, err error) (Response, error) {+ if manifest != nil {+ manifest.MarkStage(StageCover, false, err.Error())+ _ = manifest.Save()+ }+ return coverFailureResponse(req, manifest, ErrorKindRetryable, code, err), err+}++func coverFailureResponse(req CoverRequest, manifest *Manifest, kind ErrorKind, code string, err error) Response {+ return coverResponse(false, req, manifest, &Error{+ Kind: kind,+ Code: code,+ Message: err.Error(),+ Retryable: kind == ErrorKindRetryable,+ })+}++func coverResponse(ok bool, req CoverRequest, manifest *Manifest, pipelineErr *Error) Response {+ resp := Response{+ OK: ok,+ Stage: StageCover,+ Workdir: req.Workdir,+ TaskID: req.TaskID,+ Error: pipelineErr,+ }+ if manifest != nil {+ resp.Workdir = manifest.Workdir+ resp.TaskID = manifest.TaskID+ resp.Outputs = manifest.Outputs+ resp.Warnings = manifest.Warnings+ resp.FailedIndexes = manifest.FailedIndexes+ }+ return resp+}diff --git a/internal/pipeline/cover_test.go b/internal/pipeline/cover_test.goindex d0b8f404..00402e58 100644--- a/internal/pipeline/cover_test.go+++ b/internal/pipeline/cover_test.go@@ -1,6 +1,13 @@package pipeline-import "testing"+import (+ "context"+ "encoding/base64"+ "os"+ "path/filepath"+ "strings"+ "testing"+)func TestRenderCoverPrompt(t *testing.T) {template := "{{title}}\n{{target_language}}\n{{style_hint}}"@@ -14,3 +21,65 @@ func TestRenderCoverPrompt(t *testing.T) {t.Fatalf("RenderCoverPrompt() = %q, want %q", got, want)}}++func TestGenerateCoverWritesPromptAndImage(t *testing.T) {+ dir := t.TempDir()+ fake := &fakeStageService{+ coverImageB64: base64.StdEncoding.EncodeToString([]byte("png-bytes")),+ }+ req := CoverRequest{+ Workdir: dir,+ TaskID: "demo",+ Prompt: "电影感科技封面,醒目中文标题",+ Size: "1536x1024",+ }++ resp, err := GenerateCover(context.Background(), fake, req)+ if err != nil {+ t.Fatalf("GenerateCover() error = %v", err)+ }+ if !resp.OK {+ t.Fatalf("OK = false, error = %#v", resp.Error)+ }+ if fake.lastCoverPrompt != req.Prompt {+ t.Fatalf("cover prompt = %q, want %q", fake.lastCoverPrompt, req.Prompt)+ }+ if fake.lastCoverSize != req.Size {+ t.Fatalf("cover size = %q, want %q", fake.lastCoverSize, req.Size)+ }++ promptData, err := os.ReadFile(filepath.Join(dir, "cover_prompt.final.txt"))+ if err != nil {+ t.Fatalf("prompt file not written: %v", err)+ }+ if string(promptData) != req.Prompt {+ t.Fatalf("prompt file = %q, want %q", string(promptData), req.Prompt)+ }+ imageData, err := os.ReadFile(filepath.Join(dir, "generated_cover.png"))+ if err != nil {+ t.Fatalf("cover image not written: %v", err)+ }+ if string(imageData) != "png-bytes" {+ t.Fatalf("cover image bytes = %q", string(imageData))+ }+ if !strings.HasSuffix(resp.Outputs.GeneratedCover, "generated_cover.png") {+ t.Fatalf("GeneratedCover = %q", resp.Outputs.GeneratedCover)+ }+}++func TestGenerateCoverRejectsEmptyPrompt(t *testing.T) {+ dir := t.TempDir()+ resp, err := GenerateCover(context.Background(), &fakeStageService{}, CoverRequest{+ Workdir: dir,+ TaskID: "demo",+ })+ if err == nil {+ t.Fatalf("GenerateCover() error = nil, want error")+ }+ if resp.OK {+ t.Fatalf("OK = true, want false")+ }+ if resp.Error == nil || resp.Error.Code != "prompt_required" {+ t.Fatalf("error = %#v, want prompt_required", resp.Error)+ }+}diff --git a/internal/pipeline/service_adapter.go b/internal/pipeline/service_adapter.goindex e14c6ebf..b5ab4dab 100644--- a/internal/pipeline/service_adapter.go+++ b/internal/pipeline/service_adapter.go@@ -4,6 +4,7 @@ import ("context""krillin-ai/internal/service""krillin-ai/internal/types"+ pkgimage "krillin-ai/pkg/image")type StageService interface {@@ -14,6 +15,7 @@ type StageService interface {DownloadYouTubeSubtitle(context.Context, *service.YoutubeSubtitleReq) (string, error)ProcessYouTubeSubtitle(context.Context, *service.YoutubeSubtitleReq) (string, error)RenderVideo(context.Context, service.RenderVideoRequest) (string, error)+ GenerateCoverImage(context.Context, pkgimage.GenerateRequest) (pkgimage.GenerateResult, error)}type ServiceAdapter struct {@@ -51,3 +53,7 @@ func (a *ServiceAdapter) ProcessYouTubeSubtitle(ctx context.Context, r *service.func (a *ServiceAdapter) RenderVideo(ctx context.Context, r service.RenderVideoRequest) (string, error) {return a.svc.RenderVideo(ctx, r)}++func (a *ServiceAdapter) GenerateCoverImage(ctx context.Context, r pkgimage.GenerateRequest) (pkgimage.GenerateResult, error) {+ return a.svc.GenerateCoverImage(ctx, r)+}diff --git a/internal/pipeline/subtitle_test.go b/internal/pipeline/subtitle_test.goindex 718fbc21..8a78c29f 100644--- a/internal/pipeline/subtitle_test.go+++ b/internal/pipeline/subtitle_test.go@@ -5,6 +5,7 @@ import ("errors""krillin-ai/internal/service""krillin-ai/internal/types"+ pkgimage "krillin-ai/pkg/image""testing")@@ -15,6 +16,9 @@ type fakeStageService struct {prepareVTT []boolprepareEmbedTypes []stringlastSpeech *types.SubtitleTaskStepParam+ lastCoverPrompt string+ lastCoverSize string+ coverImageB64 string}func (f *fakeStageService) PrepareMedia(_ context.Context, p *types.SubtitleTaskStepParam) error {@@ -53,6 +57,13 @@ func (f *fakeStageService) RenderVideo(context.Context, service.RenderVideoRequereturn "", nil}+func (f *fakeStageService) GenerateCoverImage(_ context.Context, req pkgimage.GenerateRequest) (pkgimage.GenerateResult, error) {+ f.calls = append(f.calls, "cover-image")+ f.lastCoverPrompt = req.Prompt+ f.lastCoverSize = req.Size+ return pkgimage.GenerateResult{B64JSON: f.coverImageB64}, nil+}+func TestGenerateSubtitlesFallsBackToAudioWhenAnySourceFails(t *testing.T) {dir := t.TempDir()fake := &fakeStageService{downloadErr: errors.New("no captions")}diff --git a/internal/service/dubbing/audio.go b/internal/service/dubbing/audio.goindex d3a1252e..929336fd 100644--- a/internal/service/dubbing/audio.go+++ b/internal/service/dubbing/audio.go@@ -85,6 +85,14 @@ func fittedSegmentPath(segmentsDir string, index int) string {return filepath.Join(segmentsDir, "fitted", fmt.Sprintf("%d.wav", index))}+func rawChunkPath(segmentsDir string, id int) string {+ return filepath.Join(segmentsDir, "raw", fmt.Sprintf("chunk_%d.wav", id))+}++func fittedChunkPath(segmentsDir string, id int) string {+ return filepath.Join(segmentsDir, "fitted", fmt.Sprintf("chunk_%d.wav", id))+}+func AssembleAudio(plan []PlanItem, segmentsDir, outputAudio string, run CommandRunner) error {if run == nil {run = defaultFFmpegRunner@@ -161,6 +169,76 @@ func AssembleAudio(plan []PlanItem, segmentsDir, outputAudio string, run Commandreturn nil}+func AssembleChunkAudio(plan []PlanItem, chunks []Chunk, segmentsDir, outputAudio string, run CommandRunner) error {+ if run == nil {+ run = defaultFFmpegRunner+ }+ filters, err := validateAssembleChunkPlan(plan, chunks, segmentsDir)+ if err != nil {+ return err+ }++ fittedDir := filepath.Join(segmentsDir, "fitted")+ if err := os.MkdirAll(fittedDir, 0755); err != nil {+ return err+ }++ concatLines := make([]string, 0, len(chunks)*2)+ lastEnd := 0.0+ for i, chunk := range chunks {+ raw := rawChunkPath(segmentsDir, chunk.ID)+ fitted := fittedChunkPath(segmentsDir, chunk.ID)+ if err := run([]string{+ "-y",+ "-i", raw,+ "-filter:a", filters[i],+ "-ar", "44100",+ "-ac", "1",+ "-c:a", "pcm_s16le",+ fitted,+ }); err != nil {+ return fmt.Errorf("fit chunk %d: %w", chunk.ID, err)+ }++ if chunk.Start > lastEnd {+ silence := filepath.Join(fittedDir, fmt.Sprintf("silence_chunk_%d.wav", chunk.ID))+ if err := run([]string{+ "-y",+ "-f", "lavfi",+ "-i", "anullsrc=channel_layout=mono:sample_rate=44100",+ "-t", fmt.Sprintf("%.3f", chunk.Start-lastEnd),+ "-ar", "44100",+ "-ac", "1",+ "-c:a", "pcm_s16le",+ silence,+ }); err != nil {+ return fmt.Errorf("write silence before chunk %d: %w", chunk.ID, err)+ }+ concatLines = append(concatLines, fmt.Sprintf("file '%s'", filepath.Base(silence)))+ }++ concatLines = append(concatLines, fmt.Sprintf("file '%s'", filepath.Base(fitted)))+ lastEnd = chunkFittedEnd(plan, chunk)+ }++ concatPath := filepath.Join(fittedDir, "concat.txt")+ if err := os.WriteFile(concatPath, []byte(strings.Join(concatLines, "\n")+"\n"), 0644); err != nil {+ return err+ }++ if err := run([]string{+ "-y",+ "-f", "concat",+ "-safe", "0",+ "-i", concatPath,+ "-c", "copy",+ outputAudio,+ }); err != nil {+ return fmt.Errorf("concat fitted audio: %w", err)+ }+ return nil+}+func validateAssemblePlan(plan []PlanItem, segmentsDir string) ([]string, error) {if len(plan) == 0 {return nil, fmt.Errorf("plan is empty")@@ -191,3 +269,68 @@ func validateAssemblePlan(plan []PlanItem, segmentsDir string) ([]string, error)}return filters, nil}++func validateAssembleChunkPlan(plan []PlanItem, chunks []Chunk, segmentsDir string) ([]string, error) {+ if len(plan) == 0 {+ return nil, fmt.Errorf("plan is empty")+ }+ if len(chunks) == 0 {+ return nil, fmt.Errorf("chunks are empty")+ }++ filters := make([]string, len(chunks))+ lastEnd := 0.0+ for i, chunk := range chunks {+ if len(chunk.Items) == 0 {+ return nil, fmt.Errorf("chunk %d has no items", chunk.ID)+ }+ if chunk.Start < lastEnd {+ return nil, fmt.Errorf("chunk %d starts before previous end: start %.3f lastEnd %.3f", chunk.ID, chunk.Start, lastEnd)+ }+ end := chunkFittedEnd(plan, chunk)+ if end <= chunk.Start {+ return nil, fmt.Errorf("chunk %d end must be greater than start: start %.3f end %.3f", chunk.ID, chunk.Start, end)+ }+ filter, err := buildAtempoFilter(chunkSpeedFactor(plan, chunk))+ if err != nil {+ return nil, err+ }+ filters[i] = filter++ raw := rawChunkPath(segmentsDir, chunk.ID)+ if err := ensureNonEmptyFile(raw, "raw chunk"); err != nil {+ return nil, err+ }+ lastEnd = end+ }+ return filters, nil+}++func chunkSpeedFactor(plan []PlanItem, chunk Chunk) float64 {+ if chunk.SpeedFactor > 0 {+ return chunk.SpeedFactor+ }+ for _, idx := range chunk.Items {+ if idx >= 0 && idx < len(plan) && plan[idx].SpeedFactor > 0 {+ return plan[idx].SpeedFactor+ }+ }+ return 1+}++func chunkFittedEnd(plan []PlanItem, chunk Chunk) float64 {+ end := 0.0+ for _, idx := range chunk.Items {+ if idx >= 0 && idx < len(plan) && plan[idx].NewEnd > end {+ end = plan[idx].NewEnd+ }+ }+ if end > 0 {+ return end+ }+ end = chunk.Start+ if chunk.End > end {+ end = chunk.End+ }+ return end+}diff --git a/internal/service/dubbing/audio_assemble_test.go b/internal/service/dubbing/audio_assemble_test.goindex 88c506df..187f1046 100644--- a/internal/service/dubbing/audio_assemble_test.go+++ b/internal/service/dubbing/audio_assemble_test.go@@ -155,3 +155,85 @@ func TestAssembleAudioRejectsEmptyPlan(t *testing.T) {t.Fatalf("runner calls = %d, want 0", calls)}}++func TestAssembleChunkAudioUsesOneRawFilePerChunk(t *testing.T) {+ dir := t.TempDir()+ rawDir := filepath.Join(dir, "raw")+ if err := os.MkdirAll(rawDir, 0755); err != nil {+ t.Fatal(err)+ }+ if err := os.WriteFile(filepath.Join(rawDir, "chunk_1.wav"), []byte("raw"), 0644); err != nil {+ t.Fatal(err)+ }+ plan := []PlanItem{+ {Index: 1, NewStart: 1, NewEnd: 2, SpeedFactor: 1, ChunkID: 1},+ {Index: 2, NewStart: 2, NewEnd: 4, SpeedFactor: 1, ChunkID: 1},+ }+ chunks := []Chunk{{ID: 1, Items: []int{0, 1}, Start: 1, End: 4, ActualDuration: 3, SpeedFactor: 1}}+ var fittedInputs []string++ err := AssembleChunkAudio(plan, chunks, dir, filepath.Join(dir, "out.wav"), func(args []string) error {+ for i, arg := range args {+ if arg == "-i" && i+1 < len(args) {+ fittedInputs = append(fittedInputs, args[i+1])+ }+ }+ return os.WriteFile(args[len(args)-1], []byte("media"), 0644)+ })+ if err != nil {+ t.Fatalf("AssembleChunkAudio() error = %v", err)+ }+ if len(fittedInputs) < 2 || !strings.Contains(fittedInputs[0], "chunk_1.wav") {+ t.Fatalf("fitted inputs = %+v, want first input raw chunk file", fittedInputs)+ }+ if strings.Contains(strings.Join(fittedInputs, " "), "raw/1.wav") || strings.Contains(strings.Join(fittedInputs, " "), "raw/2.wav") {+ t.Fatalf("fitted inputs = %+v, should not use item raw files for chunk mode", fittedInputs)+ }+ data, err := os.ReadFile(filepath.Join(dir, "fitted", "concat.txt"))+ if err != nil {+ t.Fatal(err)+ }+ if !strings.Contains(string(data), "silence_chunk_1.wav") || !strings.Contains(string(data), "chunk_1.wav") {+ t.Fatalf("concat list = %q", string(data))+ }+}++func TestAssembleChunkAudioPreservesGapAfterShortChunkAudio(t *testing.T) {+ dir := t.TempDir()+ rawDir := filepath.Join(dir, "raw")+ if err := os.MkdirAll(rawDir, 0755); err != nil {+ t.Fatal(err)+ }+ for _, name := range []string{"chunk_1.wav", "chunk_2.wav"} {+ if err := os.WriteFile(filepath.Join(rawDir, name), []byte("raw"), 0644); err != nil {+ t.Fatal(err)+ }+ }+ plan := []PlanItem{+ {Index: 1, NewStart: 0, NewEnd: 3, SpeedFactor: 1, ChunkID: 1},+ {Index: 2, NewStart: 7, NewEnd: 8, SpeedFactor: 1, ChunkID: 2},+ }+ chunks := []Chunk{+ {ID: 1, Items: []int{0}, Start: 0, End: 5, ActualDuration: 3, SpeedFactor: 1},+ {ID: 2, Items: []int{1}, Start: 7, End: 8, ActualDuration: 1, SpeedFactor: 1},+ }+ silenceDuration := ""++ err := AssembleChunkAudio(plan, chunks, dir, filepath.Join(dir, "out.wav"), func(args []string) error {+ out := args[len(args)-1]+ if strings.Contains(out, "silence_chunk_2.wav") {+ for i, arg := range args {+ if arg == "-t" && i+1 < len(args) {+ silenceDuration = args[i+1]+ }+ }+ }+ return os.WriteFile(out, []byte("media"), 0644)+ })+ if err != nil {+ t.Fatalf("AssembleChunkAudio() error = %v", err)+ }+ if silenceDuration != "4.000" {+ t.Fatalf("silence before second chunk = %q, want 4.000", silenceDuration)+ }+}diff --git a/internal/service/dubbing/fit.go b/internal/service/dubbing/fit.goindex 40fc3c85..9b2f2619 100644--- a/internal/service/dubbing/fit.go+++ b/internal/service/dubbing/fit.go@@ -2,32 +2,28 @@ package dubbingimport ("fmt"+ "strings")-func FitTimeline(plan []PlanItem, chunks []Chunk, cfg Config) ([]PlanItem, Report, error) {+func FitTimeline(plan []PlanItem, chunks []Chunk, cfg Config) ([]PlanItem, []Chunk, Report, error) {cfg = normalizeSpeedConfig(cfg)if !(cfg.SpeedMin > 0 && cfg.SpeedMin <= cfg.SpeedAccept && cfg.SpeedAccept <= cfg.SpeedMax) {- return nil, Report{}, fmt.Errorf("invalid speed config: min %.2f accept %.2f max %.2f", cfg.SpeedMin, cfg.SpeedAccept, cfg.SpeedMax)+ return nil, nil, Report{}, fmt.Errorf("invalid speed config: min %.2f accept %.2f max %.2f", cfg.SpeedMin, cfg.SpeedAccept, cfg.SpeedMax)}fitted := append([]PlanItem(nil), plan...)+ fittedChunks := append([]Chunk(nil), chunks...)report := Report{}- for _, chunk := range chunks {+ for chunkIndex, chunk := range fittedChunks {available := chunk.End - chunk.Startif available <= 0 {- return nil, report, fmt.Errorf("chunk %d has non-positive duration: %.3f", chunk.ID, available)+ return nil, nil, report, fmt.Errorf("chunk %d has non-positive duration: %.3f", chunk.ID, available)}- actual := 0.0- for itemIndex, idx := range chunk.Items {- if idx < 0 || idx >= len(fitted) {- return nil, report, fmt.Errorf("chunk %d references plan item %d out of range", chunk.ID, idx)- }- if fitted[idx].ActualDuration <= 0 {- return nil, report, fmt.Errorf("chunk %d item %d references plan index %d with non-positive actual duration: %.3f", chunk.ID, itemIndex, idx, fitted[idx].ActualDuration)- }- actual += fitted[idx].ActualDuration+ actual, err := chunkActualDuration(fitted, chunk)+ if err != nil {+ return nil, nil, report, err}speed := 1.0@@ -50,13 +46,12 @@ func FitTimeline(plan []PlanItem, chunks []Chunk, cfg Config) ([]PlanItem, Reporif appliedSpeed < cfg.SpeedMin {appliedSpeed = cfg.SpeedMin}+ fittedChunks[chunkIndex].SpeedFactor = appliedSpeed+ durations := allocateChunkDurations(fitted, chunk, actual, appliedSpeed)cursor := chunk.Start- for _, idx := range chunk.Items {- duration := fitted[idx].ActualDuration- if appliedSpeed > 0 {- duration = duration / appliedSpeed- }+ for i, idx := range chunk.Items {+ duration := durations[i]fitted[idx].NewStart = cursorfitted[idx].NewEnd = cursor + durationfitted[idx].SpeedFactor = appliedSpeed@@ -68,7 +63,73 @@ func FitTimeline(plan []PlanItem, chunks []Chunk, cfg Config) ([]PlanItem, Repor}}- return fitted, report, nil+ return fitted, fittedChunks, report, nil+}++func chunkActualDuration(plan []PlanItem, chunk Chunk) (float64, error) {+ if chunk.ActualDuration > 0 {+ for itemIndex, idx := range chunk.Items {+ if idx < 0 || idx >= len(plan) {+ return 0, fmt.Errorf("chunk %d references plan item %d out of range", chunk.ID, itemIndex)+ }+ }+ return chunk.ActualDuration, nil+ }++ actual := 0.0+ for itemIndex, idx := range chunk.Items {+ if idx < 0 || idx >= len(plan) {+ return 0, fmt.Errorf("chunk %d references plan item %d out of range", chunk.ID, itemIndex)+ }+ if plan[idx].ActualDuration <= 0 {+ return 0, fmt.Errorf("chunk %d item %d references plan index %d with non-positive actual duration: %.3f", chunk.ID, itemIndex, idx, plan[idx].ActualDuration)+ }+ actual += plan[idx].ActualDuration+ }+ return actual, nil+}++func allocateChunkDurations(plan []PlanItem, chunk Chunk, actual, speed float64) []float64 {+ durations := make([]float64, len(chunk.Items))+ if len(chunk.Items) == 0 {+ return durations+ }+ if speed <= 0 {+ speed = 1+ }++ total := actual / speed+ weights := make([]float64, len(chunk.Items))+ weightSum := 0.0+ useItemActual := chunk.ActualDuration <= 0+ for i, idx := range chunk.Items {+ weight := 0.0+ if useItemActual {+ weight = plan[idx].ActualDuration+ }+ if weight <= 0 {+ weight = plan[idx].EstimatedDuration+ }+ if weight <= 0 {+ weight = float64(len([]rune(strings.TrimSpace(plan[idx].SpokenText))))+ }+ if weight <= 0 {+ weight = 1+ }+ weights[i] = weight+ weightSum += weight+ }+ if weightSum <= 0 {+ even := total / float64(len(durations))+ for i := range durations {+ durations[i] = even+ }+ return durations+ }+ for i, weight := range weights {+ durations[i] = total * weight / weightSum+ }+ return durations}func normalizeSpeedConfig(cfg Config) Config {diff --git a/internal/service/dubbing/fit_test.go b/internal/service/dubbing/fit_test.goindex f4172bde..53a6ff87 100644--- a/internal/service/dubbing/fit_test.go+++ b/internal/service/dubbing/fit_test.go@@ -12,7 +12,7 @@ func TestFitTimelineProducesMonotonicTimesAndChunkSpeed(t *testing.T) {{Index: 2, OriginalStart: 1.1, OriginalEnd: 2, SpokenText: "二", ActualDuration: 0.8, ChunkID: 1},}chunks := []Chunk{{ID: 1, Items: []int{0, 1}, Start: 0, End: 2.5}}- got, report, err := FitTimeline(plan, chunks, cfg)+ got, _, report, err := FitTimeline(plan, chunks, cfg)if err != nil {t.Fatalf("FitTimeline() error = %v", err)}@@ -24,6 +24,32 @@ func TestFitTimelineProducesMonotonicTimesAndChunkSpeed(t *testing.T) {}}+func TestFitTimelineUsesChunkAudioAndEstimatedWeights(t *testing.T) {+ cfg := DefaultConfig()+ plan := []PlanItem{+ {Index: 1, EstimatedDuration: 1, ChunkID: 1},+ {Index: 2, EstimatedDuration: 3, ChunkID: 1},+ }+ chunks := []Chunk{{ID: 1, Items: []int{0, 1}, Start: 10, End: 15, ActualDuration: 4}}++ got, _, report, err := FitTimeline(plan, chunks, cfg)+ if err != nil {+ t.Fatalf("FitTimeline() error = %v", err)+ }+ if got[0].NewStart != 10 || got[0].NewEnd != 11 {+ t.Fatalf("first cue window = %.3f --> %.3f, want 10 --> 11", got[0].NewStart, got[0].NewEnd)+ }+ if got[1].NewStart != 11 || got[1].NewEnd != 14 {+ t.Fatalf("second cue window = %.3f --> %.3f, want 11 --> 14", got[1].NewStart, got[1].NewEnd)+ }+ if got[0].SpeedFactor != 1 || got[1].SpeedFactor != 1 {+ t.Fatalf("SpeedFactor = %.3f %.3f, want chunk speed 1", got[0].SpeedFactor, got[1].SpeedFactor)+ }+ if report.MaxSpeedFactor != 1 {+ t.Fatalf("MaxSpeedFactor = %v, want 1", report.MaxSpeedFactor)+ }+}+func TestFitTimelineClampsAppliedSpeedToMaxButReportsRequiredSpeed(t *testing.T) {cfg := DefaultConfig()cfg.SpeedMax = 1.25@@ -32,7 +58,7 @@ func TestFitTimelineClampsAppliedSpeedToMaxButReportsRequiredSpeed(t *testing.T){Index: 1, ActualDuration: 4, ChunkID: 1},}chunks := []Chunk{{ID: 1, Items: []int{0}, Start: 0, End: 2}}- got, report, err := FitTimeline(plan, chunks, cfg)+ got, _, report, err := FitTimeline(plan, chunks, cfg)if err != nil {t.Fatalf("FitTimeline() error = %v", err)}@@ -57,7 +83,7 @@ func TestFitTimelineRejectsNonPositiveActualDuration(t *testing.T) {{Index: 8, ActualDuration: 0, ChunkID: 3},}chunks := []Chunk{{ID: 3, Items: []int{0, 1}, Start: 0, End: 1}}- _, _, err := FitTimeline(plan, chunks, cfg)+ _, _, _, err := FitTimeline(plan, chunks, cfg)if err == nil {t.Fatal("FitTimeline() error = nil, want non-positive actual duration error")}@@ -76,7 +102,7 @@ func TestFitTimelineNormalizesZeroSpeedConfig(t *testing.T) {{Index: 1, ActualDuration: 1.2, ChunkID: 1},}chunks := []Chunk{{ID: 1, Items: []int{0}, Start: 0, End: 1}}- got, report, err := FitTimeline(plan, chunks, cfg)+ got, _, report, err := FitTimeline(plan, chunks, cfg)if err != nil {t.Fatalf("FitTimeline() error = %v", err)}@@ -97,7 +123,7 @@ func TestFitTimelineRejectsInvalidSpeedOrder(t *testing.T) {{Index: 1, ActualDuration: 1, ChunkID: 1},}chunks := []Chunk{{ID: 1, Items: []int{0}, Start: 0, End: 1}}- _, _, err := FitTimeline(plan, chunks, cfg)+ _, _, _, err := FitTimeline(plan, chunks, cfg)if err == nil {t.Fatal("FitTimeline() error = nil, want invalid speed config error")}diff --git a/internal/service/dubbing/runner.go b/internal/service/dubbing/runner.goindex a095babd..b0f78201 100644--- a/internal/service/dubbing/runner.go+++ b/internal/service/dubbing/runner.go@@ -76,12 +76,12 @@ func (r *Runner) Run(ctx context.Context) (Result, error) {return Result{}, err}- plan, err = GenerateRawSegments(ctx, r.deps.TTS, plan, r.deps.Voice, segmentsDir, r.deps.FFmpeg, r.deps.Duration)+ plan, chunks, err = GenerateRawChunkSegments(ctx, r.deps.TTS, plan, chunks, r.deps.Voice, segmentsDir, r.deps.FFmpeg, r.deps.Duration)if err != nil {return Result{}, err}- fitted, report, err := FitTimeline(plan, chunks, r.deps.Config)+ fitted, fittedChunks, report, err := FitTimeline(plan, chunks, r.deps.Config)if err != nil {return Result{}, err}@@ -100,7 +100,7 @@ func (r *Runner) Run(ctx context.Context) (Result, error) {if err := ensureParentDir(r.deps.OutputAudio); err != nil {return Result{}, err}- if err := AssembleAudio(fitted, segmentsDir, r.deps.OutputAudio, r.deps.FFmpeg); err != nil {+ if err := AssembleChunkAudio(fitted, fittedChunks, segmentsDir, r.deps.OutputAudio, r.deps.FFmpeg); err != nil {return Result{}, err}if err := ensureNonEmptyFile(r.deps.OutputAudio, "output audio"); err != nil {@@ -119,7 +119,7 @@ func (r *Runner) Run(ctx context.Context) (Result, error) {return Result{Plan: fitted,- Chunks: chunks,+ Chunks: fittedChunks,Report: report,DubSRT: dubSRT,Audio: r.deps.OutputAudio,diff --git a/internal/service/dubbing/tts.go b/internal/service/dubbing/tts.goindex 629fb858..428926b2 100644--- a/internal/service/dubbing/tts.go+++ b/internal/service/dubbing/tts.go@@ -7,6 +7,7 @@ import ("krillin-ai/internal/types""os""path/filepath"+ "strings")func GenerateRawSegments(ctx context.Context, tts types.Ttser, plan []PlanItem, voice, dir string, run CommandRunner, duration DurationProbe) ([]PlanItem, error) {@@ -54,6 +55,71 @@ func GenerateRawSegments(ctx context.Context, tts types.Ttser, plan []PlanItem,return plan, nil}+func GenerateRawChunkSegments(ctx context.Context, tts types.Ttser, plan []PlanItem, chunks []Chunk, voice, dir string, run CommandRunner, duration DurationProbe) ([]PlanItem, []Chunk, error) {+ if ctx == nil {+ ctx = context.Background()+ }+ if run == nil {+ run = defaultFFmpegRunner+ }+ if duration == nil {+ return nil, nil, errors.New("duration probe is required")+ }++ rawDir := filepath.Join(dir, "raw")+ if err := os.MkdirAll(rawDir, 0755); err != nil {+ return nil, nil, err+ }++ outPlan := append([]PlanItem(nil), plan...)+ outChunks := append([]Chunk(nil), chunks...)+ for i := range outChunks {+ if err := ctx.Err(); err != nil {+ return nil, nil, err+ }+ text, err := chunkSpeechText(outPlan, outChunks[i])+ if err != nil {+ return nil, nil, err+ }++ output := filepath.Join(rawDir, fmt.Sprintf("chunk_%d.wav", outChunks[i].ID))+ if IsSilenceOnlyText(text) {+ if err := WriteTinySilence(output, run); err != nil {+ return nil, nil, err+ }+ } else {+ if tts == nil {+ return nil, nil, errors.New("tts is required for non-silence text")+ }+ if err := retryTTS(tts, text, voice, output, 3); err != nil {+ return nil, nil, fmt.Errorf("tts chunk %d failed: %w", outChunks[i].ID, err)+ }+ }++ dur, err := duration(output)+ if err != nil {+ return nil, nil, fmt.Errorf("measure chunk %d duration failed for %s: %w", outChunks[i].ID, output, err)+ }+ outChunks[i].ActualDuration = dur+ }++ return outPlan, outChunks, nil+}++func chunkSpeechText(plan []PlanItem, chunk Chunk) (string, error) {+ parts := make([]string, 0, len(chunk.Items))+ for itemIndex, idx := range chunk.Items {+ if idx < 0 || idx >= len(plan) {+ return "", fmt.Errorf("chunk %d references plan item %d out of range", chunk.ID, itemIndex)+ }+ text := strings.Join(strings.Fields(plan[idx].SpokenText), " ")+ if text != "" {+ parts = append(parts, text)+ }+ }+ return strings.Join(parts, " "), nil+}+func retryTTS(tts types.Ttser, text, voice, output string, attempts int) error {if attempts <= 0 {return fmt.Errorf("attempts must be > 0: %d", attempts)diff --git a/internal/service/dubbing/tts_test.go b/internal/service/dubbing/tts_test.goindex 63387f9e..109c1994 100644--- a/internal/service/dubbing/tts_test.go+++ b/internal/service/dubbing/tts_test.go@@ -12,11 +12,13 @@ import (type fakeTTS struct {failures intcalls int+ texts []stringwriteOnReturn bool}func (f *fakeTTS) Text2Speech(text, voice, outputFile string) error {f.calls+++ f.texts = append(f.texts, text)if f.calls <= f.failures {return errors.New("tts failed")}@@ -86,3 +88,42 @@ func TestGenerateRawSegmentsWrapsDurationProbeError(t *testing.T) {t.Fatalf("GenerateRawSegments() error = %q, want segment index and output path", err)}}++func TestGenerateRawChunkSegmentsCallsTTSOncePerChunk(t *testing.T) {+ dir := t.TempDir()+ tts := &fakeTTS{writeOnReturn: true}+ plan := []PlanItem{+ {Index: 1, SpokenText: "我认为学习速记是一项技能"},+ {Index: 2, SpokenText: "它能够改变你的人生。"},+ {Index: 3, SpokenText: "学习是免费的。"},+ }+ chunks := []Chunk{+ {ID: 1, Items: []int{0, 1}, Start: 0, End: 5},+ {ID: 2, Items: []int{2}, Start: 6, End: 8},+ }++ gotPlan, gotChunks, err := GenerateRawChunkSegments(context.Background(), tts, plan, chunks, "voice", dir, nil, func(path string) (float64, error) {+ if strings.Contains(path, "chunk_1.wav") {+ return 3.2, nil+ }+ return 1.1, nil+ })+ if err != nil {+ t.Fatalf("GenerateRawChunkSegments() error = %v", err)+ }+ if tts.calls != 2 {+ t.Fatalf("TTS calls = %d, want one call per chunk", tts.calls)+ }+ if got := tts.texts[0]; got != "我认为学习速记是一项技能 它能够改变你的人生。" {+ t.Fatalf("first TTS text = %q", got)+ }+ if gotChunks[0].ActualDuration != 3.2 || gotChunks[1].ActualDuration != 1.1 {+ t.Fatalf("chunk durations = %+v", gotChunks)+ }+ if gotPlan[0].ActualDuration != 0 || gotPlan[1].ActualDuration != 0 {+ t.Fatalf("item actual durations should remain chunk-derived later: %+v", gotPlan)+ }+ if _, err := os.Stat(filepath.Join(dir, "raw", "chunk_1.wav")); err != nil {+ t.Fatalf("chunk raw file missing: %v", err)+ }+}diff --git a/internal/service/dubbing/types.go b/internal/service/dubbing/types.goindex 7ad45a24..d66083b6 100644--- a/internal/service/dubbing/types.go+++ b/internal/service/dubbing/types.go@@ -69,10 +69,12 @@ type PlanItem struct {}type Chunk struct {- ID int- Items []int- Start float64- End float64+ ID int+ Items []int+ Start float64+ End float64+ ActualDuration float64+ SpeedFactor float64}type Report struct {diff --git a/internal/service/init.go b/internal/service/init.goindex b9eae942..77c0de7b 100644--- a/internal/service/init.go+++ b/internal/service/init.go@@ -6,6 +6,7 @@ import ("krillin-ai/log""krillin-ai/pkg/aliyun""krillin-ai/pkg/fasterwhisper"+ pkgimage "krillin-ai/pkg/image""krillin-ai/pkg/localtts""krillin-ai/pkg/openai""krillin-ai/pkg/whisper"@@ -22,6 +23,7 @@ type Service struct {OssClient *aliyun.OssClientVoiceCloneClient *aliyun.VoiceCloneClientYouTubeSubtitleSrv *YouTubeSubtitleService+ ImageClient *pkgimage.OpenAICompatibleClient}func NewService() *Service {@@ -65,6 +67,7 @@ func NewService() *Service {TtsClient: ttsClient,OssClient: aliyun.NewOssClient(config.Conf.Transcribe.Aliyun.Oss.AccessKeyId, config.Conf.Transcribe.Aliyun.Oss.AccessKeySecret, config.Conf.Transcribe.Aliyun.Oss.Bucket),VoiceCloneClient: aliyun.NewVoiceCloneClient(config.Conf.Tts.Aliyun.Speech.AccessKeyId, config.Conf.Tts.Aliyun.Speech.AccessKeySecret, config.Conf.Tts.Aliyun.Speech.AppKey),+ ImageClient: pkgimage.NewOpenAICompatibleClient(config.Conf.Image.Openai.BaseUrl, config.Conf.Image.Openai.ApiKey, config.Conf.Image.Openai.Model),}s.YouTubeSubtitleSrv = NewYouTubeSubtitleService()diff --git a/internal/service/srt_embed.go b/internal/service/srt_embed.goindex 47051e17..7568d6d2 100644--- a/internal/service/srt_embed.go+++ b/internal/service/srt_embed.go@@ -427,7 +427,7 @@ func srtToAss(inputSRT, outputASS string, isHorizontal bool, stepParam *types.SusubtitleLines = append(subtitleLines, textLine)}- if len(subtitleLines) < 2 {+ if len(subtitleLines) == 0 {continue}//var majorTextLanguage types.StandardLanguageCode@@ -442,6 +442,11 @@ func srtToAss(inputSRT, outputASS string, isHorizontal bool, stepParam *types.Su// ASS条目startFormatted := formatTimestamp(startTime)endFormatted := formatTimestamp(endTime)+ if len(subtitleLines) == 1 {+ combinedText := fmt.Sprintf("{\\an2}{\\rMajor}%s", util.CleanPunction(subtitleLines[0]))+ _, _ = assFile.WriteString(fmt.Sprintf("Dialogue: 0,%s,%s,Major,,0,0,0,,%s\n", startFormatted, endFormatted, combinedText))+ continue+ }combinedText := fmt.Sprintf("{\\an2}{\\rMajor}%s\\N{\\rMinor}%s", subtitleLines[0], util.CleanPunction(subtitleLines[1]))_, _ = assFile.WriteString(fmt.Sprintf("Dialogue: 0,%s,%s,Major,,0,0,0,,%s\n", startFormatted, endFormatted, combinedText))}diff --git a/internal/service/srt_embed_test.go b/internal/service/srt_embed_test.goindex 0f5aea47..77434078 100644--- a/internal/service/srt_embed_test.go+++ b/internal/service/srt_embed_test.go@@ -71,6 +71,35 @@ func TestVerticalAssKeepsChineseLineInSingleDialogueWithLineBreak(t *testing.T)}}+func TestHorizontalAssKeepsSingleLineSubtitle(t *testing.T) {+ dir := t.TempDir()+ in := filepath.Join(dir, "single-line.srt")+ out := filepath.Join(dir, "single-line.ass")+ content := "1\n00:00:00,840 --> 00:00:02,900\n我认为学习速记是一项技能\n\n"+ if err := os.WriteFile(in, []byte(content), 0644); err != nil {+ t.Fatal(err)+ }++ err := srtToAss(in, out, true, &types.SubtitleTaskStepParam{TaskBasePath: dir})+ if err != nil {+ t.Fatalf("srtToAss() error = %v", err)+ }+ data, err := os.ReadFile(out)+ if err != nil {+ t.Fatal(err)+ }+ ass := string(data)+ if count := strings.Count(ass, "Dialogue:"); count != 1 {+ t.Fatalf("Dialogue count = %d, want 1; ass = %s", count, ass)+ }+ if !strings.Contains(ass, "{\\an2}{\\rMajor}我认为学习速记是一项技能") {+ t.Fatalf("single-line subtitle was not written as Major dialogue: %s", ass)+ }+ if strings.Contains(ass, "{\\rMinor}") {+ t.Fatalf("single-line subtitle should not include Minor style: %s", ass)+ }+}+func subtitleDisplayWidth(text string) int {width := 0for _, r := range text {diff --git a/internal/service/stage_exports.go b/internal/service/stage_exports.goindex 58d32d47..0a58075e 100644--- a/internal/service/stage_exports.go+++ b/internal/service/stage_exports.go@@ -4,9 +4,11 @@ import ("context""errors""krillin-ai/internal/types"+ pkgimage "krillin-ai/pkg/image")var ErrYouTubeSubtitleServiceNotInitialized = errors.New("youtube subtitle service not initialized")+var ErrImageClientNotInitialized = errors.New("image client not initialized")func (s Service) PrepareMedia(ctx context.Context, stepParam *types.SubtitleTaskStepParam) error {return s.linkToFile(ctx, stepParam)@@ -37,3 +39,10 @@ func (s Service) ProcessYouTubeSubtitle(ctx context.Context, req *YoutubeSubtitl}return s.YouTubeSubtitleSrv.processYouTubeSubtitle(ctx, req)}++func (s Service) GenerateCoverImage(ctx context.Context, req pkgimage.GenerateRequest) (pkgimage.GenerateResult, error) {+ if s.ImageClient == nil {+ return pkgimage.GenerateResult{}, ErrImageClientNotInitialized+ }+ return s.ImageClient.Generate(ctx, req)+}diff --git a/pkg/image/openai_compatible.go b/pkg/image/openai_compatible.goindex eb26fd9f..7eb96240 100644--- a/pkg/image/openai_compatible.go+++ b/pkg/image/openai_compatible.go@@ -19,6 +19,7 @@ type GenerateRequest struct {type GenerateResult struct {B64JSON string+ URL string}type OpenAICompatibleClient struct {@@ -46,10 +47,12 @@ func (c *OpenAICompatibleClient) Generate(ctx context.Context, req GenerateRequesize = "1024x1024"}body := map[string]string{- "model": c.model,- "prompt": req.Prompt,- "size": size,- "response_format": "b64_json",+ "model": c.model,+ "prompt": req.Prompt,+ "size": size,+ }+ if !strings.HasPrefix(c.model, "gpt-image-") {+ body["response_format"] = "b64_json"}data, err := json.Marshal(body)if err != nil {@@ -78,13 +81,14 @@ func (c *OpenAICompatibleClient) Generate(ctx context.Context, req GenerateRequevar parsed struct {Data []struct {B64JSON string `json:"b64_json"`+ URL string `json:"url"`} `json:"data"`}if err := json.Unmarshal(respBody, &parsed); err != nil {return GenerateResult{}, err}- if len(parsed.Data) == 0 || parsed.Data[0].B64JSON == "" {- return GenerateResult{}, fmt.Errorf("image generation response missing b64_json")+ if len(parsed.Data) == 0 || (parsed.Data[0].B64JSON == "" && parsed.Data[0].URL == "") {+ return GenerateResult{}, fmt.Errorf("image generation response missing b64_json or url")}- return GenerateResult{B64JSON: parsed.Data[0].B64JSON}, nil+ return GenerateResult{B64JSON: parsed.Data[0].B64JSON, URL: parsed.Data[0].URL}, nil}diff --git a/pkg/image/openai_compatible_test.go b/pkg/image/openai_compatible_test.goindex e9bd2003..8a7d0007 100644--- a/pkg/image/openai_compatible_test.go+++ b/pkg/image/openai_compatible_test.go@@ -22,7 +22,7 @@ func TestOpenAICompatibleGenerateSendsJSONRequest(t *testing.T) {}))defer server.Close()- client := NewOpenAICompatibleClient(server.URL, "test-key", "gpt-image-1")+ client := NewOpenAICompatibleClient(server.URL, "test-key", "dall-e-2")out, err := client.Generate(context.Background(), GenerateRequest{Prompt: "bilibili cover",Size: "1024x1024",@@ -39,7 +39,7 @@ func TestOpenAICompatibleGenerateSendsJSONRequest(t *testing.T) {if gotAuth != "Bearer test-key" {t.Fatalf("Authorization = %q", gotAuth)}- if gotBody["model"] != "gpt-image-1" {+ if gotBody["model"] != "dall-e-2" {t.Fatalf("model = %v", gotBody["model"])}if gotBody["prompt"] != "bilibili cover" {@@ -50,6 +50,42 @@ func TestOpenAICompatibleGenerateSendsJSONRequest(t *testing.T) {}}+func TestOpenAICompatibleGenerateOmitsResponseFormatForGPTImage(t *testing.T) {+ var gotBody map[string]any+ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ if err := json.NewDecoder(r.Body).Decode(&gotBody); err != nil {+ t.Fatalf("decode request: %v", err)+ }+ _, _ = w.Write([]byte(`{"data":[{"b64_json":"abc123"}]}`))+ }))+ defer server.Close()++ client := NewOpenAICompatibleClient(server.URL, "test-key", "gpt-image-1")+ _, err := client.Generate(context.Background(), GenerateRequest{Prompt: "cover"})+ if err != nil {+ t.Fatalf("Generate() error = %v", err)+ }+ if _, ok := gotBody["response_format"]; ok {+ t.Fatalf("response_format should be omitted for gpt-image models: %#v", gotBody)+ }+}++func TestOpenAICompatibleGenerateAcceptsURLResponse(t *testing.T) {+ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ _, _ = w.Write([]byte(`{"data":[{"url":"https://example.com/cover.png"}]}`))+ }))+ defer server.Close()++ client := NewOpenAICompatibleClient(server.URL, "test-key", "gpt-image-1")+ out, err := client.Generate(context.Background(), GenerateRequest{Prompt: "cover"})+ if err != nil {+ t.Fatalf("Generate() error = %v", err)+ }+ if out.URL != "https://example.com/cover.png" {+ t.Fatalf("URL = %q", out.URL)+ }+}+func TestOpenAICompatibleGenerateReturnsHTTPError(t *testing.T) {server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {http.Error(w, "bad request", http.StatusBadRequest)