* 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
352 lines
11 KiB
Go
352 lines
11 KiB
Go
package aws
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/relay/channel"
|
|
"github.com/QuantumNous/new-api/relay/channel/claude"
|
|
relaycommon "github.com/QuantumNous/new-api/relay/common"
|
|
"github.com/QuantumNous/new-api/relay/helper"
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
"github.com/QuantumNous/new-api/relaykit/types"
|
|
"github.com/QuantumNous/new-api/service"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/pkg/errors"
|
|
|
|
"github.com/QuantumNous/new-api/setting/model_setting"
|
|
"github.com/aws/aws-sdk-go-v2/aws"
|
|
"github.com/aws/aws-sdk-go-v2/credentials"
|
|
"github.com/aws/aws-sdk-go-v2/service/bedrockruntime"
|
|
bedrockruntimeTypes "github.com/aws/aws-sdk-go-v2/service/bedrockruntime/types"
|
|
"github.com/aws/smithy-go/auth/bearer"
|
|
)
|
|
|
|
// getAwsErrorStatusCode extracts HTTP status code from AWS SDK error
|
|
func getAwsErrorStatusCode(err error) int {
|
|
// Check for HTTP response error which contains status code
|
|
var httpErr interface{ HTTPStatusCode() int }
|
|
if errors.As(err, &httpErr) {
|
|
return httpErr.HTTPStatusCode()
|
|
}
|
|
// Default to 500 if we can't determine the status code
|
|
return http.StatusInternalServerError
|
|
}
|
|
|
|
func newAwsInvokeContext() (context.Context, context.CancelFunc) {
|
|
if common.RelayTimeout <= 0 {
|
|
return context.Background(), func() {}
|
|
}
|
|
return context.WithTimeout(context.Background(), time.Duration(common.RelayTimeout)*time.Second)
|
|
}
|
|
|
|
func newAwsClient(c *gin.Context, info *relaycommon.RelayInfo) (*bedrockruntime.Client, error) {
|
|
var (
|
|
httpClient *http.Client
|
|
err error
|
|
)
|
|
if info.ChannelSetting.Proxy != "" {
|
|
httpClient, err = service.GetHttpClientWithProxy(info.ChannelSetting.Proxy)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("new proxy http client failed: %w", err)
|
|
}
|
|
} else {
|
|
httpClient = service.GetHttpClient()
|
|
}
|
|
|
|
awsSecret := strings.Split(info.ApiKey, "|")
|
|
var client *bedrockruntime.Client
|
|
switch len(awsSecret) {
|
|
case 2:
|
|
apiKey := awsSecret[0]
|
|
region := awsSecret[1]
|
|
client = bedrockruntime.New(bedrockruntime.Options{
|
|
Region: region,
|
|
BearerAuthTokenProvider: bearer.StaticTokenProvider{Token: bearer.Token{Value: apiKey}},
|
|
HTTPClient: httpClient,
|
|
})
|
|
case 3:
|
|
ak := awsSecret[0]
|
|
sk := awsSecret[1]
|
|
region := awsSecret[2]
|
|
client = bedrockruntime.New(bedrockruntime.Options{
|
|
Region: region,
|
|
Credentials: aws.NewCredentialsCache(credentials.NewStaticCredentialsProvider(ak, sk, "")),
|
|
HTTPClient: httpClient,
|
|
})
|
|
default:
|
|
return nil, errors.New("invalid aws secret key")
|
|
}
|
|
|
|
return client, nil
|
|
}
|
|
|
|
func doAwsClientRequest(c *gin.Context, info *relaycommon.RelayInfo, a *Adaptor, requestBody io.Reader) (any, error) {
|
|
awsCli, err := newAwsClient(c, info)
|
|
if err != nil {
|
|
return nil, types.NewError(err, types.ErrorCodeChannelAwsClientError)
|
|
}
|
|
a.AwsClient = awsCli
|
|
|
|
// 获取对应的AWS模型ID
|
|
awsModelId := getAwsModelID(info.UpstreamModelName)
|
|
|
|
awsRegionPrefix := getAwsRegionPrefix(awsCli.Options().Region)
|
|
canCrossRegion := awsModelCanCrossRegion(awsModelId, awsRegionPrefix)
|
|
if canCrossRegion {
|
|
awsModelId = awsModelCrossRegion(awsModelId, awsRegionPrefix)
|
|
}
|
|
|
|
// init empty request.header
|
|
requestHeader := http.Header{}
|
|
a.SetupRequestHeader(c, &requestHeader, info)
|
|
headerOverride, err := channel.ResolveHeaderOverride(info, c)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
for key, value := range headerOverride {
|
|
requestHeader.Set(key, value)
|
|
}
|
|
|
|
if isNovaModel(awsModelId) {
|
|
var novaReq *NovaRequest
|
|
err = common.DecodeJson(requestBody, &novaReq)
|
|
if err != nil {
|
|
return nil, types.NewError(errors.Wrap(err, "decode nova request fail"), types.ErrorCodeBadRequestBody)
|
|
}
|
|
|
|
// 使用InvokeModel API,但使用Nova格式的请求体
|
|
awsReq := &bedrockruntime.InvokeModelInput{
|
|
ModelId: aws.String(awsModelId),
|
|
Accept: aws.String("application/json"),
|
|
ContentType: aws.String("application/json"),
|
|
}
|
|
|
|
reqBody, err := common.Marshal(novaReq)
|
|
if err != nil {
|
|
return nil, types.NewError(errors.Wrap(err, "marshal nova request"), types.ErrorCodeBadResponseBody)
|
|
}
|
|
awsReq.Body = reqBody
|
|
a.AwsReq = awsReq
|
|
return nil, nil
|
|
} else {
|
|
awsClaudeReq, err := formatRequest(requestBody, requestHeader)
|
|
if err != nil {
|
|
return nil, types.NewError(errors.Wrap(err, "format aws request fail"), types.ErrorCodeBadRequestBody)
|
|
}
|
|
|
|
if info.IsStream {
|
|
awsReq := &bedrockruntime.InvokeModelWithResponseStreamInput{
|
|
ModelId: aws.String(awsModelId),
|
|
Accept: aws.String("application/json"),
|
|
ContentType: aws.String("application/json"),
|
|
}
|
|
awsReq.Body, err = buildAwsRequestBody(c, info, awsClaudeReq)
|
|
if err != nil {
|
|
return nil, types.NewError(errors.Wrap(err, "marshal aws request fail"), types.ErrorCodeBadRequestBody)
|
|
}
|
|
a.AwsReq = awsReq
|
|
return nil, nil
|
|
} else {
|
|
awsReq := &bedrockruntime.InvokeModelInput{
|
|
ModelId: aws.String(awsModelId),
|
|
Accept: aws.String("application/json"),
|
|
ContentType: aws.String("application/json"),
|
|
}
|
|
awsReq.Body, err = buildAwsRequestBody(c, info, awsClaudeReq)
|
|
if err != nil {
|
|
return nil, types.NewError(errors.Wrap(err, "marshal aws request fail"), types.ErrorCodeBadRequestBody)
|
|
}
|
|
a.AwsReq = awsReq
|
|
return nil, nil
|
|
}
|
|
}
|
|
}
|
|
|
|
// buildAwsRequestBody prepares the payload for AWS requests, applying passthrough rules when enabled.
|
|
func buildAwsRequestBody(c *gin.Context, info *relaycommon.RelayInfo, awsClaudeReq any) ([]byte, error) {
|
|
if model_setting.GetGlobalSettings().PassThroughRequestEnabled || info.ChannelSetting.PassThroughBodyEnabled {
|
|
storage, err := common.GetBodyStorage(c)
|
|
if err != nil {
|
|
return nil, errors.Wrap(err, "get request body for pass-through fail")
|
|
}
|
|
body, err := storage.Bytes()
|
|
if err != nil {
|
|
return nil, errors.Wrap(err, "get request body bytes fail")
|
|
}
|
|
var data map[string]interface{}
|
|
if err := common.Unmarshal(body, &data); err != nil {
|
|
return nil, errors.Wrap(err, "pass-through unmarshal request body fail")
|
|
}
|
|
delete(data, "model")
|
|
delete(data, "stream")
|
|
return common.Marshal(data)
|
|
}
|
|
return common.Marshal(awsClaudeReq)
|
|
}
|
|
|
|
func getAwsRegionPrefix(awsRegionId string) string {
|
|
parts := strings.Split(awsRegionId, "-")
|
|
regionPrefix := ""
|
|
if len(parts) > 0 {
|
|
regionPrefix = parts[0]
|
|
}
|
|
return regionPrefix
|
|
}
|
|
|
|
func awsModelCanCrossRegion(awsModelId, awsRegionPrefix string) bool {
|
|
regionSet, exists := awsModelCanCrossRegionMap[awsModelId]
|
|
return exists && regionSet[awsRegionPrefix]
|
|
}
|
|
|
|
func awsModelCrossRegion(awsModelId, awsRegionPrefix string) string {
|
|
modelPrefix, find := awsRegionCrossModelPrefixMap[awsRegionPrefix]
|
|
if !find {
|
|
return awsModelId
|
|
}
|
|
return modelPrefix + "." + awsModelId
|
|
}
|
|
|
|
func getAwsModelID(requestModel string) string {
|
|
if awsModelIDName, ok := awsModelIDMap[requestModel]; ok {
|
|
return awsModelIDName
|
|
}
|
|
return requestModel
|
|
}
|
|
|
|
func awsHandler(c *gin.Context, info *relaycommon.RelayInfo, a *Adaptor) (*types.NewAPIError, *dto.Usage) {
|
|
|
|
ctx, cancel := newAwsInvokeContext()
|
|
defer cancel()
|
|
|
|
awsResp, err := a.AwsClient.InvokeModel(ctx, a.AwsReq.(*bedrockruntime.InvokeModelInput))
|
|
if err != nil {
|
|
statusCode := getAwsErrorStatusCode(err)
|
|
return types.NewOpenAIError(errors.Wrap(err, "InvokeModel"), types.ErrorCodeAwsInvokeError, statusCode), nil
|
|
}
|
|
|
|
claudeInfo := &claude.ClaudeResponseInfo{
|
|
ResponseId: helper.GetResponseID(c),
|
|
Created: common.GetTimestamp(),
|
|
Model: info.UpstreamModelName,
|
|
ResponseText: strings.Builder{},
|
|
Usage: &dto.Usage{},
|
|
}
|
|
|
|
// 复制上游 Content-Type 到客户端响应头
|
|
if awsResp.ContentType != nil && *awsResp.ContentType != "" {
|
|
c.Writer.Header().Set("Content-Type", *awsResp.ContentType)
|
|
}
|
|
|
|
handlerErr := claude.HandleClaudeResponseData(c, info, claudeInfo, nil, awsResp.Body)
|
|
if handlerErr != nil {
|
|
return handlerErr, nil
|
|
}
|
|
return nil, claudeInfo.Usage
|
|
}
|
|
|
|
func awsStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, a *Adaptor) (*types.NewAPIError, *dto.Usage) {
|
|
ctx, cancel := newAwsInvokeContext()
|
|
defer cancel()
|
|
|
|
awsResp, err := a.AwsClient.InvokeModelWithResponseStream(ctx, a.AwsReq.(*bedrockruntime.InvokeModelWithResponseStreamInput))
|
|
if err != nil {
|
|
statusCode := getAwsErrorStatusCode(err)
|
|
return types.NewOpenAIError(errors.Wrap(err, "InvokeModelWithResponseStream"), types.ErrorCodeAwsInvokeError, statusCode), nil
|
|
}
|
|
stream := awsResp.GetStream()
|
|
defer stream.Close()
|
|
|
|
claudeInfo := &claude.ClaudeResponseInfo{
|
|
ResponseId: helper.GetResponseID(c),
|
|
Created: common.GetTimestamp(),
|
|
Model: info.UpstreamModelName,
|
|
ResponseText: strings.Builder{},
|
|
Usage: &dto.Usage{},
|
|
}
|
|
|
|
for event := range stream.Events() {
|
|
switch v := event.(type) {
|
|
case *bedrockruntimeTypes.ResponseStreamMemberChunk:
|
|
info.SetFirstResponseTime()
|
|
respErr := claude.HandleStreamResponseData(c, info, claudeInfo, string(v.Value.Bytes))
|
|
if respErr != nil {
|
|
return respErr, nil
|
|
}
|
|
case *bedrockruntimeTypes.UnknownUnionMember:
|
|
fmt.Println("unknown tag:", v.Tag)
|
|
return types.NewError(errors.New("unknown response type"), types.ErrorCodeInvalidRequest), nil
|
|
default:
|
|
fmt.Println("union is nil or unknown type")
|
|
return types.NewError(errors.New("nil or unknown response type"), types.ErrorCodeInvalidRequest), nil
|
|
}
|
|
}
|
|
|
|
claude.HandleStreamFinalResponse(c, info, claudeInfo)
|
|
return nil, claudeInfo.Usage
|
|
}
|
|
|
|
// Nova模型处理函数
|
|
func handleNovaRequest(c *gin.Context, info *relaycommon.RelayInfo, a *Adaptor) (*types.NewAPIError, *dto.Usage) {
|
|
|
|
ctx, cancel := newAwsInvokeContext()
|
|
defer cancel()
|
|
|
|
awsResp, err := a.AwsClient.InvokeModel(ctx, a.AwsReq.(*bedrockruntime.InvokeModelInput))
|
|
if err != nil {
|
|
statusCode := getAwsErrorStatusCode(err)
|
|
return types.NewOpenAIError(errors.Wrap(err, "InvokeModel"), types.ErrorCodeAwsInvokeError, statusCode), nil
|
|
}
|
|
|
|
// 解析Nova响应
|
|
var novaResp struct {
|
|
Output struct {
|
|
Message struct {
|
|
Content []struct {
|
|
Text string `json:"text"`
|
|
} `json:"content"`
|
|
} `json:"message"`
|
|
} `json:"output"`
|
|
Usage struct {
|
|
InputTokens int `json:"inputTokens"`
|
|
OutputTokens int `json:"outputTokens"`
|
|
TotalTokens int `json:"totalTokens"`
|
|
} `json:"usage"`
|
|
}
|
|
|
|
if err := json.Unmarshal(awsResp.Body, &novaResp); err != nil {
|
|
return types.NewError(errors.Wrap(err, "unmarshal nova response"), types.ErrorCodeBadResponseBody), nil
|
|
}
|
|
|
|
// 构造OpenAI格式响应
|
|
response := dto.OpenAITextResponse{
|
|
Id: helper.GetResponseID(c),
|
|
Object: "chat.completion",
|
|
Created: common.GetTimestamp(),
|
|
Model: info.UpstreamModelName,
|
|
Choices: []dto.OpenAITextResponseChoice{{
|
|
Index: 0,
|
|
Message: dto.Message{
|
|
Role: "assistant",
|
|
Content: novaResp.Output.Message.Content[0].Text,
|
|
},
|
|
FinishReason: "stop",
|
|
}},
|
|
Usage: dto.Usage{
|
|
PromptTokens: novaResp.Usage.InputTokens,
|
|
CompletionTokens: novaResp.Usage.OutputTokens,
|
|
TotalTokens: novaResp.Usage.TotalTokens,
|
|
},
|
|
}
|
|
|
|
c.JSON(http.StatusOK, response)
|
|
return nil, &response.Usage
|
|
}
|