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

common/constants.go

@@ -106,6 +106,9 @@ var PreConsumedQuota = 500
 
 var RetryTimes = 0
 
+var EnableAutodisabledChannelOrKeyAfterMinute = 0
+var EnableAutodisabledChannelOrKeyAt = -1 // UTC hour
+
 //var RootUserEmail = ""
 
 var IsMasterNode bool

controller/channel-test.go

@@ -449,9 +449,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/relay.go

@@ -59,8 +59,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)
@@ -136,20 +157,18 @@ func Relay(c *gin.Context, relayFormat types.RelayFormat) {
 		return
 	}
 
-	// common.SetContextKey(c, constant.ContextKeyTokenCountMeta, meta)
-
 	preConsumedQuota, newAPIError := service.PreConsumeQuota(c, priceData.ShouldPreConsumedQuota, relayInfo)
 	if newAPIError != nil {
 		return
 	}
 
 	defer func() {
-		// Only return quota if downstream failed and quota was actually pre-consumed
 		if newAPIError != nil && preConsumedQuota != 0 {
 			service.ReturnPreConsumedQuota(c, relayInfo, preConsumedQuota)
 		}
 	}()
 
+	// Main retry loop for selecting channels
 	for i := 0; i <= common.RetryTimes; i++ {
 		channel, err := getChannel(c, group, originalModel, i)
 		if err != nil {
@@ -159,28 +178,59 @@ 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
+				}
+
+				// 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
 		}
 	}
 
@@ -236,6 +286,12 @@ func shouldRetry(c *gin.Context, openaiErr *types.NewAPIError, retryTimes int) b
 	if openaiErr == nil {
 		return false
 	}
+	if strings.Contains(openaiErr.Error(), "no response received") {
+		return false
+	}
+	if strings.Contains(openaiErr.Error(), "no candidates returned") {
+		return false
+	}
 	if types.IsChannelError(openaiErr) {
 		return true
 	}
@@ -281,7 +337,11 @@ func processChannelError(c *gin.Context, channelError types.ChannelError, err *t
 		// 不要使用context获取渠道信息，异步处理时可能会出现渠道信息不一致的情况
 		// 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 {
-			service.DisableChannel(channelError, err.Error())
+			reason := err.Error()
+			if err.GetErrorType() == "insufficient_quota" {
+				reason = "insufficient_quota: " + reason
+			}
+			service.DisableChannel(channelError, reason)
 		}
 	})
 

dto/gemini.go

@@ -13,8 +13,8 @@ type GeminiChatRequest struct {
 	Contents           []GeminiChatContent        `json:"contents"`
 	SafetySettings     []GeminiChatSafetySettings `json:"safetySettings,omitempty"`
 	GenerationConfig   GeminiChatGenerationConfig `json:"generationConfig,omitempty"`
-	Tools              json.RawMessage            `json:"tools,omitempty"`
-	SystemInstructions *GeminiChatContent         `json:"systemInstruction,omitempty"`
+	Tools             json.RawMessage    `json:"tools,omitempty"`
+	SystemInstruction *GeminiChatContent `json:"system_instruction,omitempty"`
 }
 
 func (r *GeminiChatRequest) GetTokenCountMeta() *types.TokenCountMeta {

main.go

@@ -115,6 +115,16 @@ func main() {
 		model.InitBatchUpdater()
 	}
 
+	common.EnableAutodisabledChannelOrKeyAfterMinute = common.GetEnvOrDefault("ENABLE_AUTODISABLED_CHANNEL_OR_KEY_AFTER_MINUTE", 0)
+	common.EnableAutodisabledChannelOrKeyAt = common.GetEnvOrDefault("ENABLE_AUTODISABLED_CHANNEL_OR_KEY_AT", -1)
+	if common.EnableAutodisabledChannelOrKeyAt != -1 {
+		common.SysLog(fmt.Sprintf("auto-disabled channels/keys will be re-enabled at %d:00 UTC daily", common.EnableAutodisabledChannelOrKeyAt))
+		go service.CheckAndReEnableChannels()
+	} else if common.EnableAutodisabledChannelOrKeyAfterMinute > 0 {
+		common.SysLog(fmt.Sprintf("auto-disabled channels/keys will be re-enabled after %d minutes", common.EnableAutodisabledChannelOrKeyAfterMinute))
+		go service.CheckAndReEnableChannels()
+	}
+
 	if os.Getenv("ENABLE_PPROF") == "true" {
 		gopool.Go(func() {
 			log.Println(http.ListenAndServe("0.0.0.0:8005", nil))

middleware/distributor.go

@@ -259,6 +259,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)

model/channel.go

@@ -569,6 +569,10 @@ func handlerMultiKeyUpdate(channel *Channel, usingKey string, status int, reason
 		}
 		if status == common.ChannelStatusEnabled {
 			delete(channel.ChannelInfo.MultiKeyStatusList, keyIndex)
+			// If the channel was auto-disabled, re-enable it since at least one key is now enabled.
+			if channel.Status == common.ChannelStatusAutoDisabled {
+				channel.Status = common.ChannelStatusEnabled
+			}
 		} else {
 			channel.ChannelInfo.MultiKeyStatusList[keyIndex] = status
 			if channel.ChannelInfo.MultiKeyDisabledReason == nil {
@@ -963,3 +967,16 @@ func CountChannelsGroupByType() (map[int64]int64, error) {
 	}
 	return counts, nil
 }
+
+func GetAutoDisabledChannels() ([]*Channel, error) {
+	var channels []*Channel
+	err := DB.Where("status = ?", common.ChannelStatusAutoDisabled).Find(&channels).Error
+	return channels, err
+}
+
+func GetChannelsWithDisabledKeys() ([]*Channel, error) {
+	var channels []*Channel
+	// Find channels that are not manually disabled and have disabled keys
+	err := DB.Where("status != ? AND JSON_LENGTH(channel_info -> '$.multi_key_status_list') > 0", common.ChannelStatusManuallyDisabled).Find(&channels).Error
+	return channels, err
+}

relay/channel/gemini/relay-gemini.go

@@ -462,7 +462,7 @@ func CovertGemini2OpenAI(c *gin.Context, textRequest dto.GeneralOpenAIRequest, i
 	}
 
 	if len(system_content) > 0 {
-		geminiRequest.SystemInstructions = &dto.GeminiChatContent{
+		geminiRequest.SystemInstruction = &dto.GeminiChatContent{
 			Parts: []dto.GeminiPart{
 				{
 					Text: strings.Join(system_content, "\n"),

relay/gemini_handler.go

@@ -90,16 +90,16 @@ func GeminiHelper(c *gin.Context, info *relaycommon.RelayInfo) (newAPIError *typ
 	adaptor.Init(info)
 
 	// Clean up empty system instruction
-	if request.SystemInstructions != nil {
+	if request.SystemInstruction != nil {
 		hasContent := false
-		for _, part := range request.SystemInstructions.Parts {
+		for _, part := range request.SystemInstruction.Parts {
 			if part.Text != "" {
 				hasContent = true
 				break
 			}
 		}
 		if !hasContent {
-			request.SystemInstructions = nil
+			request.SystemInstruction = nil
 		}
 	}