mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-03-30 02:05:21 +00:00
feat: auto fetch upstream models (#2979)
* feat: add upstream model update detection with scheduled sync and manual apply flows * feat: support upstream model removal sync and selectable deletes in update modal * feat: add detect-only upstream updates and show compact +/- model badges * feat: improve upstream model update UX * feat: improve upstream model update UX * fix: respect model_mapping in upstream update detection * feat: improve upstream update modal to prevent missed add/remove actions * feat: add admin upstream model update notifications with digest and truncation * fix: avoid repeated partial-submit confirmation in upstream update modal * feat: improve ui/ux * feat: suppress upstream update alerts for unchanged channel-count within 24h * fix: submit upstream update choices even when no models are selected * feat: improve upstream model update flow and split frontend updater * fix merge conflict
This commit is contained in:
@@ -86,6 +86,7 @@ const PersonalSetting = () => {
|
||||
gotifyUrl: '',
|
||||
gotifyToken: '',
|
||||
gotifyPriority: 5,
|
||||
upstreamModelUpdateNotifyEnabled: false,
|
||||
acceptUnsetModelRatioModel: false,
|
||||
recordIpLog: false,
|
||||
});
|
||||
@@ -158,6 +159,8 @@ const PersonalSetting = () => {
|
||||
gotifyToken: settings.gotify_token || '',
|
||||
gotifyPriority:
|
||||
settings.gotify_priority !== undefined ? settings.gotify_priority : 5,
|
||||
upstreamModelUpdateNotifyEnabled:
|
||||
settings.upstream_model_update_notify_enabled === true,
|
||||
acceptUnsetModelRatioModel:
|
||||
settings.accept_unset_model_ratio_model || false,
|
||||
recordIpLog: settings.record_ip_log || false,
|
||||
@@ -426,6 +429,8 @@ const PersonalSetting = () => {
|
||||
const parsed = parseInt(notificationSettings.gotifyPriority);
|
||||
return isNaN(parsed) ? 5 : parsed;
|
||||
})(),
|
||||
upstream_model_update_notify_enabled:
|
||||
notificationSettings.upstreamModelUpdateNotifyEnabled === true,
|
||||
accept_unset_model_ratio_model:
|
||||
notificationSettings.acceptUnsetModelRatioModel,
|
||||
record_ip_log: notificationSettings.recordIpLog,
|
||||
|
||||
@@ -58,6 +58,7 @@ const NotificationSettings = ({
|
||||
const formApiRef = useRef(null);
|
||||
const [statusState] = useContext(StatusContext);
|
||||
const [userState] = useContext(UserContext);
|
||||
const isAdminOrRoot = (userState?.user?.role || 0) >= 10;
|
||||
|
||||
// 左侧边栏设置相关状态
|
||||
const [sidebarLoading, setSidebarLoading] = useState(false);
|
||||
@@ -470,6 +471,21 @@ const NotificationSettings = ({
|
||||
]}
|
||||
/>
|
||||
|
||||
{isAdminOrRoot && (
|
||||
<Form.Switch
|
||||
field='upstreamModelUpdateNotifyEnabled'
|
||||
label={t('接收上游模型更新通知')}
|
||||
checkedText={t('开')}
|
||||
uncheckedText={t('关')}
|
||||
onChange={(value) =>
|
||||
handleFormChange('upstreamModelUpdateNotifyEnabled', value)
|
||||
}
|
||||
extraText={t(
|
||||
'仅管理员可用。开启后,当系统定时检测全部渠道发现上游模型变更或检测异常时,将按你选择的通知方式发送汇总通知;渠道或模型过多时会自动省略部分明细。',
|
||||
)}
|
||||
/>
|
||||
)}
|
||||
|
||||
{/* 邮件通知设置 */}
|
||||
{notificationSettings.warningType === 'email' && (
|
||||
<Form.Input
|
||||
|
||||
@@ -36,6 +36,10 @@ const ChannelsActions = ({
|
||||
fixChannelsAbilities,
|
||||
updateAllChannelsBalance,
|
||||
deleteAllDisabledChannels,
|
||||
applyAllUpstreamUpdates,
|
||||
detectAllUpstreamUpdates,
|
||||
detectAllUpstreamUpdatesLoading,
|
||||
applyAllUpstreamUpdatesLoading,
|
||||
compactMode,
|
||||
setCompactMode,
|
||||
idSort,
|
||||
@@ -96,6 +100,8 @@ const ChannelsActions = ({
|
||||
size='small'
|
||||
type='tertiary'
|
||||
className='w-full'
|
||||
loading={detectAllUpstreamUpdatesLoading}
|
||||
disabled={detectAllUpstreamUpdatesLoading}
|
||||
onClick={() => {
|
||||
Modal.confirm({
|
||||
title: t('确定?'),
|
||||
@@ -146,6 +152,46 @@ const ChannelsActions = ({
|
||||
{t('更新所有已启用通道余额')}
|
||||
</Button>
|
||||
</Dropdown.Item>
|
||||
<Dropdown.Item>
|
||||
<Button
|
||||
size='small'
|
||||
type='tertiary'
|
||||
className='w-full'
|
||||
onClick={() => {
|
||||
Modal.confirm({
|
||||
title: t('确定?'),
|
||||
content: t(
|
||||
'确定要仅检测全部渠道上游模型更新吗?(不执行新增/删除)',
|
||||
),
|
||||
onOk: () => detectAllUpstreamUpdates(),
|
||||
size: 'sm',
|
||||
centered: true,
|
||||
});
|
||||
}}
|
||||
>
|
||||
{t('检测全部渠道上游更新')}
|
||||
</Button>
|
||||
</Dropdown.Item>
|
||||
<Dropdown.Item>
|
||||
<Button
|
||||
size='small'
|
||||
type='primary'
|
||||
className='w-full'
|
||||
loading={applyAllUpstreamUpdatesLoading}
|
||||
disabled={applyAllUpstreamUpdatesLoading}
|
||||
onClick={() => {
|
||||
Modal.confirm({
|
||||
title: t('确定?'),
|
||||
content: t('确定要对全部渠道执行上游模型更新吗?'),
|
||||
onOk: () => applyAllUpstreamUpdates(),
|
||||
size: 'sm',
|
||||
centered: true,
|
||||
});
|
||||
}}
|
||||
>
|
||||
{t('处理全部渠道上游更新')}
|
||||
</Button>
|
||||
</Dropdown.Item>
|
||||
<Dropdown.Item>
|
||||
<Button
|
||||
size='small'
|
||||
|
||||
@@ -37,8 +37,13 @@ import {
|
||||
renderQuotaWithAmount,
|
||||
showSuccess,
|
||||
showError,
|
||||
showInfo,
|
||||
} from '../../../helpers';
|
||||
import { CHANNEL_OPTIONS } from '../../../constants';
|
||||
import {
|
||||
CHANNEL_OPTIONS,
|
||||
MODEL_FETCHABLE_CHANNEL_TYPES,
|
||||
} from '../../../constants';
|
||||
import { parseUpstreamUpdateMeta } from '../../../hooks/channels/upstreamUpdateUtils';
|
||||
import {
|
||||
IconTreeTriangleDown,
|
||||
IconMore,
|
||||
@@ -270,6 +275,35 @@ const isRequestPassThroughEnabled = (record) => {
|
||||
}
|
||||
};
|
||||
|
||||
const getUpstreamUpdateMeta = (record) => {
|
||||
const supported =
|
||||
!!record &&
|
||||
record.children === undefined &&
|
||||
MODEL_FETCHABLE_CHANNEL_TYPES.has(record.type);
|
||||
if (!record || record.children !== undefined) {
|
||||
return {
|
||||
supported: false,
|
||||
enabled: false,
|
||||
pendingAddModels: [],
|
||||
pendingRemoveModels: [],
|
||||
};
|
||||
}
|
||||
const parsed =
|
||||
record?.upstreamUpdateMeta && typeof record.upstreamUpdateMeta === 'object'
|
||||
? record.upstreamUpdateMeta
|
||||
: parseUpstreamUpdateMeta(record?.settings);
|
||||
return {
|
||||
supported,
|
||||
enabled: parsed?.enabled === true,
|
||||
pendingAddModels: Array.isArray(parsed?.pendingAddModels)
|
||||
? parsed.pendingAddModels
|
||||
: [],
|
||||
pendingRemoveModels: Array.isArray(parsed?.pendingRemoveModels)
|
||||
? parsed.pendingRemoveModels
|
||||
: [],
|
||||
};
|
||||
};
|
||||
|
||||
export const getChannelsColumns = ({
|
||||
t,
|
||||
COLUMN_KEYS,
|
||||
@@ -291,6 +325,8 @@ export const getChannelsColumns = ({
|
||||
checkOllamaVersion,
|
||||
setShowMultiKeyManageModal,
|
||||
setCurrentMultiKeyChannel,
|
||||
openUpstreamUpdateModal,
|
||||
detectChannelUpstreamUpdates,
|
||||
}) => {
|
||||
return [
|
||||
{
|
||||
@@ -304,6 +340,14 @@ export const getChannelsColumns = ({
|
||||
dataIndex: 'name',
|
||||
render: (text, record, index) => {
|
||||
const passThroughEnabled = isRequestPassThroughEnabled(record);
|
||||
const upstreamUpdateMeta = getUpstreamUpdateMeta(record);
|
||||
const pendingAddCount = upstreamUpdateMeta.pendingAddModels.length;
|
||||
const pendingRemoveCount =
|
||||
upstreamUpdateMeta.pendingRemoveModels.length;
|
||||
const showUpstreamUpdateTag =
|
||||
upstreamUpdateMeta.supported &&
|
||||
upstreamUpdateMeta.enabled &&
|
||||
(pendingAddCount > 0 || pendingRemoveCount > 0);
|
||||
const nameNode =
|
||||
record.remark && record.remark.trim() !== '' ? (
|
||||
<Tooltip
|
||||
@@ -339,26 +383,76 @@ export const getChannelsColumns = ({
|
||||
<span>{text}</span>
|
||||
);
|
||||
|
||||
if (!passThroughEnabled) {
|
||||
if (!passThroughEnabled && !showUpstreamUpdateTag) {
|
||||
return nameNode;
|
||||
}
|
||||
|
||||
return (
|
||||
<Space spacing={6} align='center'>
|
||||
{nameNode}
|
||||
<Tooltip
|
||||
content={t(
|
||||
'该渠道已开启请求透传:参数覆写、模型重定向、渠道适配等 NewAPI 内置功能将失效,非最佳实践;如因此产生问题,请勿提交 issue 反馈。',
|
||||
)}
|
||||
trigger='hover'
|
||||
position='topLeft'
|
||||
>
|
||||
<span className='inline-flex items-center'>
|
||||
<IconAlertTriangle
|
||||
style={{ color: 'var(--semi-color-warning)' }}
|
||||
/>
|
||||
</span>
|
||||
</Tooltip>
|
||||
{passThroughEnabled && (
|
||||
<Tooltip
|
||||
content={t(
|
||||
'该渠道已开启请求透传:参数覆写、模型重定向、渠道适配等 NewAPI 内置功能将失效,非最佳实践;如因此产生问题,请勿提交 issue 反馈。',
|
||||
)}
|
||||
trigger='hover'
|
||||
position='topLeft'
|
||||
>
|
||||
<span className='inline-flex items-center'>
|
||||
<IconAlertTriangle
|
||||
style={{ color: 'var(--semi-color-warning)' }}
|
||||
/>
|
||||
</span>
|
||||
</Tooltip>
|
||||
)}
|
||||
{showUpstreamUpdateTag && (
|
||||
<Space spacing={4} align='center'>
|
||||
{pendingAddCount > 0 ? (
|
||||
<Tooltip content={t('点击处理新增模型')} position='top'>
|
||||
<Tag
|
||||
color='green'
|
||||
type='light'
|
||||
size='small'
|
||||
shape='circle'
|
||||
className='cursor-pointer transition-all duration-150 hover:opacity-85 hover:-translate-y-px active:scale-95'
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
openUpstreamUpdateModal(
|
||||
record,
|
||||
upstreamUpdateMeta.pendingAddModels,
|
||||
upstreamUpdateMeta.pendingRemoveModels,
|
||||
'add',
|
||||
);
|
||||
}}
|
||||
>
|
||||
+{pendingAddCount}
|
||||
</Tag>
|
||||
</Tooltip>
|
||||
) : null}
|
||||
{pendingRemoveCount > 0 ? (
|
||||
<Tooltip content={t('点击处理删除模型')} position='top'>
|
||||
<Tag
|
||||
color='red'
|
||||
type='light'
|
||||
size='small'
|
||||
shape='circle'
|
||||
className='cursor-pointer transition-all duration-150 hover:opacity-85 hover:-translate-y-px active:scale-95'
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
openUpstreamUpdateModal(
|
||||
record,
|
||||
upstreamUpdateMeta.pendingAddModels,
|
||||
upstreamUpdateMeta.pendingRemoveModels,
|
||||
'remove',
|
||||
);
|
||||
}}
|
||||
>
|
||||
-{pendingRemoveCount}
|
||||
</Tag>
|
||||
</Tooltip>
|
||||
) : null}
|
||||
</Space>
|
||||
)}
|
||||
</Space>
|
||||
);
|
||||
},
|
||||
@@ -585,6 +679,7 @@ export const getChannelsColumns = ({
|
||||
fixed: 'right',
|
||||
render: (text, record, index) => {
|
||||
if (record.children === undefined) {
|
||||
const upstreamUpdateMeta = getUpstreamUpdateMeta(record);
|
||||
const moreMenuItems = [
|
||||
{
|
||||
node: 'item',
|
||||
@@ -622,6 +717,47 @@ export const getChannelsColumns = ({
|
||||
},
|
||||
];
|
||||
|
||||
if (upstreamUpdateMeta.supported) {
|
||||
moreMenuItems.push({
|
||||
node: 'item',
|
||||
name: t('仅检测上游模型更新'),
|
||||
type: 'tertiary',
|
||||
onClick: () => {
|
||||
if (!upstreamUpdateMeta.enabled) {
|
||||
showInfo(t('该渠道未开启上游模型更新检测'));
|
||||
return;
|
||||
}
|
||||
detectChannelUpstreamUpdates(record);
|
||||
},
|
||||
});
|
||||
moreMenuItems.push({
|
||||
node: 'item',
|
||||
name: t('处理上游模型更新'),
|
||||
type: 'tertiary',
|
||||
onClick: () => {
|
||||
if (!upstreamUpdateMeta.enabled) {
|
||||
showInfo(t('该渠道未开启上游模型更新检测'));
|
||||
return;
|
||||
}
|
||||
if (
|
||||
upstreamUpdateMeta.pendingAddModels.length === 0 &&
|
||||
upstreamUpdateMeta.pendingRemoveModels.length === 0
|
||||
) {
|
||||
showInfo(t('该渠道暂无可处理的上游模型更新'));
|
||||
return;
|
||||
}
|
||||
openUpstreamUpdateModal(
|
||||
record,
|
||||
upstreamUpdateMeta.pendingAddModels,
|
||||
upstreamUpdateMeta.pendingRemoveModels,
|
||||
upstreamUpdateMeta.pendingAddModels.length > 0
|
||||
? 'add'
|
||||
: 'remove',
|
||||
);
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
if (record.type === 4) {
|
||||
moreMenuItems.unshift({
|
||||
node: 'item',
|
||||
|
||||
@@ -61,6 +61,8 @@ const ChannelsTable = (channelsData) => {
|
||||
// Multi-key management
|
||||
setShowMultiKeyManageModal,
|
||||
setCurrentMultiKeyChannel,
|
||||
openUpstreamUpdateModal,
|
||||
detectChannelUpstreamUpdates,
|
||||
} = channelsData;
|
||||
|
||||
// Get all columns
|
||||
@@ -86,6 +88,8 @@ const ChannelsTable = (channelsData) => {
|
||||
checkOllamaVersion,
|
||||
setShowMultiKeyManageModal,
|
||||
setCurrentMultiKeyChannel,
|
||||
openUpstreamUpdateModal,
|
||||
detectChannelUpstreamUpdates,
|
||||
});
|
||||
}, [
|
||||
t,
|
||||
@@ -108,6 +112,8 @@ const ChannelsTable = (channelsData) => {
|
||||
checkOllamaVersion,
|
||||
setShowMultiKeyManageModal,
|
||||
setCurrentMultiKeyChannel,
|
||||
openUpstreamUpdateModal,
|
||||
detectChannelUpstreamUpdates,
|
||||
]);
|
||||
|
||||
// Filter columns based on visibility settings
|
||||
|
||||
@@ -33,6 +33,7 @@ import ColumnSelectorModal from './modals/ColumnSelectorModal';
|
||||
import EditChannelModal from './modals/EditChannelModal';
|
||||
import EditTagModal from './modals/EditTagModal';
|
||||
import MultiKeyManageModal from './modals/MultiKeyManageModal';
|
||||
import ChannelUpstreamUpdateModal from './modals/ChannelUpstreamUpdateModal';
|
||||
import { createCardProPagination } from '../../../helpers/utils';
|
||||
|
||||
const ChannelsPage = () => {
|
||||
@@ -63,6 +64,15 @@ const ChannelsPage = () => {
|
||||
channel={channelsData.currentMultiKeyChannel}
|
||||
onRefresh={channelsData.refresh}
|
||||
/>
|
||||
<ChannelUpstreamUpdateModal
|
||||
visible={channelsData.showUpstreamUpdateModal}
|
||||
addModels={channelsData.upstreamUpdateAddModels}
|
||||
removeModels={channelsData.upstreamUpdateRemoveModels}
|
||||
preferredTab={channelsData.upstreamUpdatePreferredTab}
|
||||
confirmLoading={channelsData.upstreamApplyLoading}
|
||||
onConfirm={channelsData.applyUpstreamUpdates}
|
||||
onCancel={channelsData.closeUpstreamUpdateModal}
|
||||
/>
|
||||
|
||||
{/* Main Content */}
|
||||
{channelsData.globalPassThroughEnabled ? (
|
||||
|
||||
@@ -0,0 +1,313 @@
|
||||
/*
|
||||
Copyright (C) 2025 QuantumNous
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Affero General Public License as
|
||||
published by the Free Software Foundation, either version 3 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Affero General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Affero General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
For commercial licensing, please contact support@quantumnous.com
|
||||
*/
|
||||
|
||||
import React, { useEffect, useMemo, useState } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import {
|
||||
Modal,
|
||||
Checkbox,
|
||||
Empty,
|
||||
Input,
|
||||
Tabs,
|
||||
Typography,
|
||||
} from '@douyinfe/semi-ui';
|
||||
import {
|
||||
IllustrationNoResult,
|
||||
IllustrationNoResultDark,
|
||||
} from '@douyinfe/semi-illustrations';
|
||||
import { IconSearch } from '@douyinfe/semi-icons';
|
||||
import { useIsMobile } from '../../../../hooks/common/useIsMobile';
|
||||
|
||||
const normalizeModels = (models = []) =>
|
||||
Array.from(
|
||||
new Set(
|
||||
(models || []).map((model) => String(model || '').trim()).filter(Boolean),
|
||||
),
|
||||
);
|
||||
|
||||
const filterByKeyword = (models = [], keyword = '') => {
|
||||
const normalizedKeyword = String(keyword || '')
|
||||
.trim()
|
||||
.toLowerCase();
|
||||
if (!normalizedKeyword) {
|
||||
return models;
|
||||
}
|
||||
return models.filter((model) =>
|
||||
String(model).toLowerCase().includes(normalizedKeyword),
|
||||
);
|
||||
};
|
||||
|
||||
const ChannelUpstreamUpdateModal = ({
|
||||
visible,
|
||||
addModels = [],
|
||||
removeModels = [],
|
||||
preferredTab = 'add',
|
||||
confirmLoading = false,
|
||||
onConfirm,
|
||||
onCancel,
|
||||
}) => {
|
||||
const { t } = useTranslation();
|
||||
const isMobile = useIsMobile();
|
||||
|
||||
const normalizedAddModels = useMemo(
|
||||
() => normalizeModels(addModels),
|
||||
[addModels],
|
||||
);
|
||||
const normalizedRemoveModels = useMemo(
|
||||
() => normalizeModels(removeModels),
|
||||
[removeModels],
|
||||
);
|
||||
|
||||
const [selectedAddModels, setSelectedAddModels] = useState([]);
|
||||
const [selectedRemoveModels, setSelectedRemoveModels] = useState([]);
|
||||
const [keyword, setKeyword] = useState('');
|
||||
const [activeTab, setActiveTab] = useState('add');
|
||||
const [partialSubmitConfirmed, setPartialSubmitConfirmed] = useState(false);
|
||||
|
||||
const addTabEnabled = normalizedAddModels.length > 0;
|
||||
const removeTabEnabled = normalizedRemoveModels.length > 0;
|
||||
const filteredAddModels = useMemo(
|
||||
() => filterByKeyword(normalizedAddModels, keyword),
|
||||
[normalizedAddModels, keyword],
|
||||
);
|
||||
const filteredRemoveModels = useMemo(
|
||||
() => filterByKeyword(normalizedRemoveModels, keyword),
|
||||
[normalizedRemoveModels, keyword],
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
if (!visible) {
|
||||
return;
|
||||
}
|
||||
setSelectedAddModels([]);
|
||||
setSelectedRemoveModels([]);
|
||||
setKeyword('');
|
||||
setPartialSubmitConfirmed(false);
|
||||
const normalizedPreferredTab = preferredTab === 'remove' ? 'remove' : 'add';
|
||||
if (normalizedPreferredTab === 'remove' && removeTabEnabled) {
|
||||
setActiveTab('remove');
|
||||
return;
|
||||
}
|
||||
if (normalizedPreferredTab === 'add' && addTabEnabled) {
|
||||
setActiveTab('add');
|
||||
return;
|
||||
}
|
||||
setActiveTab(addTabEnabled ? 'add' : 'remove');
|
||||
}, [visible, addTabEnabled, removeTabEnabled, preferredTab]);
|
||||
|
||||
const currentModels =
|
||||
activeTab === 'add' ? filteredAddModels : filteredRemoveModels;
|
||||
const currentSelectedModels =
|
||||
activeTab === 'add' ? selectedAddModels : selectedRemoveModels;
|
||||
const currentSetSelectedModels =
|
||||
activeTab === 'add' ? setSelectedAddModels : setSelectedRemoveModels;
|
||||
const selectedAddCount = selectedAddModels.length;
|
||||
const selectedRemoveCount = selectedRemoveModels.length;
|
||||
const checkedCount = currentModels.filter((model) =>
|
||||
currentSelectedModels.includes(model),
|
||||
).length;
|
||||
const isAllChecked =
|
||||
currentModels.length > 0 && checkedCount === currentModels.length;
|
||||
const isIndeterminate =
|
||||
checkedCount > 0 && checkedCount < currentModels.length;
|
||||
|
||||
const handleToggleAllCurrent = (checked) => {
|
||||
if (checked) {
|
||||
const merged = normalizeModels([
|
||||
...currentSelectedModels,
|
||||
...currentModels,
|
||||
]);
|
||||
currentSetSelectedModels(merged);
|
||||
return;
|
||||
}
|
||||
const currentSet = new Set(currentModels);
|
||||
currentSetSelectedModels(
|
||||
currentSelectedModels.filter((model) => !currentSet.has(model)),
|
||||
);
|
||||
};
|
||||
|
||||
const tabList = [
|
||||
{
|
||||
itemKey: 'add',
|
||||
tab: `${t('新增模型')} (${selectedAddCount}/${normalizedAddModels.length})`,
|
||||
disabled: !addTabEnabled,
|
||||
},
|
||||
{
|
||||
itemKey: 'remove',
|
||||
tab: `${t('删除模型')} (${selectedRemoveCount}/${normalizedRemoveModels.length})`,
|
||||
disabled: !removeTabEnabled,
|
||||
},
|
||||
];
|
||||
|
||||
const submitSelectedChanges = () => {
|
||||
onConfirm?.({
|
||||
addModels: selectedAddModels,
|
||||
removeModels: selectedRemoveModels,
|
||||
});
|
||||
};
|
||||
|
||||
const handleSubmit = () => {
|
||||
const hasAnySelected = selectedAddCount > 0 || selectedRemoveCount > 0;
|
||||
if (!hasAnySelected) {
|
||||
submitSelectedChanges();
|
||||
return;
|
||||
}
|
||||
|
||||
const hasBothPending = addTabEnabled && removeTabEnabled;
|
||||
const hasUnselectedAdd = addTabEnabled && selectedAddCount === 0;
|
||||
const hasUnselectedRemove = removeTabEnabled && selectedRemoveCount === 0;
|
||||
if (hasBothPending && (hasUnselectedAdd || hasUnselectedRemove)) {
|
||||
if (partialSubmitConfirmed) {
|
||||
submitSelectedChanges();
|
||||
return;
|
||||
}
|
||||
const missingTab = hasUnselectedAdd ? 'add' : 'remove';
|
||||
const missingType = hasUnselectedAdd ? t('新增') : t('删除');
|
||||
const missingCount = hasUnselectedAdd
|
||||
? normalizedAddModels.length
|
||||
: normalizedRemoveModels.length;
|
||||
setActiveTab(missingTab);
|
||||
Modal.confirm({
|
||||
title: t('仍有未处理项'),
|
||||
content: t(
|
||||
'你还没有处理{{type}}模型({{count}}个)。是否仅提交当前已勾选内容?',
|
||||
{
|
||||
type: missingType,
|
||||
count: missingCount,
|
||||
},
|
||||
),
|
||||
okText: t('仅提交已勾选'),
|
||||
cancelText: t('去处理{{type}}', { type: missingType }),
|
||||
centered: true,
|
||||
onOk: () => {
|
||||
setPartialSubmitConfirmed(true);
|
||||
submitSelectedChanges();
|
||||
},
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
submitSelectedChanges();
|
||||
};
|
||||
|
||||
return (
|
||||
<Modal
|
||||
visible={visible}
|
||||
title={t('处理上游模型更新')}
|
||||
okText={t('确定')}
|
||||
cancelText={t('取消')}
|
||||
size={isMobile ? 'full-width' : 'medium'}
|
||||
centered
|
||||
closeOnEsc
|
||||
maskClosable
|
||||
confirmLoading={confirmLoading}
|
||||
onCancel={onCancel}
|
||||
onOk={handleSubmit}
|
||||
>
|
||||
<div className='flex flex-col gap-3'>
|
||||
<Typography.Text type='secondary' size='small'>
|
||||
{t(
|
||||
'可勾选需要执行的变更:新增会加入渠道模型列表,删除会从渠道模型列表移除。',
|
||||
)}
|
||||
</Typography.Text>
|
||||
|
||||
<Tabs
|
||||
type='slash'
|
||||
size='small'
|
||||
tabList={tabList}
|
||||
activeKey={activeTab}
|
||||
onChange={(key) => setActiveTab(key)}
|
||||
/>
|
||||
<div className='flex items-center gap-3 text-xs text-gray-500'>
|
||||
<span>
|
||||
{t('新增已选 {{selected}} / {{total}}', {
|
||||
selected: selectedAddCount,
|
||||
total: normalizedAddModels.length,
|
||||
})}
|
||||
</span>
|
||||
<span>
|
||||
{t('删除已选 {{selected}} / {{total}}', {
|
||||
selected: selectedRemoveCount,
|
||||
total: normalizedRemoveModels.length,
|
||||
})}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<Input
|
||||
prefix={<IconSearch size={14} />}
|
||||
placeholder={t('搜索模型')}
|
||||
value={keyword}
|
||||
onChange={(value) => setKeyword(value)}
|
||||
showClear
|
||||
/>
|
||||
|
||||
<div style={{ maxHeight: 320, overflowY: 'auto', paddingRight: 8 }}>
|
||||
{currentModels.length === 0 ? (
|
||||
<Empty
|
||||
image={
|
||||
<IllustrationNoResult style={{ width: 150, height: 150 }} />
|
||||
}
|
||||
darkModeImage={
|
||||
<IllustrationNoResultDark style={{ width: 150, height: 150 }} />
|
||||
}
|
||||
description={t('暂无匹配模型')}
|
||||
style={{ padding: 24 }}
|
||||
/>
|
||||
) : (
|
||||
<Checkbox.Group
|
||||
value={currentSelectedModels}
|
||||
onChange={(values) =>
|
||||
currentSetSelectedModels(normalizeModels(values))
|
||||
}
|
||||
>
|
||||
<div className='grid grid-cols-1 md:grid-cols-2 gap-x-4'>
|
||||
{currentModels.map((model) => (
|
||||
<Checkbox
|
||||
key={`${activeTab}:${model}`}
|
||||
value={model}
|
||||
className='my-1'
|
||||
>
|
||||
{model}
|
||||
</Checkbox>
|
||||
))}
|
||||
</div>
|
||||
</Checkbox.Group>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className='flex items-center justify-end gap-2'>
|
||||
<Typography.Text type='secondary' size='small'>
|
||||
{t('已选择 {{selected}} / {{total}}', {
|
||||
selected: checkedCount,
|
||||
total: currentModels.length,
|
||||
})}
|
||||
</Typography.Text>
|
||||
<Checkbox
|
||||
checked={isAllChecked}
|
||||
indeterminate={isIndeterminate}
|
||||
aria-label={t('全选当前列表模型')}
|
||||
onChange={(e) => handleToggleAllCurrent(e.target.checked)}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</Modal>
|
||||
);
|
||||
};
|
||||
|
||||
export default ChannelUpstreamUpdateModal;
|
||||
@@ -27,7 +27,7 @@ import {
|
||||
verifyJSON,
|
||||
} from '../../../../helpers';
|
||||
import { useIsMobile } from '../../../../hooks/common/useIsMobile';
|
||||
import { CHANNEL_OPTIONS } from '../../../../constants';
|
||||
import { CHANNEL_OPTIONS, MODEL_FETCHABLE_CHANNEL_TYPES } from '../../../../constants';
|
||||
import {
|
||||
SideSheet,
|
||||
Space,
|
||||
@@ -100,6 +100,7 @@ const REGION_EXAMPLE = {
|
||||
'gemini-1.5-flash-002': 'europe-west2',
|
||||
'claude-3-5-sonnet-20240620': 'europe-west1',
|
||||
};
|
||||
const UPSTREAM_DETECTED_MODEL_PREVIEW_LIMIT = 8;
|
||||
|
||||
const PARAM_OVERRIDE_LEGACY_TEMPLATE = {
|
||||
temperature: 0,
|
||||
@@ -203,6 +204,11 @@ const EditChannelModal = (props) => {
|
||||
allow_include_obfuscation: false,
|
||||
allow_inference_geo: false,
|
||||
claude_beta_query: false,
|
||||
upstream_model_update_check_enabled: false,
|
||||
upstream_model_update_auto_sync_enabled: false,
|
||||
upstream_model_update_last_check_time: 0,
|
||||
upstream_model_update_last_detected_models: [],
|
||||
upstream_model_update_ignored_models: '',
|
||||
};
|
||||
const [batch, setBatch] = useState(false);
|
||||
const [multiToSingle, setMultiToSingle] = useState(false);
|
||||
@@ -257,6 +263,23 @@ const EditChannelModal = (props) => {
|
||||
return [];
|
||||
}
|
||||
}, [inputs.model_mapping]);
|
||||
const upstreamDetectedModels = useMemo(
|
||||
() =>
|
||||
Array.from(
|
||||
new Set(
|
||||
(inputs.upstream_model_update_last_detected_models || [])
|
||||
.map((model) => String(model || '').trim())
|
||||
.filter(Boolean),
|
||||
),
|
||||
),
|
||||
[inputs.upstream_model_update_last_detected_models],
|
||||
);
|
||||
const upstreamDetectedModelsPreview = useMemo(
|
||||
() => upstreamDetectedModels.slice(0, UPSTREAM_DETECTED_MODEL_PREVIEW_LIMIT),
|
||||
[upstreamDetectedModels],
|
||||
);
|
||||
const upstreamDetectedModelsOmittedCount =
|
||||
upstreamDetectedModels.length - upstreamDetectedModelsPreview.length;
|
||||
const modelSearchMatchedCount = useMemo(() => {
|
||||
const keyword = modelSearchValue.trim();
|
||||
if (!keyword) {
|
||||
@@ -665,6 +688,14 @@ const EditChannelModal = (props) => {
|
||||
}
|
||||
};
|
||||
|
||||
const formatUnixTime = (timestamp) => {
|
||||
const value = Number(timestamp || 0);
|
||||
if (!value) {
|
||||
return t('暂无');
|
||||
}
|
||||
return new Date(value * 1000).toLocaleString();
|
||||
};
|
||||
|
||||
const copyParamOverrideJson = async () => {
|
||||
const raw =
|
||||
typeof inputs.param_override === 'string'
|
||||
@@ -854,6 +885,22 @@ const EditChannelModal = (props) => {
|
||||
data.allow_inference_geo =
|
||||
parsedSettings.allow_inference_geo || false;
|
||||
data.claude_beta_query = parsedSettings.claude_beta_query || false;
|
||||
data.upstream_model_update_check_enabled =
|
||||
parsedSettings.upstream_model_update_check_enabled === true;
|
||||
data.upstream_model_update_auto_sync_enabled =
|
||||
parsedSettings.upstream_model_update_auto_sync_enabled === true;
|
||||
data.upstream_model_update_last_check_time =
|
||||
Number(parsedSettings.upstream_model_update_last_check_time) || 0;
|
||||
data.upstream_model_update_last_detected_models = Array.isArray(
|
||||
parsedSettings.upstream_model_update_last_detected_models,
|
||||
)
|
||||
? parsedSettings.upstream_model_update_last_detected_models
|
||||
: [];
|
||||
data.upstream_model_update_ignored_models = Array.isArray(
|
||||
parsedSettings.upstream_model_update_ignored_models,
|
||||
)
|
||||
? parsedSettings.upstream_model_update_ignored_models.join(',')
|
||||
: '';
|
||||
} catch (error) {
|
||||
console.error('解析其他设置失败:', error);
|
||||
data.azure_responses_version = '';
|
||||
@@ -867,6 +914,11 @@ const EditChannelModal = (props) => {
|
||||
data.allow_include_obfuscation = false;
|
||||
data.allow_inference_geo = false;
|
||||
data.claude_beta_query = false;
|
||||
data.upstream_model_update_check_enabled = false;
|
||||
data.upstream_model_update_auto_sync_enabled = false;
|
||||
data.upstream_model_update_last_check_time = 0;
|
||||
data.upstream_model_update_last_detected_models = [];
|
||||
data.upstream_model_update_ignored_models = '';
|
||||
}
|
||||
} else {
|
||||
// 兼容历史数据:老渠道没有 settings 时,默认按 json 展示
|
||||
@@ -879,6 +931,11 @@ const EditChannelModal = (props) => {
|
||||
data.allow_include_obfuscation = false;
|
||||
data.allow_inference_geo = false;
|
||||
data.claude_beta_query = false;
|
||||
data.upstream_model_update_check_enabled = false;
|
||||
data.upstream_model_update_auto_sync_enabled = false;
|
||||
data.upstream_model_update_last_check_time = 0;
|
||||
data.upstream_model_update_last_detected_models = [];
|
||||
data.upstream_model_update_ignored_models = '';
|
||||
}
|
||||
|
||||
if (
|
||||
@@ -1009,7 +1066,7 @@ const EditChannelModal = (props) => {
|
||||
const mappingKey = String(pairKey ?? '').trim();
|
||||
if (!mappingKey) return;
|
||||
|
||||
if (!MODEL_FETCHABLE_TYPES.has(inputs.type)) {
|
||||
if (!MODEL_FETCHABLE_CHANNEL_TYPES.has(inputs.type)) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1681,6 +1738,29 @@ const EditChannelModal = (props) => {
|
||||
}
|
||||
}
|
||||
|
||||
settings.upstream_model_update_check_enabled =
|
||||
localInputs.upstream_model_update_check_enabled === true;
|
||||
settings.upstream_model_update_auto_sync_enabled =
|
||||
settings.upstream_model_update_check_enabled &&
|
||||
localInputs.upstream_model_update_auto_sync_enabled === true;
|
||||
settings.upstream_model_update_ignored_models = Array.from(
|
||||
new Set(
|
||||
String(localInputs.upstream_model_update_ignored_models || '')
|
||||
.split(',')
|
||||
.map((model) => model.trim())
|
||||
.filter(Boolean),
|
||||
),
|
||||
);
|
||||
if (
|
||||
!Array.isArray(settings.upstream_model_update_last_detected_models) ||
|
||||
!settings.upstream_model_update_check_enabled
|
||||
) {
|
||||
settings.upstream_model_update_last_detected_models = [];
|
||||
}
|
||||
if (typeof settings.upstream_model_update_last_check_time !== 'number') {
|
||||
settings.upstream_model_update_last_check_time = 0;
|
||||
}
|
||||
|
||||
localInputs.settings = JSON.stringify(settings);
|
||||
|
||||
// 清理不需要发送到后端的字段
|
||||
@@ -1702,6 +1782,11 @@ const EditChannelModal = (props) => {
|
||||
delete localInputs.allow_include_obfuscation;
|
||||
delete localInputs.allow_inference_geo;
|
||||
delete localInputs.claude_beta_query;
|
||||
delete localInputs.upstream_model_update_check_enabled;
|
||||
delete localInputs.upstream_model_update_auto_sync_enabled;
|
||||
delete localInputs.upstream_model_update_last_check_time;
|
||||
delete localInputs.upstream_model_update_last_detected_models;
|
||||
delete localInputs.upstream_model_update_ignored_models;
|
||||
|
||||
let res;
|
||||
localInputs.auto_ban = localInputs.auto_ban ? 1 : 0;
|
||||
@@ -3080,7 +3165,7 @@ const EditChannelModal = (props) => {
|
||||
>
|
||||
{t('填入所有模型')}
|
||||
</Button>
|
||||
{MODEL_FETCHABLE_TYPES.has(inputs.type) && (
|
||||
{MODEL_FETCHABLE_CHANNEL_TYPES.has(inputs.type) && (
|
||||
<Button
|
||||
size='small'
|
||||
type='tertiary'
|
||||
@@ -3183,6 +3268,32 @@ const EditChannelModal = (props) => {
|
||||
}
|
||||
/>
|
||||
|
||||
{MODEL_FETCHABLE_CHANNEL_TYPES.has(inputs.type) && (
|
||||
<>
|
||||
<Form.Switch
|
||||
field='upstream_model_update_check_enabled'
|
||||
label={t('是否检测上游模型更新')}
|
||||
checkedText={t('开')}
|
||||
uncheckedText={t('关')}
|
||||
onChange={(value) =>
|
||||
handleChannelOtherSettingsChange(
|
||||
'upstream_model_update_check_enabled',
|
||||
value,
|
||||
)
|
||||
}
|
||||
extraText={t(
|
||||
'开启后由后端定时任务检测该渠道上游模型变化',
|
||||
)}
|
||||
/>
|
||||
<div className='text-xs text-gray-500 mb-2'>
|
||||
{t('上次检测时间')}:
|
||||
{formatUnixTime(
|
||||
inputs.upstream_model_update_last_check_time,
|
||||
)}
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
|
||||
<Form.Input
|
||||
field='test_model'
|
||||
label={t('默认测试模型')}
|
||||
@@ -3212,7 +3323,7 @@ const EditChannelModal = (props) => {
|
||||
editorType='keyValue'
|
||||
formApi={formApiRef.current}
|
||||
renderStringValueSuffix={({ pairKey, value }) => {
|
||||
if (!MODEL_FETCHABLE_TYPES.has(inputs.type)) {
|
||||
if (!MODEL_FETCHABLE_CHANNEL_TYPES.has(inputs.type)) {
|
||||
return null;
|
||||
}
|
||||
const disabled = !String(pairKey ?? '').trim();
|
||||
@@ -3332,31 +3443,93 @@ const EditChannelModal = (props) => {
|
||||
initValue={autoBan}
|
||||
/>
|
||||
|
||||
<Form.Switch
|
||||
field='upstream_model_update_auto_sync_enabled'
|
||||
label={t('是否自动同步上游模型更新')}
|
||||
checkedText={t('开')}
|
||||
uncheckedText={t('关')}
|
||||
disabled={!inputs.upstream_model_update_check_enabled}
|
||||
onChange={(value) =>
|
||||
handleChannelOtherSettingsChange(
|
||||
'upstream_model_update_auto_sync_enabled',
|
||||
value,
|
||||
)
|
||||
}
|
||||
extraText={t(
|
||||
'开启后检测到新增模型会自动加入当前渠道模型列表',
|
||||
)}
|
||||
/>
|
||||
|
||||
<Form.Input
|
||||
field='upstream_model_update_ignored_models'
|
||||
label={t('手动忽略模型(逗号分隔)')}
|
||||
placeholder={t('例如:gpt-4.1-nano,gpt-4o-mini')}
|
||||
onChange={(value) =>
|
||||
handleInputChange(
|
||||
'upstream_model_update_ignored_models',
|
||||
value,
|
||||
)
|
||||
}
|
||||
showClear
|
||||
/>
|
||||
|
||||
<div className='text-xs text-gray-500 mb-3'>
|
||||
{t('上次检测到可加入模型')}:
|
||||
{upstreamDetectedModels.length === 0 ? (
|
||||
t('暂无')
|
||||
) : (
|
||||
<>
|
||||
<Tooltip
|
||||
position='topLeft'
|
||||
content={
|
||||
<div className='max-w-[640px] break-all text-xs leading-5'>
|
||||
{upstreamDetectedModels.join(', ')}
|
||||
</div>
|
||||
}
|
||||
>
|
||||
<span className='cursor-help break-all'>
|
||||
{upstreamDetectedModelsPreview.join(', ')}
|
||||
</span>
|
||||
</Tooltip>
|
||||
<span className='ml-1 text-gray-400'>
|
||||
{upstreamDetectedModelsOmittedCount > 0
|
||||
? t('(共 {{total}} 个,省略 {{omit}} 个)', {
|
||||
total: upstreamDetectedModels.length,
|
||||
omit: upstreamDetectedModelsOmittedCount,
|
||||
})
|
||||
: t('(共 {{total}} 个)', {
|
||||
total: upstreamDetectedModels.length,
|
||||
})}
|
||||
</span>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className='mb-4'>
|
||||
<div className='flex items-center justify-between gap-2 mb-1'>
|
||||
<Text className='text-sm font-medium'>{t('参数覆盖')}</Text>
|
||||
<Space wrap>
|
||||
<Button
|
||||
size='small'
|
||||
type='primary'
|
||||
icon={<IconCode size={14} />}
|
||||
onClick={() => setParamOverrideEditorVisible(true)}
|
||||
size='small'
|
||||
type='primary'
|
||||
icon={<IconCode size={14} />}
|
||||
onClick={() => setParamOverrideEditorVisible(true)}
|
||||
>
|
||||
{t('可视化编辑')}
|
||||
</Button>
|
||||
<Button
|
||||
size='small'
|
||||
onClick={() =>
|
||||
applyParamOverrideTemplate('operations', 'fill')
|
||||
}
|
||||
size='small'
|
||||
onClick={() =>
|
||||
applyParamOverrideTemplate('operations', 'fill')
|
||||
}
|
||||
>
|
||||
{t('填充新模板')}
|
||||
</Button>
|
||||
<Button
|
||||
size='small'
|
||||
onClick={() =>
|
||||
applyParamOverrideTemplate('legacy', 'fill')
|
||||
}
|
||||
size='small'
|
||||
onClick={() =>
|
||||
applyParamOverrideTemplate('legacy', 'fill')
|
||||
}
|
||||
>
|
||||
{t('填充旧模板')}
|
||||
</Button>
|
||||
@@ -3373,11 +3546,11 @@ const EditChannelModal = (props) => {
|
||||
{t('此项可选,用于覆盖请求参数。不支持覆盖 stream 参数')}
|
||||
</Text>
|
||||
<div
|
||||
className='mt-2 rounded-xl p-3'
|
||||
style={{
|
||||
backgroundColor: 'var(--semi-color-fill-0)',
|
||||
border: '1px solid var(--semi-color-fill-2)',
|
||||
}}
|
||||
className='mt-2 rounded-xl p-3'
|
||||
style={{
|
||||
backgroundColor: 'var(--semi-color-fill-0)',
|
||||
border: '1px solid var(--semi-color-fill-2)',
|
||||
}}
|
||||
>
|
||||
<div className='flex items-center justify-between mb-2'>
|
||||
<Tag color={paramOverrideMeta.tagColor}>
|
||||
@@ -3385,17 +3558,17 @@ const EditChannelModal = (props) => {
|
||||
</Tag>
|
||||
<Space spacing={8}>
|
||||
<Button
|
||||
size='small'
|
||||
icon={<IconCopy />}
|
||||
type='tertiary'
|
||||
onClick={copyParamOverrideJson}
|
||||
size='small'
|
||||
icon={<IconCopy />}
|
||||
type='tertiary'
|
||||
onClick={copyParamOverrideJson}
|
||||
>
|
||||
{t('复制')}
|
||||
</Button>
|
||||
<Button
|
||||
size='small'
|
||||
type='tertiary'
|
||||
onClick={() => setParamOverrideEditorVisible(true)}
|
||||
size='small'
|
||||
type='tertiary'
|
||||
onClick={() => setParamOverrideEditorVisible(true)}
|
||||
>
|
||||
{t('编辑')}
|
||||
</Button>
|
||||
@@ -3408,82 +3581,81 @@ const EditChannelModal = (props) => {
|
||||
</div>
|
||||
|
||||
<Form.TextArea
|
||||
field='header_override'
|
||||
label={t('请求头覆盖')}
|
||||
placeholder={
|
||||
t('此项可选,用于覆盖请求头参数') +
|
||||
'\n' +
|
||||
t('格式示例:') +
|
||||
'\n{\n "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/139.0.0.0 Safari/537.36 Edg/139.0.0.0",\n "Authorization": "Bearer {api_key}"\n}'
|
||||
}
|
||||
autosize
|
||||
onChange={(value) =>
|
||||
handleInputChange('header_override', value)
|
||||
}
|
||||
extraText={
|
||||
<div className='flex flex-col gap-1'>
|
||||
<div className='flex gap-2 flex-wrap items-center'>
|
||||
<Text
|
||||
className='!text-semi-color-primary cursor-pointer'
|
||||
onClick={() =>
|
||||
handleInputChange(
|
||||
'header_override',
|
||||
JSON.stringify(
|
||||
{
|
||||
'*': true,
|
||||
're:^X-Trace-.*$': true,
|
||||
'X-Foo': '{client_header:X-Foo}',
|
||||
Authorization: 'Bearer {api_key}',
|
||||
'User-Agent':
|
||||
'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/139.0.0.0 Safari/537.36 Edg/139.0.0.0',
|
||||
},
|
||||
null,
|
||||
2,
|
||||
),
|
||||
)
|
||||
}
|
||||
>
|
||||
{t('填入模板')}
|
||||
</Text>
|
||||
<Text
|
||||
className='!text-semi-color-primary cursor-pointer'
|
||||
onClick={() =>
|
||||
handleInputChange(
|
||||
'header_override',
|
||||
JSON.stringify(
|
||||
{
|
||||
'*': true,
|
||||
},
|
||||
null,
|
||||
2,
|
||||
),
|
||||
)
|
||||
}
|
||||
>
|
||||
{t('填入透传模版')}
|
||||
</Text>
|
||||
<Text
|
||||
className='!text-semi-color-primary cursor-pointer'
|
||||
onClick={() => formatJsonField('header_override')}
|
||||
>
|
||||
{t('格式化')}
|
||||
</Text>
|
||||
</div>
|
||||
<div>
|
||||
<Text type='tertiary' size='small'>
|
||||
{t('支持变量:')}
|
||||
</Text>
|
||||
<div className='text-xs text-tertiary ml-2'>
|
||||
<div>
|
||||
{t('渠道密钥')}: {'{api_key}'}
|
||||
field='header_override'
|
||||
label={t('请求头覆盖')}
|
||||
placeholder={
|
||||
t('此项可选,用于覆盖请求头参数') +
|
||||
'\n' +
|
||||
t('格式示例:') +
|
||||
'\n{\n "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/139.0.0.0 Safari/537.36 Edg/139.0.0.0",\n "Authorization": "Bearer {api_key}"\n}'
|
||||
}
|
||||
autosize
|
||||
onChange={(value) =>
|
||||
handleInputChange('header_override', value)
|
||||
}
|
||||
extraText={
|
||||
<div className='flex flex-col gap-1'>
|
||||
<div className='flex gap-2 flex-wrap items-center'>
|
||||
<Text
|
||||
className='!text-semi-color-primary cursor-pointer'
|
||||
onClick={() =>
|
||||
handleInputChange(
|
||||
'header_override',
|
||||
JSON.stringify(
|
||||
{
|
||||
'*': true,
|
||||
're:^X-Trace-.*$': true,
|
||||
'X-Foo': '{client_header:X-Foo}',
|
||||
Authorization: 'Bearer {api_key}',
|
||||
'User-Agent':
|
||||
'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/139.0.0.0 Safari/537.36 Edg/139.0.0.0',
|
||||
},
|
||||
null,
|
||||
2,
|
||||
),
|
||||
)
|
||||
}
|
||||
>
|
||||
{t('填入模板')}
|
||||
</Text>
|
||||
<Text
|
||||
className='!text-semi-color-primary cursor-pointer'
|
||||
onClick={() =>
|
||||
handleInputChange(
|
||||
'header_override',
|
||||
JSON.stringify(
|
||||
{
|
||||
'*': true,
|
||||
},
|
||||
null,
|
||||
2,
|
||||
),
|
||||
)
|
||||
}
|
||||
>
|
||||
{t('填入透传模版')}
|
||||
</Text>
|
||||
<Text
|
||||
className='!text-semi-color-primary cursor-pointer'
|
||||
onClick={() => formatJsonField('header_override')}
|
||||
>
|
||||
{t('格式化')}
|
||||
</Text>
|
||||
</div>
|
||||
<div>
|
||||
<Text type='tertiary' size='small'>
|
||||
{t('支持变量:')}
|
||||
</Text>
|
||||
<div className='text-xs text-tertiary ml-2'>
|
||||
<div>
|
||||
{t('渠道密钥')}: {'{api_key}'}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
showClear
|
||||
}
|
||||
showClear
|
||||
/>
|
||||
|
||||
<JSONEditor
|
||||
key={`status_code_mapping-${isEdit ? channelId : 'new'}`}
|
||||
field='status_code_mapping'
|
||||
|
||||
5
web/src/constants/channel.constants.js
vendored
5
web/src/constants/channel.constants.js
vendored
@@ -191,4 +191,9 @@ export const CHANNEL_OPTIONS = [
|
||||
},
|
||||
];
|
||||
|
||||
// Channel types that support upstream model list fetching in UI.
|
||||
export const MODEL_FETCHABLE_CHANNEL_TYPES = new Set([
|
||||
1, 4, 14, 34, 17, 26, 27, 24, 47, 25, 20, 23, 31, 40, 42, 48, 43,
|
||||
]);
|
||||
|
||||
export const MODEL_TABLE_PAGE_SIZE = 10;
|
||||
|
||||
56
web/src/hooks/channels/upstreamUpdateUtils.js
vendored
Normal file
56
web/src/hooks/channels/upstreamUpdateUtils.js
vendored
Normal file
@@ -0,0 +1,56 @@
|
||||
/*
|
||||
Copyright (C) 2025 QuantumNous
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Affero General Public License as
|
||||
published by the Free Software Foundation, either version 3 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Affero General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Affero General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
For commercial licensing, please contact support@quantumnous.com
|
||||
*/
|
||||
|
||||
export const normalizeModelList = (models = []) =>
|
||||
Array.from(
|
||||
new Set(
|
||||
(models || []).map((model) => String(model || '').trim()).filter(Boolean),
|
||||
),
|
||||
);
|
||||
|
||||
export const parseUpstreamUpdateMeta = (settings) => {
|
||||
let parsed = null;
|
||||
if (settings && typeof settings === 'object') {
|
||||
parsed = settings;
|
||||
} else if (typeof settings === 'string') {
|
||||
try {
|
||||
parsed = JSON.parse(settings);
|
||||
} catch (error) {
|
||||
parsed = null;
|
||||
}
|
||||
}
|
||||
|
||||
if (!parsed || typeof parsed !== 'object') {
|
||||
return {
|
||||
enabled: false,
|
||||
pendingAddModels: [],
|
||||
pendingRemoveModels: [],
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
enabled: parsed.upstream_model_update_check_enabled === true,
|
||||
pendingAddModels: normalizeModelList(
|
||||
parsed.upstream_model_update_last_detected_models,
|
||||
),
|
||||
pendingRemoveModels: normalizeModelList(
|
||||
parsed.upstream_model_update_last_removed_models,
|
||||
),
|
||||
};
|
||||
};
|
||||
288
web/src/hooks/channels/useChannelUpstreamUpdates.jsx
vendored
Normal file
288
web/src/hooks/channels/useChannelUpstreamUpdates.jsx
vendored
Normal file
@@ -0,0 +1,288 @@
|
||||
/*
|
||||
Copyright (C) 2025 QuantumNous
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Affero General Public License as
|
||||
published by the Free Software Foundation, either version 3 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Affero General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Affero General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
For commercial licensing, please contact support@quantumnous.com
|
||||
*/
|
||||
|
||||
import { useRef, useState } from 'react';
|
||||
import { API, showError, showInfo, showSuccess } from '../../helpers';
|
||||
import { normalizeModelList } from './upstreamUpdateUtils';
|
||||
|
||||
export const useChannelUpstreamUpdates = ({ t, refresh }) => {
|
||||
const [showUpstreamUpdateModal, setShowUpstreamUpdateModal] = useState(false);
|
||||
const [upstreamUpdateChannel, setUpstreamUpdateChannel] = useState(null);
|
||||
const [upstreamUpdateAddModels, setUpstreamUpdateAddModels] = useState([]);
|
||||
const [upstreamUpdateRemoveModels, setUpstreamUpdateRemoveModels] = useState(
|
||||
[],
|
||||
);
|
||||
const [upstreamUpdatePreferredTab, setUpstreamUpdatePreferredTab] =
|
||||
useState('add');
|
||||
const [upstreamApplyLoading, setUpstreamApplyLoading] = useState(false);
|
||||
const [detectAllUpstreamUpdatesLoading, setDetectAllUpstreamUpdatesLoading] =
|
||||
useState(false);
|
||||
const [applyAllUpstreamUpdatesLoading, setApplyAllUpstreamUpdatesLoading] =
|
||||
useState(false);
|
||||
|
||||
const applyUpstreamUpdatesInFlightRef = useRef(false);
|
||||
const detectChannelUpstreamUpdatesInFlightRef = useRef(false);
|
||||
const detectAllUpstreamUpdatesInFlightRef = useRef(false);
|
||||
const applyAllUpstreamUpdatesInFlightRef = useRef(false);
|
||||
|
||||
const openUpstreamUpdateModal = (
|
||||
record,
|
||||
pendingAddModels = [],
|
||||
pendingRemoveModels = [],
|
||||
preferredTab = 'add',
|
||||
) => {
|
||||
const normalizedAddModels = normalizeModelList(pendingAddModels);
|
||||
const normalizedRemoveModels = normalizeModelList(pendingRemoveModels);
|
||||
if (
|
||||
!record?.id ||
|
||||
(normalizedAddModels.length === 0 && normalizedRemoveModels.length === 0)
|
||||
) {
|
||||
showInfo(t('该渠道暂无可处理的上游模型更新'));
|
||||
return;
|
||||
}
|
||||
setUpstreamUpdateChannel(record);
|
||||
setUpstreamUpdateAddModels(normalizedAddModels);
|
||||
setUpstreamUpdateRemoveModels(normalizedRemoveModels);
|
||||
const normalizedPreferredTab = preferredTab === 'remove' ? 'remove' : 'add';
|
||||
setUpstreamUpdatePreferredTab(normalizedPreferredTab);
|
||||
setShowUpstreamUpdateModal(true);
|
||||
};
|
||||
|
||||
const closeUpstreamUpdateModal = () => {
|
||||
setShowUpstreamUpdateModal(false);
|
||||
setUpstreamUpdateChannel(null);
|
||||
setUpstreamUpdateAddModels([]);
|
||||
setUpstreamUpdateRemoveModels([]);
|
||||
setUpstreamUpdatePreferredTab('add');
|
||||
};
|
||||
|
||||
const applyUpstreamUpdates = async ({
|
||||
addModels: selectedAddModels = [],
|
||||
removeModels: selectedRemoveModels = [],
|
||||
} = {}) => {
|
||||
if (applyUpstreamUpdatesInFlightRef.current) {
|
||||
showInfo(t('正在处理,请稍候'));
|
||||
return;
|
||||
}
|
||||
if (!upstreamUpdateChannel?.id) {
|
||||
closeUpstreamUpdateModal();
|
||||
return;
|
||||
}
|
||||
applyUpstreamUpdatesInFlightRef.current = true;
|
||||
setUpstreamApplyLoading(true);
|
||||
|
||||
try {
|
||||
const normalizedSelectedAddModels = normalizeModelList(selectedAddModels);
|
||||
const normalizedSelectedRemoveModels =
|
||||
normalizeModelList(selectedRemoveModels);
|
||||
const selectedAddSet = new Set(normalizedSelectedAddModels);
|
||||
const ignoreModels = upstreamUpdateAddModels.filter(
|
||||
(model) => !selectedAddSet.has(model),
|
||||
);
|
||||
|
||||
const res = await API.post(
|
||||
'/api/channel/upstream_updates/apply',
|
||||
{
|
||||
id: upstreamUpdateChannel.id,
|
||||
add_models: normalizedSelectedAddModels,
|
||||
ignore_models: ignoreModels,
|
||||
remove_models: normalizedSelectedRemoveModels,
|
||||
},
|
||||
{ skipErrorHandler: true },
|
||||
);
|
||||
const { success, message, data } = res.data || {};
|
||||
if (!success) {
|
||||
showError(message || t('操作失败'));
|
||||
return;
|
||||
}
|
||||
|
||||
const addedCount = data?.added_models?.length || 0;
|
||||
const removedCount = data?.removed_models?.length || 0;
|
||||
const ignoredCount = data?.ignored_models?.length || 0;
|
||||
showSuccess(
|
||||
t(
|
||||
'已处理上游模型更新:加入 {{added}} 个,删除 {{removed}} 个,忽略 {{ignored}} 个',
|
||||
{
|
||||
added: addedCount,
|
||||
removed: removedCount,
|
||||
ignored: ignoredCount,
|
||||
},
|
||||
),
|
||||
);
|
||||
closeUpstreamUpdateModal();
|
||||
await refresh();
|
||||
} catch (error) {
|
||||
showError(
|
||||
error?.response?.data?.message || error?.message || t('操作失败'),
|
||||
);
|
||||
} finally {
|
||||
applyUpstreamUpdatesInFlightRef.current = false;
|
||||
setUpstreamApplyLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
const applyAllUpstreamUpdates = async () => {
|
||||
if (applyAllUpstreamUpdatesInFlightRef.current) {
|
||||
showInfo(t('正在批量处理,请稍候'));
|
||||
return;
|
||||
}
|
||||
applyAllUpstreamUpdatesInFlightRef.current = true;
|
||||
setApplyAllUpstreamUpdatesLoading(true);
|
||||
try {
|
||||
const res = await API.post(
|
||||
'/api/channel/upstream_updates/apply_all',
|
||||
{},
|
||||
{ skipErrorHandler: true },
|
||||
);
|
||||
const { success, message, data } = res.data || {};
|
||||
if (!success) {
|
||||
showError(message || t('批量处理失败'));
|
||||
return;
|
||||
}
|
||||
|
||||
const channelCount = data?.processed_channels || 0;
|
||||
const addedCount = data?.added_models || 0;
|
||||
const removedCount = data?.removed_models || 0;
|
||||
const failedCount = (data?.failed_channel_ids || []).length;
|
||||
showSuccess(
|
||||
t(
|
||||
'已批量处理上游模型更新:渠道 {{channels}} 个,加入 {{added}} 个,删除 {{removed}} 个,失败 {{fails}} 个',
|
||||
{
|
||||
channels: channelCount,
|
||||
added: addedCount,
|
||||
removed: removedCount,
|
||||
fails: failedCount,
|
||||
},
|
||||
),
|
||||
);
|
||||
await refresh();
|
||||
} catch (error) {
|
||||
showError(
|
||||
error?.response?.data?.message || error?.message || t('批量处理失败'),
|
||||
);
|
||||
} finally {
|
||||
applyAllUpstreamUpdatesInFlightRef.current = false;
|
||||
setApplyAllUpstreamUpdatesLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
const detectChannelUpstreamUpdates = async (channel) => {
|
||||
if (detectChannelUpstreamUpdatesInFlightRef.current) {
|
||||
showInfo(t('正在检测,请稍候'));
|
||||
return;
|
||||
}
|
||||
if (!channel?.id) {
|
||||
return;
|
||||
}
|
||||
detectChannelUpstreamUpdatesInFlightRef.current = true;
|
||||
try {
|
||||
const res = await API.post(
|
||||
'/api/channel/upstream_updates/detect',
|
||||
{
|
||||
id: channel.id,
|
||||
},
|
||||
{ skipErrorHandler: true },
|
||||
);
|
||||
const { success, message, data } = res.data || {};
|
||||
if (!success) {
|
||||
showError(message || t('检测失败'));
|
||||
return;
|
||||
}
|
||||
|
||||
const addCount = data?.add_models?.length || 0;
|
||||
const removeCount = data?.remove_models?.length || 0;
|
||||
showSuccess(
|
||||
t('检测完成:新增 {{add}} 个,删除 {{remove}} 个', {
|
||||
add: addCount,
|
||||
remove: removeCount,
|
||||
}),
|
||||
);
|
||||
await refresh();
|
||||
} catch (error) {
|
||||
showError(
|
||||
error?.response?.data?.message || error?.message || t('检测失败'),
|
||||
);
|
||||
} finally {
|
||||
detectChannelUpstreamUpdatesInFlightRef.current = false;
|
||||
}
|
||||
};
|
||||
|
||||
const detectAllUpstreamUpdates = async () => {
|
||||
if (detectAllUpstreamUpdatesInFlightRef.current) {
|
||||
showInfo(t('正在批量检测,请稍候'));
|
||||
return;
|
||||
}
|
||||
detectAllUpstreamUpdatesInFlightRef.current = true;
|
||||
setDetectAllUpstreamUpdatesLoading(true);
|
||||
try {
|
||||
const res = await API.post(
|
||||
'/api/channel/upstream_updates/detect_all',
|
||||
{},
|
||||
{ skipErrorHandler: true },
|
||||
);
|
||||
const { success, message, data } = res.data || {};
|
||||
if (!success) {
|
||||
showError(message || t('批量检测失败'));
|
||||
return;
|
||||
}
|
||||
|
||||
const channelCount = data?.processed_channels || 0;
|
||||
const addCount = data?.detected_add_models || 0;
|
||||
const removeCount = data?.detected_remove_models || 0;
|
||||
const failedCount = (data?.failed_channel_ids || []).length;
|
||||
showSuccess(
|
||||
t(
|
||||
'批量检测完成:渠道 {{channels}} 个,新增 {{add}} 个,删除 {{remove}} 个,失败 {{fails}} 个',
|
||||
{
|
||||
channels: channelCount,
|
||||
add: addCount,
|
||||
remove: removeCount,
|
||||
fails: failedCount,
|
||||
},
|
||||
),
|
||||
);
|
||||
await refresh();
|
||||
} catch (error) {
|
||||
showError(
|
||||
error?.response?.data?.message || error?.message || t('批量检测失败'),
|
||||
);
|
||||
} finally {
|
||||
detectAllUpstreamUpdatesInFlightRef.current = false;
|
||||
setDetectAllUpstreamUpdatesLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
return {
|
||||
showUpstreamUpdateModal,
|
||||
setShowUpstreamUpdateModal,
|
||||
upstreamUpdateChannel,
|
||||
upstreamUpdateAddModels,
|
||||
upstreamUpdateRemoveModels,
|
||||
upstreamUpdatePreferredTab,
|
||||
upstreamApplyLoading,
|
||||
detectAllUpstreamUpdatesLoading,
|
||||
applyAllUpstreamUpdatesLoading,
|
||||
openUpstreamUpdateModal,
|
||||
closeUpstreamUpdateModal,
|
||||
applyUpstreamUpdates,
|
||||
applyAllUpstreamUpdates,
|
||||
detectChannelUpstreamUpdates,
|
||||
detectAllUpstreamUpdates,
|
||||
};
|
||||
};
|
||||
8
web/src/hooks/channels/useChannelsData.jsx
vendored
8
web/src/hooks/channels/useChannelsData.jsx
vendored
@@ -35,6 +35,8 @@ import {
|
||||
} from '../../constants';
|
||||
import { useIsMobile } from '../common/useIsMobile';
|
||||
import { useTableCompactMode } from '../common/useTableCompactMode';
|
||||
import { useChannelUpstreamUpdates } from './useChannelUpstreamUpdates';
|
||||
import { parseUpstreamUpdateMeta } from './upstreamUpdateUtils';
|
||||
import { Modal, Button } from '@douyinfe/semi-ui';
|
||||
import { openCodexUsageModal } from '../../components/table/channels/modals/CodexUsageModal';
|
||||
|
||||
@@ -235,6 +237,9 @@ export const useChannelsData = () => {
|
||||
let channelTags = {};
|
||||
|
||||
for (let i = 0; i < channels.length; i++) {
|
||||
channels[i].upstreamUpdateMeta = parseUpstreamUpdateMeta(
|
||||
channels[i].settings,
|
||||
);
|
||||
channels[i].key = '' + channels[i].id;
|
||||
if (!enableTagMode) {
|
||||
channelDates.push(channels[i]);
|
||||
@@ -432,6 +437,8 @@ export const useChannelsData = () => {
|
||||
}
|
||||
};
|
||||
|
||||
const upstreamUpdates = useChannelUpstreamUpdates({ t, refresh });
|
||||
|
||||
// Channel management
|
||||
const manageChannel = async (id, action, record, value) => {
|
||||
let data = { id };
|
||||
@@ -1194,6 +1201,7 @@ export const useChannelsData = () => {
|
||||
setShowMultiKeyManageModal,
|
||||
currentMultiKeyChannel,
|
||||
setCurrentMultiKeyChannel,
|
||||
...upstreamUpdates,
|
||||
|
||||
// Form
|
||||
formApi,
|
||||
|
||||
Reference in New Issue
Block a user