fix(backend): 分镜生成 - 合并流式保活与超时调整 (#172)
保留主分支图片能力配置,并合入 PR #172 的上游 SSE 保活实现。 Co-authored-by: yepwait <1239738103@qq.com>
This commit is contained in:
commit
1aeaf2aba3
4 files changed
+232
-29
No files matched your search
@@ -1,6 +1,7 @@
|
|||||||
package service
|
package service
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bufio"
|
||||||
"bytes"
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
@@ -34,6 +35,7 @@ type canvasGenerationInput struct {
|
|||||||
Mask *providerMedia `json:"mask"`
|
Mask *providerMedia `json:"mask"`
|
||||||
Metadata map[string]interface{} `json:"metadata"`
|
Metadata map[string]interface{} `json:"metadata"`
|
||||||
ImageCapability *ImageCapabilityConfig `json:"-"`
|
ImageCapability *ImageCapabilityConfig `json:"-"`
|
||||||
|
StreamText bool `json:"-"` // 分镜请求使用上游 SSE 保活;最终结构仍在流结束后统一校验。
|
||||||
VideoCapability *VideoCapabilityConfig `json:"-"`
|
VideoCapability *VideoCapabilityConfig `json:"-"`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -855,13 +857,13 @@ func runTextTask(ctx context.Context, input canvasGenerationInput) (map[string]i
|
|||||||
}
|
}
|
||||||
|
|
||||||
func runLegacyTextTask(ctx context.Context, input canvasGenerationInput) (map[string]interface{}, error) {
|
func runLegacyTextTask(ctx context.Context, input canvasGenerationInput) (map[string]interface{}, error) {
|
||||||
var payload map[string]interface{}
|
|
||||||
responseInput, err := textResponseInput(input)
|
responseInput, err := textResponseInput(input)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
body := map[string]interface{}{"model": input.Config.Model, "input": responseInput}
|
body := map[string]interface{}{"model": input.Config.Model, "input": responseInput}
|
||||||
if err := postJSON(ctx, input.Config, "/responses", body, &payload); err != nil {
|
text, err := requestTextProvider(ctx, input.Config, "/responses", body, "responses", input.StreamText)
|
||||||
|
if err != nil {
|
||||||
if !shouldFallbackTextToChat(err) {
|
if !shouldFallbackTextToChat(err) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -871,37 +873,23 @@ func runLegacyTextTask(ctx context.Context, input canvasGenerationInput) (map[st
|
|||||||
}
|
}
|
||||||
return nil, fmt.Errorf("文本接口请求失败:Responses API %v;Chat Completions %v", err, chatErr)
|
return nil, fmt.Errorf("文本接口请求失败:Responses API %v;Chat Completions %v", err, chatErr)
|
||||||
}
|
}
|
||||||
text := stringField(payload, "output_text")
|
|
||||||
if text == "" {
|
|
||||||
text = extractResponseText(payload)
|
|
||||||
}
|
|
||||||
if text == "" {
|
|
||||||
return nil, errors.New("文本接口没有返回内容")
|
|
||||||
}
|
|
||||||
return map[string]interface{}{"mode": "text", "text": text}, nil
|
return map[string]interface{}{"mode": "text", "text": text}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func runResponsesTextTask(ctx context.Context, input canvasGenerationInput) (map[string]interface{}, error) {
|
func runResponsesTextTask(ctx context.Context, input canvasGenerationInput) (map[string]interface{}, error) {
|
||||||
var payload map[string]interface{}
|
|
||||||
responseInput, err := textResponseInput(input)
|
responseInput, err := textResponseInput(input)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if err := postJSON(ctx, input.Config, "/responses", map[string]interface{}{"model": input.Config.Model, "input": responseInput}, &payload); err != nil {
|
body := map[string]interface{}{"model": input.Config.Model, "input": responseInput}
|
||||||
|
text, err := requestTextProvider(ctx, input.Config, "/responses", body, "responses", input.StreamText)
|
||||||
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
text := stringField(payload, "output_text")
|
|
||||||
if text == "" {
|
|
||||||
text = extractResponseText(payload)
|
|
||||||
}
|
|
||||||
if text == "" {
|
|
||||||
return nil, errors.New("文本接口没有返回内容")
|
|
||||||
}
|
|
||||||
return map[string]interface{}{"mode": "text", "text": text}, nil
|
return map[string]interface{}{"mode": "text", "text": text}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func runChatCompletionsTextTask(ctx context.Context, input canvasGenerationInput) (map[string]interface{}, error) {
|
func runChatCompletionsTextTask(ctx context.Context, input canvasGenerationInput) (map[string]interface{}, error) {
|
||||||
var payload map[string]interface{}
|
|
||||||
messages := []map[string]interface{}{}
|
messages := []map[string]interface{}{}
|
||||||
if systemPrompt := strings.TrimSpace(input.Config.SystemPrompt); systemPrompt != "" {
|
if systemPrompt := strings.TrimSpace(input.Config.SystemPrompt); systemPrompt != "" {
|
||||||
messages = append(messages, map[string]interface{}{"role": "system", "content": systemPrompt})
|
messages = append(messages, map[string]interface{}{"role": "system", "content": systemPrompt})
|
||||||
@@ -912,13 +900,10 @@ func runChatCompletionsTextTask(ctx context.Context, input canvasGenerationInput
|
|||||||
}
|
}
|
||||||
messages = append(messages, map[string]interface{}{"role": "user", "content": userContent})
|
messages = append(messages, map[string]interface{}{"role": "user", "content": userContent})
|
||||||
body := map[string]interface{}{"model": input.Config.Model, "messages": messages}
|
body := map[string]interface{}{"model": input.Config.Model, "messages": messages}
|
||||||
if err := postJSON(ctx, input.Config, "/chat/completions", body, &payload); err != nil {
|
text, err := requestTextProvider(ctx, input.Config, "/chat/completions", body, "chat-completion", input.StreamText)
|
||||||
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
text := extractChatCompletionText(payload)
|
|
||||||
if text == "" {
|
|
||||||
return nil, errors.New("文本接口没有返回内容")
|
|
||||||
}
|
|
||||||
return map[string]interface{}{"mode": "text", "text": text}, nil
|
return map[string]interface{}{"mode": "text", "text": text}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2163,6 +2148,170 @@ func runSeedanceAgentPlanVideoTask(ctx context.Context, input canvasGenerationIn
|
|||||||
return nil, fmt.Errorf("%s视频生成超时", providerName)
|
return nil, fmt.Errorf("%s视频生成超时", providerName)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func requestTextProvider(ctx context.Context, config providerConfig, path string, body map[string]interface{}, protocol string, stream bool) (string, error) {
|
||||||
|
if stream {
|
||||||
|
return postStreamingText(ctx, config, path, body, protocol)
|
||||||
|
}
|
||||||
|
var payload map[string]interface{}
|
||||||
|
if err := postJSON(ctx, config, path, body, &payload); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
text := extractTextPayload(payload, protocol)
|
||||||
|
if text == "" {
|
||||||
|
return "", errors.New("文本接口没有返回内容")
|
||||||
|
}
|
||||||
|
return text, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func postStreamingText(ctx context.Context, config providerConfig, path string, body map[string]interface{}, protocol string) (string, error) {
|
||||||
|
// 只把分镜规划/修复切到上游 SSE,完整 JSON 仍在流结束后校验,避免半截结构污染画布。
|
||||||
|
body["stream"] = true
|
||||||
|
data, mimeType, err := postStreamingBinary(ctx, config, path, body)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if !strings.Contains(strings.ToLower(mimeType), "event-stream") {
|
||||||
|
var payload map[string]interface{}
|
||||||
|
if err := json.Unmarshal(data, &payload); err != nil {
|
||||||
|
return "", fmt.Errorf("流式文本接口返回格式无效:%w", err)
|
||||||
|
}
|
||||||
|
if err := validateTextPayload(payload); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
text := extractTextPayload(payload, protocol)
|
||||||
|
if text == "" {
|
||||||
|
return "", errors.New("文本接口没有返回内容")
|
||||||
|
}
|
||||||
|
return text, nil
|
||||||
|
}
|
||||||
|
return parseTextEventStream(data, protocol)
|
||||||
|
}
|
||||||
|
|
||||||
|
func extractTextPayload(payload map[string]interface{}, protocol string) string {
|
||||||
|
if protocol == "responses" {
|
||||||
|
text := stringField(payload, "output_text")
|
||||||
|
if text == "" {
|
||||||
|
text = extractResponseText(payload)
|
||||||
|
}
|
||||||
|
return text
|
||||||
|
}
|
||||||
|
return extractChatCompletionText(payload)
|
||||||
|
}
|
||||||
|
|
||||||
|
func validateTextPayload(payload map[string]interface{}) error {
|
||||||
|
if code, ok := payload["code"].(float64); ok && code != 0 {
|
||||||
|
return errors.New(defaultString(stringField(payload, "msg"), "请求失败"))
|
||||||
|
}
|
||||||
|
if errValue, ok := payload["error"].(map[string]interface{}); ok {
|
||||||
|
if message := stringField(errValue, "message"); message != "" {
|
||||||
|
return errors.New(message)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseTextEventStream(data []byte, protocol string) (string, error) {
|
||||||
|
scanner := bufio.NewScanner(bytes.NewReader(data))
|
||||||
|
scanner.Buffer(make([]byte, 64<<10), len(data)+1)
|
||||||
|
var text strings.Builder
|
||||||
|
var eventName string
|
||||||
|
var dataLines []string
|
||||||
|
|
||||||
|
flush := func() error {
|
||||||
|
if len(dataLines) == 0 {
|
||||||
|
eventName = ""
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
raw := strings.TrimSpace(strings.Join(dataLines, "\n"))
|
||||||
|
dataLines = nil
|
||||||
|
if raw == "" || raw == "[DONE]" {
|
||||||
|
eventName = ""
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
var payload map[string]interface{}
|
||||||
|
if err := json.Unmarshal([]byte(raw), &payload); err != nil {
|
||||||
|
return fmt.Errorf("流式文本事件解析失败:%w", err)
|
||||||
|
}
|
||||||
|
if eventName == "error" {
|
||||||
|
if err := validateTextPayload(payload); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return errors.New("上游流式文本请求失败")
|
||||||
|
}
|
||||||
|
if err := validateTextPayload(payload); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if protocol == "responses" {
|
||||||
|
text.WriteString(stringField(payload, "delta"))
|
||||||
|
} else {
|
||||||
|
choices, _ := payload["choices"].([]interface{})
|
||||||
|
for _, choice := range choices {
|
||||||
|
record, _ := choice.(map[string]interface{})
|
||||||
|
delta, _ := record["delta"].(map[string]interface{})
|
||||||
|
text.WriteString(streamContentText(delta["content"]))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
eventName = ""
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
for scanner.Scan() {
|
||||||
|
line := strings.TrimSuffix(scanner.Text(), "\r")
|
||||||
|
if line == "" {
|
||||||
|
if err := flush(); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
switch {
|
||||||
|
case strings.HasPrefix(line, "event:"):
|
||||||
|
eventName = strings.TrimSpace(strings.TrimPrefix(line, "event:"))
|
||||||
|
case strings.HasPrefix(line, "data:"):
|
||||||
|
value := strings.TrimPrefix(line, "data:")
|
||||||
|
dataLines = append(dataLines, strings.TrimPrefix(value, " "))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := scanner.Err(); err != nil {
|
||||||
|
return "", fmt.Errorf("读取流式文本响应失败:%w", err)
|
||||||
|
}
|
||||||
|
if err := flush(); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if text.Len() == 0 {
|
||||||
|
return "", errors.New("流式文本接口没有返回内容")
|
||||||
|
}
|
||||||
|
return text.String(), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func streamContentText(value interface{}) string {
|
||||||
|
if text, ok := value.(string); ok {
|
||||||
|
return text
|
||||||
|
}
|
||||||
|
parts, ok := value.([]interface{})
|
||||||
|
if !ok {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
var result strings.Builder
|
||||||
|
for _, part := range parts {
|
||||||
|
record, _ := part.(map[string]interface{})
|
||||||
|
result.WriteString(stringField(record, "text"))
|
||||||
|
}
|
||||||
|
return result.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
func postStreamingBinary(ctx context.Context, config providerConfig, path string, body interface{}) ([]byte, string, error) {
|
||||||
|
data, _ := json.Marshal(body)
|
||||||
|
req, err := http.NewRequestWithContext(ctx, http.MethodPost, apiURL(config.BaseURL, path), bytes.NewReader(data))
|
||||||
|
if err != nil {
|
||||||
|
return nil, "", err
|
||||||
|
}
|
||||||
|
req.Header.Set("Authorization", "Bearer "+config.APIKey)
|
||||||
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
req.Header.Set("Accept", "text/event-stream")
|
||||||
|
ApplyOutboundHeaders(req, config.Headers)
|
||||||
|
return doBinary(req)
|
||||||
|
}
|
||||||
|
|
||||||
func postJSON(ctx context.Context, config providerConfig, path string, body interface{}, target interface{}) error {
|
func postJSON(ctx context.Context, config providerConfig, path string, body interface{}, target interface{}) error {
|
||||||
data, _ := json.Marshal(body)
|
data, _ := json.Marshal(body)
|
||||||
req, err := http.NewRequestWithContext(ctx, http.MethodPost, apiURL(config.BaseURL, path), bytes.NewReader(data))
|
req, err := http.NewRequestWithContext(ctx, http.MethodPost, apiURL(config.BaseURL, path), bytes.NewReader(data))
|
||||||
|
|||||||
@@ -55,6 +55,60 @@ func TestWriteMediaPartSanitizesFilenameAndSetsMimeType(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestParseTextEventStreamSupportsResponsesAndChat(t *testing.T) {
|
||||||
|
responses := []byte(`event: response.output_text.delta
|
||||||
|
data: {"delta":"{\"title\":\"分镜\"}"}
|
||||||
|
|
||||||
|
event: response.output_text.delta
|
||||||
|
data: {"delta":"}"}
|
||||||
|
|
||||||
|
data: [DONE]
|
||||||
|
|
||||||
|
`)
|
||||||
|
if got, err := parseTextEventStream(responses, "responses"); err != nil || got != `{"title":"分镜"}` {
|
||||||
|
t.Fatalf("Responses stream = %q, err = %v", got, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
chat := []byte(`data: {"choices":[{"delta":{"content":"第一镜"}}]}
|
||||||
|
|
||||||
|
data: {"choices":[{"delta":{"content":":远景"}}]}
|
||||||
|
|
||||||
|
data: [DONE]
|
||||||
|
|
||||||
|
`)
|
||||||
|
if got, err := parseTextEventStream(chat, "chat-completion"); err != nil || got != "第一镜:远景" {
|
||||||
|
t.Fatalf("Chat stream = %q, err = %v", got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPostStreamingTextSetsStreamHeaders(t *testing.T) {
|
||||||
|
t.Setenv("CANVAS_ALLOW_PRIVATE_UPSTREAMS", "true")
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if got := r.Header.Get("Accept"); got != "text/event-stream" {
|
||||||
|
t.Errorf("Accept = %q", got)
|
||||||
|
}
|
||||||
|
var body map[string]interface{}
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
|
||||||
|
t.Errorf("decode request body: %v", err)
|
||||||
|
}
|
||||||
|
if stream, ok := body["stream"].(bool); !ok || !stream {
|
||||||
|
t.Errorf("stream body field = %#v", body["stream"])
|
||||||
|
}
|
||||||
|
w.Header().Set("Content-Type", "text/event-stream; charset=utf-8")
|
||||||
|
_, _ = w.Write([]byte(`data: {"choices":[{"delta":{"content":"流式分镜"}}]}
|
||||||
|
|
||||||
|
data: [DONE]
|
||||||
|
|
||||||
|
`))
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
got, err := postStreamingText(context.Background(), providerConfig{BaseURL: server.URL, APIKey: "test-key"}, "/chat/completions", map[string]interface{}{"model": "test-model"}, "chat-completion")
|
||||||
|
if err != nil || got != "流式分镜" {
|
||||||
|
t.Fatalf("postStreamingText() = %q, err = %v", got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestProviderHTTPErrorWarnsAboutUncertain524Billing(t *testing.T) {
|
func TestProviderHTTPErrorWarnsAboutUncertain524Billing(t *testing.T) {
|
||||||
message := (providerHTTPError{StatusCode: 524, Status: "524 A Timeout Occurred"}).Error()
|
message := (providerHTTPError{StatusCode: 524, Status: "524 A Timeout Occurred"}).Error()
|
||||||
if !strings.Contains(message, "可能仍在服务端执行并产生费用") || !strings.Contains(message, "请勿立即重试") {
|
if !strings.Contains(message, "可能仍在服务端执行并产生费用") || !strings.Contains(message, "请勿立即重试") {
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ func defaultRuntimePolicy() RuntimePolicySetting {
|
|||||||
TextTimeoutMinutes: 8,
|
TextTimeoutMinutes: 8,
|
||||||
AudioTimeoutMinutes: 8,
|
AudioTimeoutMinutes: 8,
|
||||||
VideoTimeoutMinutes: 30,
|
VideoTimeoutMinutes: 30,
|
||||||
StoryboardTimeoutMinutes: 12,
|
StoryboardTimeoutMinutes: 20,
|
||||||
DefaultTimeoutMinutes: 10,
|
DefaultTimeoutMinutes: 10,
|
||||||
},
|
},
|
||||||
Request: RuntimeRequestPolicy{
|
Request: RuntimeRequestPolicy{
|
||||||
|
|||||||
@@ -1135,7 +1135,7 @@ func (s *Service) processAgentStoryboardTask(ctx context.Context, task model.Tas
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
result, err := runTextTask(ctx, canvasGenerationInput{Mode: "text", Prompt: plannerPrompt, Config: config})
|
result, err := runTextTask(ctx, canvasGenerationInput{Mode: "text", Prompt: plannerPrompt, Config: config, StreamText: true})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
@@ -1150,7 +1150,7 @@ func (s *Service) processAgentStoryboardTask(ctx context.Context, task model.Tas
|
|||||||
if promptErr != nil {
|
if promptErr != nil {
|
||||||
return nil, nil, promptErr
|
return nil, nil, promptErr
|
||||||
}
|
}
|
||||||
repaired, repairErr := runTextTask(withProviderRequestKind(ctx, "repair"), canvasGenerationInput{Mode: "text", Prompt: repairPrompt, Config: config})
|
repaired, repairErr := runTextTask(withProviderRequestKind(ctx, "repair"), canvasGenerationInput{Mode: "text", Prompt: repairPrompt, Config: config, StreamText: true})
|
||||||
if repairErr != nil {
|
if repairErr != nil {
|
||||||
return nil, nil, fmt.Errorf("分镜结构修复失败:%w", repairErr)
|
return nil, nil, fmt.Errorf("分镜结构修复失败:%w", repairErr)
|
||||||
}
|
}
|
||||||
@@ -1191,7 +1191,7 @@ func (s *Service) processStoryboardRowsTask(ctx context.Context, task model.Task
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
result, err := runTextTask(ctx, canvasGenerationInput{Mode: "text", Prompt: plannerPrompt, Config: config})
|
result, err := runTextTask(ctx, canvasGenerationInput{Mode: "text", Prompt: plannerPrompt, Config: config, StreamText: true})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
@@ -1206,7 +1206,7 @@ func (s *Service) processStoryboardRowsTask(ctx context.Context, task model.Task
|
|||||||
if promptErr != nil {
|
if promptErr != nil {
|
||||||
return nil, nil, promptErr
|
return nil, nil, promptErr
|
||||||
}
|
}
|
||||||
repaired, repairErr := runTextTask(withProviderRequestKind(ctx, "repair"), canvasGenerationInput{Mode: "text", Prompt: repairPrompt, Config: config})
|
repaired, repairErr := runTextTask(withProviderRequestKind(ctx, "repair"), canvasGenerationInput{Mode: "text", Prompt: repairPrompt, Config: config, StreamText: true})
|
||||||
if repairErr != nil {
|
if repairErr != nil {
|
||||||
return nil, nil, fmt.Errorf("分镜结构修复失败:%w", repairErr)
|
return nil, nil, fmt.Errorf("分镜结构修复失败:%w", repairErr)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user