fix: channel affinity (#2799)
* fix: channel affinity log styles * fix: Issue with incorrect data storage when switching key sources * feat: support not retrying after a single rule configuration fails * fix: render channel affinity tooltip as multiline content * feat: channel affinity cache hit * fix: prevent ChannelAffinityUsageCacheModal infinite loading and hide data before fetch * chore: format backend with gofmt and frontend with prettier/eslint autofix
This commit is contained in:
Seefs
@@ -20,6 +20,7 @@ For commercial licensing, please contact support@quantumnous.com
|
||||
import React from 'react';
|
||||
import {
|
||||
Avatar,
|
||||
Button,
|
||||
Space,
|
||||
Tag,
|
||||
Tooltip,
|
||||
@@ -71,6 +72,34 @@ function formatRatio(ratio) {
|
||||
return String(ratio);
|
||||
}
|
||||
|
||||
function buildChannelAffinityTooltip(affinity, t) {
|
||||
if (!affinity) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const keySource = affinity.key_source || '-';
|
||||
const keyPath = affinity.key_path || affinity.key_key || '-';
|
||||
const keyHint = affinity.key_hint || '';
|
||||
const keyFp = affinity.key_fp ? `#${affinity.key_fp}` : '';
|
||||
const keyText = `${keySource}:${keyPath}${keyFp}`;
|
||||
|
||||
const lines = [
|
||||
t('渠道亲和性'),
|
||||
`${t('规则')}：${affinity.rule_name || '-'}`,
|
||||
`${t('分组')}：${affinity.selected_group || '-'}`,
|
||||
`${t('Key')}：${keyText}`,
|
||||
...(keyHint ? [`${t('Key 摘要')}：${keyHint}`] : []),
|
||||
];
|
||||
|
||||
return (
|
||||
<div style={{ lineHeight: 1.6, display: 'flex', flexDirection: 'column' }}>
|
||||
{lines.map((line, i) => (
|
||||
<div key={i}>{line}</div>
|
||||
))}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// Render functions
|
||||
function renderType(type, t) {
|
||||
switch (type) {
|
||||
@@ -250,6 +279,7 @@ export const getLogsColumns = ({
|
||||
COLUMN_KEYS,
|
||||
copyText,
|
||||
showUserInfoFunc,
|
||||
openChannelAffinityUsageCacheModal,
|
||||
isAdminUser,
|
||||
}) => {
|
||||
return [
|
||||
@@ -532,42 +562,39 @@ export const getLogsColumns = ({
|
||||
return isAdminUser ? (
|
||||
<Space>
|
||||
<div>{content}</div>
|
||||
{affinity ? (
|
||||
<Tooltip
|
||||
content={
|
||||
<div style={{ lineHeight: 1.6 }}>
|
||||
<Typography.Text strong>{t('渠道亲和性')}</Typography.Text>
|
||||
<div>
|
||||
<Typography.Text type='secondary'>
|
||||
{t('规则')}：{affinity.rule_name || '-'}
|
||||
</Typography.Text>
|
||||
</div>
|
||||
<div>
|
||||
<Typography.Text type='secondary'>
|
||||
{t('分组')}：{affinity.selected_group || '-'}
|
||||
</Typography.Text>
|
||||
</div>
|
||||
<div>
|
||||
<Typography.Text type='secondary'>
|
||||
{t('Key')}：
|
||||
{(affinity.key_source || '-') +
|
||||
':' +
|
||||
(affinity.key_path || affinity.key_key || '-') +
|
||||
(affinity.key_fp ? `#${affinity.key_fp}` : '')}
|
||||
</Typography.Text>
|
||||
{affinity ? (
|
||||
<Tooltip
|
||||
content={
|
||||
<div>
|
||||
{buildChannelAffinityTooltip(affinity, t)}
|
||||
<div style={{ marginTop: 6 }}>
|
||||
<Button
|
||||
theme='borderless'
|
||||
size='small'
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
openChannelAffinityUsageCacheModal?.(affinity);
|
||||
}}
|
||||
>
|
||||
{t('查看详情')}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
>
|
||||
<span>
|
||||
<Tag className='channel-affinity-tag' color='cyan' shape='circle'>
|
||||
<span className='channel-affinity-tag-content'>
|
||||
<IconStarStroked style={{ fontSize: 13 }} />
|
||||
{t('优选')}
|
||||
</span>
|
||||
</Tag>
|
||||
</span>
|
||||
</Tooltip>
|
||||
</div>
|
||||
}
|
||||
>
|
||||
<span>
|
||||
<Tag
|
||||
className='channel-affinity-tag'
|
||||
color='cyan'
|
||||
shape='circle'
|
||||
>
|
||||
<span className='channel-affinity-tag-content'>
|
||||
<IconStarStroked style={{ fontSize: 13 }} />
|
||||
{t('优选')}
|
||||
</span>
|
||||
</Tag>
|
||||
</span>
|
||||
</Tooltip>
|
||||
) : null}
|
||||
</Space>
|
||||
) : (
|
||||
|
||||
@@ -40,6 +40,7 @@ const LogsTable = (logsData) => {
|
||||
handlePageSizeChange,
|
||||
copyText,
|
||||
showUserInfoFunc,
|
||||
openChannelAffinityUsageCacheModal,
|
||||
hasExpandableRows,
|
||||
isAdminUser,
|
||||
t,
|
||||
@@ -53,9 +54,17 @@ const LogsTable = (logsData) => {
|
||||
COLUMN_KEYS,
|
||||
copyText,
|
||||
showUserInfoFunc,
|
||||
openChannelAffinityUsageCacheModal,
|
||||
isAdminUser,
|
||||
});
|
||||
}, [t, COLUMN_KEYS, copyText, showUserInfoFunc, isAdminUser]);
|
||||
}, [
|
||||
t,
|
||||
COLUMN_KEYS,
|
||||
copyText,
|
||||
showUserInfoFunc,
|
||||
openChannelAffinityUsageCacheModal,
|
||||
isAdminUser,
|
||||
]);
|
||||
|
||||
// Filter columns based on visibility settings
|
||||
const getVisibleColumns = () => {
|
||||
|
||||
@@ -24,6 +24,7 @@ import LogsActions from './UsageLogsActions';
|
||||
import LogsFilters from './UsageLogsFilters';
|
||||
import ColumnSelectorModal from './modals/ColumnSelectorModal';
|
||||
import UserInfoModal from './modals/UserInfoModal';
|
||||
import ChannelAffinityUsageCacheModal from './modals/ChannelAffinityUsageCacheModal';
|
||||
import { useLogsData } from '../../../hooks/usage-logs/useUsageLogsData';
|
||||
import { useIsMobile } from '../../../hooks/common/useIsMobile';
|
||||
import { createCardProPagination } from '../../../helpers/utils';
|
||||
@@ -37,6 +38,7 @@ const LogsPage = () => {
|
||||
{/* Modals */}
|
||||
<ColumnSelectorModal {...logsData} />
|
||||
<UserInfoModal {...logsData} />
|
||||
<ChannelAffinityUsageCacheModal {...logsData} />
|
||||
|
||||
{/* Main Content */}
|
||||
<CardPro
|
||||
|
||||
@@ -0,0 +1,200 @@
|
||||
/*
|
||||
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, useRef, useState } from 'react';
|
||||
import { Modal, Descriptions, Spin, Typography } from '@douyinfe/semi-ui';
|
||||
import { API, showError, timestamp2string } from '../../../../helpers';
|
||||
|
||||
const { Text } = Typography;
|
||||
|
||||
function formatRate(hit, total) {
|
||||
if (!total || total <= 0) return '-';
|
||||
const r = (Number(hit || 0) / Number(total || 0)) * 100;
|
||||
if (!Number.isFinite(r)) return '-';
|
||||
return `${r.toFixed(2)}%`;
|
||||
}
|
||||
|
||||
function formatTokenRate(n, d) {
|
||||
const nn = Number(n || 0);
|
||||
const dd = Number(d || 0);
|
||||
if (!dd || dd <= 0) return '-';
|
||||
const r = (nn / dd) * 100;
|
||||
if (!Number.isFinite(r)) return '-';
|
||||
return `${r.toFixed(2)}%`;
|
||||
}
|
||||
|
||||
const ChannelAffinityUsageCacheModal = ({
|
||||
t,
|
||||
showChannelAffinityUsageCacheModal,
|
||||
setShowChannelAffinityUsageCacheModal,
|
||||
channelAffinityUsageCacheTarget,
|
||||
}) => {
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [stats, setStats] = useState(null);
|
||||
const requestSeqRef = useRef(0);
|
||||
|
||||
const params = useMemo(() => {
|
||||
const x = channelAffinityUsageCacheTarget || {};
|
||||
return {
|
||||
rule_name: (x.rule_name || '').trim(),
|
||||
using_group: (x.using_group || '').trim(),
|
||||
key_hint: (x.key_hint || '').trim(),
|
||||
key_fp: (x.key_fp || '').trim(),
|
||||
};
|
||||
}, [channelAffinityUsageCacheTarget]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!showChannelAffinityUsageCacheModal) {
|
||||
requestSeqRef.current += 1; // invalidate inflight request
|
||||
setLoading(false);
|
||||
setStats(null);
|
||||
return;
|
||||
}
|
||||
if (!params.rule_name || !params.key_fp) {
|
||||
setLoading(false);
|
||||
setStats(null);
|
||||
return;
|
||||
}
|
||||
|
||||
const reqSeq = (requestSeqRef.current += 1);
|
||||
setStats(null);
|
||||
setLoading(true);
|
||||
(async () => {
|
||||
try {
|
||||
const res = await API.get('/api/log/channel_affinity_usage_cache', {
|
||||
params,
|
||||
disableDuplicate: true,
|
||||
});
|
||||
if (reqSeq !== requestSeqRef.current) return;
|
||||
const { success, message, data } = res.data || {};
|
||||
if (!success) {
|
||||
setStats(null);
|
||||
showError(t(message || '请求失败'));
|
||||
return;
|
||||
}
|
||||
setStats(data || {});
|
||||
} catch (e) {
|
||||
if (reqSeq !== requestSeqRef.current) return;
|
||||
setStats(null);
|
||||
showError(t('请求失败'));
|
||||
} finally {
|
||||
if (reqSeq !== requestSeqRef.current) return;
|
||||
setLoading(false);
|
||||
}
|
||||
})();
|
||||
}, [
|
||||
showChannelAffinityUsageCacheModal,
|
||||
params.rule_name,
|
||||
params.using_group,
|
||||
params.key_hint,
|
||||
params.key_fp,
|
||||
t,
|
||||
]);
|
||||
|
||||
const rows = useMemo(() => {
|
||||
const s = stats || {};
|
||||
const hit = Number(s.hit || 0);
|
||||
const total = Number(s.total || 0);
|
||||
const windowSeconds = Number(s.window_seconds || 0);
|
||||
const lastSeenAt = Number(s.last_seen_at || 0);
|
||||
const promptTokens = Number(s.prompt_tokens || 0);
|
||||
const completionTokens = Number(s.completion_tokens || 0);
|
||||
const totalTokens = Number(s.total_tokens || 0);
|
||||
const cachedTokens = Number(s.cached_tokens || 0);
|
||||
const promptCacheHitTokens = Number(s.prompt_cache_hit_tokens || 0);
|
||||
|
||||
return [
|
||||
{ key: t('规则'), value: s.rule_name || params.rule_name || '-' },
|
||||
{ key: t('分组'), value: s.using_group || params.using_group || '-' },
|
||||
{
|
||||
key: t('Key 摘要'),
|
||||
value: params.key_hint || '-',
|
||||
},
|
||||
{
|
||||
key: t('Key 指纹'),
|
||||
value: s.key_fp || params.key_fp || '-',
|
||||
},
|
||||
{ key: t('TTL（秒）'), value: windowSeconds > 0 ? windowSeconds : '-' },
|
||||
{
|
||||
key: t('命中率'),
|
||||
value: `${hit}/${total} (${formatRate(hit, total)})`,
|
||||
},
|
||||
{
|
||||
key: t('Prompt tokens'),
|
||||
value: promptTokens,
|
||||
},
|
||||
{
|
||||
key: t('Cached tokens'),
|
||||
value: `${cachedTokens} (${formatTokenRate(cachedTokens, promptTokens)})`,
|
||||
},
|
||||
{
|
||||
key: t('Prompt cache hit tokens'),
|
||||
value: promptCacheHitTokens,
|
||||
},
|
||||
{
|
||||
key: t('Completion tokens'),
|
||||
value: completionTokens,
|
||||
},
|
||||
{
|
||||
key: t('Total tokens'),
|
||||
value: totalTokens,
|
||||
},
|
||||
{
|
||||
key: t('最近一次'),
|
||||
value: lastSeenAt > 0 ? timestamp2string(lastSeenAt) : '-',
|
||||
},
|
||||
];
|
||||
}, [stats, params, t]);
|
||||
|
||||
return (
|
||||
<Modal
|
||||
title={t('渠道亲和性：上游缓存命中')}
|
||||
visible={showChannelAffinityUsageCacheModal}
|
||||
onCancel={() => setShowChannelAffinityUsageCacheModal(false)}
|
||||
footer={null}
|
||||
centered
|
||||
closable
|
||||
maskClosable
|
||||
width={640}
|
||||
>
|
||||
<div style={{ padding: 16 }}>
|
||||
<div style={{ marginBottom: 12 }}>
|
||||
<Text type='tertiary' size='small'>
|
||||
{t(
|
||||
'命中判定：usage 中存在 cached tokens（例如 cached_tokens/prompt_cache_hit_tokens）即视为命中。',
|
||||
)}
|
||||
</Text>
|
||||
</div>
|
||||
<Spin spinning={loading} tip={t('加载中...')}>
|
||||
{stats ? (
|
||||
<Descriptions data={rows} />
|
||||
) : (
|
||||
<div style={{ padding: '24px 0' }}>
|
||||
<Text type='tertiary' size='small'>
|
||||
{loading ? t('加载中...') : t('暂无数据')}
|
||||
</Text>
|
||||
</div>
|
||||
)}
|
||||
</Spin>
|
||||
</div>
|
||||
</Modal>
|
||||
);
|
||||
};
|
||||
|
||||
export default ChannelAffinityUsageCacheModal;
|
||||
Reference in New Issue
Block a user