refactor: rename content to messages

Author: zhu327

README.md

@@ -11,7 +11,7 @@ Gemini-OpenAI-Proxy is a proxy designed to convert the OpenAI API protocol to th
   - [Build](#build)
   - [Deploy](#deploy)
   - [Usage](#usage)
-  - [Compatibility Testing](#compatibility-testing)
+  - [Compatibility](#compatibility)
   - [License](#license)
 
 ---
@@ -106,16 +106,14 @@ Gemini-OpenAI-Proxy offers a straightforward way to integrate OpenAI functionali
 
    If you wish to map `gpt-4-vision-preview` to `gemini-1.5-pro-latest`, you can configure the environment variable `GPT_4_VISION_PREVIEW = gemini-1.5-pro-latest`. This is because `gemini-1.5-pro-latest` now also supports multi-modal data.
 
-   These are the corresponding model mappings for your reference. We've aligned the models from our project with the latest offerings from Gemini, ensuring compatibility and seamless integration.
-
 4. **Handle Responses:**
    Process the responses from the Gemini-OpenAI-Proxy in the same way you would handle responses from OpenAI.
 
 Now, your application is equipped to leverage OpenAI functionality through the Gemini-OpenAI-Proxy, bridging the gap between OpenAI and applications using the Google Gemini Pro protocol.
 
-## Compatibility Testing
+## Compatibility
 
-Gemini-OpenAI-Proxy is designed to seamlessly integrate OpenAI-powered functionalities into applications using the Google Gemini Pro protocol. To ensure comprehensive compatibility, we have conducted testing specifically targeting `chatbox` and `openai translator` functionalities.
+- <https://github.com/zhu327/gemini-openai-proxy/issues/4>
 
 ---
 

api/handler.go

@@ -87,7 +87,7 @@ func ChatProxyHandler(c *gin.Context) {
 		return
 	}
 
-	content, err := req.ToGenaiContent()
+	messages, err := req.ToGenaiMessages()
 	if err != nil {
 		c.JSON(http.StatusBadRequest, openai.APIError{
 			Code:    http.StatusBadRequest,
@@ -112,7 +112,7 @@ func ChatProxyHandler(c *gin.Context) {
 	gemini := adapter.NewGeminiAdapter(client, model)
 
 	if !req.Stream {
-		resp, err := gemini.GenerateContent(ctx, req, content)
+		resp, err := gemini.GenerateContent(ctx, req, messages)
 		if err != nil {
 			log.Printf("genai generate content error %v\n", err)
 			c.JSON(http.StatusBadRequest, openai.APIError{
@@ -126,7 +126,7 @@ func ChatProxyHandler(c *gin.Context) {
 		return
 	}
 
-	dataChan, err := gemini.GenerateStreamContent(ctx, req, content)
+	dataChan, err := gemini.GenerateStreamContent(ctx, req, messages)
 	if err != nil {
 		log.Printf("genai generate content error %v\n", err)
 		c.JSON(http.StatusBadRequest, openai.APIError{

pkg/adapter/chat.go

@@ -41,15 +41,15 @@ func NewGeminiAdapter(client *genai.Client, model string) *GeminiAdapter {
 func (g *GeminiAdapter) GenerateContent(
 	ctx context.Context,
 	req *ChatCompletionRequest,
-	content []*genai.Content,
+	messages []*genai.Content,
 ) (*openai.ChatCompletionResponse, error) {
 	model := g.client.GenerativeModel(g.model)
 	setGenaiModelByOpenaiRequest(model, req)
 
 	cs := model.StartChat()
-	setGenaiChatHistory(cs, content)
+	setGenaiChatHistory(cs, messages)
 
-	genaiResp, err := cs.SendMessage(ctx, content[len(content)-1].Parts...)
+	genaiResp, err := cs.SendMessage(ctx, messages[len(messages)-1].Parts...)
 	if err != nil {
 		return nil, errors.Wrap(err, "genai send message error")
 	}
@@ -61,15 +61,15 @@ func (g *GeminiAdapter) GenerateContent(
 func (g *GeminiAdapter) GenerateStreamContent(
 	ctx context.Context,
 	req *ChatCompletionRequest,
-	content []*genai.Content,
+	messages []*genai.Content,
 ) (<-chan string, error) {
 	model := g.client.GenerativeModel(g.model)
 	setGenaiModelByOpenaiRequest(model, req)
 
 	cs := model.StartChat()
-	setGenaiChatHistory(cs, content)
+	setGenaiChatHistory(cs, messages)
 
-	iter := cs.SendMessageStream(ctx, content[len(content)-1].Parts...)
+	iter := cs.SendMessageStream(ctx, messages[len(messages)-1].Parts...)
 
 	dataChan := make(chan string)
 	go handleStreamIter(g.model, iter, dataChan)
@@ -192,10 +192,10 @@ func convertFinishReason(reason genai.FinishReason) openai.FinishReason {
 	return openaiFinishReason
 }
 
-func setGenaiChatHistory(cs *genai.ChatSession, content []*genai.Content) {
-	cs.History = make([]*genai.Content, 0, len(content))
-	if len(content) > 1 {
-		cs.History = content[:len(content)-1]
+func setGenaiChatHistory(cs *genai.ChatSession, messages []*genai.Content) {
+	cs.History = make([]*genai.Content, 0, len(messages))
+	if len(messages) > 1 {
+		cs.History = messages[:len(messages)-1]
 	}
 
 	if len(cs.History) != 0 && cs.History[len(cs.History)-1].Role != genaiRoleModel {

pkg/adapter/struct.go

@@ -60,7 +60,7 @@ func (req *ChatCompletionRequest) ToGenaiModel() string {
 	}
 }
 
-func (req *ChatCompletionRequest) ToGenaiContent() ([]*genai.Content, error) {
+func (req *ChatCompletionRequest) ToGenaiMessages() ([]*genai.Content, error) {
 	if req.Model == openai.GPT4VisionPreview {
 		return req.toVisionGenaiContent()
 	}