Merge e1ee4fe7d9 into 8df4a2670b

relay/adaptor/gemini/main.go

@@ -93,13 +93,22 @@ func ConvertRequest(textRequest model.GeneralOpenAIRequest) *ChatRequest {
 		}
 	}
 	if textRequest.Tools != nil {
-		geminiRequest.Tools = textRequest.Tools
+		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,
+			},
+		}
 	}
-
-	if textRequest.Functions != nil {
-		geminiRequest.Tools = textRequest.Functions
-	}
-
 	shouldAddDummyModelMessage := false
 	for _, message := range textRequest.Messages {
 		content := ChatContent{

relay/adaptor/gemini/model.go

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