* feat: support aws bedrockruntime claude3 closes #622, closes #749, closes #1300 * fix: convert to aws claude model id * fix: Update AWS adapter to handle stream completions and calculate usage metrics Based on the file summaries provided, here are the important bullet points for the commit message: - Add functionality to handle stream completion events from AWS in the relay/adaptor/aws/main.go file - Marshall AWS response to OpenAI format and calculate usage metrics in the same file - Implement a custom render function for streaming events in the same file - Improve error handling for JSON unmarshalling and marshalling errors in the same file * fix: Implement AWS handler with usage tracking and error handling - Implemented streaming response handling for AWS handler - Set response content type to text/event-stream - Added error handling for failed marshaling/unmarshaling - Updated return values to include `relaymodel.ErrorWithStatusCode` and `relaymodel.Usage` - Improved error handling and response formatting for AWS adaptor * fix: Refactor AWS Adapter for Improved Model Mapping and Error Handling * Refactor AWS adapter to improve model management - Replace hardcoded model list in `adapter.go` with a function to get models from `awsModelIDMap` - Update `GetModelList` function to return model list directly - Add `GetChannelName` function to get channel name from `Adaptor` object * Improve error handling and code organization in main.go - Replace switch statement with a map to map AWS model IDs to OpenAI model IDs - Return an error if the model is not found in the map - Use a single return statement instead of wrapping multiple return statements in the `awsModelID` function - Add a new error message for when the model is not found in the map in the `Handler` function * fix: bug fix * chore: change variable name & package * chore: change variable name * perf: update config related code --------- Co-authored-by: JustSong <songquanpeng@foxmail.com>
87 lines
2.6 KiB
Go
87 lines
2.6 KiB
Go
package middleware
|
|
|
|
import (
|
|
"fmt"
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/songquanpeng/one-api/common/config"
|
|
"github.com/songquanpeng/one-api/common/ctxkey"
|
|
"github.com/songquanpeng/one-api/common/logger"
|
|
"github.com/songquanpeng/one-api/model"
|
|
"github.com/songquanpeng/one-api/relay/channeltype"
|
|
"net/http"
|
|
"strconv"
|
|
)
|
|
|
|
type ModelRequest struct {
|
|
Model string `json:"model"`
|
|
}
|
|
|
|
func Distribute() func(c *gin.Context) {
|
|
return func(c *gin.Context) {
|
|
userId := c.GetInt("id")
|
|
userGroup, _ := model.CacheGetUserGroup(userId)
|
|
c.Set("group", userGroup)
|
|
var requestModel string
|
|
var channel *model.Channel
|
|
channelId, ok := c.Get("specific_channel_id")
|
|
if ok {
|
|
id, err := strconv.Atoi(channelId.(string))
|
|
if err != nil {
|
|
abortWithMessage(c, http.StatusBadRequest, "无效的渠道 Id")
|
|
return
|
|
}
|
|
channel, err = model.GetChannelById(id, true)
|
|
if err != nil {
|
|
abortWithMessage(c, http.StatusBadRequest, "无效的渠道 Id")
|
|
return
|
|
}
|
|
if channel.Status != model.ChannelStatusEnabled {
|
|
abortWithMessage(c, http.StatusForbidden, "该渠道已被禁用")
|
|
return
|
|
}
|
|
} else {
|
|
requestModel = c.GetString("request_model")
|
|
var err error
|
|
channel, err = model.CacheGetRandomSatisfiedChannel(userGroup, requestModel, false)
|
|
if err != nil {
|
|
message := fmt.Sprintf("当前分组 %s 下对于模型 %s 无可用渠道", userGroup, requestModel)
|
|
if channel != nil {
|
|
logger.SysError(fmt.Sprintf("渠道不存在:%d", channel.Id))
|
|
message = "数据库一致性已被破坏,请联系管理员"
|
|
}
|
|
abortWithMessage(c, http.StatusServiceUnavailable, message)
|
|
return
|
|
}
|
|
}
|
|
SetupContextForSelectedChannel(c, channel, requestModel)
|
|
c.Next()
|
|
}
|
|
}
|
|
|
|
func SetupContextForSelectedChannel(c *gin.Context, channel *model.Channel, modelName string) {
|
|
c.Set("channel", channel.Type)
|
|
c.Set("channel_id", channel.Id)
|
|
c.Set("channel_name", channel.Name)
|
|
c.Set("model_mapping", channel.GetModelMapping())
|
|
c.Set(ctxkey.OriginalModel, modelName) // for retry
|
|
c.Request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", channel.Key))
|
|
c.Set("base_url", channel.GetBaseURL())
|
|
// this is for backward compatibility
|
|
switch channel.Type {
|
|
case channeltype.Azure:
|
|
c.Set(config.KeyAPIVersion, channel.Other)
|
|
case channeltype.Xunfei:
|
|
c.Set(config.KeyAPIVersion, channel.Other)
|
|
case channeltype.Gemini:
|
|
c.Set(config.KeyAPIVersion, channel.Other)
|
|
case channeltype.AIProxyLibrary:
|
|
c.Set(config.KeyLibraryID, channel.Other)
|
|
case channeltype.Ali:
|
|
c.Set(config.KeyPlugin, channel.Other)
|
|
}
|
|
cfg, _ := channel.LoadConfig()
|
|
for k, v := range cfg {
|
|
c.Set(config.KeyPrefix+k, v)
|
|
}
|
|
}
|