Compare commits

...

8 Commits

11 changed files with 1172 additions and 156 deletions

47
app.js
View File

@@ -65,6 +65,9 @@ class CLIProxyManager {
}); });
this.configCache = this.configService.cache; this.configCache = this.configService.cache;
this.cacheTimestamps = this.configService.cacheTimestamps; this.cacheTimestamps = this.configService.cacheTimestamps;
this.availableModels = [];
this.availableModelApiKeysCache = null;
this.availableModelsLoading = false;
// 状态更新定时器 // 状态更新定时器
this.statusUpdateTimer = null; this.statusUpdateTimer = null;
@@ -77,7 +80,9 @@ class CLIProxyManager {
this.logsRefreshTimer = null; this.logsRefreshTimer = null;
// 当前展示的日志行 // 当前展示的日志行
this.allLogLines = [];
this.displayedLogLines = []; this.displayedLogLines = [];
this.logSearchQuery = '';
this.maxDisplayLogLines = MAX_LOG_LINES; this.maxDisplayLogLines = MAX_LOG_LINES;
this.logFetchLimit = LOG_FETCH_LIMIT; this.logFetchLimit = LOG_FETCH_LIMIT;
@@ -274,6 +279,7 @@ class CLIProxyManager {
// 连接状态检查 // 连接状态检查
const connectionStatus = document.getElementById('connection-status'); const connectionStatus = document.getElementById('connection-status');
const refreshAll = document.getElementById('refresh-all'); const refreshAll = document.getElementById('refresh-all');
const availableModelsRefresh = document.getElementById('available-models-refresh');
if (connectionStatus) { if (connectionStatus) {
connectionStatus.addEventListener('click', () => this.checkConnectionStatus()); connectionStatus.addEventListener('click', () => this.checkConnectionStatus());
@@ -281,6 +287,9 @@ class CLIProxyManager {
if (refreshAll) { if (refreshAll) {
refreshAll.addEventListener('click', () => this.refreshAllData()); refreshAll.addEventListener('click', () => this.refreshAllData());
} }
if (availableModelsRefresh) {
availableModelsRefresh.addEventListener('click', () => this.loadAvailableModels({ forceRefresh: true }));
}
// 基础设置 // 基础设置
const debugToggle = document.getElementById('debug-toggle'); const debugToggle = document.getElementById('debug-toggle');
@@ -333,6 +342,7 @@ class CLIProxyManager {
const downloadLogs = document.getElementById('download-logs'); const downloadLogs = document.getElementById('download-logs');
const clearLogs = document.getElementById('clear-logs'); const clearLogs = document.getElementById('clear-logs');
const logsAutoRefreshToggle = document.getElementById('logs-auto-refresh-toggle'); const logsAutoRefreshToggle = document.getElementById('logs-auto-refresh-toggle');
const logsSearchInput = document.getElementById('logs-search-input');
if (refreshLogs) { if (refreshLogs) {
refreshLogs.addEventListener('click', () => this.refreshLogs()); refreshLogs.addEventListener('click', () => this.refreshLogs());
@@ -349,6 +359,14 @@ class CLIProxyManager {
if (logsAutoRefreshToggle) { if (logsAutoRefreshToggle) {
logsAutoRefreshToggle.addEventListener('change', (e) => this.toggleLogsAutoRefresh(e.target.checked)); logsAutoRefreshToggle.addEventListener('change', (e) => this.toggleLogsAutoRefresh(e.target.checked));
} }
if (logsSearchInput) {
const debouncedLogSearch = this.debounce((value) => {
this.updateLogSearchQuery(value);
}, 200);
logsSearchInput.addEventListener('input', (e) => {
debouncedLogSearch(e?.target?.value ?? '');
});
}
// API 密钥管理 // API 密钥管理
const addApiKey = document.getElementById('add-api-key'); const addApiKey = document.getElementById('add-api-key');
@@ -524,7 +542,9 @@ class CLIProxyManager {
const tokensDayBtn = document.getElementById('tokens-day-btn'); const tokensDayBtn = document.getElementById('tokens-day-btn');
const costHourBtn = document.getElementById('cost-hour-btn'); const costHourBtn = document.getElementById('cost-hour-btn');
const costDayBtn = document.getElementById('cost-day-btn'); const costDayBtn = document.getElementById('cost-day-btn');
const addChartLineBtn = document.getElementById('add-chart-line');
const chartLineSelects = document.querySelectorAll('.chart-line-select'); const chartLineSelects = document.querySelectorAll('.chart-line-select');
const chartLineDeleteButtons = document.querySelectorAll('.chart-line-delete');
const modelPriceForm = document.getElementById('model-price-form'); const modelPriceForm = document.getElementById('model-price-form');
const resetModelPricesBtn = document.getElementById('reset-model-prices'); const resetModelPricesBtn = document.getElementById('reset-model-prices');
const modelPriceSelect = document.getElementById('model-price-model-select'); const modelPriceSelect = document.getElementById('model-price-model-select');
@@ -550,6 +570,9 @@ class CLIProxyManager {
if (costDayBtn) { if (costDayBtn) {
costDayBtn.addEventListener('click', () => this.switchCostPeriod('day')); costDayBtn.addEventListener('click', () => this.switchCostPeriod('day'));
} }
if (addChartLineBtn) {
addChartLineBtn.addEventListener('click', () => this.changeChartLineCount(1));
}
if (chartLineSelects.length) { if (chartLineSelects.length) {
chartLineSelects.forEach(select => { chartLineSelects.forEach(select => {
select.addEventListener('change', (event) => { select.addEventListener('change', (event) => {
@@ -558,6 +581,15 @@ class CLIProxyManager {
}); });
}); });
} }
if (chartLineDeleteButtons.length) {
chartLineDeleteButtons.forEach(button => {
button.addEventListener('click', () => {
const index = Number.parseInt(button.getAttribute('data-line-index'), 10);
this.removeChartLine(Number.isNaN(index) ? -1 : index);
});
});
}
this.updateChartLineControlsUI();
if (modelPriceForm) { if (modelPriceForm) {
modelPriceForm.addEventListener('submit', (event) => { modelPriceForm.addEventListener('submit', (event) => {
event.preventDefault(); event.preventDefault();
@@ -661,12 +693,21 @@ class CLIProxyManager {
tokensChart = null; tokensChart = null;
costChart = null; costChart = null;
currentUsageData = null; currentUsageData = null;
chartLineSelections = ['none', 'none', 'none']; chartLineMaxCount = 9;
chartLineSelectIds = ['chart-line-select-0', 'chart-line-select-1', 'chart-line-select-2']; chartLineVisibleCount = 3;
chartLineSelections = Array(3).fill('none');
chartLineSelectionsInitialized = false;
chartLineSelectIds = Array.from({ length: 9 }, (_, idx) => `chart-line-select-${idx}`);
chartLineStyles = [ chartLineStyles = [
{ borderColor: '#3b82f6', backgroundColor: 'rgba(59, 130, 246, 0.15)' }, { borderColor: '#3b82f6', backgroundColor: 'rgba(59, 130, 246, 0.15)' },
{ borderColor: '#a855f7', backgroundColor: 'rgba(168, 85, 247, 0.15)' }, { borderColor: '#a855f7', backgroundColor: 'rgba(168, 85, 247, 0.15)' },
{ borderColor: '#10b981', backgroundColor: 'rgba(16, 185, 129, 0.15)' } { borderColor: '#10b981', backgroundColor: 'rgba(16, 185, 129, 0.15)' },
{ borderColor: '#f97316', backgroundColor: 'rgba(249, 115, 22, 0.15)' },
{ borderColor: '#ec4899', backgroundColor: 'rgba(236, 72, 153, 0.15)' },
{ borderColor: '#14b8a6', backgroundColor: 'rgba(20, 184, 166, 0.15)' },
{ borderColor: '#8b5cf6', backgroundColor: 'rgba(139, 92, 246, 0.15)' },
{ borderColor: '#f59e0b', backgroundColor: 'rgba(245, 158, 11, 0.15)' },
{ borderColor: '#22c55e', backgroundColor: 'rgba(34, 197, 94, 0.15)' }
]; ];
modelPriceStorageKey = 'cli-proxy-model-prices-v2'; modelPriceStorageKey = 'cli-proxy-model-prices-v2';
modelPrices = {}; modelPrices = {};

54
i18n.js
View File

@@ -94,7 +94,7 @@ const i18n = {
'nav.usage_stats': '使用统计', 'nav.usage_stats': '使用统计',
'nav.config_management': '配置管理', 'nav.config_management': '配置管理',
'nav.logs': '日志查看', 'nav.logs': '日志查看',
'nav.system_info': '系统信息', 'nav.system_info': '管理中心信息',
// 基础设置 // 基础设置
'basic_settings.title': '基础设置', 'basic_settings.title': '基础设置',
@@ -224,6 +224,9 @@ const i18n = {
'ai_providers.openai_models_fetch_error': '获取模型失败', 'ai_providers.openai_models_fetch_error': '获取模型失败',
'ai_providers.openai_models_fetch_back': '返回编辑', 'ai_providers.openai_models_fetch_back': '返回编辑',
'ai_providers.openai_models_fetch_apply': '添加所选模型', 'ai_providers.openai_models_fetch_apply': '添加所选模型',
'ai_providers.openai_models_search_label': '搜索模型',
'ai_providers.openai_models_search_placeholder': '按名称、别名或描述筛选',
'ai_providers.openai_models_search_empty': '没有匹配的模型,请更换关键字试试。',
'ai_providers.openai_models_fetch_invalid_url': '请先填写有效的 Base URL', 'ai_providers.openai_models_fetch_invalid_url': '请先填写有效的 Base URL',
'ai_providers.openai_models_fetch_added': '已添加 {count} 个新模型', 'ai_providers.openai_models_fetch_added': '已添加 {count} 个新模型',
'ai_providers.openai_edit_modal_title': '编辑OpenAI兼容提供商', 'ai_providers.openai_edit_modal_title': '编辑OpenAI兼容提供商',
@@ -460,7 +463,18 @@ const i18n = {
'usage_stats.chart_line_label_1': '曲线 1', 'usage_stats.chart_line_label_1': '曲线 1',
'usage_stats.chart_line_label_2': '曲线 2', 'usage_stats.chart_line_label_2': '曲线 2',
'usage_stats.chart_line_label_3': '曲线 3', 'usage_stats.chart_line_label_3': '曲线 3',
'usage_stats.chart_line_label_4': '曲线 4',
'usage_stats.chart_line_label_5': '曲线 5',
'usage_stats.chart_line_label_6': '曲线 6',
'usage_stats.chart_line_label_7': '曲线 7',
'usage_stats.chart_line_label_8': '曲线 8',
'usage_stats.chart_line_label_9': '曲线 9',
'usage_stats.chart_line_hidden': '不显示', 'usage_stats.chart_line_hidden': '不显示',
'usage_stats.chart_line_actions_label': '曲线数量',
'usage_stats.chart_line_add': '增加曲线',
'usage_stats.chart_line_all': '全部',
'usage_stats.chart_line_delete': '删除曲线',
'usage_stats.chart_line_hint': '最多同时显示 9 条模型曲线',
'usage_stats.no_data': '暂无数据', 'usage_stats.no_data': '暂无数据',
'usage_stats.loading_error': '加载失败', 'usage_stats.loading_error': '加载失败',
'usage_stats.api_endpoint': 'API端点', 'usage_stats.api_endpoint': 'API端点',
@@ -515,6 +529,9 @@ const i18n = {
'logs.auto_refresh': '自动刷新', 'logs.auto_refresh': '自动刷新',
'logs.auto_refresh_enabled': '自动刷新已开启', 'logs.auto_refresh_enabled': '自动刷新已开启',
'logs.auto_refresh_disabled': '自动刷新已关闭', 'logs.auto_refresh_disabled': '自动刷新已关闭',
'logs.search_placeholder': '搜索日志内容或关键字',
'logs.search_empty_title': '未找到匹配的日志',
'logs.search_empty_desc': '尝试更换关键字或清空搜索条件。',
'logs.lines': '行', 'logs.lines': '行',
'logs.removed': '已删除', 'logs.removed': '已删除',
'logs.upgrade_required_title': '需要升级 CLI Proxy API', 'logs.upgrade_required_title': '需要升级 CLI Proxy API',
@@ -540,7 +557,7 @@ const i18n = {
'config_management.editor_placeholder': 'key: value', 'config_management.editor_placeholder': 'key: value',
// 系统信息 // 系统信息
'system_info.title': '系统信息', 'system_info.title': '管理中心信息',
'system_info.connection_status_title': '连接状态', 'system_info.connection_status_title': '连接状态',
'system_info.api_status_label': 'API 状态:', 'system_info.api_status_label': 'API 状态:',
'system_info.config_status_label': '配置状态:', 'system_info.config_status_label': '配置状态:',
@@ -549,6 +566,12 @@ const i18n = {
'system_info.real_time_data': '实时数据', 'system_info.real_time_data': '实时数据',
'system_info.not_loaded': '未加载', 'system_info.not_loaded': '未加载',
'system_info.seconds_ago': '秒前', 'system_info.seconds_ago': '秒前',
'system_info.models_title': '可用模型列表',
'system_info.models_desc': '展示 /v1/models 返回的模型,并自动使用服务器保存的 API Key 进行鉴权。',
'system_info.models_loading': '正在加载可用模型...',
'system_info.models_empty': '未从 /v1/models 获取到模型数据',
'system_info.models_error': '获取模型列表失败',
'system_info.models_count': '可用模型 {count} 个',
// 通知消息 // 通知消息
'notification.debug_updated': '调试设置已更新', 'notification.debug_updated': '调试设置已更新',
@@ -713,7 +736,7 @@ const i18n = {
'nav.usage_stats': 'Usage Statistics', 'nav.usage_stats': 'Usage Statistics',
'nav.config_management': 'Config Management', 'nav.config_management': 'Config Management',
'nav.logs': 'Logs Viewer', 'nav.logs': 'Logs Viewer',
'nav.system_info': 'System Info', 'nav.system_info': 'Management Center Info',
// Basic settings // Basic settings
'basic_settings.title': 'Basic Settings', 'basic_settings.title': 'Basic Settings',
@@ -843,6 +866,9 @@ const i18n = {
'ai_providers.openai_models_fetch_error': 'Failed to fetch models', 'ai_providers.openai_models_fetch_error': 'Failed to fetch models',
'ai_providers.openai_models_fetch_back': 'Back to edit', 'ai_providers.openai_models_fetch_back': 'Back to edit',
'ai_providers.openai_models_fetch_apply': 'Add selected models', 'ai_providers.openai_models_fetch_apply': 'Add selected models',
'ai_providers.openai_models_search_label': 'Search models',
'ai_providers.openai_models_search_placeholder': 'Filter by name, alias, or description',
'ai_providers.openai_models_search_empty': 'No models match your search. Try a different keyword.',
'ai_providers.openai_models_fetch_invalid_url': 'Please enter a valid Base URL first', 'ai_providers.openai_models_fetch_invalid_url': 'Please enter a valid Base URL first',
'ai_providers.openai_models_fetch_added': '{count} new models added', 'ai_providers.openai_models_fetch_added': '{count} new models added',
'ai_providers.openai_edit_modal_title': 'Edit OpenAI Compatible Provider', 'ai_providers.openai_edit_modal_title': 'Edit OpenAI Compatible Provider',
@@ -1078,7 +1104,18 @@ const i18n = {
'usage_stats.chart_line_label_1': 'Line 1', 'usage_stats.chart_line_label_1': 'Line 1',
'usage_stats.chart_line_label_2': 'Line 2', 'usage_stats.chart_line_label_2': 'Line 2',
'usage_stats.chart_line_label_3': 'Line 3', 'usage_stats.chart_line_label_3': 'Line 3',
'usage_stats.chart_line_label_4': 'Line 4',
'usage_stats.chart_line_label_5': 'Line 5',
'usage_stats.chart_line_label_6': 'Line 6',
'usage_stats.chart_line_label_7': 'Line 7',
'usage_stats.chart_line_label_8': 'Line 8',
'usage_stats.chart_line_label_9': 'Line 9',
'usage_stats.chart_line_hidden': 'Hide', 'usage_stats.chart_line_hidden': 'Hide',
'usage_stats.chart_line_actions_label': 'Lines to display',
'usage_stats.chart_line_add': 'Add line',
'usage_stats.chart_line_all': 'All',
'usage_stats.chart_line_delete': 'Delete line',
'usage_stats.chart_line_hint': 'Show up to 9 model lines at once',
'usage_stats.no_data': 'No Data Available', 'usage_stats.no_data': 'No Data Available',
'usage_stats.loading_error': 'Loading Failed', 'usage_stats.loading_error': 'Loading Failed',
'usage_stats.api_endpoint': 'API Endpoint', 'usage_stats.api_endpoint': 'API Endpoint',
@@ -1133,6 +1170,9 @@ const i18n = {
'logs.auto_refresh': 'Auto Refresh', 'logs.auto_refresh': 'Auto Refresh',
'logs.auto_refresh_enabled': 'Auto refresh enabled', 'logs.auto_refresh_enabled': 'Auto refresh enabled',
'logs.auto_refresh_disabled': 'Auto refresh disabled', 'logs.auto_refresh_disabled': 'Auto refresh disabled',
'logs.search_placeholder': 'Search logs by content or keyword',
'logs.search_empty_title': 'No matching logs found',
'logs.search_empty_desc': 'Try a different keyword or clear the search filter.',
'logs.lines': 'lines', 'logs.lines': 'lines',
'logs.removed': 'Removed', 'logs.removed': 'Removed',
'logs.upgrade_required_title': 'Please Upgrade CLI Proxy API', 'logs.upgrade_required_title': 'Please Upgrade CLI Proxy API',
@@ -1158,7 +1198,7 @@ const i18n = {
'config_management.editor_placeholder': 'key: value', 'config_management.editor_placeholder': 'key: value',
// System info // System info
'system_info.title': 'System Information', 'system_info.title': 'Management Center Info',
'system_info.connection_status_title': 'Connection Status', 'system_info.connection_status_title': 'Connection Status',
'system_info.api_status_label': 'API Status:', 'system_info.api_status_label': 'API Status:',
'system_info.config_status_label': 'Config Status:', 'system_info.config_status_label': 'Config Status:',
@@ -1167,6 +1207,12 @@ const i18n = {
'system_info.real_time_data': 'Real-time Data', 'system_info.real_time_data': 'Real-time Data',
'system_info.not_loaded': 'Not Loaded', 'system_info.not_loaded': 'Not Loaded',
'system_info.seconds_ago': 'seconds ago', 'system_info.seconds_ago': 'seconds ago',
'system_info.models_title': 'Available Models',
'system_info.models_desc': 'Shows the /v1/models response and uses saved API keys for auth automatically.',
'system_info.models_loading': 'Loading available models...',
'system_info.models_empty': 'No models returned by /v1/models',
'system_info.models_error': 'Failed to load model list',
'system_info.models_count': '{count} available models',
// Notification messages // Notification messages
'notification.debug_updated': 'Debug settings updated', 'notification.debug_updated': 'Debug settings updated',

View File

@@ -182,7 +182,7 @@
<i class="fas fa-scroll"></i> <span data-i18n="nav.logs">日志查看</span> <i class="fas fa-scroll"></i> <span data-i18n="nav.logs">日志查看</span>
</a></li> </a></li>
<li data-i18n-tooltip="nav.system_info"><a href="#system-info" class="nav-item" data-section="system-info"> <li data-i18n-tooltip="nav.system_info"><a href="#system-info" class="nav-item" data-section="system-info">
<i class="fas fa-info-circle"></i> <span data-i18n="nav.system_info">系统信息</span> <i class="fas fa-info-circle"></i> <span data-i18n="nav.system_info">管理中心信息</span>
</a></li> </a></li>
</ul> </ul>
</nav> </nav>
@@ -839,27 +839,33 @@
<h2 data-i18n="logs.title">日志查看</h2> <h2 data-i18n="logs.title">日志查看</h2>
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header logs-header">
<h3><i class="fas fa-scroll"></i> <span data-i18n="logs.log_content">日志内容</span></h3> <div class="logs-header-main">
<h3><i class="fas fa-scroll"></i> <span data-i18n="logs.log_content">日志内容</span></h3>
<div class="logs-search">
<i class="fas fa-search"></i>
<input type="text" id="logs-search-input" aria-label="搜索日志" data-i18n-placeholder="logs.search_placeholder" placeholder="搜索日志...">
</div>
</div>
<div class="header-actions"> <div class="header-actions">
<div class="toggle-group" style="margin-right: 15px;"> <div class="toggle-group" style="margin-right: 15px;">
<label class="toggle-switch" style="margin-right: 5px;"> <label class="toggle-switch" style="margin-right: 5px;">
<input type="checkbox" id="logs-auto-refresh-toggle"> <input type="checkbox" id="logs-auto-refresh-toggle">
<span class="slider"></span> <span class="slider"></span>
</label> </label>
<span class="toggle-label" data-i18n="logs.auto_refresh" style="font-size: 0.9em;">自动刷新</span> <span class="toggle-label" data-i18n="logs.auto_refresh" style="font-size: 0.9em;">自动刷新</span>
</div> </div>
<button id="refresh-logs" class="btn btn-primary"> <button id="refresh-logs" class="btn btn-primary">
<i class="fas fa-sync-alt"></i> <span data-i18n="logs.refresh_button">刷新日志</span> <i class="fas fa-sync-alt"></i> <span data-i18n="logs.refresh_button">刷新日志</span>
</button> </button>
<button id="select-error-log" class="btn btn-secondary"> <button id="select-error-log" class="btn btn-secondary">
<i class="fas fa-file-circle-exclamation"></i> <span data-i18n="logs.error_log_button">选择错误日志</span> <i class="fas fa-file-circle-exclamation"></i> <span data-i18n="logs.error_log_button">选择错误日志</span>
</button> </button>
<button id="download-logs" class="btn btn-secondary"> <button id="download-logs" class="btn btn-secondary">
<i class="fas fa-download"></i> <span data-i18n="logs.download_button">下载日志</span> <i class="fas fa-download"></i> <span data-i18n="logs.download_button">下载日志</span>
</button> </button>
<button id="clear-logs" class="btn btn-danger"> <button id="clear-logs" class="btn btn-danger">
<i class="fas fa-trash"></i> <span data-i18n="logs.clear_button">清空日志</span> <i class="fas fa-trash"></i> <span data-i18n="logs.clear_button">清空日志</span>
</button> </button>
</div> </div>
</div> </div>
@@ -958,24 +964,125 @@
</div> </div>
<!-- 图表曲线选择 --> <!-- 图表曲线选择 -->
<div class="usage-filter-bar"> <div class="usage-filter-bar" id="chart-line-bar">
<div class="usage-filter-group"> <div class="usage-filter-group usage-filter-actions">
<label data-i18n="usage_stats.chart_line_actions_label">曲线数量</label>
<div class="chart-line-actions">
<button type="button" class="btn btn-small" id="add-chart-line">
<i class="fas fa-plus"></i>
<span data-i18n="usage_stats.chart_line_add">增加曲线</span>
</button>
<span class="chart-line-count" id="chart-line-count">3/9</span>
</div>
<div class="chart-line-hint" data-i18n="usage_stats.chart_line_hint">最多显示 9 条模型曲线</div>
</div>
<div class="usage-filter-group chart-line-group" data-line-index="0">
<label for="chart-line-select-0" data-i18n="usage_stats.chart_line_label_1">曲线 1</label> <label for="chart-line-select-0" data-i18n="usage_stats.chart_line_label_1">曲线 1</label>
<select id="chart-line-select-0" class="model-filter-select chart-line-select" data-line-index="0" disabled> <div class="chart-line-control">
<option value="none" data-i18n="usage_stats.chart_line_hidden">不显示</option> <select id="chart-line-select-0" class="model-filter-select chart-line-select" data-line-index="0" disabled>
</select> <option value="all" data-i18n="usage_stats.chart_line_all">全部</option>
</select>
<button type="button" class="btn btn-small btn-danger chart-line-delete" data-line-index="0">
<i class="fas fa-trash"></i>
<span data-i18n="usage_stats.chart_line_delete">删除</span>
</button>
</div>
</div> </div>
<div class="usage-filter-group"> <div class="usage-filter-group chart-line-group" data-line-index="1">
<label for="chart-line-select-1" data-i18n="usage_stats.chart_line_label_2">曲线 2</label> <label for="chart-line-select-1" data-i18n="usage_stats.chart_line_label_2">曲线 2</label>
<select id="chart-line-select-1" class="model-filter-select chart-line-select" data-line-index="1" disabled> <div class="chart-line-control">
<option value="none" data-i18n="usage_stats.chart_line_hidden">不显示</option> <select id="chart-line-select-1" class="model-filter-select chart-line-select" data-line-index="1" disabled>
</select> <option value="all" data-i18n="usage_stats.chart_line_all">全部</option>
</select>
<button type="button" class="btn btn-small btn-danger chart-line-delete" data-line-index="1">
<i class="fas fa-trash"></i>
<span data-i18n="usage_stats.chart_line_delete">删除</span>
</button>
</div>
</div> </div>
<div class="usage-filter-group"> <div class="usage-filter-group chart-line-group" data-line-index="2">
<label for="chart-line-select-2" data-i18n="usage_stats.chart_line_label_3">曲线 3</label> <label for="chart-line-select-2" data-i18n="usage_stats.chart_line_label_3">曲线 3</label>
<select id="chart-line-select-2" class="model-filter-select chart-line-select" data-line-index="2" disabled> <div class="chart-line-control">
<option value="none" data-i18n="usage_stats.chart_line_hidden">不显示</option> <select id="chart-line-select-2" class="model-filter-select chart-line-select" data-line-index="2" disabled>
</select> <option value="all" data-i18n="usage_stats.chart_line_all">全部</option>
</select>
<button type="button" class="btn btn-small btn-danger chart-line-delete" data-line-index="2">
<i class="fas fa-trash"></i>
<span data-i18n="usage_stats.chart_line_delete">删除</span>
</button>
</div>
</div>
<div class="usage-filter-group chart-line-group chart-line-hidden" data-line-index="3">
<label for="chart-line-select-3" data-i18n="usage_stats.chart_line_label_4">曲线 4</label>
<div class="chart-line-control">
<select id="chart-line-select-3" class="model-filter-select chart-line-select" data-line-index="3" disabled>
<option value="all" data-i18n="usage_stats.chart_line_all">全部</option>
</select>
<button type="button" class="btn btn-small btn-danger chart-line-delete" data-line-index="3">
<i class="fas fa-trash"></i>
<span data-i18n="usage_stats.chart_line_delete">删除</span>
</button>
</div>
</div>
<div class="usage-filter-group chart-line-group chart-line-hidden" data-line-index="4">
<label for="chart-line-select-4" data-i18n="usage_stats.chart_line_label_5">曲线 5</label>
<div class="chart-line-control">
<select id="chart-line-select-4" class="model-filter-select chart-line-select" data-line-index="4" disabled>
<option value="all" data-i18n="usage_stats.chart_line_all">全部</option>
</select>
<button type="button" class="btn btn-small btn-danger chart-line-delete" data-line-index="4">
<i class="fas fa-trash"></i>
<span data-i18n="usage_stats.chart_line_delete">删除</span>
</button>
</div>
</div>
<div class="usage-filter-group chart-line-group chart-line-hidden" data-line-index="5">
<label for="chart-line-select-5" data-i18n="usage_stats.chart_line_label_6">曲线 6</label>
<div class="chart-line-control">
<select id="chart-line-select-5" class="model-filter-select chart-line-select" data-line-index="5" disabled>
<option value="all" data-i18n="usage_stats.chart_line_all">全部</option>
</select>
<button type="button" class="btn btn-small btn-danger chart-line-delete" data-line-index="5">
<i class="fas fa-trash"></i>
<span data-i18n="usage_stats.chart_line_delete">删除</span>
</button>
</div>
</div>
<div class="usage-filter-group chart-line-group chart-line-hidden" data-line-index="6">
<label for="chart-line-select-6" data-i18n="usage_stats.chart_line_label_7">曲线 7</label>
<div class="chart-line-control">
<select id="chart-line-select-6" class="model-filter-select chart-line-select" data-line-index="6" disabled>
<option value="all" data-i18n="usage_stats.chart_line_all">全部</option>
</select>
<button type="button" class="btn btn-small btn-danger chart-line-delete" data-line-index="6">
<i class="fas fa-trash"></i>
<span data-i18n="usage_stats.chart_line_delete">删除</span>
</button>
</div>
</div>
<div class="usage-filter-group chart-line-group chart-line-hidden" data-line-index="7">
<label for="chart-line-select-7" data-i18n="usage_stats.chart_line_label_8">曲线 8</label>
<div class="chart-line-control">
<select id="chart-line-select-7" class="model-filter-select chart-line-select" data-line-index="7" disabled>
<option value="all" data-i18n="usage_stats.chart_line_all">全部</option>
</select>
<button type="button" class="btn btn-small btn-danger chart-line-delete" data-line-index="7">
<i class="fas fa-trash"></i>
<span data-i18n="usage_stats.chart_line_delete">删除</span>
</button>
</div>
</div>
<div class="usage-filter-group chart-line-group chart-line-hidden" data-line-index="8">
<label for="chart-line-select-8" data-i18n="usage_stats.chart_line_label_9">曲线 9</label>
<div class="chart-line-control">
<select id="chart-line-select-8" class="model-filter-select chart-line-select" data-line-index="8" disabled>
<option value="all" data-i18n="usage_stats.chart_line_all">全部</option>
</select>
<button type="button" class="btn btn-small btn-danger chart-line-delete" data-line-index="8">
<i class="fas fa-trash"></i>
<span data-i18n="usage_stats.chart_line_delete">删除</span>
</button>
</div>
</div> </div>
</div> </div>
@@ -1128,9 +1235,23 @@
</div> </div>
</section> </section>
<!-- 系统信息 --> <!-- 管理中心信息 -->
<section id="system-info" class="content-section"> <section id="system-info" class="content-section">
<h2 data-i18n="system_info.title">系统信息</h2> <h2 data-i18n="system_info.title">管理中心信息</h2>
<div class="card">
<div class="card-header">
<h3><i class="fas fa-layer-group"></i> <span data-i18n="system_info.models_title">可用模型列表</span></h3>
<button type="button" id="available-models-refresh" class="btn btn-secondary">
<i class="fas fa-sync-alt"></i> <span data-i18n="common.refresh">刷新</span>
</button>
</div>
<div class="card-content">
<p class="form-hint" data-i18n="system_info.models_desc">展示当前服务返回的 /v1/models 列表(使用服务器保存的 API Key 自动鉴权)。</p>
<div id="available-models-status" class="available-models-status" data-i18n="common.loading">加载中...</div>
<div id="available-models-list" class="available-models-list"></div>
</div>
</div>
<!-- 连接信息卡片 --> <!-- 连接信息卡片 -->
<div class="card"> <div class="card">

View File

@@ -3,6 +3,34 @@
import { STATUS_UPDATE_INTERVAL_MS, DEFAULT_API_PORT } from '../utils/constants.js'; import { STATUS_UPDATE_INTERVAL_MS, DEFAULT_API_PORT } from '../utils/constants.js';
import { secureStorage } from '../utils/secure-storage.js'; import { secureStorage } from '../utils/secure-storage.js';
import { normalizeModelList, classifyModels } from '../utils/models.js';
const buildModelsEndpoint = (baseUrl) => {
if (!baseUrl) return '';
const trimmed = String(baseUrl).trim().replace(/\/+$/g, '');
if (!trimmed) return '';
return trimmed.endsWith('/v1') ? `${trimmed}/models` : `${trimmed}/v1/models`;
};
const normalizeApiKeyList = (input) => {
if (!Array.isArray(input)) return [];
const seen = new Set();
const keys = [];
input.forEach(item => {
const value = typeof item === 'string'
? item
: (item && item['api-key'] ? item['api-key'] : '');
const trimmed = String(value || '').trim();
if (!trimmed || seen.has(trimmed)) {
return;
}
seen.add(trimmed);
keys.push(trimmed);
});
return keys;
};
export const connectionModule = { export const connectionModule = {
// 规范化基础地址,移除尾部斜杠与 /v0/management // 规范化基础地址,移除尾部斜杠与 /v0/management
@@ -153,6 +181,178 @@ export const connectionModule = {
} }
}, },
buildAvailableModelsEndpoint() {
return buildModelsEndpoint(this.apiBase || this.apiClient?.apiBase || '');
},
setAvailableModelsStatus(message = '', type = 'info') {
const statusEl = document.getElementById('available-models-status');
if (!statusEl) return;
statusEl.textContent = message || '';
statusEl.className = `available-models-status ${type}`;
},
renderAvailableModels(models = []) {
const listEl = document.getElementById('available-models-list');
if (!listEl) return;
if (!models.length) {
listEl.innerHTML = `
<div class="available-models-empty">
<i class="fas fa-inbox"></i>
<span>${i18n.t('system_info.models_empty')}</span>
</div>
`;
return;
}
const language = (i18n?.currentLanguage || '').toLowerCase();
const otherLabel = language.startsWith('zh') ? '其他' : 'Other';
const groups = classifyModels(models, { otherLabel });
const groupHtml = groups.map(group => {
const pills = group.items.map(model => {
const name = this.escapeHtml(model.name || '');
const alias = model.alias ? `<span class="model-alias">${this.escapeHtml(model.alias)}</span>` : '';
const description = model.description ? this.escapeHtml(model.description) : '';
const titleAttr = description ? ` title="${description}"` : '';
return `
<span class="provider-model-tag available-model-tag"${titleAttr}>
<span class="model-name">${name}</span>
${alias}
</span>
`;
}).join('');
const label = this.escapeHtml(group.label || group.id || '');
return `
<div class="available-model-group">
<div class="available-model-group-header">
<div class="available-model-group-title">
<span class="available-model-group-label">${label}</span>
<span class="available-model-group-count">${group.items.length}</span>
</div>
</div>
<div class="available-model-group-body">
${pills}
</div>
</div>
`;
}).join('');
listEl.innerHTML = groupHtml;
},
clearAvailableModels(messageKey = 'system_info.models_empty') {
this.availableModels = [];
this.availableModelApiKeysCache = null;
const listEl = document.getElementById('available-models-list');
if (listEl) {
listEl.innerHTML = '';
}
this.setAvailableModelsStatus(i18n.t(messageKey), 'warning');
},
async resolveApiKeysForModels({ config = null, forceRefresh = false } = {}) {
if (!forceRefresh && Array.isArray(this.availableModelApiKeysCache) && this.availableModelApiKeysCache.length) {
return this.availableModelApiKeysCache;
}
const configKeys = normalizeApiKeyList(config?.['api-keys'] || this.configCache?.['api-keys']);
if (configKeys.length) {
this.availableModelApiKeysCache = configKeys;
return configKeys;
}
try {
const data = await this.makeRequest('/api-keys');
const keys = normalizeApiKeyList(data?.['api-keys']);
if (keys.length) {
this.availableModelApiKeysCache = keys;
}
return keys;
} catch (error) {
console.warn('自动获取 API Key 失败:', error);
return [];
}
},
async loadAvailableModels({ config = null, forceRefresh = false } = {}) {
const listEl = document.getElementById('available-models-list');
const statusEl = document.getElementById('available-models-status');
if (!listEl || !statusEl) {
return;
}
if (!this.isConnected) {
this.setAvailableModelsStatus(i18n.t('common.disconnected'), 'warning');
listEl.innerHTML = '';
return;
}
const endpoint = this.buildAvailableModelsEndpoint();
if (!endpoint) {
this.setAvailableModelsStatus(i18n.t('system_info.models_error'), 'error');
listEl.innerHTML = `
<div class="available-models-empty">
<i class="fas fa-exclamation-circle"></i>
<span>${i18n.t('login.error_invalid')}</span>
</div>
`;
return;
}
this.availableModelsLoading = true;
this.setAvailableModelsStatus(i18n.t('system_info.models_loading'), 'info');
listEl.innerHTML = '<div class="available-models-placeholder"><i class="fas fa-spinner fa-spin"></i></div>';
try {
const headers = {};
const keys = await this.resolveApiKeysForModels({ config, forceRefresh });
if (keys.length) {
headers.Authorization = `Bearer ${keys[0]}`;
}
const response = await fetch(endpoint, { headers });
if (!response.ok) {
throw new Error(`${response.status} ${response.statusText}`);
}
let data;
try {
data = await response.json();
} catch (err) {
const text = await response.text();
throw new Error(text || err.message || 'Invalid JSON');
}
const models = normalizeModelList(data, { dedupe: true });
this.availableModels = models;
if (!models.length) {
this.setAvailableModelsStatus(i18n.t('system_info.models_empty'), 'warning');
this.renderAvailableModels([]);
return;
}
this.setAvailableModelsStatus(i18n.t('system_info.models_count', { count: models.length }), 'success');
this.renderAvailableModels(models);
} catch (error) {
console.error('加载可用模型失败:', error);
this.availableModels = [];
this.setAvailableModelsStatus(`${i18n.t('system_info.models_error')}: ${error.message}`, 'error');
listEl.innerHTML = `
<div class="available-models-empty">
<i class="fas fa-exclamation-circle"></i>
<span>${this.escapeHtml(error.message || '')}</span>
</div>
`;
} finally {
this.availableModelsLoading = false;
}
},
// 测试连接(简化版,用于内部调用) // 测试连接(简化版,用于内部调用)
async testConnection() { async testConnection() {
try { try {
@@ -203,6 +403,11 @@ export const connectionModule = {
apiStatus.textContent = i18n.t('common.disconnected'); apiStatus.textContent = i18n.t('common.disconnected');
configStatus.textContent = i18n.t('system_info.not_loaded'); configStatus.textContent = i18n.t('system_info.not_loaded');
configStatus.style.color = '#6b7280'; configStatus.style.color = '#6b7280';
this.setAvailableModelsStatus(i18n.t('common.disconnected'), 'warning');
const modelsList = document.getElementById('available-models-list');
if (modelsList) {
modelsList.innerHTML = '';
}
} }
lastUpdate.textContent = new Date().toLocaleString('zh-CN'); lastUpdate.textContent = new Date().toLocaleString('zh-CN');
@@ -280,8 +485,12 @@ export const connectionModule = {
this.configService.clearCache(section); this.configService.clearCache(section);
this.configCache = this.configService.cache; this.configCache = this.configService.cache;
this.cacheTimestamps = this.configService.cacheTimestamps; this.cacheTimestamps = this.configService.cacheTimestamps;
if (!section || section === 'api-keys') {
this.availableModelApiKeysCache = null;
}
if (!section) { if (!section) {
this.configYamlCache = ''; this.configYamlCache = '';
this.availableModels = [];
} }
}, },
@@ -329,6 +538,8 @@ export const connectionModule = {
// 从配置中提取并设置各个设置项现在传递keyStats // 从配置中提取并设置各个设置项现在传递keyStats
await this.updateSettingsFromConfig(config, keyStats); await this.updateSettingsFromConfig(config, keyStats);
await this.loadAvailableModels({ config, forceRefresh });
if (this.events && typeof this.events.emit === 'function') { if (this.events && typeof this.events.emit === 'function') {
this.events.emit('data:config-loaded', { this.events.emit('data:config-loaded', {
config, config,

View File

@@ -2,6 +2,8 @@
// 这些函数依赖于 CLIProxyManager 实例上的 makeRequest/getConfig/clearCache/showNotification 等能力, // 这些函数依赖于 CLIProxyManager 实例上的 makeRequest/getConfig/clearCache/showNotification 等能力,
// 以及 apiKeysModule 中的工具方法(如 applyHeadersToConfig/renderHeaderBadges // 以及 apiKeysModule 中的工具方法(如 applyHeadersToConfig/renderHeaderBadges
import { normalizeModelList } from '../utils/models.js';
const getStatsBySource = (stats) => { const getStatsBySource = (stats) => {
if (stats && typeof stats === 'object' && stats.bySource) { if (stats && typeof stats === 'object' && stats.bySource) {
return stats.bySource; return stats.bySource;
@@ -21,44 +23,6 @@ const buildModelEndpoint = (baseUrl) => {
return `${trimmed}/v1/models`; return `${trimmed}/v1/models`;
}; };
const normalizeModelList = (payload) => {
const toModel = (entry) => {
if (typeof entry === 'string') {
return { name: entry };
}
if (!entry || typeof entry !== 'object') {
return null;
}
const name = entry.id || entry.name || entry.model || entry.value;
if (!name) return null;
const alias = entry.alias || entry.display_name || entry.displayName;
const description = entry.description || entry.note || entry.comment;
const model = { name: String(name) };
if (alias && alias !== name) {
model.alias = String(alias);
}
if (description) {
model.description = String(description);
}
return model;
};
if (Array.isArray(payload)) {
return payload.map(toModel).filter(Boolean);
}
if (payload && typeof payload === 'object') {
if (Array.isArray(payload.data)) {
return payload.data.map(toModel).filter(Boolean);
}
if (Array.isArray(payload.models)) {
return payload.models.map(toModel).filter(Boolean);
}
}
return [];
};
const normalizeExcludedModels = (input) => { const normalizeExcludedModels = (input) => {
const rawList = Array.isArray(input) const rawList = Array.isArray(input)
? input ? input
@@ -128,25 +92,7 @@ export function getGeminiKeysFromConfig(config) {
} }
const geminiKeys = Array.isArray(config['gemini-api-key']) ? config['gemini-api-key'] : []; const geminiKeys = Array.isArray(config['gemini-api-key']) ? config['gemini-api-key'] : [];
if (geminiKeys.length > 0) { return geminiKeys;
return geminiKeys;
}
const legacyKeys = Array.isArray(config['generative-language-api-key']) ? config['generative-language-api-key'] : [];
return legacyKeys
.map(item => {
if (item && typeof item === 'object') {
return { ...item };
}
if (typeof item === 'string') {
const trimmed = item.trim();
if (trimmed) {
return { 'api-key': trimmed };
}
}
return null;
})
.filter(Boolean);
} }
export async function renderGeminiKeys(keys, keyStats = null) { export async function renderGeminiKeys(keys, keyStats = null) {
@@ -1152,6 +1098,10 @@ function ensureOpenAIModelDiscoveryCard(manager) {
<button type="button" class="btn btn-secondary" id="openai-model-discovery-refresh">${i18n.t('ai_providers.openai_models_fetch_refresh')}</button> <button type="button" class="btn btn-secondary" id="openai-model-discovery-refresh">${i18n.t('ai_providers.openai_models_fetch_refresh')}</button>
</div> </div>
</div> </div>
<div class="form-group">
<label for="openai-model-discovery-search">${i18n.t('ai_providers.openai_models_search_label')}</label>
<input type="text" id="openai-model-discovery-search" placeholder="${i18n.t('ai_providers.openai_models_search_placeholder')}">
</div>
<div id="openai-model-discovery-status" class="model-discovery-status"></div> <div id="openai-model-discovery-status" class="model-discovery-status"></div>
<div id="openai-model-discovery-list" class="model-discovery-list"></div> <div id="openai-model-discovery-list" class="model-discovery-list"></div>
<div class="modal-actions"> <div class="modal-actions">
@@ -1174,6 +1124,13 @@ function ensureOpenAIModelDiscoveryCard(manager) {
bind('openai-model-discovery-cancel', () => manager.closeOpenAIModelDiscovery()); bind('openai-model-discovery-cancel', () => manager.closeOpenAIModelDiscovery());
bind('openai-model-discovery-refresh', () => manager.refreshOpenAIModelDiscovery()); bind('openai-model-discovery-refresh', () => manager.refreshOpenAIModelDiscovery());
bind('openai-model-discovery-apply', () => manager.applyOpenAIModelDiscoverySelection()); bind('openai-model-discovery-apply', () => manager.applyOpenAIModelDiscoverySelection());
const searchInput = document.getElementById('openai-model-discovery-search');
if (searchInput) {
searchInput.addEventListener('input', (event) => {
const query = event?.target?.value || '';
manager.setOpenAIModelDiscoverySearch(query);
});
}
return overlay; return overlay;
} }
@@ -1185,10 +1142,30 @@ export function setOpenAIModelDiscoveryStatus(message = '', type = 'info') {
status.className = `model-discovery-status ${type}`; status.className = `model-discovery-status ${type}`;
} }
export function setOpenAIModelDiscoverySearch(query = '') {
if (!this.openAIModelDiscoveryContext) return;
const normalized = (query || '').trim();
this.openAIModelDiscoveryContext.modelSearchQuery = normalized;
const models = this.openAIModelDiscoveryContext.discoveredModels || [];
this.renderOpenAIModelDiscoveryList(models);
}
export function renderOpenAIModelDiscoveryList(models = []) { export function renderOpenAIModelDiscoveryList(models = []) {
const list = document.getElementById('openai-model-discovery-list'); const list = document.getElementById('openai-model-discovery-list');
if (!list) return; if (!list) return;
const context = this.openAIModelDiscoveryContext || {};
const filter = (context.modelSearchQuery || '').trim().toLowerCase();
const filtered = models
.map((model, index) => ({ model, index }))
.filter(({ model }) => {
if (!filter) return true;
const name = (model?.name || '').toLowerCase();
const alias = (model?.alias || '').toLowerCase();
const desc = (model?.description || '').toLowerCase();
return name.includes(filter) || alias.includes(filter) || desc.includes(filter);
});
if (!models.length) { if (!models.length) {
list.innerHTML = ` list.innerHTML = `
<div class="model-discovery-empty"> <div class="model-discovery-empty">
@@ -1199,10 +1176,20 @@ export function renderOpenAIModelDiscoveryList(models = []) {
return; return;
} }
list.innerHTML = models.map((model, index) => { if (!filtered.length) {
const name = this.escapeHtml(model.name || ''); list.innerHTML = `
const alias = model.alias ? `<span class="model-discovery-alias">${this.escapeHtml(model.alias)}</span>` : ''; <div class="model-discovery-empty">
const desc = model.description ? `<div class="model-discovery-desc">${this.escapeHtml(model.description)}</div>` : ''; <i class="fas fa-search"></i>
<span>${i18n.t('ai_providers.openai_models_search_empty')}</span>
</div>
`;
return;
}
list.innerHTML = filtered.map(({ model, index }) => {
const name = this.escapeHtml(model?.name || '');
const alias = model?.alias ? `<span class="model-discovery-alias">${this.escapeHtml(model.alias)}</span>` : '';
const desc = model?.description ? `<div class="model-discovery-desc">${this.escapeHtml(model.description)}</div>` : '';
return ` return `
<label class="model-discovery-row"> <label class="model-discovery-row">
<input type="checkbox" class="model-discovery-checkbox" data-model-index="${index}"> <input type="checkbox" class="model-discovery-checkbox" data-model-index="${index}">
@@ -1244,13 +1231,18 @@ export function openOpenAIModelDiscovery(mode = 'new') {
...context, ...context,
endpoint, endpoint,
headers, headers,
discoveredModels: [] discoveredModels: [],
modelSearchQuery: ''
}; };
const urlInput = document.getElementById('openai-model-discovery-url'); const urlInput = document.getElementById('openai-model-discovery-url');
if (urlInput) { if (urlInput) {
urlInput.value = endpoint; urlInput.value = endpoint;
} }
const searchInput = document.getElementById('openai-model-discovery-search');
if (searchInput) {
searchInput.value = '';
}
this.renderOpenAIModelDiscoveryList([]); this.renderOpenAIModelDiscoveryList([]);
this.setOpenAIModelDiscoveryStatus(i18n.t('ai_providers.openai_models_fetch_loading'), 'info'); this.setOpenAIModelDiscoveryStatus(i18n.t('ai_providers.openai_models_fetch_loading'), 'info');
@@ -1688,6 +1680,7 @@ export const aiProvidersModule = {
refreshOpenAIModelDiscovery, refreshOpenAIModelDiscovery,
renderOpenAIModelDiscoveryList, renderOpenAIModelDiscoveryList,
setOpenAIModelDiscoveryStatus, setOpenAIModelDiscoveryStatus,
setOpenAIModelDiscoverySearch,
applyOpenAIModelDiscoverySelection, applyOpenAIModelDiscoverySelection,
closeOpenAIModelDiscovery, closeOpenAIModelDiscovery,
addModelField, addModelField,

View File

@@ -1049,6 +1049,50 @@ export const authFilesModule = {
return normalized; return normalized;
}, },
resolveOauthExcludedFromConfig(config = null) {
const sources = [];
if (config && typeof config === 'object') {
sources.push(config);
}
if (this.configCache && typeof this.configCache === 'object') {
if (this.configCache['oauth-excluded-models'] !== undefined) {
sources.push({ 'oauth-excluded-models': this.configCache['oauth-excluded-models'] });
}
if (this.configCache['__full__']) {
sources.push(this.configCache['__full__']);
}
}
for (const source of sources) {
if (!source || typeof source !== 'object') continue;
if (Object.prototype.hasOwnProperty.call(source, 'oauth-excluded-models')) {
return {
map: this.normalizeOauthExcludedMap(source),
found: true
};
}
}
return { map: {}, found: false };
},
applyOauthExcludedFromConfig(config = null, options = {}) {
const { render = true } = options || {};
const { map, found } = this.resolveOauthExcludedFromConfig(config);
if (!found) {
return false;
}
this.oauthExcludedModels = map;
this._oauthExcludedLoading = false;
this.setOauthExcludedStatus('');
this.updateOauthExcludedButtonsState(false);
if (render) {
this.renderOauthExcludedModels();
}
return true;
},
getFilteredOauthExcludedMap(filterType = this.currentAuthFileFilter) { getFilteredOauthExcludedMap(filterType = this.currentAuthFileFilter) {
const map = this.oauthExcludedModels || {}; const map = this.oauthExcludedModels || {};
if (!map || typeof map !== 'object') { if (!map || typeof map !== 'object') {
@@ -1407,9 +1451,36 @@ export const authFilesModule = {
this.renderOauthExcludedModels(); this.renderOauthExcludedModels();
try { try {
const data = await this.makeRequest('/oauth-excluded-models'); let targetMap = {};
this.oauthExcludedModels = this.normalizeOauthExcludedMap(data); let hasData = false;
this.refreshOauthProviderOptions();
if (!forceRefresh) {
const { map, found } = this.resolveOauthExcludedFromConfig();
if (found) {
targetMap = map;
hasData = true;
}
}
if (!hasData) {
try {
const configSection = await this.getConfig('oauth-excluded-models', forceRefresh);
if (configSection !== undefined) {
targetMap = this.normalizeOauthExcludedMap(configSection);
hasData = true;
}
} catch (configError) {
console.warn('从配置获取 OAuth 排除列表失败,尝试回退接口:', configError);
}
}
if (!hasData) {
const data = await this.makeRequest('/oauth-excluded-models');
targetMap = this.normalizeOauthExcludedMap(data);
hasData = true;
}
this.oauthExcludedModels = targetMap;
this.setOauthExcludedStatus(''); this.setOauthExcludedStatus('');
} catch (error) { } catch (error) {
console.error('加载 OAuth 排除列表失败:', error); console.error('加载 OAuth 排除列表失败:', error);
@@ -1501,6 +1572,7 @@ export const authFilesModule = {
} }
this.events.on('data:config-loaded', async (event) => { this.events.on('data:config-loaded', async (event) => {
const detail = event?.detail || {}; const detail = event?.detail || {};
const config = detail.config || {};
const keyStats = detail.keyStats || null; const keyStats = detail.keyStats || null;
try { try {
await this.loadAuthFiles(keyStats); await this.loadAuthFiles(keyStats);
@@ -1508,7 +1580,10 @@ export const authFilesModule = {
console.error('加载认证文件失败:', error); console.error('加载认证文件失败:', error);
} }
try { try {
await this.loadOauthExcludedModels(true); const applied = this.applyOauthExcludedFromConfig(config, { render: true });
if (!applied) {
await this.loadOauthExcludedModels(true);
}
} catch (error) { } catch (error) {
console.error('加载 OAuth 排除列表失败:', error); console.error('加载 OAuth 排除列表失败:', error);
} }
@@ -1518,7 +1593,9 @@ export const authFilesModule = {
const detail = event?.detail || {}; const detail = event?.detail || {};
this.updateOauthExcludedButtonsState(false); this.updateOauthExcludedButtonsState(false);
if (detail.isConnected) { if (detail.isConnected) {
this.loadOauthExcludedModels(true); if (!this.applyOauthExcludedFromConfig(null, { render: true })) {
this.renderOauthExcludedModels();
}
} else { } else {
this.renderOauthExcludedModels(); this.renderOauthExcludedModels();
} }

View File

@@ -106,6 +106,9 @@ export const loginModule = {
if (typeof this.renderOauthExcludedModels === 'function') { if (typeof this.renderOauthExcludedModels === 'function') {
this.renderOauthExcludedModels('all'); this.renderOauthExcludedModels('all');
} }
if (typeof this.clearAvailableModels === 'function') {
this.clearAvailableModels('common.disconnected');
}
localStorage.removeItem('isLoggedIn'); localStorage.removeItem('isLoggedIn');
secureStorage.removeItem('managementKey'); secureStorage.removeItem('managementKey');

View File

@@ -50,20 +50,19 @@ export const logsModule = {
} else if (!incremental && response.lines.length > 0) { } else if (!incremental && response.lines.length > 0) {
this.renderLogs(response.lines, response['line-count'] || response.lines.length, true); this.renderLogs(response.lines, response['line-count'] || response.lines.length, true);
} else if (!incremental) { } else if (!incremental) {
logsContent.innerHTML = '<div class="empty-state"><i class="fas fa-inbox"></i><p data-i18n="logs.empty_title">' +
i18n.t('logs.empty_title') + '</p><p data-i18n="logs.empty_desc">' +
i18n.t('logs.empty_desc') + '</p></div>';
this.latestLogTimestamp = null; this.latestLogTimestamp = null;
this.renderLogs([], 0, false);
} }
} else if (!incremental) { } else if (!incremental) {
logsContent.innerHTML = '<div class="empty-state"><i class="fas fa-inbox"></i><p data-i18n="logs.empty_title">' +
i18n.t('logs.empty_title') + '</p><p data-i18n="logs.empty_desc">' +
i18n.t('logs.empty_desc') + '</p></div>';
this.latestLogTimestamp = null; this.latestLogTimestamp = null;
this.renderLogs([], 0, false);
} }
} catch (error) { } catch (error) {
console.error('加载日志失败:', error); console.error('加载日志失败:', error);
if (!incremental) { if (!incremental) {
this.allLogLines = [];
this.displayedLogLines = [];
this.latestLogTimestamp = null;
const is404 = error.message && (error.message.includes('404') || error.message.includes('Not Found')); const is404 = error.message && (error.message.includes('404') || error.message.includes('Not Found'));
if (is404) { if (is404) {
@@ -82,7 +81,17 @@ export const logsModule = {
const logsContent = document.getElementById('logs-content'); const logsContent = document.getElementById('logs-content');
if (!logsContent) return; if (!logsContent) return;
if (!lines || lines.length === 0) { const sourceLines = Array.isArray(lines) ? lines : [];
const filteredLines = sourceLines.filter(line => !line.includes('/v0/management/'));
let displayedLines = filteredLines;
if (filteredLines.length > this.maxDisplayLogLines) {
const linesToRemove = filteredLines.length - this.maxDisplayLogLines;
displayedLines = filteredLines.slice(linesToRemove);
}
this.allLogLines = displayedLines.slice();
if (displayedLines.length === 0) {
this.displayedLogLines = []; this.displayedLogLines = [];
logsContent.innerHTML = '<div class="empty-state"><i class="fas fa-inbox"></i><p data-i18n="logs.empty_title">' + logsContent.innerHTML = '<div class="empty-state"><i class="fas fa-inbox"></i><p data-i18n="logs.empty_title">' +
i18n.t('logs.empty_title') + '</p><p data-i18n="logs.empty_desc">' + i18n.t('logs.empty_title') + '</p><p data-i18n="logs.empty_desc">' +
@@ -90,14 +99,15 @@ export const logsModule = {
return; return;
} }
const filteredLines = lines.filter(line => !line.includes('/v0/management/')); const visibleLines = this.filterLogLinesBySearch(displayedLines);
let displayedLines = filteredLines; this.displayedLogLines = visibleLines.slice();
if (filteredLines.length > this.maxDisplayLogLines) {
const linesToRemove = filteredLines.length - this.maxDisplayLogLines;
displayedLines = filteredLines.slice(linesToRemove);
}
this.displayedLogLines = displayedLines.slice(); if (visibleLines.length === 0) {
logsContent.innerHTML = '<div class="empty-state"><i class="fas fa-search"></i><p data-i18n="logs.search_empty_title">' +
i18n.t('logs.search_empty_title') + '</p><p data-i18n="logs.search_empty_desc">' +
i18n.t('logs.search_empty_desc') + '</p></div>';
return;
}
const displayedLineCount = this.displayedLogLines.length; const displayedLineCount = this.displayedLogLines.length;
logsContent.innerHTML = ` logsContent.innerHTML = `
@@ -107,7 +117,7 @@ export const logsModule = {
<pre class="logs-text">${this.buildLogsHtml(this.displayedLogLines)}</pre> <pre class="logs-text">${this.buildLogsHtml(this.displayedLogLines)}</pre>
`; `;
if (scrollToBottom) { if (scrollToBottom && !this.logSearchQuery) {
const logsTextElement = logsContent.querySelector('.logs-text'); const logsTextElement = logsContent.querySelector('.logs-text');
if (logsTextElement) { if (logsTextElement) {
logsTextElement.scrollTop = logsTextElement.scrollHeight; logsTextElement.scrollTop = logsTextElement.scrollHeight;
@@ -138,9 +148,21 @@ export const logsModule = {
const isAtBottom = logsTextElement.scrollHeight - logsTextElement.scrollTop - logsTextElement.clientHeight < 50; const isAtBottom = logsTextElement.scrollHeight - logsTextElement.scrollTop - logsTextElement.clientHeight < 50;
this.displayedLogLines = this.displayedLogLines.concat(filteredNewLines); const baseLines = Array.isArray(this.allLogLines) && this.allLogLines.length > 0
if (this.displayedLogLines.length > this.maxDisplayLogLines) { ? this.allLogLines
this.displayedLogLines = this.displayedLogLines.slice(this.displayedLogLines.length - this.maxDisplayLogLines); : (Array.isArray(this.displayedLogLines) ? this.displayedLogLines : []);
this.allLogLines = baseLines.concat(filteredNewLines);
if (this.allLogLines.length > this.maxDisplayLogLines) {
this.allLogLines = this.allLogLines.slice(this.allLogLines.length - this.maxDisplayLogLines);
}
const visibleLines = this.filterLogLinesBySearch(this.allLogLines);
this.displayedLogLines = visibleLines.slice();
if (visibleLines.length === 0) {
this.renderLogs(this.allLogLines, this.allLogLines.length, false);
return;
} }
logsTextElement.innerHTML = this.buildLogsHtml(this.displayedLogLines); logsTextElement.innerHTML = this.buildLogsHtml(this.displayedLogLines);
@@ -150,11 +172,44 @@ export const logsModule = {
logsInfoElement.innerHTML = `<span><i class="fas fa-list-ol"></i> ${displayedLines} ${i18n.t('logs.lines')}</span>`; logsInfoElement.innerHTML = `<span><i class="fas fa-list-ol"></i> ${displayedLines} ${i18n.t('logs.lines')}</span>`;
} }
if (isAtBottom) { if (isAtBottom && !this.logSearchQuery) {
logsTextElement.scrollTop = logsTextElement.scrollHeight; logsTextElement.scrollTop = logsTextElement.scrollHeight;
} }
}, },
filterLogLinesBySearch(lines) {
const keyword = (this.logSearchQuery || '').toLowerCase();
if (!keyword) {
return Array.isArray(lines) ? lines.slice() : [];
}
if (!Array.isArray(lines) || lines.length === 0) {
return [];
}
return lines.filter(line => (line || '').toLowerCase().includes(keyword));
},
updateLogSearchQuery(value = '') {
const normalized = (value || '').trim();
if (this.logSearchQuery === normalized) {
return;
}
this.logSearchQuery = normalized;
this.applyLogSearchFilter();
},
applyLogSearchFilter() {
const logsContent = document.getElementById('logs-content');
if (!logsContent) return;
if (logsContent.querySelector('.upgrade-notice') || logsContent.querySelector('.error-state')) {
return;
}
const baseLines = Array.isArray(this.allLogLines) ? this.allLogLines : [];
if (baseLines.length === 0 && logsContent.querySelector('.loading-placeholder')) {
return;
}
this.renderLogs(baseLines, baseLines.length, false);
},
buildLogsHtml(lines) { buildLogsHtml(lines) {
if (!lines || lines.length === 0) { if (!lines || lines.length === 0) {
return ''; return '';

View File

@@ -1,6 +1,9 @@
const DEFAULT_MODEL_PRICE_STORAGE_KEY = 'cli-proxy-model-prices-v2'; const DEFAULT_MODEL_PRICE_STORAGE_KEY = 'cli-proxy-model-prices-v2';
const LEGACY_MODEL_PRICE_STORAGE_KEY = 'cli-proxy-model-prices'; const LEGACY_MODEL_PRICE_STORAGE_KEY = 'cli-proxy-model-prices';
const TOKENS_PER_PRICE_UNIT = 1_000_000; const TOKENS_PER_PRICE_UNIT = 1_000_000;
const DEFAULT_CHART_LINE_COUNT = 3;
const MIN_CHART_LINE_COUNT = 1;
const ALL_MODELS_VALUE = 'all';
// 获取API密钥的统计信息 // 获取API密钥的统计信息
export async function getKeyStats(usageData = null) { export async function getKeyStats(usageData = null) {
@@ -214,23 +217,136 @@ export function getModelNamesFromUsage(usage) {
return Array.from(names).sort((a, b) => a.localeCompare(b)); return Array.from(names).sort((a, b) => a.localeCompare(b));
} }
export function getChartLineMaxCount() {
const idCount = Array.isArray(this.chartLineSelectIds) ? this.chartLineSelectIds.length : 0;
const configuredMax = Number(this.chartLineMaxCount);
const fallback = idCount || DEFAULT_CHART_LINE_COUNT;
const resolvedMax = Number.isFinite(configuredMax) ? configuredMax : fallback;
if (idCount > 0) {
return Math.max(MIN_CHART_LINE_COUNT, Math.min(resolvedMax, idCount));
}
return Math.max(MIN_CHART_LINE_COUNT, resolvedMax);
}
export function getVisibleChartLineCount() {
const maxCount = this.getChartLineMaxCount();
const stored = Number(this.chartLineVisibleCount);
const base = Number.isFinite(stored)
? stored
: (Array.isArray(this.chartLineSelections) ? this.chartLineSelections.length : DEFAULT_CHART_LINE_COUNT);
const resolved = Math.min(Math.max(base, MIN_CHART_LINE_COUNT), maxCount);
this.chartLineVisibleCount = resolved;
return resolved;
}
export function ensureChartLineSelectionLength(targetLength = null) {
const maxCount = this.getChartLineMaxCount();
const desiredLength = Math.min(
Math.max(targetLength ?? this.getVisibleChartLineCount(), MIN_CHART_LINE_COUNT),
maxCount
);
if (!Array.isArray(this.chartLineSelections)) {
this.chartLineSelections = Array(desiredLength).fill('none');
return this.chartLineSelections;
}
const trimmed = this.chartLineSelections.slice(0, maxCount);
if (trimmed.length < desiredLength) {
this.chartLineSelections = [...trimmed, ...Array(desiredLength - trimmed.length).fill('none')];
} else if (trimmed.length > desiredLength) {
this.chartLineSelections = trimmed.slice(0, desiredLength);
} else {
this.chartLineSelections = trimmed;
}
return this.chartLineSelections;
}
export function updateChartLineControlsUI() {
const maxCount = this.getChartLineMaxCount();
const visibleCount = this.getVisibleChartLineCount();
const counter = document.getElementById('chart-line-count');
if (counter) {
counter.textContent = `${visibleCount}/${maxCount}`;
}
const addBtn = document.getElementById('add-chart-line');
if (addBtn) {
addBtn.disabled = visibleCount >= maxCount;
}
const deleteButtons = document.querySelectorAll('.chart-line-delete');
if (deleteButtons.length) {
deleteButtons.forEach(button => {
const group = button.closest('.chart-line-group');
const index = Number.parseInt(button.getAttribute('data-line-index'), 10);
const isVisible = group
? !group.classList.contains('chart-line-hidden')
: (Number.isFinite(index) ? index < visibleCount : true);
button.disabled = visibleCount <= MIN_CHART_LINE_COUNT || !isVisible;
});
}
}
export function setChartLineVisibleCount(count) {
const maxCount = this.getChartLineMaxCount();
const nextCount = Math.min(Math.max(count, MIN_CHART_LINE_COUNT), maxCount);
const current = this.getVisibleChartLineCount();
if (nextCount === current) {
this.updateChartLineControlsUI();
return;
}
this.chartLineVisibleCount = nextCount;
this.ensureChartLineSelectionLength(nextCount);
this.updateChartLineSelectors(this.currentUsageData);
this.refreshChartsForSelections();
}
export function changeChartLineCount(delta = 0) {
const current = this.getVisibleChartLineCount();
this.setChartLineVisibleCount(current + delta);
}
export function removeChartLine(index) {
const visibleCount = this.getVisibleChartLineCount();
const normalizedIndex = Number.parseInt(index, 10);
if (!Number.isFinite(normalizedIndex) || normalizedIndex < 0 || normalizedIndex >= visibleCount) {
return;
}
if (visibleCount <= MIN_CHART_LINE_COUNT) {
return;
}
const nextSelections = this.ensureChartLineSelectionLength(visibleCount).slice(0, visibleCount);
nextSelections.splice(normalizedIndex, 1);
this.chartLineSelections = nextSelections;
this.chartLineVisibleCount = Math.max(MIN_CHART_LINE_COUNT, visibleCount - 1);
this.updateChartLineSelectors(this.currentUsageData);
this.refreshChartsForSelections();
}
export function updateChartLineSelectors(usage) { export function updateChartLineSelectors(usage) {
const modelNames = this.getModelNamesFromUsage(usage); const modelNames = this.getModelNamesFromUsage(usage);
const selectors = this.chartLineSelectIds const selectors = this.chartLineSelectIds
.map(id => document.getElementById(id)) .map(id => document.getElementById(id))
.filter(Boolean); .filter(Boolean);
const availableCount = selectors.length || this.getChartLineMaxCount();
const visibleCount = Math.min(this.getVisibleChartLineCount(), availableCount);
this.chartLineVisibleCount = visibleCount;
this.ensureChartLineSelectionLength(visibleCount);
const wasInitialized = this.chartLineSelectionsInitialized === true;
if (!selectors.length) { if (!selectors.length) {
this.chartLineSelections = ['none', 'none', 'none']; this.chartLineSelections = Array(visibleCount).fill('none');
this.chartLineSelectionsInitialized = false;
this.updateChartLineControlsUI();
return; return;
} }
const optionsFragment = () => { const optionsFragment = () => {
const fragment = document.createDocumentFragment(); const fragment = document.createDocumentFragment();
const hiddenOption = document.createElement('option'); const allOption = document.createElement('option');
hiddenOption.value = 'none'; allOption.value = ALL_MODELS_VALUE;
hiddenOption.textContent = i18n.t('usage_stats.chart_line_hidden'); allOption.textContent = i18n.t('usage_stats.chart_line_all');
fragment.appendChild(hiddenOption); fragment.appendChild(allOption);
modelNames.forEach(name => { modelNames.forEach(name => {
const option = document.createElement('option'); const option = document.createElement('option');
option.value = name; option.value = name;
@@ -241,57 +357,82 @@ export function updateChartLineSelectors(usage) {
}; };
const hasModels = modelNames.length > 0; const hasModels = modelNames.length > 0;
selectors.forEach(select => { selectors.forEach((select, index) => {
const group = select.closest('.chart-line-group');
const isVisible = index < visibleCount;
if (group) {
group.classList.toggle('chart-line-hidden', !isVisible);
}
const deleteBtn = group ? group.querySelector('.chart-line-delete') : null;
select.innerHTML = ''; select.innerHTML = '';
select.appendChild(optionsFragment()); select.appendChild(optionsFragment());
select.disabled = !hasModels; select.disabled = !isVisible;
if (deleteBtn) {
deleteBtn.disabled = !isVisible || visibleCount <= MIN_CHART_LINE_COUNT;
}
if (!isVisible) {
select.value = ALL_MODELS_VALUE;
}
}); });
if (!hasModels) { if (!hasModels) {
this.chartLineSelections = ['none', 'none', 'none']; this.chartLineSelections = Array(visibleCount).fill(ALL_MODELS_VALUE);
selectors.forEach(select => { this.chartLineSelectionsInitialized = false;
select.value = 'none'; selectors.forEach((select, index) => {
const group = select.closest('.chart-line-group');
if (group) {
group.classList.toggle('chart-line-hidden', index >= visibleCount);
}
select.value = ALL_MODELS_VALUE;
}); });
this.updateChartLineControlsUI();
return; return;
} }
const nextSelections = Array.isArray(this.chartLineSelections) const nextSelections = this.ensureChartLineSelectionLength(visibleCount).slice(0, visibleCount);
? [...this.chartLineSelections]
: ['none', 'none', 'none'];
const validNames = new Set(modelNames); const validNames = new Set([...modelNames, ALL_MODELS_VALUE]);
let hasActiveSelection = false; let hasActiveSelection = false;
for (let i = 0; i < nextSelections.length; i++) { for (let i = 0; i < nextSelections.length; i++) {
const selection = nextSelections[i]; const selection = nextSelections[i];
if (selection && selection !== 'none' && !validNames.has(selection)) { if (selection && selection !== 'none' && !validNames.has(selection)) {
nextSelections[i] = 'none'; nextSelections[i] = ALL_MODELS_VALUE;
} }
if (nextSelections[i] !== 'none') { if (nextSelections[i] && nextSelections[i] !== 'none') {
hasActiveSelection = true; hasActiveSelection = true;
} }
} }
if (!hasActiveSelection) { const allSelectionsAreAll = nextSelections.length > 0 && nextSelections.every(value => value === ALL_MODELS_VALUE);
if (!hasActiveSelection || (!wasInitialized && allSelectionsAreAll)) {
modelNames.slice(0, nextSelections.length).forEach((name, index) => { modelNames.slice(0, nextSelections.length).forEach((name, index) => {
nextSelections[index] = name; nextSelections[index] = name;
}); });
} }
for (let i = 0; i < nextSelections.length; i++) {
if (!nextSelections[i] || nextSelections[i] === 'none') {
nextSelections[i] = modelNames[i % Math.max(modelNames.length, 1)] || ALL_MODELS_VALUE;
}
}
this.chartLineSelections = nextSelections; this.chartLineSelections = nextSelections;
selectors.forEach((select, index) => { selectors.forEach((select, index) => {
const value = this.chartLineSelections[index] || 'none'; const value = this.chartLineSelections[index] || ALL_MODELS_VALUE;
select.value = value; select.value = index < visibleCount ? value : ALL_MODELS_VALUE;
}); });
this.chartLineSelectionsInitialized = hasModels;
this.updateChartLineControlsUI();
} }
export function handleChartLineSelectionChange(index, value) { export function handleChartLineSelectionChange(index, value) {
if (!Array.isArray(this.chartLineSelections)) { const visibleCount = this.getVisibleChartLineCount();
this.chartLineSelections = ['none', 'none', 'none']; if (index < 0 || index >= visibleCount) {
}
if (index < 0 || index >= this.chartLineSelections.length) {
return; return;
} }
const normalized = value || 'none'; this.ensureChartLineSelectionLength(visibleCount);
const normalized = (value && value !== 'none') ? value : ALL_MODELS_VALUE;
if (this.chartLineSelections[index] === normalized) { if (this.chartLineSelections[index] === normalized) {
return; return;
} }
@@ -324,10 +465,9 @@ export function refreshChartsForSelections() {
} }
export function getActiveChartLineSelections() { export function getActiveChartLineSelections() {
if (!Array.isArray(this.chartLineSelections)) { const visibleCount = this.getVisibleChartLineCount();
this.chartLineSelections = ['none', 'none', 'none']; const selections = this.ensureChartLineSelectionLength(visibleCount).slice(0, visibleCount);
} return selections
return this.chartLineSelections
.map((value, index) => ({ model: value, index })) .map((value, index) => ({ model: value, index }))
.filter(item => item.model && item.model !== 'none'); .filter(item => item.model && item.model !== 'none');
} }
@@ -761,11 +901,37 @@ export function buildChartDataForMetric(period = 'day', metric = 'requests') {
const labels = baseSeries?.labels || []; const labels = baseSeries?.labels || [];
const dataByModel = baseSeries?.dataByModel || new Map(); const dataByModel = baseSeries?.dataByModel || new Map();
const activeSelections = this.getActiveChartLineSelections(); const activeSelections = this.getActiveChartLineSelections();
let allSeriesCache = null;
const getAllSeries = () => {
if (allSeriesCache) {
return allSeriesCache;
}
const summed = new Array(labels.length).fill(0);
dataByModel.forEach(values => {
values.forEach((value, idx) => {
summed[idx] = (summed[idx] || 0) + value;
});
});
allSeriesCache = summed;
return summed;
};
const getSeriesForSelection = (selectionValue) => {
if (selectionValue === ALL_MODELS_VALUE) {
return getAllSeries();
}
return dataByModel.get(selectionValue) || new Array(labels.length).fill(0);
};
const datasets = activeSelections.map(selection => { const datasets = activeSelections.map(selection => {
const values = dataByModel.get(selection.model) || new Array(labels.length).fill(0); const values = getSeriesForSelection(selection.model);
const style = this.chartLineStyles[selection.index] || this.chartLineStyles[0]; const style = this.chartLineStyles[selection.index % this.chartLineStyles.length] || this.chartLineStyles[0];
const label = selection.model === ALL_MODELS_VALUE
? i18n.t('usage_stats.chart_line_all')
: selection.model;
return { return {
label: selection.model, label,
data: values, data: values,
borderColor: style.borderColor, borderColor: style.borderColor,
backgroundColor: style.backgroundColor, backgroundColor: style.backgroundColor,
@@ -1361,6 +1527,13 @@ export const usageModule = {
loadUsageStats, loadUsageStats,
updateUsageOverview, updateUsageOverview,
getModelNamesFromUsage, getModelNamesFromUsage,
getChartLineMaxCount,
getVisibleChartLineCount,
ensureChartLineSelectionLength,
updateChartLineControlsUI,
setChartLineVisibleCount,
changeChartLineCount,
removeChartLine,
updateChartLineSelectors, updateChartLineSelectors,
handleChartLineSelectionChange, handleChartLineSelectionChange,
refreshChartsForSelections, refreshChartsForSelections,

104
src/utils/models.js Normal file
View File

@@ -0,0 +1,104 @@
/**
* 模型工具函数
* 提供模型列表的规范化与去重能力
*/
export function normalizeModelList(payload, { dedupe = false } = {}) {
const toModel = (entry) => {
if (typeof entry === 'string') {
return { name: entry };
}
if (!entry || typeof entry !== 'object') {
return null;
}
const name = entry.id || entry.name || entry.model || entry.value;
if (!name) return null;
const alias = entry.alias || entry.display_name || entry.displayName;
const description = entry.description || entry.note || entry.comment;
const model = { name: String(name) };
if (alias && alias !== name) {
model.alias = String(alias);
}
if (description) {
model.description = String(description);
}
return model;
};
let models = [];
if (Array.isArray(payload)) {
models = payload.map(toModel).filter(Boolean);
} else if (payload && typeof payload === 'object') {
if (Array.isArray(payload.data)) {
models = payload.data.map(toModel).filter(Boolean);
} else if (Array.isArray(payload.models)) {
models = payload.models.map(toModel).filter(Boolean);
}
}
if (!dedupe) {
return models;
}
const seen = new Set();
return models.filter(model => {
const key = (model?.name || '').toLowerCase();
if (!key || seen.has(key)) {
return false;
}
seen.add(key);
return true;
});
}
const MODEL_CATEGORIES = [
{ id: 'gpt', label: 'GPT', patterns: [/gpt/i, /\bo\d\b/i, /\bo\d+\.?/i, /\bchatgpt/i] },
{ id: 'claude', label: 'Claude', patterns: [/claude/i] },
{ id: 'gemini', label: 'Gemini', patterns: [/gemini/i, /\bgai\b/i] },
{ id: 'kimi', label: 'Kimi', patterns: [/kimi/i] },
{ id: 'qwen', label: 'Qwen', patterns: [/qwen/i] },
{ id: 'glm', label: 'GLM', patterns: [/glm/i, /chatglm/i] },
{ id: 'grok', label: 'Grok', patterns: [/grok/i] },
{ id: 'deepseek', label: 'DeepSeek', patterns: [/deepseek/i] }
];
function matchCategory(text) {
for (const category of MODEL_CATEGORIES) {
if (category.patterns.some(pattern => pattern.test(text))) {
return category.id;
}
}
return null;
}
export function classifyModels(models = [], { otherLabel = 'Other' } = {}) {
const groups = MODEL_CATEGORIES.map(category => ({
id: category.id,
label: category.label,
items: []
}));
const otherGroup = { id: 'other', label: otherLabel, items: [] };
models.forEach(model => {
const name = (model?.name || '').toString();
const alias = (model?.alias || '').toString();
const haystack = `${name} ${alias}`.toLowerCase();
const matchedId = matchCategory(haystack);
const target = matchedId ? groups.find(group => group.id === matchedId) : null;
if (target) {
target.items.push(model);
} else {
otherGroup.items.push(model);
}
});
const populatedGroups = groups.filter(group => group.items.length > 0);
if (otherGroup.items.length) {
populatedGroups.push(otherGroup);
}
return populatedGroups;
}

View File

@@ -1385,7 +1385,6 @@ textarea::placeholder {
#config-management .card { #config-management .card {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
min-height: calc(100vh - 360px);
margin-bottom: 12px; margin-bottom: 12px;
} }
@@ -2243,6 +2242,87 @@ input:checked+.slider:before {
font-style: italic; font-style: italic;
} }
.available-models-status {
display: flex;
align-items: center;
gap: 8px;
color: var(--text-secondary);
font-size: 0.95rem;
margin-bottom: 10px;
}
.available-models-status.success {
color: #10b981;
}
.available-models-status.warning {
color: #d97706;
}
.available-models-status.error {
color: #dc2626;
}
.available-models-list {
display: flex;
flex-direction: column;
gap: 12px;
}
.available-models-empty {
display: flex;
align-items: center;
gap: 8px;
color: var(--text-tertiary);
padding: 6px 0;
}
.available-models-placeholder {
color: var(--text-tertiary);
}
.available-model-group {
background: var(--bg-tertiary);
border: 1px solid var(--border-color);
border-radius: 10px;
padding: 10px 12px;
}
.available-model-group-header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 8px;
}
.available-model-group-title {
display: flex;
align-items: center;
gap: 8px;
font-weight: 600;
color: var(--text-primary);
}
.available-model-group-label {
font-size: 0.95rem;
letter-spacing: 0.3px;
}
.available-model-group-count {
background: var(--bg-secondary);
border: 1px solid var(--border-color);
border-radius: 999px;
padding: 2px 8px;
font-size: 0.85rem;
color: var(--text-secondary);
}
.available-model-group-body {
display: flex;
flex-wrap: wrap;
gap: 8px;
}
.item-value { .item-value {
font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace; font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
background: var(--bg-tertiary); background: var(--bg-tertiary);
@@ -3098,12 +3178,55 @@ input:checked+.slider:before {
min-width: 220px; min-width: 220px;
} }
.usage-filter-actions {
min-width: 260px;
}
.usage-filter-group label { .usage-filter-group label {
font-weight: 600; font-weight: 600;
color: var(--text-secondary); color: var(--text-secondary);
font-size: 14px; font-size: 14px;
} }
.chart-line-actions {
display: flex;
gap: 8px;
align-items: center;
flex-wrap: wrap;
}
.chart-line-count {
padding: 6px 10px;
border-radius: 20px;
background: var(--bg-tertiary);
color: var(--text-secondary);
font-size: 13px;
border: 1px solid var(--border-color);
}
.chart-line-hint {
color: var(--text-secondary);
font-size: 13px;
}
.chart-line-control {
display: flex;
align-items: center;
gap: 8px;
}
.chart-line-control .model-filter-select {
flex: 1;
}
.chart-line-delete {
white-space: nowrap;
}
.chart-line-group.chart-line-hidden {
display: none;
}
.model-filter-select { .model-filter-select {
border: 1px solid var(--border-color); border: 1px solid var(--border-color);
border-radius: 10px; border-radius: 10px;
@@ -4289,6 +4412,60 @@ input:checked+.slider:before {
line-height: 1.6; line-height: 1.6;
} }
/* 日志页面头部布局 */
#logs .card-header.logs-header {
flex-wrap: wrap;
gap: 12px;
}
.logs-header-main {
display: flex;
align-items: center;
gap: 12px;
flex: 1;
min-width: 280px;
}
.logs-header-main h3 {
margin: 0;
}
.logs-search {
display: flex;
align-items: center;
border: 1px solid var(--border-primary);
border-radius: 10px;
padding: 0 12px;
background: var(--bg-secondary);
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.03);
min-width: 240px;
max-width: 420px;
flex: 1;
}
[data-theme="dark"] .logs-search {
background: var(--bg-tertiary);
box-shadow: inset 0 1px 1px rgba(255, 255, 255, 0.04);
}
.logs-search i {
color: var(--text-tertiary);
margin-right: 8px;
}
.logs-search input {
border: none;
background: transparent;
color: var(--text-primary);
width: 100%;
padding: 10px 0;
font-size: 0.95rem;
}
.logs-search input:focus {
outline: none;
}
/* 日志页面头部操作区域 */ /* 日志页面头部操作区域 */
#logs .card-header .header-actions { #logs .card-header .header-actions {
display: flex; display: flex;
@@ -4320,6 +4497,21 @@ input:checked+.slider:before {
font-size: 12px; font-size: 12px;
} }
#logs .card-header.logs-header {
align-items: flex-start;
}
.logs-header-main {
width: 100%;
flex-direction: column;
align-items: flex-start;
}
.logs-search {
width: 100%;
max-width: none;
}
#logs .card-header .header-actions { #logs .card-header .header-actions {
width: 100%; width: 100%;
justify-content: flex-start; justify-content: flex-start;