diff --git a/i18n/keys.go b/i18n/keys.go index 5123fa9d..8e551d2e 100644 --- a/i18n/keys.go +++ b/i18n/keys.go @@ -304,18 +304,19 @@ const ( // Distributor related messages const ( - MsgDistributorInvalidRequest = "distributor.invalid_request" - MsgDistributorInvalidChannelId = "distributor.invalid_channel_id" - MsgDistributorChannelDisabled = "distributor.channel_disabled" - MsgDistributorTokenNoModelAccess = "distributor.token_no_model_access" - MsgDistributorTokenModelForbidden = "distributor.token_model_forbidden" - MsgDistributorModelNameRequired = "distributor.model_name_required" - MsgDistributorInvalidPlayground = "distributor.invalid_playground_request" - MsgDistributorGroupAccessDenied = "distributor.group_access_denied" - MsgDistributorGetChannelFailed = "distributor.get_channel_failed" - MsgDistributorNoAvailableChannel = "distributor.no_available_channel" - MsgDistributorInvalidMidjourney = "distributor.invalid_midjourney_request" - MsgDistributorInvalidParseModel = "distributor.invalid_request_parse_model" + MsgDistributorInvalidRequest = "distributor.invalid_request" + MsgDistributorInvalidChannelId = "distributor.invalid_channel_id" + MsgDistributorChannelDisabled = "distributor.channel_disabled" + MsgDistributorAffinityChannelDisabled = "distributor.affinity_channel_disabled" + MsgDistributorTokenNoModelAccess = "distributor.token_no_model_access" + MsgDistributorTokenModelForbidden = "distributor.token_model_forbidden" + MsgDistributorModelNameRequired = "distributor.model_name_required" + MsgDistributorInvalidPlayground = "distributor.invalid_playground_request" + MsgDistributorGroupAccessDenied = "distributor.group_access_denied" + MsgDistributorGetChannelFailed = "distributor.get_channel_failed" + MsgDistributorNoAvailableChannel = "distributor.no_available_channel" + MsgDistributorInvalidMidjourney = "distributor.invalid_midjourney_request" + MsgDistributorInvalidParseModel = "distributor.invalid_request_parse_model" ) // Custom OAuth provider related messages diff --git a/i18n/locales/en.yaml b/i18n/locales/en.yaml index e9fc80f2..064abc70 100644 --- a/i18n/locales/en.yaml +++ b/i18n/locales/en.yaml @@ -257,6 +257,7 @@ common.invalid_input: "Invalid input" distributor.invalid_request: "Invalid request: {{.Error}}" distributor.invalid_channel_id: "Invalid channel ID" 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_model_forbidden: "This token has no access to model {{.Model}}" distributor.model_name_required: "Model name not specified, model name cannot be empty" diff --git a/i18n/locales/zh-CN.yaml b/i18n/locales/zh-CN.yaml index 58ba5007..b05ca743 100644 --- a/i18n/locales/zh-CN.yaml +++ b/i18n/locales/zh-CN.yaml @@ -258,6 +258,7 @@ common.invalid_input: "输入不合法" distributor.invalid_request: "无效的请求,{{.Error}}" distributor.invalid_channel_id: "无效的渠道 Id" distributor.channel_disabled: "该渠道已被禁用" +distributor.affinity_channel_disabled: "渠道亲和性命中的渠道已被禁用,已按规则停止重试,请联系管理员处理" distributor.token_no_model_access: "该令牌无权访问任何模型" distributor.token_model_forbidden: "该令牌无权访问模型 {{.Model}}" distributor.model_name_required: "未指定模型名称,模型名称不能为空" diff --git a/i18n/locales/zh-TW.yaml b/i18n/locales/zh-TW.yaml index 5a24bff7..6ae222b7 100644 --- a/i18n/locales/zh-TW.yaml +++ b/i18n/locales/zh-TW.yaml @@ -258,6 +258,7 @@ common.invalid_input: "輸入不合法" distributor.invalid_request: "無效的請求,{{.Error}}" distributor.invalid_channel_id: "無效的管道 Id" distributor.channel_disabled: "該管道已被禁用" +distributor.affinity_channel_disabled: "管道親和性命中的管道已被禁用,已按規則停止重試,請聯絡管理員處理" distributor.token_no_model_access: "該令牌無權存取任何模型" distributor.token_model_forbidden: "該令牌無權存取模型 {{.Model}}" distributor.model_name_required: "未指定模型名稱,模型名稱不能為空" diff --git a/middleware/distributor.go b/middleware/distributor.go index d6269414..2263fae3 100644 --- a/middleware/distributor.go +++ b/middleware/distributor.go @@ -104,7 +104,7 @@ func Distribute() func(c *gin.Context) { if err == nil && preferred != nil { if preferred.Status != common.ChannelStatusEnabled { if service.ShouldSkipRetryAfterChannelAffinityFailure(c) { - abortWithOpenAiMessage(c, http.StatusForbidden, i18n.T(c, i18n.MsgDistributorChannelDisabled)) + abortWithOpenAiMessage(c, http.StatusForbidden, i18n.T(c, i18n.MsgDistributorAffinityChannelDisabled)) return } } else if usingGroup == "auto" {