mirror of
https://github.com/linux-do/new-api.git
synced 2025-09-17 07:56:38 +08:00
feat: 添加Mistral渠道 (close #546)
This commit is contained in:
parent
3e2ae29ba0
commit
4b48e490fa
@ -222,6 +222,7 @@ const (
|
|||||||
ChannelCloudflare = 39
|
ChannelCloudflare = 39
|
||||||
ChannelTypeSiliconFlow = 40
|
ChannelTypeSiliconFlow = 40
|
||||||
ChannelTypeVertexAi = 41
|
ChannelTypeVertexAi = 41
|
||||||
|
ChannelTypeMistral = 42
|
||||||
|
|
||||||
ChannelTypeDummy // this one is only for count, do not add any channel after this
|
ChannelTypeDummy // this one is only for count, do not add any channel after this
|
||||||
|
|
||||||
@ -270,4 +271,5 @@ var ChannelBaseURLs = []string{
|
|||||||
"https://api.cloudflare.com", //39
|
"https://api.cloudflare.com", //39
|
||||||
"https://api.siliconflow.cn", //40
|
"https://api.siliconflow.cn", //40
|
||||||
"", //41
|
"", //41
|
||||||
|
"https://api.mistral.ai", //42
|
||||||
}
|
}
|
||||||
|
72
relay/channel/mistral/adaptor.go
Normal file
72
relay/channel/mistral/adaptor.go
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
package mistral
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"one-api/dto"
|
||||||
|
"one-api/relay/channel"
|
||||||
|
"one-api/relay/channel/openai"
|
||||||
|
relaycommon "one-api/relay/common"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Adaptor struct {
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *Adaptor) ConvertAudioRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.AudioRequest) (io.Reader, error) {
|
||||||
|
//TODO implement me
|
||||||
|
return nil, errors.New("not implemented")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *Adaptor) ConvertImageRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.ImageRequest) (any, error) {
|
||||||
|
//TODO implement me
|
||||||
|
return nil, errors.New("not implemented")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *Adaptor) Init(info *relaycommon.RelayInfo) {
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
|
||||||
|
return relaycommon.GetFullRequestURL(info.BaseUrl, info.RequestURLPath, info.ChannelType), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *Adaptor) SetupRequestHeader(c *gin.Context, req *http.Request, info *relaycommon.RelayInfo) error {
|
||||||
|
channel.SetupApiRequestHeader(info, c, req)
|
||||||
|
req.Header.Set("Authorization", "Bearer "+info.ApiKey)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *Adaptor) ConvertRequest(c *gin.Context, info *relaycommon.RelayInfo, request *dto.GeneralOpenAIRequest) (any, error) {
|
||||||
|
if request == nil {
|
||||||
|
return nil, errors.New("request is nil")
|
||||||
|
}
|
||||||
|
mistralReq := requestOpenAI2Mistral(*request)
|
||||||
|
//common.LogJson(c, "body", mistralReq)
|
||||||
|
return mistralReq, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *Adaptor) ConvertRerankRequest(c *gin.Context, relayMode int, request dto.RerankRequest) (any, error) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, requestBody io.Reader) (*http.Response, error) {
|
||||||
|
return channel.DoApiRequest(a, c, info, requestBody)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode) {
|
||||||
|
if info.IsStream {
|
||||||
|
err, usage = openai.OaiStreamHandler(c, resp, info)
|
||||||
|
} else {
|
||||||
|
err, usage = openai.OpenaiHandler(c, resp, info.PromptTokens, info.UpstreamModelName)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *Adaptor) GetModelList() []string {
|
||||||
|
return ModelList
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *Adaptor) GetChannelName() string {
|
||||||
|
return ChannelName
|
||||||
|
}
|
12
relay/channel/mistral/constants.go
Normal file
12
relay/channel/mistral/constants.go
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
package mistral
|
||||||
|
|
||||||
|
var ModelList = []string{
|
||||||
|
"open-mistral-7b",
|
||||||
|
"open-mixtral-8x7b",
|
||||||
|
"mistral-small-latest",
|
||||||
|
"mistral-medium-latest",
|
||||||
|
"mistral-large-latest",
|
||||||
|
"mistral-embed",
|
||||||
|
}
|
||||||
|
|
||||||
|
var ChannelName = "mistral"
|
40
relay/channel/mistral/text.go
Normal file
40
relay/channel/mistral/text.go
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
package mistral
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"one-api/dto"
|
||||||
|
)
|
||||||
|
|
||||||
|
func requestOpenAI2Mistral(request dto.GeneralOpenAIRequest) *dto.GeneralOpenAIRequest {
|
||||||
|
messages := make([]dto.Message, 0, len(request.Messages))
|
||||||
|
for _, message := range request.Messages {
|
||||||
|
if !message.IsStringContent() {
|
||||||
|
mediaMessages := message.ParseContent()
|
||||||
|
for j, mediaMessage := range mediaMessages {
|
||||||
|
if mediaMessage.Type == dto.ContentTypeImageURL {
|
||||||
|
imageUrl := mediaMessage.ImageUrl.(dto.MessageImageUrl)
|
||||||
|
mediaMessage.ImageUrl = imageUrl.Url
|
||||||
|
mediaMessages[j] = mediaMessage
|
||||||
|
}
|
||||||
|
}
|
||||||
|
messageRaw, _ := json.Marshal(mediaMessages)
|
||||||
|
message.Content = messageRaw
|
||||||
|
}
|
||||||
|
messages = append(messages, dto.Message{
|
||||||
|
Role: message.Role,
|
||||||
|
Content: message.Content,
|
||||||
|
ToolCalls: message.ToolCalls,
|
||||||
|
ToolCallId: message.ToolCallId,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return &dto.GeneralOpenAIRequest{
|
||||||
|
Model: request.Model,
|
||||||
|
Stream: request.Stream,
|
||||||
|
Messages: messages,
|
||||||
|
Temperature: request.Temperature,
|
||||||
|
TopP: request.TopP,
|
||||||
|
MaxTokens: request.MaxTokens,
|
||||||
|
Tools: request.Tools,
|
||||||
|
ToolChoice: request.ToolChoice,
|
||||||
|
}
|
||||||
|
}
|
@ -25,6 +25,7 @@ const (
|
|||||||
APITypeCloudflare
|
APITypeCloudflare
|
||||||
APITypeSiliconFlow
|
APITypeSiliconFlow
|
||||||
APITypeVertexAi
|
APITypeVertexAi
|
||||||
|
APITypeMistral
|
||||||
|
|
||||||
APITypeDummy // this one is only for count, do not add any channel after this
|
APITypeDummy // this one is only for count, do not add any channel after this
|
||||||
)
|
)
|
||||||
@ -72,6 +73,8 @@ func ChannelType2APIType(channelType int) (int, bool) {
|
|||||||
apiType = APITypeSiliconFlow
|
apiType = APITypeSiliconFlow
|
||||||
case common.ChannelTypeVertexAi:
|
case common.ChannelTypeVertexAi:
|
||||||
apiType = APITypeVertexAi
|
apiType = APITypeVertexAi
|
||||||
|
case common.ChannelTypeMistral:
|
||||||
|
apiType = APITypeMistral
|
||||||
}
|
}
|
||||||
if apiType == -1 {
|
if apiType == -1 {
|
||||||
return APITypeOpenAI, false
|
return APITypeOpenAI, false
|
||||||
|
@ -12,6 +12,7 @@ import (
|
|||||||
"one-api/relay/channel/dify"
|
"one-api/relay/channel/dify"
|
||||||
"one-api/relay/channel/gemini"
|
"one-api/relay/channel/gemini"
|
||||||
"one-api/relay/channel/jina"
|
"one-api/relay/channel/jina"
|
||||||
|
"one-api/relay/channel/mistral"
|
||||||
"one-api/relay/channel/ollama"
|
"one-api/relay/channel/ollama"
|
||||||
"one-api/relay/channel/openai"
|
"one-api/relay/channel/openai"
|
||||||
"one-api/relay/channel/palm"
|
"one-api/relay/channel/palm"
|
||||||
@ -68,6 +69,8 @@ func GetAdaptor(apiType int) channel.Adaptor {
|
|||||||
return &siliconflow.Adaptor{}
|
return &siliconflow.Adaptor{}
|
||||||
case constant.APITypeVertexAi:
|
case constant.APITypeVertexAi:
|
||||||
return &vertex.Adaptor{}
|
return &vertex.Adaptor{}
|
||||||
|
case constant.APITypeMistral:
|
||||||
|
return &mistral.Adaptor{}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
@ -109,6 +109,7 @@ export const CHANNEL_OPTIONS = [
|
|||||||
{ key: 37, text: 'Dify', value: 37, color: 'teal', label: 'Dify' },
|
{ key: 37, text: 'Dify', value: 37, color: 'teal', label: 'Dify' },
|
||||||
{ key: 38, text: 'Jina', value: 38, color: 'blue', label: 'Jina' },
|
{ key: 38, text: 'Jina', value: 38, color: 'blue', label: 'Jina' },
|
||||||
{ key: 40, text: 'SiliconCloud', value: 40, color: 'purple', label: 'SiliconCloud' },
|
{ key: 40, text: 'SiliconCloud', value: 40, color: 'purple', label: 'SiliconCloud' },
|
||||||
|
{ key: 42, text: 'Mistral AI', value: 42, color: 'blue', label: 'Mistral AI' },
|
||||||
{ key: 8, text: '自定义渠道', value: 8, color: 'pink', label: '自定义渠道' },
|
{ key: 8, text: '自定义渠道', value: 8, color: 'pink', label: '自定义渠道' },
|
||||||
{
|
{
|
||||||
key: 22,
|
key: 22,
|
||||||
|
Loading…
Reference in New Issue
Block a user