oadmin/new-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Update SystemInstructions type in GeminiChatRequest and adjust handling in CovertGemini2OpenAI

Browse Source 
- 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.
This commit is contained in:
CalciumIon
2024-12-16 22:41:23 +08:00
parent 76acfdc9e2
commit 4163713714
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
relay/channel/gemini/dto.go
View File

@@ -5,7 +5,7 @@ type GeminiChatRequest struct {
SafetySettings []GeminiChatSafetySettings `json:"safety_settings,omitempty"` SafetySettings []GeminiChatSafetySettings `json:"safety_settings,omitempty"`
GenerationConfig GeminiChatGenerationConfig `json:"generation_config,omitempty"` GenerationConfig GeminiChatGenerationConfig `json:"generation_config,omitempty"`
Tools []GeminiChatTools `json:"tools,omitempty"` Tools []GeminiChatTools `json:"tools,omitempty"`
SystemInstructions *GeminiPart `json:"system_instruction,omitempty"` SystemInstructions *GeminiChatContent `json:"system_instruction,omitempty"`
} }
type GeminiInlineData struct { type GeminiInlineData struct {

8
relay/channel/gemini/relay-gemini.go
View File

@@ -76,8 +76,12 @@ func CovertGemini2OpenAI(textRequest dto.GeneralOpenAIRequest) *GeminiChatReques
for _, message := range textRequest.Messages { for _, message := range textRequest.Messages {
if message.Role == "system" { if message.Role == "system" {
geminiRequest.SystemInstructions = &GeminiPart{ geminiRequest.SystemInstructions = &GeminiChatContent{
Text: message.StringContent(), Parts: []GeminiPart{
{
Text: message.StringContent(),
},
},
} }
continue continue
} }