支持gemini风格api的系统提示词传递

.claude/settings.local.json

@@ -0,0 +1,11 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(go build:*)",
+      "Bash(npm run build)",
+      "Bash(git:*)"
+    ],
+    "deny": [],
+    "ask": []
+  }
+}

Dockerfile

@@ -9,10 +9,12 @@ COPY ./VERSION .
 RUN DISABLE_ESLINT_PLUGIN='true' VITE_REACT_APP_VERSION=$(cat VERSION) bun run build
 
 FROM golang:alpine AS builder2
+ENV GO111MODULE=on CGO_ENABLED=0
+
+ARG TARGETOS
+ARG TARGETARCH
+ENV GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH:-amd64}
 
-ENV GO111MODULE=on \
-    CGO_ENABLED=0 \
-    GOOS=linux
 
 WORKDIR /build
 

controller/channel-test.go

@@ -586,9 +586,9 @@ func testAllChannels(notify bool) error {
 			}
 
 			// enable channel
-			if !isChannelEnabled && service.ShouldEnableChannel(newAPIError, channel.Status) {
-				service.EnableChannel(channel.Id, common.GetContextKeyString(result.context, constant.ContextKeyChannelKey), channel.Name)
-			}
+			//if !isChannelEnabled && service.ShouldEnableChannel(newAPIError, channel.Status) {
+			//	service.EnableChannel(channel.Id, common.GetContextKeyString(result.context, constant.ContextKeyChannelKey), channel.Name)
+			//}
 
 			channel.UpdateResponseTime(milliseconds)
 			time.Sleep(common.RequestInterval)

controller/option.go

@@ -164,6 +164,24 @@ func UpdateOption(c *gin.Context) {
 			})
 			return
 		}
+	case "TokenRateLimitGroup":
+		err = setting.CheckTokenRateLimitGroup(option.Value.(string))
+		if err != nil {
+			c.JSON(http.StatusOK, gin.H{
+				"success": false,
+				"message": err.Error(),
+			})
+			return
+		}
+	case "TokenDailyRateLimitGroup":
+		err = setting.CheckTokenDailyRateLimitGroup(option.Value.(string))
+		if err != nil {
+			c.JSON(http.StatusOK, gin.H{
+				"success": false,
+				"message": err.Error(),
+			})
+			return
+		}
 	case "console_setting.api_info":
 		err = console_setting.ValidateConsoleSettings(option.Value.(string), "ApiInfo")
 		if err != nil {

controller/relay.go

@@ -60,8 +60,29 @@ func geminiRelayHandler(c *gin.Context, info *relaycommon.RelayInfo) *types.NewA
 	return err
 }
 
-func Relay(c *gin.Context, relayFormat types.RelayFormat) {
+func relayToChannel(c *gin.Context, relayInfo *relaycommon.RelayInfo, channel *model.Channel) *types.NewAPIError {
+	requestBody, _ := common.GetRequestBody(c)
+	c.Request.Body = io.NopCloser(bytes.NewBuffer(requestBody))
+
+	var newAPIError *types.NewAPIError
+	switch relayInfo.RelayFormat {
+	case types.RelayFormatOpenAIRealtime:
+		newAPIError = relay.WssHelper(c, relayInfo)
+	case types.RelayFormatClaude:
+		newAPIError = relay.ClaudeHelper(c, relayInfo)
+	case types.RelayFormatGemini:
+		newAPIError = geminiRelayHandler(c, relayInfo)
+	default:
+		newAPIError = relayHandler(c, relayInfo)
+	}
 
+	if newAPIError != nil {
+		processChannelError(c, *types.NewChannelError(channel.Id, channel.Type, channel.Name, channel.ChannelInfo.IsMultiKey, common.GetContextKeyString(c, constant.ContextKeyChannelKey), channel.GetAutoBan()), newAPIError)
+	}
+	return newAPIError
+}
+
+func Relay(c *gin.Context, relayFormat types.RelayFormat) {
 	requestId := c.GetString(common.RequestIdKey)
 	group := common.GetContextKeyString(c, constant.ContextKeyUsingGroup)
 	originalModel := common.GetContextKeyString(c, constant.ContextKeyOriginalModel)
@@ -137,8 +158,6 @@ func Relay(c *gin.Context, relayFormat types.RelayFormat) {
 		return
 	}
 
-	// common.SetContextKey(c, constant.ContextKeyTokenCountMeta, meta)
-
 	newAPIError = service.PreConsumeQuota(c, priceData.ShouldPreConsumedQuota, relayInfo)
 	if newAPIError != nil {
 		return
@@ -151,6 +170,7 @@ func Relay(c *gin.Context, relayFormat types.RelayFormat) {
 		}
 	}()
 
+	// Main retry loop for selecting channels
 	for i := 0; i <= common.RetryTimes; i++ {
 		channel, err := getChannel(c, group, originalModel, i)
 		if err != nil {
@@ -160,28 +180,64 @@ func Relay(c *gin.Context, relayFormat types.RelayFormat) {
 		}
 
 		addUsedChannel(c, channel.Id)
-		requestBody, _ := common.GetRequestBody(c)
-		c.Request.Body = io.NopCloser(bytes.NewBuffer(requestBody))
-
-		switch relayFormat {
-		case types.RelayFormatOpenAIRealtime:
-			newAPIError = relay.WssHelper(c, relayInfo)
-		case types.RelayFormatClaude:
-			newAPIError = relay.ClaudeHelper(c, relayInfo)
-		case types.RelayFormatGemini:
-			newAPIError = geminiRelayHandler(c, relayInfo)
-		default:
-			newAPIError = relayHandler(c, relayInfo)
-		}
 
-		if newAPIError == nil {
-			return
+		// Inner loop for retrying keys within a multi-key channel
+		if channel.ChannelInfo.IsMultiKey {
+			key, keyIdx, keyErr := channel.GetNextEnabledKey()
+			if keyErr != nil {
+				newAPIError = keyErr
+				break // No keys available, break to outer loop to switch channel
+			}
+
+			triedKeys := make(map[int]bool) // Track tried keys for this channel
+			for j := 0; j < channel.ChannelInfo.MultiKeySize && j < 20; j++ {
+				if _, ok := triedKeys[keyIdx]; ok {
+					// This key has been tried, get another one
+					key, keyIdx, keyErr = channel.GetNextEnabledKey()
+					if keyErr != nil {
+						newAPIError = keyErr
+						break
+					}
+					continue
+				}
+
+				// Setup context with the new key
+				middleware.SetupContextForSelectedChannelWithKey(c, channel, originalModel, key, keyIdx)
+				triedKeys[keyIdx] = true
+
+				newAPIError = relayToChannel(c, relayInfo, channel)
+				if newAPIError == nil {
+					return // Success
+				}
+
+				// inappropriate 错误直接切换渠道，不重试同一渠道的多个密钥
+				if isInappropriateError(newAPIError) {
+					goto next_channel
+				}
+
+				// If the error is not retryable for a key, break the inner loop
+				if !shouldRetry(c, newAPIError, common.RetryTimes-i) {
+					goto next_channel // Break inner loop and go to the next channel
+				}
+
+				// Get next key for retry
+				key, keyIdx, keyErr = channel.GetNextEnabledKey()
+				if keyErr != nil {
+					newAPIError = keyErr
+					break // No more keys to try
+				}
+			}
+		} else {
+			// Single key channel logic
+			newAPIError = relayToChannel(c, relayInfo, channel)
+			if newAPIError == nil {
+				return // Success
+			}
 		}
 
-		processChannelError(c, *types.NewChannelError(channel.Id, channel.Type, channel.Name, channel.ChannelInfo.IsMultiKey, common.GetContextKeyString(c, constant.ContextKeyChannelKey), channel.GetAutoBan()), newAPIError)
-
+	next_channel:
 		if !shouldRetry(c, newAPIError, common.RetryTimes-i) {
-			break
+			break // Break outer loop if error is not retryable for the channel
 		}
 	}
 
@@ -233,10 +289,29 @@ func getChannel(c *gin.Context, group, originalModel string, retryCount int) (*m
 	return channel, nil
 }
 
+// isInappropriateError 检测错误是否包含 inappropriate 字样
+// 此类错误需要强制渠道间重试，不重试同一渠道的多个密钥
+func isInappropriateError(openaiErr *types.NewAPIError) bool {
+	if openaiErr == nil {
+		return false
+	}
+	return strings.Contains(strings.ToLower(openaiErr.Error()), "inappropriate")
+}
+
 func shouldRetry(c *gin.Context, openaiErr *types.NewAPIError, retryTimes int) bool {
 	if openaiErr == nil {
 		return false
 	}
+	if strings.Contains(openaiErr.Error(), "no response received") {
+		return false
+	}
+	if strings.Contains(openaiErr.Error(), "no candidates reMeoWturned") {
+		return false
+	}
+	// inappropriate 错误强制渠道间重试
+	if isInappropriateError(openaiErr) {
+		return true
+	}
 	if types.IsChannelError(openaiErr) {
 		return true
 	}
@@ -281,7 +356,11 @@ func processChannelError(c *gin.Context, channelError types.ChannelError, err *t
 	// do not use context to get channel info, there may be inconsistent channel info when processing asynchronously
 	if service.ShouldDisableChannel(channelError.ChannelId, err) && channelError.AutoBan {
 		gopool.Go(func() {
-			service.DisableChannel(channelError, err.Error())
+			reason := err.Error()
+			if err.GetErrorType() == "insufficient_quota" {
+				reason = "insufficient_quota: " + reason
+			}
+			service.DisableChannel(channelError, reason)
 		})
 	}
 

dto/gemini.go

@@ -16,7 +16,7 @@ type GeminiChatRequest struct {
 	GenerationConfig   GeminiChatGenerationConfig `json:"generationConfig,omitempty"`
 	Tools              json.RawMessage            `json:"tools,omitempty"`
 	ToolConfig         *ToolConfig                `json:"toolConfig,omitempty"`
-	SystemInstructions *GeminiChatContent         `json:"systemInstruction,omitempty"`
+	SystemInstruction  *GeminiChatContent         `json:"system_instruction,omitempty"`
 	CachedContent      string                     `json:"cachedContent,omitempty"`
 }
 

middleware/distributor.go

@@ -298,6 +298,10 @@ func SetupContextForSelectedChannel(c *gin.Context, channel *model.Channel, mode
 	if newAPIError != nil {
 		return newAPIError
 	}
+	return SetupContextForSelectedChannelWithKey(c, channel, modelName, key, index)
+}
+
+func SetupContextForSelectedChannelWithKey(c *gin.Context, channel *model.Channel, modelName string, key string, index int) *types.NewAPIError {
 	if channel.ChannelInfo.IsMultiKey {
 		common.SetContextKey(c, constant.ContextKeyChannelIsMultiKey, true)
 		common.SetContextKey(c, constant.ContextKeyChannelMultiKeyIndex, index)