Merge branch 'songquanpeng:main' into refactor-main

controller/relay-baidu.go

@@ -57,11 +57,22 @@ type BaiduChatStreamResponse struct {
 func requestOpenAI2Baidu(request GeneralOpenAIRequest) *BaiduChatRequest {
 	messages := make([]BaiduMessage, 0, len(request.Messages))
 	for _, message := range request.Messages {
+		if message.Role == "system" {
+			messages = append(messages, BaiduMessage{
+				Role:    "user",
+				Content: message.Content,
+			})
+			messages = append(messages, BaiduMessage{
+				Role:    "assistant",
+				Content: "Okay",
+			})
+		} else {
 			messages = append(messages, BaiduMessage{
 				Role:    message.Role,
 				Content: message.Content,
 			})
 		}
+	}
 	return &BaiduChatRequest{
 		Messages: messages,
 		Stream:   request.Stream,

controller/relay-claude.go

@@ -69,11 +69,11 @@ func requestOpenAI2Claude(textRequest GeneralOpenAIRequest) *ClaudeRequest {
 			prompt += fmt.Sprintf("\n\nHuman: %s", message.Content)
 		} else if message.Role == "assistant" {
 			prompt += fmt.Sprintf("\n\nAssistant: %s", message.Content)
-		} else {
+		} else if message.Role == "system" {
-			// ignore other roles
+			prompt += fmt.Sprintf("\n\nSystem: %s", message.Content)
+		}
 	}
 	prompt += "\n\nAssistant:"
-	}
 	claudeRequest.Prompt = prompt
 	return &claudeRequest
 }

controller/relay-zhipu.go

@@ -111,11 +111,22 @@ func getZhipuToken(apikey string) string {
 func requestOpenAI2Zhipu(request GeneralOpenAIRequest) *ZhipuRequest {
 	messages := make([]ZhipuMessage, 0, len(request.Messages))
 	for _, message := range request.Messages {
+		if message.Role == "system" {
+			messages = append(messages, ZhipuMessage{
+				Role:    "system",
+				Content: message.Content,
+			})
+			messages = append(messages, ZhipuMessage{
+				Role:    "user",
+				Content: "Okay",
+			})
+		} else {
 			messages = append(messages, ZhipuMessage{
 				Role:    message.Role,
 				Content: message.Content,
 			})
 		}
+	}
 	return &ZhipuRequest{
 		Prompt:      messages,
 		Temperature: request.Temperature,