Skip to content

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.

fix: tighten pipeline response json contract

wulien8dbbffa20abc
diff --git a/internal/pipeline/types.go b/internal/pipeline/types.go
index b191a0d9..697fca5c 100644
--- a/internal/pipeline/types.go
+++ b/internal/pipeline/types.go
@@ -1,5 +1,7 @@
package pipeline
+import "encoding/json"
+
type Stage string
const (
@@ -68,23 +70,23 @@ func ExitCodeForError(err *Error) int {
}
type Outputs struct {
- OriginVideo string `json:"origin_video,omitempty"`
- OriginAudio string `json:"origin_audio,omitempty"`
- OriginSRT string `json:"origin_srt,omitempty"`
- TargetSRT string `json:"target_srt,omitempty"`
- BilingualSRT string `json:"bilingual_srt,omitempty"`
- ShortOriginSRT string `json:"short_origin_srt,omitempty"`
- ShortMixedSRT string `json:"short_origin_mixed_srt,omitempty"`
- TTSAudio string `json:"tts_audio,omitempty"`
- VideoWithTTS string `json:"video_with_tts,omitempty"`
- HorizontalVideo string `json:"horizontal_video,omitempty"`
- VerticalVideo string `json:"vertical_video,omitempty"`
- TransferredVideo string `json:"transferred_vertical_video,omitempty"`
- OriginCover string `json:"origin_cover,omitempty"`
- GeneratedCover string `json:"generated_cover,omitempty"`
- FinalCoverPrompt string `json:"cover_prompt,omitempty"`
- OriginText string `json:"origin_text,omitempty"`
- TargetText string `json:"target_text,omitempty"`
+ OriginVideo string `json:"origin_video,omitempty"`
+ OriginAudio string `json:"origin_audio,omitempty"`
+ OriginSRT string `json:"origin_srt,omitempty"`
+ TargetSRT string `json:"target_srt,omitempty"`
+ BilingualSRT string `json:"bilingual_srt,omitempty"`
+ ShortOriginSRT string `json:"short_origin_srt,omitempty"`
+ ShortOriginMixedSRT string `json:"short_origin_mixed_srt,omitempty"`
+ TTSAudio string `json:"tts_audio,omitempty"`
+ VideoWithTTS string `json:"video_with_tts,omitempty"`
+ HorizontalVideo string `json:"horizontal_video,omitempty"`
+ VerticalVideo string `json:"vertical_video,omitempty"`
+ TransferredVideo string `json:"transferred_vertical_video,omitempty"`
+ OriginCover string `json:"origin_cover,omitempty"`
+ GeneratedCover string `json:"generated_cover,omitempty"`
+ FinalCoverPrompt string `json:"cover_prompt,omitempty"`
+ OriginText string `json:"origin_text,omitempty"`
+ TargetText string `json:"target_text,omitempty"`
}
type Response struct {
@@ -100,3 +102,19 @@ type Response struct {
Error *Error `json:"error,omitempty"`
DurationMS int64 `json:"duration_ms,omitempty"`
}
+
+func (r Response) MarshalJSON() ([]byte, error) {
+ type response Response
+ type responseWithOptionalOutputs struct {
+ response
+ Outputs *Outputs `json:"outputs,omitempty"`
+ }
+
+ resp := responseWithOptionalOutputs{
+ response: response(r),
+ }
+ if r.Outputs != (Outputs{}) {
+ resp.Outputs = &r.Outputs
+ }
+ return json.Marshal(resp)
+}
diff --git a/internal/pipeline/types_test.go b/internal/pipeline/types_test.go
index 5c1e6f4c..8a10bafb 100644
--- a/internal/pipeline/types_test.go
+++ b/internal/pipeline/types_test.go
@@ -12,9 +12,10 @@ func TestResponseJSONShape(t *testing.T) {
Workdir: "tasks/demo",
TaskID: "demo",
Outputs: Outputs{
- OriginSRT: "tasks/demo/origin_language_srt.srt",
- TargetSRT: "tasks/demo/target_language_srt.srt",
- BilingualSRT: "tasks/demo/bilingual_srt.srt",
+ OriginSRT: "tasks/demo/origin_language_srt.srt",
+ TargetSRT: "tasks/demo/target_language_srt.srt",
+ BilingualSRT: "tasks/demo/bilingual_srt.srt",
+ ShortOriginMixedSRT: "tasks/demo/short_origin_mixed_srt.srt",
},
Warnings: []string{"人工字幕未找到,使用自动字幕"},
DurationMS: 123,
@@ -39,20 +40,48 @@ func TestResponseJSONShape(t *testing.T) {
if outputs["bilingual_srt"] != "tasks/demo/bilingual_srt.srt" {
t.Fatalf("bilingual_srt = %v", outputs["bilingual_srt"])
}
+ if outputs["short_origin_mixed_srt"] != "tasks/demo/short_origin_mixed_srt.srt" {
+ t.Fatalf("short_origin_mixed_srt = %v", outputs["short_origin_mixed_srt"])
+ }
+}
+
+func TestResponseOmitsEmptyOutputs(t *testing.T) {
+ resp := Response{
+ OK: false,
+ Stage: StageSubtitle,
+ }
+
+ data, err := json.Marshal(resp)
+ if err != nil {
+ t.Fatalf("Marshal() error = %v", err)
+ }
+
+ var got map[string]any
+ if err := json.Unmarshal(data, &got); err != nil {
+ t.Fatalf("Unmarshal() error = %v", err)
+ }
+ if _, ok := got["outputs"]; ok {
+ t.Fatalf("outputs present for empty outputs: %v", got["outputs"])
+ }
}
func TestExitCodeForErrorKind(t *testing.T) {
cases := []struct {
+ name string
err *Error
want int
}{
- {&Error{Kind: ErrorKindUsage}, 1},
- {&Error{Kind: ErrorKindRetryable}, 2},
- {&Error{Kind: ErrorKindDependency}, 3},
+ {"nil", nil, 0},
+ {"usage", &Error{Kind: ErrorKindUsage}, 1},
+ {"retryable", &Error{Kind: ErrorKindRetryable}, 2},
+ {"dependency", &Error{Kind: ErrorKindDependency}, 3},
+ {"internal", &Error{Kind: ErrorKindInternal}, 1},
}
for _, tc := range cases {
- if got := ExitCodeForError(tc.err); got != tc.want {
- t.Fatalf("ExitCodeForError(%q) = %d, want %d", tc.err.Kind, got, tc.want)
- }
+ t.Run(tc.name, func(t *testing.T) {
+ if got := ExitCodeForError(tc.err); got != tc.want {
+ t.Fatalf("ExitCodeForError(%v) = %d, want %d", tc.err, got, tc.want)
+ }
+ })
}
}