fix(ai-providers): 修复 OpenAI 密钥测试状态与共享样式回归

This commit is contained in:
moxi
2026-02-11 23:51:53 +08:00
parent 0089d4a705
commit 2cf1e23351
2 changed files with 68 additions and 30 deletions

View File

@@ -221,50 +221,79 @@ export function AiProvidersOpenAIEditPage() {
const testAllKeys = useCallback(async () => { const testAllKeys = useCallback(async () => {
const baseUrl = form.baseUrl.trim(); const baseUrl = form.baseUrl.trim();
if (!baseUrl) { if (!baseUrl) {
showNotification(t('notification.openai_test_url_required'), 'error'); const message = t('notification.openai_test_url_required');
setTestStatus('error');
setTestMessage(message);
showNotification(message, 'error');
return; return;
} }
const endpoint = buildOpenAIChatCompletionsEndpoint(baseUrl); const endpoint = buildOpenAIChatCompletionsEndpoint(baseUrl);
if (!endpoint) { if (!endpoint) {
showNotification(t('notification.openai_test_url_required'), 'error'); const message = t('notification.openai_test_url_required');
setTestStatus('error');
setTestMessage(message);
showNotification(message, 'error');
return; return;
} }
const modelName = testModel.trim() || availableModels[0] || ''; const modelName = testModel.trim() || availableModels[0] || '';
if (!modelName) { if (!modelName) {
showNotification(t('notification.openai_test_model_required'), 'error'); const message = t('notification.openai_test_model_required');
setTestStatus('error');
setTestMessage(message);
showNotification(message, 'error');
return; return;
} }
// Initialize statuses for all keys const validKeyIndexes = form.apiKeyEntries
const validKeyEntries = form.apiKeyEntries.filter((entry) => entry.apiKey?.trim()); .map((entry, index) => (entry.apiKey?.trim() ? index : -1))
if (validKeyEntries.length === 0) { .filter((index) => index >= 0);
showNotification(t('notification.openai_test_key_required'), 'error'); if (validKeyIndexes.length === 0) {
const message = t('notification.openai_test_key_required');
setTestStatus('error');
setTestMessage(message);
showNotification(message, 'error');
return; return;
} }
setTestStatus('loading');
setTestMessage(t('ai_providers.openai_test_running'));
resetDraftKeyTestStatuses(form.apiKeyEntries.length); resetDraftKeyTestStatuses(form.apiKeyEntries.length);
// Test all keys in parallel const results = await Promise.all(validKeyIndexes.map((index) => testSingleKey(index)));
const results = await Promise.all(
form.apiKeyEntries.map((_, index) => testSingleKey(index))
);
const successCount = results.filter(Boolean).length; const successCount = results.filter(Boolean).length;
const failCount = results.length - successCount; const failCount = validKeyIndexes.length - successCount;
if (failCount === 0) { if (failCount === 0) {
showNotification(t('ai_providers.openai_test_all_success', { count: successCount }), 'success'); const message = t('ai_providers.openai_test_all_success', { count: successCount });
setTestStatus('success');
setTestMessage(message);
showNotification(message, 'success');
} else if (successCount === 0) { } else if (successCount === 0) {
showNotification(t('ai_providers.openai_test_all_failed', { count: failCount }), 'error'); const message = t('ai_providers.openai_test_all_failed', { count: failCount });
setTestStatus('error');
setTestMessage(message);
showNotification(message, 'error');
} else { } else {
showNotification( const message = t('ai_providers.openai_test_all_partial', { success: successCount, failed: failCount });
t('ai_providers.openai_test_all_partial', { success: successCount, failed: failCount }), setTestStatus('error');
'warning' setTestMessage(message);
); showNotification(message, 'warning');
} }
}, [form.baseUrl, form.apiKeyEntries, testModel, availableModels, t, resetDraftKeyTestStatuses, testSingleKey, showNotification]); }, [
form.baseUrl,
form.apiKeyEntries,
testModel,
availableModels,
t,
setTestStatus,
setTestMessage,
resetDraftKeyTestStatuses,
testSingleKey,
showNotification,
]);
const openOpenaiModelDiscovery = () => { const openOpenaiModelDiscovery = () => {
const baseUrl = form.baseUrl.trim(); const baseUrl = form.baseUrl.trim();
@@ -281,18 +310,28 @@ export function AiProvidersOpenAIEditPage() {
const updateEntry = (idx: number, field: keyof ApiKeyEntry, value: string) => { const updateEntry = (idx: number, field: keyof ApiKeyEntry, value: string) => {
const next = list.map((entry, i) => (i === idx ? { ...entry, [field]: value } : entry)); const next = list.map((entry, i) => (i === idx ? { ...entry, [field]: value } : entry));
setForm((prev) => ({ ...prev, apiKeyEntries: next })); setForm((prev) => ({ ...prev, apiKeyEntries: next }));
setDraftKeyTestStatus(idx, { status: 'idle', message: '' });
setTestStatus('idle');
setTestMessage('');
}; };
const removeEntry = (idx: number) => { const removeEntry = (idx: number) => {
const next = list.filter((_, i) => i !== idx); const next = list.filter((_, i) => i !== idx);
const nextLength = next.length ? next.length : 1;
setForm((prev) => ({ setForm((prev) => ({
...prev, ...prev,
apiKeyEntries: next.length ? next : [buildApiKeyEntry()], apiKeyEntries: next.length ? next : [buildApiKeyEntry()],
})); }));
resetDraftKeyTestStatuses(nextLength);
setTestStatus('idle');
setTestMessage('');
}; };
const addEntry = () => { const addEntry = () => {
setForm((prev) => ({ ...prev, apiKeyEntries: [...list, buildApiKeyEntry()] })); setForm((prev) => ({ ...prev, apiKeyEntries: [...list, buildApiKeyEntry()] }));
resetDraftKeyTestStatuses(list.length + 1);
setTestStatus('idle');
setTestMessage('');
}; };
return ( return (
@@ -305,7 +344,7 @@ export function AiProvidersOpenAIEditPage() {
variant="secondary" variant="secondary"
size="sm" size="sm"
onClick={addEntry} onClick={addEntry}
disabled={saving || disableControls} disabled={saving || disableControls || testStatus === 'loading'}
className={styles.addKeyButton} className={styles.addKeyButton}
> >
{t('ai_providers.openai_keys_add_btn')} {t('ai_providers.openai_keys_add_btn')}
@@ -345,7 +384,7 @@ export function AiProvidersOpenAIEditPage() {
type="text" type="text"
value={entry.apiKey} value={entry.apiKey}
onChange={(e) => updateEntry(index, 'apiKey', e.target.value)} onChange={(e) => updateEntry(index, 'apiKey', e.target.value)}
disabled={saving || disableControls} disabled={saving || disableControls || testStatus === 'loading'}
className={`input ${styles.keyTableInput}`} className={`input ${styles.keyTableInput}`}
placeholder={t('ai_providers.openai_key_placeholder')} placeholder={t('ai_providers.openai_key_placeholder')}
/> />
@@ -357,7 +396,7 @@ export function AiProvidersOpenAIEditPage() {
type="text" type="text"
value={entry.proxyUrl ?? ''} value={entry.proxyUrl ?? ''}
onChange={(e) => updateEntry(index, 'proxyUrl', e.target.value)} onChange={(e) => updateEntry(index, 'proxyUrl', e.target.value)}
disabled={saving || disableControls} disabled={saving || disableControls || testStatus === 'loading'}
className={`input ${styles.keyTableInput}`} className={`input ${styles.keyTableInput}`}
placeholder={t('ai_providers.openai_proxy_placeholder')} placeholder={t('ai_providers.openai_proxy_placeholder')}
/> />
@@ -369,7 +408,7 @@ export function AiProvidersOpenAIEditPage() {
variant="secondary" variant="secondary"
size="sm" size="sm"
onClick={() => void testSingleKey(index)} onClick={() => void testSingleKey(index)}
disabled={saving || disableControls || !canTestKey} disabled={saving || disableControls || testStatus === 'loading' || !canTestKey}
loading={keyStatus === 'loading'} loading={keyStatus === 'loading'}
> >
{t('ai_providers.openai_test_single_action')} {t('ai_providers.openai_test_single_action')}
@@ -378,7 +417,7 @@ export function AiProvidersOpenAIEditPage() {
variant="ghost" variant="ghost"
size="sm" size="sm"
onClick={() => removeEntry(index)} onClick={() => removeEntry(index)}
disabled={saving || disableControls || list.length <= 1} disabled={saving || disableControls || testStatus === 'loading' || list.length <= 1}
> >
{t('common.delete')} {t('common.delete')}
</Button> </Button>
@@ -510,7 +549,7 @@ export function AiProvidersOpenAIEditPage() {
setTestStatus('idle'); setTestStatus('idle');
setTestMessage(''); setTestMessage('');
}} }}
disabled={saving || disableControls || availableModels.length === 0} disabled={saving || disableControls || testStatus === 'loading' || availableModels.length === 0}
> >
<option value=""> <option value="">
{availableModels.length {availableModels.length
@@ -535,7 +574,7 @@ export function AiProvidersOpenAIEditPage() {
size="sm" size="sm"
onClick={() => void testAllKeys()} onClick={() => void testAllKeys()}
loading={testStatus === 'loading'} loading={testStatus === 'loading'}
disabled={saving || disableControls || !hasConfiguredModels || !hasTestableKeys} disabled={saving || disableControls || testStatus === 'loading' || !hasConfiguredModels || !hasTestableKeys}
title={t('ai_providers.openai_test_all_hint')} title={t('ai_providers.openai_test_all_hint')}
className={styles.modelTestAllButton} className={styles.modelTestAllButton}
> >

View File

@@ -581,16 +581,15 @@ textarea {
padding: $spacing-md; padding: $spacing-md;
background: var(--bg-primary); background: var(--bg-primary);
display: flex; display: flex;
align-items: flex-start; align-items: center;
justify-content: space-between; justify-content: space-between;
gap: $spacing-md; gap: $spacing-md;
flex-wrap: wrap;
.item-meta { .item-meta {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: $spacing-sm; gap: 6px;
flex: 1;
min-width: 0;
} }
.item-title { .item-title {