fix(provider): 修正媒体请求转换与上游错误透传
按上游协议能力延迟处理媒体资源:OpenAI 兼容平台默认使用 multipart,显式配置后才发送 JSON URL;Gemini 官方协议使用 Files API,兼容协议使用内嵌 Base64,并同步覆盖相关媒体客户端。\n\n安全的上游 400/422 原始错误会作为下游 message 返回,同时保留结构化诊断信息和历史任务兼容。\n\n验证:API 全量无缓存测试、go vet、pnpm lint、pnpm test、pnpm build、pnpm openapi、git diff --check。
This commit is contained in:
@@ -47,6 +47,25 @@ func TestPublicHTTPErrorReportsSourceAndPreservesSafeUpstreamStatus(t *testing.T
|
||||
}
|
||||
}
|
||||
|
||||
func TestPublicHTTPErrorIncludesSafeUpstreamParameterMessage(t *testing.T) {
|
||||
raw := "Duplicate parameter: 'image'. Use image[]=<value> for multiple values."
|
||||
recorder := httptest.NewRecorder()
|
||||
writeProtocolError(recorder, clients.ProtocolOpenAIImages, http.StatusBadRequest, raw, nil, "http_400")
|
||||
if recorder.Code != http.StatusBadRequest {
|
||||
t.Fatalf("status = %d, want 400; body=%s", recorder.Code, recorder.Body.String())
|
||||
}
|
||||
var body map[string]any
|
||||
if err := json.Unmarshal(recorder.Body.Bytes(), &body); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
errorPayload := requireObject(t, body["error"])
|
||||
details := requireObject(t, errorPayload["details"])
|
||||
upstream := requireObject(t, details["upstreamError"])
|
||||
if errorPayload["message"] != raw || upstream["message"] != raw || upstream["code"] != "http_400" || upstream["statusCode"] != float64(http.StatusBadRequest) {
|
||||
t.Fatalf("unexpected upstream error details: %+v", body)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPublicGatewayTaskSanitizesCopyAndKeepsRawAuditFields(t *testing.T) {
|
||||
rawMessage := `404 page not found: {"privateProject":"secret"}`
|
||||
task := store.GatewayTask{
|
||||
@@ -75,6 +94,40 @@ func TestPublicGatewayTaskSanitizesCopyAndKeepsRawAuditFields(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestPublicGatewayTaskForwardsSafeUpstreamParameterMessage(t *testing.T) {
|
||||
raw := "Duplicate parameter: 'image'. Use image[]=<value> for multiple values."
|
||||
legacy := publicerror.Error{
|
||||
Code: "upstream_invalid_request",
|
||||
Message: "The upstream service rejected the request parameters.",
|
||||
Category: "upstream",
|
||||
Source: "upstream",
|
||||
HTTPStatus: http.StatusBadRequest,
|
||||
Version: "v1",
|
||||
}
|
||||
task := store.GatewayTask{
|
||||
ID: "task-parameter-error",
|
||||
Status: "failed",
|
||||
ErrorCode: "http_400",
|
||||
ErrorMessage: raw,
|
||||
PublicError: &legacy,
|
||||
Attempts: []store.TaskAttempt{{
|
||||
AttemptNo: 1,
|
||||
Status: "failed",
|
||||
StatusCode: http.StatusBadRequest,
|
||||
ErrorCode: "http_400",
|
||||
ErrorMessage: raw,
|
||||
PublicError: &legacy,
|
||||
}},
|
||||
}
|
||||
|
||||
public := publicGatewayTask(task)
|
||||
upstream := requireObject(t, public.PublicError.Details["upstreamError"])
|
||||
attemptUpstream := requireObject(t, public.Attempts[0].PublicError.Details["upstreamError"])
|
||||
if public.ErrorMessage != raw || public.Attempts[0].ErrorMessage != raw || upstream["message"] != raw || attemptUpstream["message"] != raw {
|
||||
t.Fatalf("task response did not forward safe upstream diagnostics: %+v", public)
|
||||
}
|
||||
}
|
||||
|
||||
func TestTaskErrorHTTPStatusRebuildsLegacySnapshotFromAttempt(t *testing.T) {
|
||||
legacy := publicerror.Error{
|
||||
Code: "upstream_request_rejected",
|
||||
|
||||
Reference in New Issue
Block a user