Merge cb4ee5e86a into 8df4a2670b

relay/adaptor/gemini/model.go

@@ -65,13 +65,19 @@ type ChatTools struct {
 	FunctionDeclarations any `json:"function_declarations,omitempty"`
 }
 
-type ChatGenerationConfig struct {
+type ThinkingConfig struct {
-	ResponseMimeType string   `json:"responseMimeType,omitempty"`
+	IncludeThoughts bool `json:"includeThoughts"`
-	ResponseSchema   any      `json:"responseSchema,omitempty"`
+	ThinkingBudget  int  `json:"thinkingBudget"`
-	Temperature      *float64 `json:"temperature,omitempty"`
+}
-	TopP             *float64 `json:"topP,omitempty"`
+
-	TopK             float64  `json:"topK,omitempty"`
+type ChatGenerationConfig struct {
-	MaxOutputTokens  int      `json:"maxOutputTokens,omitempty"`
+	ResponseMimeType string          `json:"responseMimeType,omitempty"`
-	CandidateCount   int      `json:"candidateCount,omitempty"`
+	ResponseSchema   any             `json:"responseSchema,omitempty"`
-	StopSequences    []string `json:"stopSequences,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"`
 }

relay/adaptor/vertexai/gemini/adapter.go

@@ -2,6 +2,9 @@ package vertexai
 
 import (
 	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
 
 	"github.com/gin-gonic/gin"
 	"github.com/pkg/errors"
@@ -27,13 +30,47 @@ var ModelList = []string{
 type Adaptor struct {
 }
 
+func (a *Adaptor) parseGeminiChatGenerationThinking(model string) (string, *gemini.ThinkingConfig) {
+	thinkingConfig := &gemini.ThinkingConfig{
+		IncludeThoughts: false,
+		ThinkingBudget:  0,
+	}
+	modelName := model
+	if strings.Contains(model, "?") {
+		parts := strings.Split(model, "?")
+		_modelName := parts[0]
+		if len(parts) >= 2 {
+			modelOptions, err := url.ParseQuery(parts[1])
+			if err == nil && modelOptions != nil {
+				modelName = _modelName
+				hasThinkingFlag := modelOptions.Has("thinking")
+				if hasThinkingFlag {
+					thinkingConfig.IncludeThoughts = modelOptions.Get("thinking") == "1"
+				}
+				thinkingBudget := modelOptions.Get("thinking_budget")
+				if thinkingBudget != "" {
+					thinkingBudgetInt, err := strconv.Atoi(thinkingBudget)
+					if err == nil {
+						thinkingConfig.ThinkingBudget = thinkingBudgetInt
+					}
+				}
+			}
+		}
+	}
+	return modelName, thinkingConfig
+}
+
 func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.GeneralOpenAIRequest) (any, error) {
 	if request == nil {
 		return nil, errors.New("request is nil")
 	}
-
+	modelName, thinkingConfig := a.parseGeminiChatGenerationThinking(request.Model)
+	request.Model = modelName
 	geminiRequest := gemini.ConvertRequest(*request)
-	c.Set(ctxkey.RequestModel, request.Model)
+	if thinkingConfig != nil {
+		geminiRequest.GenerationConfig.ThinkingConfig = thinkingConfig
+	}
+	c.Set(ctxkey.RequestModel, modelName)
 	c.Set(ctxkey.ConvertedRequest, geminiRequest)
 	return geminiRequest, nil
 }