Skip to content

Commit 047f679

Browse files
committed
fix: 修复没配置模型的提醒
1 parent 3fcdf54 commit 047f679

1 file changed

Lines changed: 12 additions & 5 deletions

File tree

gui/src/contexts/ChatContext.tsx

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React, { createContext, useState, useContext, ReactNode, useEffect, useRef, useCallback } from 'react';
2+
import { message } from 'antd';
23
import { storageService } from '@/storage';
34
import { useXAgent, useXChat } from '@ant-design/x';
45
import type { MessageInfo } from '@ant-design/x/es/use-x-chat';
@@ -422,20 +423,26 @@ export const ChatProvider: React.FC<{ children: ReactNode }> = ({ children }) =>
422423

423424
// Setup XAgent
424425
const [agent] = useXAgent<any, { message: InputData }, ChatMessage>({
425-
request: async ({ message }, { onSuccess, onUpdate, onStream }) => {
426+
request: async ({ message: reqMessage }, { onSuccess, onUpdate, onStream }) => {
426427
// Create AbortController for cancellation: create a new one for each request
427428
if (onStream) {
428429
onStream(new AbortController());
429430
}
430-
const selectedModel = await storageService.getSelectedModelConfig();
431-
if (!selectedModel) {
432-
throw new Error(t('context.model.noModelConfigured'));
431+
let selectedModel: ModelItem | null = null;
432+
try {
433+
selectedModel = await storageService.getSelectedModelConfig();
434+
} catch (error) {
435+
const errorMsg = t('context.model.noModelConfigured');
436+
message.error(errorMsg);
437+
handleApiError(error, onUpdate, onSuccess);
438+
return;
433439
}
440+
434441
try {
435442
// 0. First add an assistant message: can have loading state, but currently auto-scroll only works when second-to-last message is visible
436443
onUpdate({ role: 'assistant', content: '', messages: [], status: 'loading' });
437444
// 1. Prepare context content
438-
const { processResult, historyList, contextItems } = await prepareContextItem(message);
445+
const { processResult, historyList, contextItems } = await prepareContextItem(reqMessage);
439446

440447

441448
// 2. Update last user message

0 commit comments

Comments
 (0)