From 410325039bb1ed4d3a141981dfa9eebd1404780a Mon Sep 17 00:00:00 2001 From: sim Date: Tue, 10 Nov 2026 23:03:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(buddy):=20=E5=AE=8C=E5=96=84=E4=BA=91?= =?UTF-8?q?=E5=A4=87=E4=BB=BD=E4=B8=8E=E6=A8=A1=E5=9E=8B=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E9=A1=B5=E5=8A=A0=E8=BD=BD=E5=A4=B1=E8=B4=A5=E6=97=B6=E7=9A=84?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=81=A2=E5=A4=8D=E4=B8=8E=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../providers/DesktopModelsSettings.vue | 8 +++++- .../providerSettingsReactivity.spec.ts | 27 +++++++++++++++++++ .../widgets/sync/DesktopSyncSettings.vue | 19 +++++++++---- 3 files changed, 48 insertions(+), 6 deletions(-) diff --git a/apps/buddy/src/modules/models/widgets/providers/DesktopModelsSettings.vue b/apps/buddy/src/modules/models/widgets/providers/DesktopModelsSettings.vue index 8b1465bb3..be65cb0fa 100644 --- a/apps/buddy/src/modules/models/widgets/providers/DesktopModelsSettings.vue +++ b/apps/buddy/src/modules/models/widgets/providers/DesktopModelsSettings.vue @@ -3,7 +3,7 @@ import type { LocalProvider } from '@buddy-shared/providers/providerApi' import type { ModelProvidersStore } from '@/modules/models/state/typing' import { Add20Regular, Info20Regular } from '@vicons/fluent' -import { NButton, NEmpty, NPopconfirm, NSwitch, NTooltip } from 'naive-ui' +import { NAlert, NButton, NEmpty, NPopconfirm, NSwitch, NTooltip } from 'naive-ui' import { computed, shallowRef } from 'vue' import { useBuddyI18n } from '@/i18n/buddyI18n' import DesktopModelSnapshotStatus from '@/modules/models/widgets/providers/DesktopModelSnapshotStatus.vue' @@ -42,6 +42,12 @@ function providerAuthenticationLabel(type: NonNullable
+ + {{ providerSettings.modelProviderError.value }} + + {{ t('desktop.loading.retry') }} + +
diff --git a/apps/buddy/src/modules/models/widgets/providers/__tests__/providerSettingsReactivity.spec.ts b/apps/buddy/src/modules/models/widgets/providers/__tests__/providerSettingsReactivity.spec.ts index e81c43e51..7ddb2d8f8 100644 --- a/apps/buddy/src/modules/models/widgets/providers/__tests__/providerSettingsReactivity.spec.ts +++ b/apps/buddy/src/modules/models/widgets/providers/__tests__/providerSettingsReactivity.spec.ts @@ -65,6 +65,33 @@ describe('provider settings prop reactivity', () => { expect(document.body.textContent).toContain(translateBuddy('zh-CN', heading)) }) + it('displays the model catalog error and retries loading from settings', async () => { + const store = createStore('Alpha') + const loadModelCatalog = vi.fn(async () => true) + store.loadModelCatalog = loadModelCatalog + const root = document.createElement('div') + document.body.append(root) + const app = createApp({ + setup: () => () => h(DesktopModelsSettings, { providerSettings: store }), + }) + app.mount(root) + cleanups.push(() => { + app.unmount() + root.remove() + }) + await nextTick() + + store.modelProviderError.value = 'Unable to load model catalog' + await nextTick() + expect(root.textContent).toContain('Unable to load model catalog') + + const retry = [...root.querySelectorAll('button')] + .find(button => button.textContent?.trim() === translateBuddy('zh-CN', 'desktop.loading.retry')) + expect(retry).toBeDefined() + retry?.click() + expect(loadModelCatalog).toHaveBeenCalledWith(true) + }) + it('keeps provider logos paired with their names when the add dialog is filtered', async () => { const store = createStore('OpenAI') store.builtinPresets.value = [ diff --git a/apps/buddy/src/modules/settings/widgets/sync/DesktopSyncSettings.vue b/apps/buddy/src/modules/settings/widgets/sync/DesktopSyncSettings.vue index b1e503eb2..45cc77f87 100644 --- a/apps/buddy/src/modules/settings/widgets/sync/DesktopSyncSettings.vue +++ b/apps/buddy/src/modules/settings/widgets/sync/DesktopSyncSettings.vue @@ -1,7 +1,7 @@ @@ -124,7 +130,10 @@ onUnmounted(() => unsubscribe?.())