|
@@ -8,7 +8,6 @@ import (
|
|
|
"one-api/dto"
|
|
"one-api/dto"
|
|
|
"one-api/relay/channel/claude"
|
|
"one-api/relay/channel/claude"
|
|
|
relaycommon "one-api/relay/common"
|
|
relaycommon "one-api/relay/common"
|
|
|
- "strings"
|
|
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
const (
|
|
const (
|
|
@@ -31,11 +30,7 @@ func (a *Adaptor) ConvertImageRequest(c *gin.Context, info *relaycommon.RelayInf
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func (a *Adaptor) Init(info *relaycommon.RelayInfo) {
|
|
func (a *Adaptor) Init(info *relaycommon.RelayInfo) {
|
|
|
- if strings.HasPrefix(info.UpstreamModelName, "claude-3") {
|
|
|
|
|
- a.RequestMode = RequestModeMessage
|
|
|
|
|
- } else {
|
|
|
|
|
- a.RequestMode = RequestModeCompletion
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ a.RequestMode = RequestModeMessage
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
|
|
func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
|
|
@@ -53,11 +48,8 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, info *relaycommon.RelayInfo, re
|
|
|
|
|
|
|
|
var claudeReq *claude.ClaudeRequest
|
|
var claudeReq *claude.ClaudeRequest
|
|
|
var err error
|
|
var err error
|
|
|
- if a.RequestMode == RequestModeCompletion {
|
|
|
|
|
- claudeReq = claude.RequestOpenAI2ClaudeComplete(*request)
|
|
|
|
|
- } else {
|
|
|
|
|
- claudeReq, err = claude.RequestOpenAI2ClaudeMessage(*request)
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ claudeReq, err = claude.RequestOpenAI2ClaudeMessage(*request)
|
|
|
|
|
+
|
|
|
c.Set("request_model", request.Model)
|
|
c.Set("request_model", request.Model)
|
|
|
c.Set("converted_request", claudeReq)
|
|
c.Set("converted_request", claudeReq)
|
|
|
return claudeReq, err
|
|
return claudeReq, err
|