Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 28 additions & 4 deletions internal/api/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,28 @@ func publicErrorMessage(status int, message string) string {
return message
}

// publicRequestErrorMessage 返回公开协议的请求错误消息,账户与服务故障使用通用说明
func publicRequestErrorMessage(err error) string {
if errors.Is(err, aistudio.ErrNoEligibleAccount) {
return "No available account for this request"
}
var cooling *aistudio.AllCoolingError
if errors.As(err, &cooling) {
if cooling.HTTPStatus() == http.StatusServiceUnavailable {
return "Service unavailable"
}
return "Rate limit exceeded"
}
var rpc *aistudio.RPCError
if errors.As(err, &rpc) && (rpc.StatusCode == http.StatusUnauthorized || rpc.StatusCode == http.StatusForbidden) {
return "Upstream account unavailable"
}
if prefix := serverErrorPrefix(statusFromError(err)); prefix != "" {
return prefix
}
return err.Error()
}

func writeOpenAIError(w http.ResponseWriter, status int, code string, message string) {
message = publicErrorMessage(status, message)
setAccessLogResponseError(w, message)
Expand Down Expand Up @@ -349,22 +371,24 @@ func writeGeminiError(w http.ResponseWriter, status int, statusName string, mess
// writeOpenAIRequestError 以 OpenAI 错误体写出请求失败,可重试时带 Retry-After 并在消息末尾写明重试时间
func writeOpenAIRequestError(w http.ResponseWriter, err error) {
seconds := setRetryAfter(w, err)
writeOpenAIError(w, statusFromError(err), openAIErrorCode(err), retryMessage(err.Error(), seconds))
writeOpenAIError(w, statusFromError(err), openAIErrorCode(err), retryMessage(publicRequestErrorMessage(err), seconds))
setAccessLogResponseError(w, err.Error())
}

// writeOpenAISSEError 在已开始的 OpenAI 事件流中以 error 数据帧写出请求失败,可重试时在消息末尾写明重试时间
func writeOpenAISSEError(w http.ResponseWriter, err error) {
status := statusFromError(err)
code := openAIErrorCode(err)
_ = writeSSE(w, "", map[string]any{"error": openAIErrorBody{
Message: retryMessage(publicErrorMessage(status, err.Error()), retryAfterSeconds(err)), Type: openAIErrorType(status, code), Code: code,
Message: retryMessage(publicErrorMessage(status, publicRequestErrorMessage(err)), retryAfterSeconds(err)), Type: openAIErrorType(status, code), Code: code,
}})
}

// writeAnthropicRequestError 以 Anthropic 错误体写出请求失败,可重试时带 Retry-After 并在消息末尾写明重试时间
func writeAnthropicRequestError(w http.ResponseWriter, err error) {
seconds := setRetryAfter(w, err)
writeAnthropicError(w, statusFromError(err), anthropicErrorType(err), retryMessage(anthropicErrorMessage(err), seconds))
setAccessLogResponseError(w, err.Error())
}

// retryMessage 在 seconds 大于 0 时于消息末尾按 OpenAI 限流消息的写法另起一句 Please try again in <seconds>s.
Expand All @@ -389,7 +413,7 @@ func anthropicErrorMessage(err error) string {
if contextOverflow(err) {
return "prompt is too long: " + err.Error()
}
return err.Error()
return publicRequestErrorMessage(err)
}

// writeGeminiRequestError 以 Gemini 错误体写出请求失败,可重试时带 Retry-After 与 RetryInfo
Expand All @@ -401,7 +425,7 @@ func writeGeminiRequestError(w http.ResponseWriter, err error) {

// geminiErrorPayload 返回 Gemini 错误对象,seconds 大于 0 时 details 带该时长的 RetryInfo
func geminiErrorPayload(err error, seconds int64) map[string]any {
payload := map[string]any{"code": statusFromError(err), "message": err.Error(), "status": geminiErrorStatus(err)}
payload := map[string]any{"code": statusFromError(err), "message": publicRequestErrorMessage(err), "status": geminiErrorStatus(err)}
if seconds > 0 {
payload["details"] = []any{map[string]any{"@type": "type.googleapis.com/google.rpc.RetryInfo", "retryDelay": strconv.FormatInt(seconds, 10) + "s"}}
}
Expand Down
116 changes: 116 additions & 0 deletions internal/api/errors_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
package api

import (
"encoding/json"
"errors"
"fmt"
"net/http"
"net/http/httptest"
"strings"
"testing"
"time"

"github.com/Mag1cFall/AIStudio2API/internal/aistudio"
)

func TestPublicAccountErrors(t *testing.T) {
detail := "pool-user@example.com 需要重新登录:https://accounts.google.com/ServiceLogin?secret=private"
failure := fmt.Errorf("generation: %w", &aistudio.AccountsNotReadyError{Reasons: []string{detail}})
for name, write := range map[string]func(http.ResponseWriter, error){
"openai": writeOpenAIRequestError,
"anthropic": writeAnthropicRequestError,
"gemini": writeGeminiRequestError,
} {
t.Run(name, func(t *testing.T) {
recorder := httptest.NewRecorder()
metadata := &accessLogMetadata{}
writer := &accessLogResponseWriter{ResponseWriter: recorder, metadata: metadata}
write(writer, failure)
var body struct {
Error struct {
Message string `json:"message"`
} `json:"error"`
}
if err := json.Unmarshal(recorder.Body.Bytes(), &body); err != nil {
t.Fatal(err)
}
if recorder.Code != http.StatusServiceUnavailable || !strings.Contains(body.Error.Message, "No available account for this request") {
t.Fatalf("response = %d %s", recorder.Code, recorder.Body.String())
}
if strings.Contains(recorder.Body.String(), "example.com") || strings.Contains(recorder.Body.String(), "secret") {
t.Fatalf("public error = %s", recorder.Body.String())
}
if metadata.err != failure.Error() {
t.Fatalf("diagnostic = %q", metadata.err)
}
})
}
t.Run("openai stream", func(t *testing.T) {
recorder := httptest.NewRecorder()
writeOpenAISSEError(recorder, failure)
if !strings.Contains(recorder.Body.String(), "No available account for this request") || strings.Contains(recorder.Body.String(), "example.com") {
t.Fatalf("event = %s", recorder.Body.String())
}
})
t.Run("anthropic stream", func(t *testing.T) {
recorder := httptest.NewRecorder()
writer := anthropicStreamWriter{send: func(event string, payload any) error { return writeSSE(recorder, event, payload) }}
if err := writer.error(failure); err != nil {
t.Fatal(err)
}
if !strings.Contains(recorder.Body.String(), "No available account for this request") || strings.Contains(recorder.Body.String(), "example.com") {
t.Fatalf("event = %s", recorder.Body.String())
}
})
for name, payload := range map[string]any{
"responses": responsesError(failure),
"gemini stream": geminiErrorPayload(failure, 0),
"interaction stream": interactionErrorEvent(failure, "event-1"),
"live": bidiErrorMessage(failure),
} {
t.Run(name, func(t *testing.T) {
data, err := json.Marshal(payload)
if err != nil {
t.Fatal(err)
}
if !strings.Contains(string(data), "No available account for this request") || strings.Contains(string(data), "example.com") {
t.Fatalf("error = %s", data)
}
})
}
}

func TestPublicErrorRetryAndValidation(t *testing.T) {
cooling := &aistudio.AllCoolingError{ModelID: "gemini", Until: time.Now().Add(time.Minute), Reason: "pool-user@example.com: quota exhausted"}
recorder := httptest.NewRecorder()
writeOpenAIRequestError(recorder, cooling)
if recorder.Code != http.StatusTooManyRequests || recorder.Header().Get("Retry-After") == "" || !strings.Contains(recorder.Body.String(), "Please try again in") || strings.Contains(recorder.Body.String(), "example.com") {
t.Fatalf("response = %d %s %s", recorder.Code, recorder.Header(), recorder.Body.String())
}
payload := geminiErrorPayload(cooling, 60)
if payload["message"] != "Rate limit exceeded" || payload["details"] == nil {
t.Fatalf("gemini error = %v", payload)
}
invalid := fmt.Errorf("%w: max_output_tokens must be positive", aistudio.ErrInvalidArgument)
recorder = httptest.NewRecorder()
writeOpenAIRequestError(recorder, invalid)
if recorder.Code != http.StatusBadRequest || !strings.Contains(recorder.Body.String(), "max_output_tokens must be positive") {
t.Fatalf("validation = %d %s", recorder.Code, recorder.Body.String())
}
recorder = httptest.NewRecorder()
writeOpenAIRequestError(recorder, errors.New("proxy password and internal address"))
if recorder.Code != http.StatusBadGateway || strings.Contains(recorder.Body.String(), "proxy password") {
t.Fatalf("server error = %d %s", recorder.Code, recorder.Body.String())
}
}

func TestPublicUpstreamAuthenticationError(t *testing.T) {
for _, status := range []int{http.StatusUnauthorized, http.StatusForbidden} {
failure := aistudio.AccountError("pool-user@example.com", &aistudio.RPCError{StatusCode: status, Message: "login redirect https://accounts.google.com/private"})
recorder := httptest.NewRecorder()
writeOpenAIRequestError(recorder, failure)
if recorder.Code != status || !strings.Contains(recorder.Body.String(), "Upstream account unavailable") || strings.Contains(recorder.Body.String(), "example.com") || strings.Contains(recorder.Body.String(), "accounts.google.com") {
t.Fatalf("authentication = %d %s", recorder.Code, recorder.Body.String())
}
}
}
9 changes: 6 additions & 3 deletions internal/api/files.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,17 @@ func (s *server) handleFileUpload(w http.ResponseWriter, r *http.Request) {
writeFileParseError(w, r, err)
return
}
writeFileError(w, r, statusFromError(err), openAIErrorCode(err), err.Error())
writeFileError(w, r, statusFromError(err), openAIErrorCode(err), publicRequestErrorMessage(err))
setAccessLogResponseError(w, err.Error())
return
}
metadata, err := service.FileMetadata(r.Context(), ref.ID)
if err != nil {
if !shouldWriteRequestError(r, err) {
return
}
writeFileError(w, r, statusFromError(err), openAIErrorCode(err), err.Error())
writeFileError(w, r, statusFromError(err), openAIErrorCode(err), publicRequestErrorMessage(err))
setAccessLogResponseError(w, err.Error())
return
}
writeJSON(w, http.StatusOK, officialOrder(fileProtocol(r), fileResponse(r, metadata)))
Expand Down Expand Up @@ -564,7 +566,8 @@ func writeFileRequestError(w http.ResponseWriter, r *http.Request, err error) {
writeFileError(w, r, http.StatusNotFound, "file_not_found", "file not found")
return
}
writeFileError(w, r, statusFromError(err), openAIErrorCode(err), err.Error())
writeFileError(w, r, statusFromError(err), openAIErrorCode(err), publicRequestErrorMessage(err))
setAccessLogResponseError(w, err.Error())
}

// writeFileParseError 写入 multipart 请求体解析错误,超过大小上限时返回 413
Expand Down
3 changes: 2 additions & 1 deletion internal/api/gemini_files.go
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,8 @@ func writeGeminiUploadFailure(w http.ResponseWriter, err error, uploadStatus str
if uploadStatus != "" {
w.Header().Set("X-Goog-Upload-Status", uploadStatus)
}
writeGeminiError(w, status, statusName, err.Error())
writeGeminiError(w, status, statusName, publicRequestErrorMessage(err))
setAccessLogResponseError(w, err.Error())
}

// requestOrigin 返回客户端访问本服务使用的协议与主机
Expand Down
2 changes: 1 addition & 1 deletion internal/api/interaction_output.go
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ func (s *server) streamInteraction(w http.ResponseWriter, r *http.Request, reque

// interactionErrorEvent 返回交互流的 error 事件正文,eventID 非空时带 event_id
func interactionErrorEvent(err error, eventID string) map[string]any {
event := map[string]any{"event_type": "error", "error": map[string]any{"code": geminiErrorStatus(err), "message": err.Error()}}
event := map[string]any{"event_type": "error", "error": map[string]any{"code": geminiErrorStatus(err), "message": publicRequestErrorMessage(err)}}
if eventID != "" {
event["event_id"] = eventID
}
Expand Down
2 changes: 1 addition & 1 deletion internal/api/live.go
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ func (s *server) writeBidiEvents(
}

func bidiErrorMessage(err error) bidiServerMessage {
message := bidiServerMessage{Type: "error", Error: err.Error()}
message := bidiServerMessage{Type: "error", Error: publicRequestErrorMessage(err)}
var coded errorCodeProvider
switch {
case errors.Is(err, aistudio.ErrInvalidArgument):
Expand Down
9 changes: 6 additions & 3 deletions internal/api/media.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,8 @@ func (s *server) writeOpenAIImages(w http.ResponseWriter, r *http.Request, reque
media, size, err = fitImage(media, target, format, compression)
if err != nil {
if !streamed(err) {
writeOpenAIError(w, http.StatusBadGateway, "upstream_error", err.Error())
writeOpenAIError(w, http.StatusBadGateway, "upstream_error", publicRequestErrorMessage(err))
setAccessLogResponseError(w, err.Error())
}
return
}
Expand Down Expand Up @@ -537,12 +538,14 @@ func (s *server) handleOpenAISpeech(w http.ResponseWriter, r *http.Request) {
}
media, err := joinedAudio(result.media)
if err != nil {
writeOpenAIError(w, http.StatusBadGateway, "upstream_error", err.Error())
writeOpenAIError(w, http.StatusBadGateway, "upstream_error", publicRequestErrorMessage(err))
setAccessLogResponseError(w, err.Error())
return
}
data, contentType, err := encodeSpeechResponse(media, format)
if err != nil {
writeOpenAIError(w, http.StatusBadGateway, "upstream_error", err.Error())
writeOpenAIError(w, http.StatusBadGateway, "upstream_error", publicRequestErrorMessage(err))
setAccessLogResponseError(w, err.Error())
return
}
w.Header().Set("Content-Type", contentType)
Expand Down
3 changes: 2 additions & 1 deletion internal/api/openai.go
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,8 @@ func (s *server) handleChatCompletions(w http.ResponseWriter, r *http.Request) {
continue
}
if audio[index], err = s.takeChatAudio(&results[index], format); err != nil {
writeOpenAIError(w, http.StatusBadGateway, "upstream_error", err.Error())
writeOpenAIError(w, http.StatusBadGateway, "upstream_error", publicRequestErrorMessage(err))
setAccessLogResponseError(w, err.Error())
return
}
}
Expand Down
2 changes: 1 addition & 1 deletion internal/api/responses.go
Original file line number Diff line number Diff line change
Expand Up @@ -2273,7 +2273,7 @@ func (writer *responsesStreamWriter) failed(err error) error {

// responsesError 返回 Responses 失败对象的 error 字段:code 取 Responses 错误枚举,可重试时消息末尾写明重试时间
func responsesError(err error) map[string]any {
return map[string]any{"code": responsesErrorCode(err), "message": retryMessage(publicErrorMessage(statusFromError(err), err.Error()), retryAfterSeconds(err))}
return map[string]any{"code": responsesErrorCode(err), "message": retryMessage(publicErrorMessage(statusFromError(err), publicRequestErrorMessage(err)), retryAfterSeconds(err))}
}

// responsesErrorCode 返回 Responses 错误对象的官方枚举 code
Expand Down
2 changes: 1 addition & 1 deletion internal/api/video.go
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ func (s *server) handleGeminiVideoOperation(w http.ResponseWriter, r *http.Reque
response := map[string]any{"name": "operations/" + operationID, "done": done}
if done && failure != nil {
status := geminiErrorStatus(failure)
response["error"] = map[string]any{"code": rpcCodes[status], "message": failure.Error(), "status": status}
response["error"] = map[string]any{"code": rpcCodes[status], "message": publicRequestErrorMessage(failure), "status": status}
} else if done && missing != "" {
response["error"] = map[string]any{"code": rpcCodes["NOT_FOUND"], "message": missing, "status": "NOT_FOUND"}
} else if done {
Expand Down