fix: clarify affinity disabled channel retry message

This commit is contained in:
Seefs
2026-04-25 17:43:42 +08:00
parent f2f3410dcf
commit 355307223a
5 changed files with 17 additions and 13 deletions
+13 -12
View File
@@ -304,18 +304,19 @@ const (
// Distributor related messages // Distributor related messages
const ( const (
MsgDistributorInvalidRequest = "distributor.invalid_request" MsgDistributorInvalidRequest = "distributor.invalid_request"
MsgDistributorInvalidChannelId = "distributor.invalid_channel_id" MsgDistributorInvalidChannelId = "distributor.invalid_channel_id"
MsgDistributorChannelDisabled = "distributor.channel_disabled" MsgDistributorChannelDisabled = "distributor.channel_disabled"
MsgDistributorTokenNoModelAccess = "distributor.token_no_model_access" MsgDistributorAffinityChannelDisabled = "distributor.affinity_channel_disabled"
MsgDistributorTokenModelForbidden = "distributor.token_model_forbidden" MsgDistributorTokenNoModelAccess = "distributor.token_no_model_access"
MsgDistributorModelNameRequired = "distributor.model_name_required" MsgDistributorTokenModelForbidden = "distributor.token_model_forbidden"
MsgDistributorInvalidPlayground = "distributor.invalid_playground_request" MsgDistributorModelNameRequired = "distributor.model_name_required"
MsgDistributorGroupAccessDenied = "distributor.group_access_denied" MsgDistributorInvalidPlayground = "distributor.invalid_playground_request"
MsgDistributorGetChannelFailed = "distributor.get_channel_failed" MsgDistributorGroupAccessDenied = "distributor.group_access_denied"
MsgDistributorNoAvailableChannel = "distributor.no_available_channel" MsgDistributorGetChannelFailed = "distributor.get_channel_failed"
MsgDistributorInvalidMidjourney = "distributor.invalid_midjourney_request" MsgDistributorNoAvailableChannel = "distributor.no_available_channel"
MsgDistributorInvalidParseModel = "distributor.invalid_request_parse_model" MsgDistributorInvalidMidjourney = "distributor.invalid_midjourney_request"
MsgDistributorInvalidParseModel = "distributor.invalid_request_parse_model"
) )
// Custom OAuth provider related messages // Custom OAuth provider related messages
+1
View File
@@ -257,6 +257,7 @@ common.invalid_input: "Invalid input"
distributor.invalid_request: "Invalid request: {{.Error}}" distributor.invalid_request: "Invalid request: {{.Error}}"
distributor.invalid_channel_id: "Invalid channel ID" distributor.invalid_channel_id: "Invalid channel ID"
distributor.channel_disabled: "This channel has been disabled" distributor.channel_disabled: "This channel has been disabled"
distributor.affinity_channel_disabled: "The channel selected by channel affinity has been disabled, and retry was stopped by rule. Please contact the administrator"
distributor.token_no_model_access: "This token has no access to any models" distributor.token_no_model_access: "This token has no access to any models"
distributor.token_model_forbidden: "This token has no access to model {{.Model}}" distributor.token_model_forbidden: "This token has no access to model {{.Model}}"
distributor.model_name_required: "Model name not specified, model name cannot be empty" distributor.model_name_required: "Model name not specified, model name cannot be empty"
+1
View File
@@ -258,6 +258,7 @@ common.invalid_input: "输入不合法"
distributor.invalid_request: "无效的请求,{{.Error}}" distributor.invalid_request: "无效的请求,{{.Error}}"
distributor.invalid_channel_id: "无效的渠道 Id" distributor.invalid_channel_id: "无效的渠道 Id"
distributor.channel_disabled: "该渠道已被禁用" distributor.channel_disabled: "该渠道已被禁用"
distributor.affinity_channel_disabled: "渠道亲和性命中的渠道已被禁用,已按规则停止重试,请联系管理员处理"
distributor.token_no_model_access: "该令牌无权访问任何模型" distributor.token_no_model_access: "该令牌无权访问任何模型"
distributor.token_model_forbidden: "该令牌无权访问模型 {{.Model}}" distributor.token_model_forbidden: "该令牌无权访问模型 {{.Model}}"
distributor.model_name_required: "未指定模型名称,模型名称不能为空" distributor.model_name_required: "未指定模型名称,模型名称不能为空"
+1
View File
@@ -258,6 +258,7 @@ common.invalid_input: "輸入不合法"
distributor.invalid_request: "無效的請求,{{.Error}}" distributor.invalid_request: "無效的請求,{{.Error}}"
distributor.invalid_channel_id: "無效的管道 Id" distributor.invalid_channel_id: "無效的管道 Id"
distributor.channel_disabled: "該管道已被禁用" distributor.channel_disabled: "該管道已被禁用"
distributor.affinity_channel_disabled: "管道親和性命中的管道已被禁用,已按規則停止重試,請聯絡管理員處理"
distributor.token_no_model_access: "該令牌無權存取任何模型" distributor.token_no_model_access: "該令牌無權存取任何模型"
distributor.token_model_forbidden: "該令牌無權存取模型 {{.Model}}" distributor.token_model_forbidden: "該令牌無權存取模型 {{.Model}}"
distributor.model_name_required: "未指定模型名稱,模型名稱不能為空" distributor.model_name_required: "未指定模型名稱,模型名稱不能為空"
+1 -1
View File
@@ -104,7 +104,7 @@ func Distribute() func(c *gin.Context) {
if err == nil && preferred != nil { if err == nil && preferred != nil {
if preferred.Status != common.ChannelStatusEnabled { if preferred.Status != common.ChannelStatusEnabled {
if service.ShouldSkipRetryAfterChannelAffinityFailure(c) { if service.ShouldSkipRetryAfterChannelAffinityFailure(c) {
abortWithOpenAiMessage(c, http.StatusForbidden, i18n.T(c, i18n.MsgDistributorChannelDisabled)) abortWithOpenAiMessage(c, http.StatusForbidden, i18n.T(c, i18n.MsgDistributorAffinityChannelDisabled))
return return
} }
} else if usingGroup == "auto" { } else if usingGroup == "auto" {