mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-04-23 04:38:38 +00:00
fix: 在Vertex Adapter过滤content[].part[].functionResponse.id
This commit is contained in:
@@ -51,10 +51,43 @@ type Adaptor struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (a *Adaptor) ConvertGeminiRequest(c *gin.Context, info *relaycommon.RelayInfo, request *dto.GeminiChatRequest) (any, error) {
|
func (a *Adaptor) ConvertGeminiRequest(c *gin.Context, info *relaycommon.RelayInfo, request *dto.GeminiChatRequest) (any, error) {
|
||||||
|
// Vertex AI does not support functionResponse.id; keep it stripped here for consistency.
|
||||||
|
if model_setting.GetGeminiSettings().RemoveFunctionResponseIdEnabled {
|
||||||
|
removeFunctionResponseID(request)
|
||||||
|
}
|
||||||
geminiAdaptor := gemini.Adaptor{}
|
geminiAdaptor := gemini.Adaptor{}
|
||||||
return geminiAdaptor.ConvertGeminiRequest(c, info, request)
|
return geminiAdaptor.ConvertGeminiRequest(c, info, request)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func removeFunctionResponseID(request *dto.GeminiChatRequest) {
|
||||||
|
if request == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(request.Contents) > 0 {
|
||||||
|
for i := range request.Contents {
|
||||||
|
if len(request.Contents[i].Parts) == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for j := range request.Contents[i].Parts {
|
||||||
|
part := &request.Contents[i].Parts[j]
|
||||||
|
if part.FunctionResponse == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if len(part.FunctionResponse.ID) > 0 {
|
||||||
|
part.FunctionResponse.ID = nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(request.Requests) > 0 {
|
||||||
|
for i := range request.Requests {
|
||||||
|
removeFunctionResponseID(&request.Requests[i])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (a *Adaptor) ConvertClaudeRequest(c *gin.Context, info *relaycommon.RelayInfo, request *dto.ClaudeRequest) (any, error) {
|
func (a *Adaptor) ConvertClaudeRequest(c *gin.Context, info *relaycommon.RelayInfo, request *dto.ClaudeRequest) (any, error) {
|
||||||
if v, ok := claudeModelMap[info.UpstreamModelName]; ok {
|
if v, ok := claudeModelMap[info.UpstreamModelName]; ok {
|
||||||
c.Set("request_model", v)
|
c.Set("request_model", v)
|
||||||
|
|||||||
@@ -162,11 +162,6 @@ func GeminiHelper(c *gin.Context, info *relaycommon.RelayInfo) (newAPIError *typ
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// remove disabled fields for Vertex AI
|
|
||||||
if info.ChannelType == constant.ChannelTypeVertexAi {
|
|
||||||
jsonData, _ = relaycommon.RemoveGeminiDisabledFields(jsonData)
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.LogDebug(c, "Gemini request body: "+string(jsonData))
|
logger.LogDebug(c, "Gemini request body: "+string(jsonData))
|
||||||
|
|
||||||
requestBody = bytes.NewReader(jsonData)
|
requestBody = bytes.NewReader(jsonData)
|
||||||
|
|||||||
Reference in New Issue
Block a user