refactor: 规范错误处理 (#202)

* solve Fix: resource has been exhausted counted as failure count

* solve Fix: resource has been exhausted counted as failure count

* Update provider.go

* Update provider.go

* Update provider.go

* fix

* fix2

* fix

* feat: uncount error

* refactor: 规范错误处理

* fix: 简化判断

* feat: 调整错误处理顺序

* docs: 增加备注

---------

Co-authored-by: kikii16 <[email protected]>
Co-authored-by: kiki <[email protected]>

Author: 3 people

internal/errors/uncounted_errors.go

@@ -0,0 +1,26 @@
+package errors
+
+import "strings"
+
+// unCountedSubstrings contains a list of substrings that indicate an error
+var unCountedSubstrings = []string{
+	"resource has been exhausted",
+	"please reduce the length of the messages",
+}
+
+// IsUnCounted checks if the given error message contains substrings
+func IsUnCounted(errorMsg string) bool {
+	if errorMsg == "" {
+		return false
+	}
+
+	errorLower := strings.ToLower(errorMsg)
+
+	for _, pattern := range unCountedSubstrings {
+		if strings.Contains(errorLower, pattern) {
+			return true
+		}
+	}
+
+	return false
+}

internal/keypool/provider.go

@@ -83,8 +83,15 @@ func (p *KeyProvider) UpdateStatus(apiKey *models.APIKey, group *models.Group, i
 				logrus.WithFields(logrus.Fields{"keyID": apiKey.ID, "error": err}).Error("Failed to handle key success")
 			}
 		} else {
-			if err := p.handleFailure(apiKey, group, keyHashKey, activeKeysListKey, errorMessage); err != nil {
-				logrus.WithFields(logrus.Fields{"keyID": apiKey.ID, "error": err}).Error("Failed to handle key failure")
+			if app_errors.IsUnCounted(errorMessage) {
+				logrus.WithFields(logrus.Fields{
+					"keyID": apiKey.ID,
+					"error": errorMessage,
+				}).Debug("Uncounted error, skipping failure handling")
+			} else {
+				if err := p.handleFailure(apiKey, group, keyHashKey, activeKeysListKey); err != nil {
+					logrus.WithFields(logrus.Fields{"keyID": apiKey.ID, "error": err}).Error("Failed to handle key failure")
+				}
 			}
 		}
 	}()
@@ -117,29 +124,6 @@ func (p *KeyProvider) executeTransactionWithRetry(operation func(tx *gorm.DB) er
 	return err
 }
 
-// shouldCountFailure 判断错误是否应该计入失败次数
-func (p *KeyProvider) shouldCountFailure(errorMsg string) bool {
-	if errorMsg == "" {
-		return true // 没有错误信息时默认计数
-	}
-
-	// 转换为小写进行匹配
-	errorLower := strings.ToLower(errorMsg)
-
-	// 不计入失败次数的错误模式
-	excludePatterns := []string{
-		"resource has been exhausted (e.g. check quota).", // Resource has been exhausted (e.g. check quota).
-	}
-
-	for _, pattern := range excludePatterns {
-		if strings.Contains(errorLower, pattern) {
-			return false
-		}
-	}
-
-	return true // 其他错误计入失败次数
-}
-
 func (p *KeyProvider) handleSuccess(keyID uint, keyHashKey, activeKeysListKey string) error {
 	keyDetails, err := p.store.HGetAll(keyHashKey)
 	if err != nil {
@@ -186,7 +170,7 @@ func (p *KeyProvider) handleSuccess(keyID uint, keyHashKey, activeKeysListKey st
 	})
 }
 
-func (p *KeyProvider) handleFailure(apiKey *models.APIKey, group *models.Group, keyHashKey, activeKeysListKey string, errorMessage string) error {
+func (p *KeyProvider) handleFailure(apiKey *models.APIKey, group *models.Group, keyHashKey, activeKeysListKey string) error {
 	keyDetails, err := p.store.HGetAll(keyHashKey)
 	if err != nil {
 		return fmt.Errorf("failed to get key details from store: %w", err)
@@ -198,16 +182,6 @@ func (p *KeyProvider) handleFailure(apiKey *models.APIKey, group *models.Group,
 
 	failureCount, _ := strconv.ParseInt(keyDetails["failure_count"], 10, 64)
 
-	// 判断是否应该计入失败次数
-	shouldCount := p.shouldCountFailure(errorMessage)
-	if !shouldCount {
-		logrus.WithFields(logrus.Fields{
-			"keyID":       apiKey.ID,
-			"errorMessage": errorMessage,
-		}).Debug("Error not counted towards failure threshold")
-		return nil // 不计入失败次数，直接返回
-	}
-
 	// 获取该分组的有效配置
 	blacklistThreshold := group.EffectiveConfig.BlacklistThreshold
 

internal/proxy/server.go

@@ -202,7 +202,7 @@ func (ps *ProxyServer) executeRequestWithRetry(
 		if err != nil {
 			statusCode = 500
 			errorMessage = err.Error()
-			parsedError = errorMessage // 网络错误直接使用原始错误信息
+			parsedError = errorMessage
 			logrus.Debugf("Request failed (attempt %d/%d) for key %s: %v", retryCount+1, cfg.MaxRetries, utils.MaskAPIKey(apiKey.KeyValue), err)
 		} else {
 			// HTTP-level error (status >= 400)