feat: 完善模型请求适配与输出限制

2026-07-17 13:52:00 +08:00
parent a24eb1aeb0
commit 5ee267ecbd
31 changed files with 3287 additions and 232 deletions
@@ -74,12 +74,13 @@ func (c VolcesClient) runVideo(ctx context.Context, request Request, apiKey stri
 	submitStartedAt := time.Now()
 	submitRequestID := strings.TrimSpace(request.RemoteTaskID)
 	upstreamTaskID := strings.TrimSpace(request.RemoteTaskID)
+	taskPath := volcesVideoTaskPath(request)
 	if upstreamTaskID == "" {
 		body := volcesVideoBody(request)
 		if err := validateVolcesVideoTaskBody(body); err != nil {
 			return Response{}, err
 		}
-		submitResult, requestID, err := c.postJSON(ctx, request, request.Candidate.BaseURL, "/contents/generations/tasks", apiKey, body)
+		submitResult, requestID, err := c.postJSON(ctx, request, request.Candidate.BaseURL, taskPath, apiKey, body)
 		submitRequestID = requestID
 		if err != nil {
 			return Response{}, annotateResponseError(err, submitRequestID, submitStartedAt, time.Now())
@@ -112,7 +113,7 @@ func (c VolcesClient) runVideo(ctx context.Context, request Request, apiKey stri
 		}

 		pollStartedAt := time.Now()
-		pollResult, pollRequestID, err := c.getJSON(ctx, request, request.Candidate.BaseURL, "/contents/generations/tasks/"+upstreamTaskID, apiKey)
+		pollResult, pollRequestID, err := c.getJSON(ctx, request, request.Candidate.BaseURL, taskPath+"/"+upstreamTaskID, apiKey)
 		pollFinishedAt := time.Now()
 		requestID := firstNonEmpty(pollRequestID, submitRequestID, upstreamTaskID)
 		if err != nil {
@@ -159,6 +160,21 @@ func (c VolcesClient) runVideo(ctx context.Context, request Request, apiKey stri
 	}
 }

+func volcesVideoTaskPath(request Request) string {
+	path := firstNonEmptyStringValue(
+		request.Candidate.PlatformConfig,
+		"volcesVideoTaskPath",
+		"videoTaskPath",
+	)
+	if path == "" {
+		return "/contents/generations/tasks"
+	}
+	if !strings.HasPrefix(path, "/") {
+		path = "/" + path
+	}
+	return strings.TrimRight(path, "/")
+}
+
 func (c VolcesClient) postJSON(ctx context.Context, request Request, baseURL string, path string, apiKey string, body map[string]any) (map[string]any, string, error) {
 	raw, _ := json.Marshal(body)
 	req, err := http.NewRequestWithContext(ctx, http.MethodPost, joinURL(baseURL, path), bytes.NewReader(raw))
@@ -173,7 +189,11 @@ func (c VolcesClient) postJSON(ctx context.Context, request Request, baseURL str
 	}
 	requestID := requestIDFromHTTPResponse(resp)
 	result, err := decodeHTTPResponse(resp)
-	return result, requestID, err
+	if err != nil {
+		return result, requestID, err
+	}
+	result, envelopeRequestID, err := normalizeVolcesCompatibleResult(result)
+	return result, firstNonEmpty(requestID, envelopeRequestID), err
 }

 func (c VolcesClient) getJSON(ctx context.Context, request Request, baseURL string, path string, apiKey string) (map[string]any, string, error) {
@@ -188,7 +208,64 @@ func (c VolcesClient) getJSON(ctx context.Context, request Request, baseURL stri
 	}
 	requestID := requestIDFromHTTPResponse(resp)
 	result, err := decodeHTTPResponse(resp)
-	return result, requestID, err
+	if err != nil {
+		return result, requestID, err
+	}
+	result, envelopeRequestID, err := normalizeVolcesCompatibleResult(result)
+	return result, firstNonEmpty(requestID, envelopeRequestID), err
+}
+
+func normalizeVolcesCompatibleResult(result map[string]any) (map[string]any, string, error) {
+	requestID := firstNonEmpty(
+		stringFromAny(result["request_id"]),
+		stringFromAny(result["requestId"]),
+	)
+	if errorObject, ok := result["error"].(map[string]any); ok {
+		code := firstNonEmpty(
+			stringFromAny(errorObject["code"]),
+			stringFromAny(errorObject["type"]),
+			"volces_compatible_error",
+		)
+		message := strings.TrimSpace(stringFromAny(errorObject["message"]))
+		if message == "" {
+			message = "volces compatible request failed"
+		}
+		return result, requestID, &ClientError{
+			Code:      code,
+			Message:   message,
+			RequestID: requestID,
+			Retryable: false,
+		}
+	}
+	rawCode, hasCode := result["code"]
+	if !hasCode {
+		return result, requestID, nil
+	}
+	code, validCode := volcesIntFromAny(rawCode)
+	if !validCode {
+		return result, requestID, nil
+	}
+	if code != 0 {
+		message := strings.TrimSpace(stringFromAny(result["message"]))
+		if message == "" {
+			message = fmt.Sprintf("volces compatible request failed with code %d", code)
+		}
+		return result, requestID, &ClientError{
+			Code:      fmt.Sprintf("volces_%d", code),
+			Message:   message,
+			RequestID: requestID,
+			Retryable: false,
+		}
+	}
+	data, ok := result["data"].(map[string]any)
+	if !ok {
+		return result, requestID, nil
+	}
+	normalized := cloneBody(data)
+	if requestID != "" && requestIDFromResult(normalized) == "" {
+		normalized["request_id"] = requestID
+	}
+	return normalized, requestID, nil
 }

 func volcesImageBody(request Request) map[string]any {