Merge 1e19c333c9 into 8df4a2670b

relay/adaptor/gemini/main.go

@@ -66,23 +66,6 @@ func ConvertRequest(textRequest model.GeneralOpenAIRequest) *ChatRequest {
 			MaxOutputTokens: textRequest.MaxTokens,
 		},
 	}
-
-	if textRequest.ReasoningEffort != nil {
-		var thinkBudget int
-		switch *textRequest.ReasoningEffort {
-		case "low":
-			thinkBudget = 1000
-		case "medium":
-			thinkBudget = 8000
-		case "high":
-			thinkBudget = 24000
-		}
-		geminiRequest.GenerationConfig.ThinkingConfig = &ThinkingConfig{
-			ThinkingBudget:  thinkBudget,
-			IncludeThoughts: true,
-		}
-	}
-
 	if textRequest.ResponseFormat != nil {
 		if mimeType, ok := mimeTypeMap[textRequest.ResponseFormat.Type]; ok {
 			geminiRequest.GenerationConfig.ResponseMimeType = mimeType
@@ -216,21 +199,6 @@ func (g *ChatResponse) GetResponseText() string {
 	return ""
 }
 
-func (g *ChatResponse) GetResponseTextAndThought() (content string, thought string) {
-	if g == nil {
-		return
-	}
-	if len(g.Candidates) > 0 && len(g.Candidates[0].Content.Parts) > 0 {
-		contentPart := g.Candidates[0].Content.Parts[0]
-		if contentPart.Thought {
-			thought = contentPart.Text
-			return
-		}
-		content = contentPart.Text
-	}
-	return
-}
-
 type ChatCandidate struct {
 	Content       ChatContent        `json:"content"`
 	FinishReason  string             `json:"finishReason"`
@@ -295,11 +263,7 @@ func responseGeminiChat2OpenAI(response *ChatResponse) *openai.TextResponse {
 					if i > 0 {
 						builder.WriteString("\n")
 					}
-					if part.Thought {
-						builder.WriteString(fmt.Sprintf("<think>%s</think>\n", part.Text))
-					} else {
-						builder.WriteString(part.Text)
-					}
+					builder.WriteString(part.Text)
 				}
 				choice.Message.Content = builder.String()
 			}
@@ -314,7 +278,7 @@ func responseGeminiChat2OpenAI(response *ChatResponse) *openai.TextResponse {
 
 func streamResponseGeminiChat2OpenAI(geminiResponse *ChatResponse) *openai.ChatCompletionsStreamResponse {
 	var choice openai.ChatCompletionsStreamResponseChoice
-	choice.Delta.Content, choice.Delta.ReasoningContent = geminiResponse.GetResponseTextAndThought()
+	choice.Delta.Content = geminiResponse.GetResponseText()
 	//choice.FinishReason = &constant.StopFinishReason
 	var response openai.ChatCompletionsStreamResponse
 	response.Id = fmt.Sprintf("chatcmpl-%s", random.GetUUID())

relay/adaptor/gemini/model.go

@@ -49,7 +49,6 @@ type Part struct {
 	Text         string        `json:"text,omitempty"`
 	InlineData   *InlineData   `json:"inlineData,omitempty"`
 	FunctionCall *FunctionCall `json:"functionCall,omitempty"`
-	Thought      bool          `json:"thought,omitempty"`
 }
 
 type ChatContent struct {
@@ -67,18 +66,12 @@ type ChatTools struct {
 }
 
 type ChatGenerationConfig struct {
-	ResponseMimeType string          `json:"responseMimeType,omitempty"`
-	ResponseSchema   any             `json:"responseSchema,omitempty"`
-	Temperature      *float64        `json:"temperature,omitempty"`
-	TopP             *float64        `json:"topP,omitempty"`
-	TopK             float64         `json:"topK,omitempty"`
-	MaxOutputTokens  int             `json:"maxOutputTokens,omitempty"`
-	CandidateCount   int             `json:"candidateCount,omitempty"`
-	StopSequences    []string        `json:"stopSequences,omitempty"`
-	ThinkingConfig   *ThinkingConfig `json:"thinkingConfig,omitempty"`
-}
-
-type ThinkingConfig struct {
-	ThinkingBudget  int  `json:"thinkingBudget"`
-	IncludeThoughts bool `json:"includeThoughts"`
+	ResponseMimeType string   `json:"responseMimeType,omitempty"`
+	ResponseSchema   any      `json:"responseSchema,omitempty"`
+	Temperature      *float64 `json:"temperature,omitempty"`
+	TopP             *float64 `json:"topP,omitempty"`
+	TopK             float64  `json:"topK,omitempty"`
+	MaxOutputTokens  int      `json:"maxOutputTokens,omitempty"`
+	CandidateCount   int      `json:"candidateCount,omitempty"`
+	StopSequences    []string `json:"stopSequences,omitempty"`
 }