* test(relayconvert): add golden snapshot matrix and relaykit boundary guard Phase 0 of the relaykit extraction plan: pin byte-level output of every registered (from,to) request/response/stream conversion route, and forbid kit-bound packages from growing host-only imports. * wip(relayconvert): drop gin.Context from converter signatures; add convmeta draft Phase 1 in progress: relayconvert now takes context.Context; host media resolver adapts gin.Context back at the service boundary. * refactor(relayconvert): decouple converters from RelayInfo, gin, and settings Phase 1 of the relaykit extraction plan: - converters now depend on convmeta.Meta (implemented by RelayInfo) instead of *relaycommon.RelayInfo; ClaudeConvertInfo and the format guesser move to convmeta with aliases left behind - host settings reach converters via a convmeta.Options snapshot built in RelayInfo.ConvOptions; no more model_setting/reasoning global reads inside the conversion layer - effort-suffix helpers move to service/relayconvert/reasoning (old package forwards); chat-to-responses upgrade policy moves to service (host routing logic, not conversion) - golden conversion matrix unchanged * test(relayconvert): tighten boundary — kit packages now free of gin/setting imports * refactor(dto): drop gin and logger dependencies Phase 2 (part 1): dto.Request.IsStream now takes *http.Request instead of *gin.Context (Gemini's impl reads query/path off the std request); dto's three logger calls become common.SysError. Boundary test allowlist is now empty — kit-bound packages import no gin/setting/logger/model. * refactor(kit): extract dependency-free kitutil; dto/types/relayconvert stop importing common Phase 2 of the relaykit extraction plan: - new service/relayconvert/kitutil holds the pure helpers the kit needs (JSON wrappers, pointer/string/uuid/timestamp utils, MaskSensitiveInfo, pluggable LogInfo/LogError hooks, Debug flag) - dto, types, and all relayconvert packages now use kitutil; their only remaining internal deps are dto/types/constant - common keeps every original symbol (MaskSensitiveInfo delegates to kitutil) so host code is untouched; main.go routes kit logging into common.SysLog/SysError and mirrors DebugEnabled - golden conversion matrix unchanged * refactor(kit): move EndpointType/FinishReason to types; OpenRouter dialect via Options Kit packages (dto/types/relayconvert/reasonmap) no longer import constant: - EndpointType and finish-reason values live in types; constant re-exports - the OpenRouter special-case in claude->openai request conversion reads Options.OpenRouterDialect, set by the host from the channel type; InitChannelMeta invalidates the cached snapshot on channel switch * refactor: extract relaykit submodule (dto/types/relayconvert/reasonmap) Phase 3 of the relaykit extraction plan: - new go module github.com/QuantumNous/new-api/relaykit containing dto (minus task family), types, relayconvert (with convmeta/kitutil/reasoning), and reasonmap; host consumes it via require + replace, go.work for dev - task-family dto (task/suno/midjourney/video) stays in the host dto package; dual-consumer host files alias it as taskdto - relaykit builds and tests standalone (GOWORK=off): no host imports, no gin, no DB, no settings - golden conversion matrix unchanged * build(docker): copy relaykit/go.mod before go mod download The local-replace submodule's go.mod must exist inside the build context for the main module graph to resolve. * fix: address relaykit extraction regressions * fix: address relaykit review regressions * docs: document Meta nil receiver contract * fix(relaykit): fail OpenAI→Claude conversion without max_tokens; reject negative default_max_tokens The Claude Messages API requires max_tokens (omitting it is a 400 "Field required"), but with a nil Options.Claude.DefaultMaxTokens hook the converters silently emitted a request the upstream is guaranteed to reject. Both OpenAI Chat and Responses → Claude conversions now return sharedclaude.ErrMissingMaxTokens when no path (client value, default hook, thinking-adapter floor) supplied one. Unreachable in the host, which always configures the hook. Host side, claude.default_max_tokens now rejects negative values at the option API before persisting — they would wrap into huge unsigned values during conversion. Zero stays allowed: the current API treats max_tokens: 0 as cache pre-warming. * fix: make Gemini safety settings read path race-free
231 lines
6.7 KiB
Go
231 lines
6.7 KiB
Go
package service
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"math"
|
|
"net/http"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
taskdto "github.com/QuantumNous/new-api/dto"
|
|
"github.com/QuantumNous/new-api/logger"
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
"github.com/QuantumNous/new-api/relaykit/types"
|
|
)
|
|
|
|
func MidjourneyErrorWrapper(code int, desc string) *taskdto.MidjourneyResponse {
|
|
return &taskdto.MidjourneyResponse{
|
|
Code: code,
|
|
Description: desc,
|
|
}
|
|
}
|
|
|
|
func MidjourneyErrorWithStatusCodeWrapper(code int, desc string, statusCode int) *taskdto.MidjourneyResponseWithStatusCode {
|
|
return &taskdto.MidjourneyResponseWithStatusCode{
|
|
StatusCode: statusCode,
|
|
Response: *MidjourneyErrorWrapper(code, desc),
|
|
}
|
|
}
|
|
|
|
//// OpenAIErrorWrapper wraps an error into an OpenAIErrorWithStatusCode
|
|
//func OpenAIErrorWrapper(err error, code string, statusCode int) *dto.OpenAIErrorWithStatusCode {
|
|
// text := err.Error()
|
|
// lowerText := strings.ToLower(text)
|
|
// if !strings.HasPrefix(lowerText, "get file base64 from url") && !strings.HasPrefix(lowerText, "mime type is not supported") {
|
|
// if strings.Contains(lowerText, "post") || strings.Contains(lowerText, "dial") || strings.Contains(lowerText, "http") {
|
|
// common.SysLog(fmt.Sprintf("error: %s", text))
|
|
// text = "请求上游地址失败"
|
|
// }
|
|
// }
|
|
// openAIError := dto.OpenAIError{
|
|
// Message: text,
|
|
// Type: "new_api_error",
|
|
// Code: code,
|
|
// }
|
|
// return &dto.OpenAIErrorWithStatusCode{
|
|
// Error: openAIError,
|
|
// StatusCode: statusCode,
|
|
// }
|
|
//}
|
|
//
|
|
//func OpenAIErrorWrapperLocal(err error, code string, statusCode int) *dto.OpenAIErrorWithStatusCode {
|
|
// openaiErr := OpenAIErrorWrapper(err, code, statusCode)
|
|
// openaiErr.LocalError = true
|
|
// return openaiErr
|
|
//}
|
|
|
|
func ClaudeErrorWrapper(err error, code string, statusCode int) *dto.ClaudeErrorWithStatusCode {
|
|
text := err.Error()
|
|
lowerText := strings.ToLower(text)
|
|
if !strings.HasPrefix(lowerText, "get file base64 from url") {
|
|
if strings.Contains(lowerText, "post") || strings.Contains(lowerText, "dial") || strings.Contains(lowerText, "http") {
|
|
common.SysLog(fmt.Sprintf("error: %s", text))
|
|
text = "请求上游地址失败"
|
|
}
|
|
}
|
|
claudeError := types.ClaudeError{
|
|
Message: text,
|
|
Type: "new_api_error",
|
|
}
|
|
return &dto.ClaudeErrorWithStatusCode{
|
|
Error: claudeError,
|
|
StatusCode: statusCode,
|
|
}
|
|
}
|
|
|
|
func ClaudeErrorWrapperLocal(err error, code string, statusCode int) *dto.ClaudeErrorWithStatusCode {
|
|
claudeErr := ClaudeErrorWrapper(err, code, statusCode)
|
|
claudeErr.LocalError = true
|
|
return claudeErr
|
|
}
|
|
|
|
func RelayErrorHandler(ctx context.Context, resp *http.Response, showBodyWhenFail bool) (newApiErr *types.NewAPIError) {
|
|
newApiErr = types.InitOpenAIError(types.ErrorCodeBadResponseStatusCode, resp.StatusCode)
|
|
|
|
responseBody, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return
|
|
}
|
|
CloseResponseBodyGracefully(resp)
|
|
var errResponse dto.GeneralErrorResponse
|
|
responseBodyText := string(responseBody)
|
|
responseBodyPreview := common.LocalLogPreview(responseBodyText)
|
|
buildErrWithBody := func(message string) error {
|
|
if message == "" {
|
|
return fmt.Errorf("bad response status code %d, body: %s", resp.StatusCode, responseBodyText)
|
|
}
|
|
return fmt.Errorf("bad response status code %d, message: %s, body: %s", resp.StatusCode, message, responseBodyText)
|
|
}
|
|
|
|
err = common.Unmarshal(responseBody, &errResponse)
|
|
if err != nil {
|
|
if showBodyWhenFail {
|
|
newApiErr.Err = buildErrWithBody("")
|
|
} else {
|
|
logger.LogError(ctx, fmt.Sprintf("bad response status code %d, body: %s", resp.StatusCode, responseBodyPreview))
|
|
newApiErr.Err = fmt.Errorf("bad response status code %d", resp.StatusCode)
|
|
}
|
|
return
|
|
}
|
|
|
|
if common.GetJsonType(errResponse.Error) == "object" {
|
|
// General format error (OpenAI, Anthropic, Gemini, etc.)
|
|
oaiError := errResponse.TryToOpenAIError()
|
|
if oaiError != nil {
|
|
newApiErr = types.WithOpenAIError(*oaiError, resp.StatusCode)
|
|
if showBodyWhenFail {
|
|
newApiErr.Err = buildErrWithBody(newApiErr.Error())
|
|
}
|
|
return
|
|
}
|
|
}
|
|
message := errResponse.ToMessage()
|
|
if message == "" {
|
|
// The body parsed as JSON but carried no usable error message; log the
|
|
// raw body so the upstream failure remains diagnosable.
|
|
logger.LogError(ctx, fmt.Sprintf("bad response status code %d with empty error message, body: %s", resp.StatusCode, responseBodyPreview))
|
|
}
|
|
newApiErr = types.NewOpenAIError(errors.New(message), types.ErrorCodeBadResponseStatusCode, resp.StatusCode)
|
|
if showBodyWhenFail {
|
|
newApiErr.Err = buildErrWithBody(newApiErr.Error())
|
|
}
|
|
return
|
|
}
|
|
|
|
func ResetStatusCode(newApiErr *types.NewAPIError, statusCodeMappingStr string) {
|
|
if newApiErr == nil {
|
|
return
|
|
}
|
|
if statusCodeMappingStr == "" || statusCodeMappingStr == "{}" {
|
|
return
|
|
}
|
|
statusCodeMapping := make(map[string]any)
|
|
err := common.Unmarshal([]byte(statusCodeMappingStr), &statusCodeMapping)
|
|
if err != nil {
|
|
return
|
|
}
|
|
if newApiErr.StatusCode == http.StatusOK {
|
|
return
|
|
}
|
|
codeStr := strconv.Itoa(newApiErr.StatusCode)
|
|
if value, ok := statusCodeMapping[codeStr]; ok {
|
|
intCode, ok := parseStatusCodeMappingValue(value)
|
|
if !ok {
|
|
return
|
|
}
|
|
newApiErr.StatusCode = intCode
|
|
}
|
|
}
|
|
|
|
func parseStatusCodeMappingValue(value any) (int, bool) {
|
|
switch v := value.(type) {
|
|
case string:
|
|
if v == "" {
|
|
return 0, false
|
|
}
|
|
statusCode, err := strconv.Atoi(v)
|
|
if err != nil {
|
|
return 0, false
|
|
}
|
|
return statusCode, true
|
|
case float64:
|
|
if v != math.Trunc(v) {
|
|
return 0, false
|
|
}
|
|
return int(v), true
|
|
case int:
|
|
return v, true
|
|
case json.Number:
|
|
statusCode, err := strconv.Atoi(v.String())
|
|
if err != nil {
|
|
return 0, false
|
|
}
|
|
return statusCode, true
|
|
default:
|
|
return 0, false
|
|
}
|
|
}
|
|
|
|
func TaskErrorWrapperLocal(err error, code string, statusCode int) *taskdto.TaskError {
|
|
openaiErr := TaskErrorWrapper(err, code, statusCode)
|
|
openaiErr.LocalError = true
|
|
return openaiErr
|
|
}
|
|
|
|
func TaskErrorWrapper(err error, code string, statusCode int) *taskdto.TaskError {
|
|
text := err.Error()
|
|
lowerText := strings.ToLower(text)
|
|
if strings.Contains(lowerText, "post") || strings.Contains(lowerText, "dial") || strings.Contains(lowerText, "http") {
|
|
common.SysLog(fmt.Sprintf("error: %s", text))
|
|
//text = "请求上游地址失败"
|
|
text = common.MaskSensitiveInfo(text)
|
|
}
|
|
//避免暴露内部错误
|
|
taskError := &taskdto.TaskError{
|
|
Code: code,
|
|
Message: text,
|
|
StatusCode: statusCode,
|
|
Error: err,
|
|
}
|
|
|
|
return taskError
|
|
}
|
|
|
|
// TaskErrorFromAPIError 将 PreConsumeBilling 返回的 NewAPIError 转换为 TaskError。
|
|
func TaskErrorFromAPIError(apiErr *types.NewAPIError) *taskdto.TaskError {
|
|
if apiErr == nil {
|
|
return nil
|
|
}
|
|
return &taskdto.TaskError{
|
|
Code: string(apiErr.GetErrorCode()),
|
|
Message: apiErr.Err.Error(),
|
|
StatusCode: apiErr.StatusCode,
|
|
Error: apiErr.Err,
|
|
}
|
|
}
|