feat: 调整gemini tools

This commit is contained in:
suziheng 2025-05-28 15:08:48 +08:00
parent e1ee4fe7d9
commit cf0ce425e6
2 changed files with 7 additions and 16 deletions

View File

@ -93,22 +93,13 @@ func ConvertRequest(textRequest model.GeneralOpenAIRequest) *ChatRequest {
}
}
if textRequest.Tools != nil {
functions := make([]model.Function, 0, len(textRequest.Tools))
for _, tool := range textRequest.Tools {
functions = append(functions, tool.Function)
}
geminiRequest.Tools = []ChatTools{
{
FunctionDeclarations: functions,
},
}
} else if textRequest.Functions != nil {
geminiRequest.Tools = []ChatTools{
{
FunctionDeclarations: textRequest.Functions,
},
}
geminiRequest.Tools = textRequest.Tools
}
if textRequest.Functions != nil {
geminiRequest.Tools = textRequest.Functions
}
shouldAddDummyModelMessage := false
for _, message := range textRequest.Messages {
content := ChatContent{

View File

@ -4,7 +4,7 @@ type ChatRequest struct {
Contents []ChatContent `json:"contents"`
SafetySettings []ChatSafetySettings `json:"safety_settings,omitempty"`
GenerationConfig ChatGenerationConfig `json:"generation_config,omitempty"`
Tools []ChatTools `json:"tools,omitempty"`
Tools interface{} `json:"tools,omitempty"`
SystemInstruction *ChatContent `json:"system_instruction,omitempty"`
}