From 41637137148204d30b62d6c53421d45871911ac1 Mon Sep 17 00:00:00 2001 From: CalciumIon <1808837298@qq.com> Date: Mon, 16 Dec 2024 22:41:23 +0800 Subject: [PATCH] refactor: Update SystemInstructions type in GeminiChatRequest and adjust handling in CovertGemini2OpenAI - Changed SystemInstructions from *GeminiPart to *GeminiChatContent in GeminiChatRequest for improved structure. - Updated CovertGemini2OpenAI function to accommodate the new SystemInstructions type, ensuring proper handling of message content. --- relay/channel/gemini/dto.go | 2 +- relay/channel/gemini/relay-gemini.go | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/relay/channel/gemini/dto.go b/relay/channel/gemini/dto.go index e21649c2..fa461a37 100644 --- a/relay/channel/gemini/dto.go +++ b/relay/channel/gemini/dto.go @@ -5,7 +5,7 @@ type GeminiChatRequest struct { SafetySettings []GeminiChatSafetySettings `json:"safety_settings,omitempty"` GenerationConfig GeminiChatGenerationConfig `json:"generation_config,omitempty"` Tools []GeminiChatTools `json:"tools,omitempty"` - SystemInstructions *GeminiPart `json:"system_instruction,omitempty"` + SystemInstructions *GeminiChatContent `json:"system_instruction,omitempty"` } type GeminiInlineData struct { diff --git a/relay/channel/gemini/relay-gemini.go b/relay/channel/gemini/relay-gemini.go index 03ba46f4..5726508b 100644 --- a/relay/channel/gemini/relay-gemini.go +++ b/relay/channel/gemini/relay-gemini.go @@ -76,8 +76,12 @@ func CovertGemini2OpenAI(textRequest dto.GeneralOpenAIRequest) *GeminiChatReques for _, message := range textRequest.Messages { if message.Role == "system" { - geminiRequest.SystemInstructions = &GeminiPart{ - Text: message.StringContent(), + geminiRequest.SystemInstructions = &GeminiChatContent{ + Parts: []GeminiPart{ + { + Text: message.StringContent(), + }, + }, } continue }