Skip to content

fix: 修复 失败后不重试 配置项写到内存被覆盖 #4142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Calcium-Ion merged 2 commits into from
Apr 8, 2026
Merged

fix: 修复 失败后不重试 配置项写到内存被覆盖 #4142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59d5aef
fix: 修复 失败后不重试 配置项写到内存被覆盖
seefs001 Apr 8, 2026
c3b8fa2
fix: 修复 失败后不重试 配置项写到内存被覆盖
seefs001 Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion setting/operation_setting/channel_affinity_setting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type ChannelAffinityRule struct {

ParamOverrideTemplate map[string]interface{} `json:"param_override_template,omitempty"`

SkipRetryOnFailure bool `json:"skip_retry_on_failure,omitempty"`
SkipRetryOnFailure bool `json:"skip_retry_on_failure"`

IncludeUsingGroup bool `json:"include_using_group"`
IncludeModelName bool `json:"include_model_name"`
Expand Down
80 changes: 48 additions & 32 deletions web/src/pages/Setting/Operation/SettingsChannelAffinity.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,36 @@ const parseOptionalObjectJson = (jsonString, label) => {
}
};

const buildChannelAffinityRulePayload = ({
values,
isEdit,
editingRuleId,
rulesLength,
modelRegex,
pathRegex,
keySources,
userAgentInclude,
paramOverrideTemplate,
}) => ({
id: isEdit ? editingRuleId : rulesLength,
name: (values?.name || '').trim(),
model_regex: modelRegex,
path_regex: pathRegex,
key_sources: keySources,
value_regex: (values?.value_regex || '').trim(),
ttl_seconds: Number(values?.ttl_seconds || 0),
include_using_group: !!values?.include_using_group,
include_model_name: !!values?.include_model_name,
include_rule_name: !!values?.include_rule_name,
skip_retry_on_failure: !!values?.skip_retry_on_failure,
...(userAgentInclude.length > 0
? { user_agent_include: userAgentInclude }
: {}),
...(paramOverrideTemplate
? { param_override_template: paramOverrideTemplate }
: {}),
});

export default function SettingsChannelAffinity(props) {
const { t } = useTranslation();
const { Text } = Typography;
Expand Down Expand Up @@ -456,14 +486,12 @@ export default function SettingsChannelAffinity(props) {
const templates = [
CHANNEL_AFFINITY_RULE_TEMPLATES.codexCli,
CHANNEL_AFFINITY_RULE_TEMPLATES.claudeCli,
].map(
(tpl) => {
const baseTemplate = cloneChannelAffinityTemplate(tpl);
const name = makeUniqueName(existingNames, tpl.name);
existingNames.add(name);
return { ...baseTemplate, name };
},
);
].map((tpl) => {
const baseTemplate = cloneChannelAffinityTemplate(tpl);
const name = makeUniqueName(existingNames, tpl.name);
existingNames.add(name);
return { ...baseTemplate, name };
});

const next = [...(rules || []), ...templates].map((r, idx) => ({
...(r || {}),
Expand Down Expand Up @@ -716,27 +744,17 @@ export default function SettingsChannelAffinity(props) {
return showError(t(paramTemplateValidation.message));
}

const rulePayload = {
id: isEdit ? editingRule.id : rules.length,
name: (values.name || '').trim(),
model_regex: modelRegex,
path_regex: normalizeStringList(values.path_regex_text),
key_sources: keySourcesValidation.value,
value_regex: (values.value_regex || '').trim(),
ttl_seconds: Number(values.ttl_seconds || 0),
include_using_group: !!values.include_using_group,
include_model_name: !!values.include_model_name,
include_rule_name: !!values.include_rule_name,
...(values.skip_retry_on_failure
? { skip_retry_on_failure: true }
: {}),
...(userAgentInclude.length > 0
? { user_agent_include: userAgentInclude }
: {}),
...(paramTemplateValidation.value
? { param_override_template: paramTemplateValidation.value }
: {}),
};
const rulePayload = buildChannelAffinityRulePayload({
values,
isEdit,
editingRuleId: editingRule?.id,
rulesLength: rules.length,
modelRegex,
pathRegex: normalizeStringList(values.path_regex_text),
keySources: keySourcesValidation.value,
userAgentInclude,
paramOverrideTemplate: paramTemplateValidation.value,
});

if (!rulePayload.name) return showError(t('名称不能为空'));

Expand Down Expand Up @@ -1273,9 +1291,7 @@ export default function SettingsChannelAffinity(props) {
label={t('作用域：包含模型名称')}
/>
<Text type='tertiary' size='small'>
{t(
'开启后，模型名称会参与 cache key（不同模型隔离）。',
)}
{t('开启后，模型名称会参与 cache key（不同模型隔离）。')}
</Text>
</Col>
<Col xs={24} sm={8}>
Expand Down