@lobehub/chat 1.49.10 → 1.49.12

package/src/locales/default/modelProvider.ts

@@ -155,32 +155,6 @@ export default {
       desc: '必须包含http(s)://，本地未额外指定可留空',
       title: 'Ollama 服务地址',
     },
-    setup: {
-      cors: {
-        description: '因浏览器安全限制，你需要为 Ollama 进行跨域配置后方可正常使用。',
-        linux: {
-          env: '在 [Service] 部分下添加 `Environment`，添加 OLLAMA_ORIGINS 环境变量：',
-          reboot: '重载 systemd 并重启 Ollama',
-          systemd: '调用 systemd 编辑 ollama 服务：',
-        },
-        macos: '请打开「终端」应用程序，并粘贴以下指令，并按回车运行',
-        reboot: '请在执行完成后重启 Ollama 服务',
-        title: '配置 Ollama 允许跨域访问',
-        windows:
-          '在 Windows 上，点击「控制面板」，进入编辑系统环境变量。为您的用户账户新建名为 「OLLAMA_ORIGINS」 的环境变量，值为 * ，点击 「OK/应用」 保存',
-      },
-      install: {
-        description: '请确认你已经开启 Ollama ，如果没有下载 Ollama ，请前往官网<1>下载</1>',
-        docker:
-          '如果你更倾向于使用 Docker，Ollama 也提供了官方 Docker 镜像，你可以通过以下命令拉取：',
-        linux: {
-          command: '通过以下命令安装：',
-          manual: '或者，你也可以参考 <1>Linux 手动安装指南</1> 自行安装',
-        },
-        title: '在本地安装并开启 Ollama 应用',
-        windowsTab: 'Windows (预览版)',
-      },
-    },
     title: 'Ollama',
     unlock: {
       cancel: '取消下载',

package/src/server/routers/lambda/aiProvider.ts

@@ -48,7 +48,7 @@ export const aiProviderRouter = router({
     .input(z.object({ id: z.string() }))
 
     .query(async ({ input, ctx }): Promise<AiProviderDetailItem | undefined> => {
-      return ctx.aiProviderModel.getAiProviderById(input.id, KeyVaultsGateKeeper.getUserKeyVaults);
+      return ctx.aiInfraRepos.getAiProviderDetail(input.id, KeyVaultsGateKeeper.getUserKeyVaults);
     }),
 
   getAiProviderList: aiProviderProcedure.query(async ({ ctx }) => {
@@ -58,15 +58,7 @@ export const aiProviderRouter = router({
   getAiProviderRuntimeState: aiProviderProcedure
     .input(z.object({ isLogin: z.boolean().optional() }))
     .query(async ({ ctx }): Promise<AiProviderRuntimeState> => {
-      const runtimeConfig = await ctx.aiProviderModel.getAiProviderRuntimeConfig(
-        KeyVaultsGateKeeper.getUserKeyVaults,
-      );
-
-      const enabledAiProviders = await ctx.aiInfraRepos.getUserEnabledProviderList();
-
-      const enabledAiModels = await ctx.aiInfraRepos.getEnabledModels();
-
-      return { enabledAiModels, enabledAiProviders, runtimeConfig };
+      return ctx.aiInfraRepos.getAiProviderRuntimeState(KeyVaultsGateKeeper.getUserKeyVaults);
     }),
 
   removeAiProvider: aiProviderProcedure

package/src/services/aiProvider/client.ts

@@ -25,7 +25,7 @@ export class ClientService extends BaseClientService implements IAiProviderServi
   };
 
   getAiProviderById: IAiProviderService['getAiProviderById'] = async (id) => {
-    return this.aiProviderModel.getAiProviderById(id);
+    return this.aiInfraRepos.getAiProviderDetail(id);
   };
 
   getAiProviderList: IAiProviderService['getAiProviderList'] = async () => {
@@ -33,13 +33,7 @@ export class ClientService extends BaseClientService implements IAiProviderServi
   };
 
   getAiProviderRuntimeState: IAiProviderService['getAiProviderRuntimeState'] = async () => {
-    const runtimeConfig = await this.aiProviderModel.getAiProviderRuntimeConfig();
-
-    const enabledAiProviders = await this.aiInfraRepos.getUserEnabledProviderList();
-
-    const enabledAiModels = await this.aiInfraRepos.getEnabledModels();
-
-    return { enabledAiModels, enabledAiProviders, runtimeConfig };
+    return await this.aiInfraRepos.getAiProviderRuntimeState();
   };
 
   toggleProviderEnabled: IAiProviderService['toggleProviderEnabled'] = async (id, enabled) => {

package/src/store/chat/slices/aiChat/actions/__tests__/generateAIChat.test.ts

@@ -576,7 +576,7 @@ describe('chatMessage actions', () => {
       const abortController = new AbortController();
 
       act(() => {
-        useChatStore.setState({ abortController });
+        useChatStore.setState({ chatLoadingIdsAbortController: abortController });
       });
 
       await act(async () => {
@@ -596,18 +596,18 @@ describe('chatMessage actions', () => {
 
       await act(async () => {
         // 确保没有设置 abortController
-        useChatStore.setState({ abortController: undefined });
+        useChatStore.setState({ chatLoadingIdsAbortController: undefined });
 
         result.current.stopGenerateMessage();
       });
 
       // 由于没有 abortController，不应调用任何方法
-      expect(result.current.abortController).toBeUndefined();
+      expect(result.current.chatLoadingIdsAbortController).toBeUndefined();
     });
 
     it('should return early if abortController is undefined', () => {
       act(() => {
-        useChatStore.setState({ abortController: undefined });
+        useChatStore.setState({ chatLoadingIdsAbortController: undefined });
       });
 
       const { result } = renderHook(() => useChatStore());
@@ -625,7 +625,7 @@ describe('chatMessage actions', () => {
       const abortMock = vi.fn();
       const abortController = { abort: abortMock } as unknown as AbortController;
       act(() => {
-        useChatStore.setState({ abortController });
+        useChatStore.setState({ chatLoadingIdsAbortController: abortController });
       });
       const { result } = renderHook(() => useChatStore());
 
@@ -639,7 +639,7 @@ describe('chatMessage actions', () => {
     it('should call internal_toggleChatLoading with correct parameters', () => {
       const abortController = new AbortController();
       act(() => {
-        useChatStore.setState({ abortController });
+        useChatStore.setState({ chatLoadingIdsAbortController: abortController });
       });
       const { result } = renderHook(() => useChatStore());
       const spy = vi.spyOn(result.current, 'internal_toggleChatLoading');
@@ -868,7 +868,7 @@ describe('chatMessage actions', () => {
       });
 
       const state = useChatStore.getState();
-      expect(state.abortController).toBeInstanceOf(AbortController);
+      expect(state.chatLoadingIdsAbortController).toBeInstanceOf(AbortController);
       expect(state.chatLoadingIds).toEqual(['message-id']);
     });
 
@@ -887,7 +887,7 @@ describe('chatMessage actions', () => {
       });
 
       const state = useChatStore.getState();
-      expect(state.abortController).toBeUndefined();
+      expect(state.chatLoadingIdsAbortController).toBeUndefined();
       expect(state.chatLoadingIds).toEqual([]);
     });
 
@@ -920,12 +920,12 @@ describe('chatMessage actions', () => {
       const abortController = new AbortController();
 
       act(() => {
-        useChatStore.setState({ abortController });
+        useChatStore.setState({ chatLoadingIdsAbortController: abortController });
         result.current.internal_toggleChatLoading(true, 'message-id', 'loading-action');
       });
 
       const state = useChatStore.getState();
-      expect(state.abortController).toEqual(abortController);
+      expect(state.chatLoadingIdsAbortController).toEqual(abortController);
     });
   });
 

package/src/store/chat/slices/aiChat/actions/generateAIChat.ts

@@ -267,10 +267,11 @@ export const generateAIChat: StateCreator<
     await Promise.all([summaryTitle(), addFilesToAgent()]);
   },
   stopGenerateMessage: () => {
-    const { abortController, internal_toggleChatLoading } = get();
-    if (!abortController) return;
+    const { chatLoadingIdsAbortController, internal_toggleChatLoading } = get();
 
-    abortController.abort(MESSAGE_CANCEL_FLAT);
+    if (!chatLoadingIdsAbortController) return;
+
+    chatLoadingIdsAbortController.abort(MESSAGE_CANCEL_FLAT);
 
     internal_toggleChatLoading(false, undefined, n('stopGenerateMessage') as string);
   },

package/src/store/chat/slices/aiChat/initialState.ts

@@ -1,9 +1,9 @@
 export interface ChatAIChatState {
-  abortController?: AbortController;
   /**
    * is the AI message is generating
    */
   chatLoadingIds: string[];
+  chatLoadingIdsAbortController?: AbortController;
   inputFiles: File[];
   inputMessage: string;
   /**

package/src/store/chat/slices/message/action.ts

@@ -368,13 +368,14 @@ export const chatMessage: StateCreator<
     );
   },
   internal_toggleLoadingArrays: (key, loading, id, action) => {
+    const abortControllerKey = `${key}AbortController`;
     if (loading) {
       window.addEventListener('beforeunload', preventLeavingFn);
 
       const abortController = new AbortController();
       set(
         {
-          abortController,
+          [abortControllerKey]: abortController,
           [key]: toggleBooleanList(get()[key] as string[], id!, loading),
         },
         false,
@@ -384,11 +385,11 @@ export const chatMessage: StateCreator<
       return abortController;
     } else {
       if (!id) {
-        set({ abortController: undefined, [key]: [] }, false, action);
+        set({ [abortControllerKey]: undefined, [key]: [] }, false, action);
       } else
         set(
           {
-            abortController: undefined,
+            [abortControllerKey]: undefined,
             [key]: toggleBooleanList(get()[key] as string[], id, loading),
           },
           false,

package/src/store/global/initialState.ts

@@ -52,6 +52,7 @@ export interface SystemStatus {
   latestChangelogId?: string;
   mobileShowPortal?: boolean;
   mobileShowTopic?: boolean;
+  portalWidth: number;
   sessionsWidth: number;
   showChatSideBar?: boolean;
   showFilePanel?: boolean;
@@ -86,6 +87,7 @@ export const INITIAL_STATUS = {
   hideThreadLimitAlert: false,
   inputHeight: 200,
   mobileShowTopic: false,
+  portalWidth: 400,
   sessionsWidth: 320,
   showChatSideBar: true,
   showFilePanel: true,

package/src/store/global/selectors.ts

@@ -20,6 +20,7 @@ const hidePWAInstaller = (s: GlobalStore) => s.status.hidePWAInstaller;
 const showChatHeader = (s: GlobalStore) => !s.status.zenMode;
 const inZenMode = (s: GlobalStore) => s.status.zenMode;
 const sessionWidth = (s: GlobalStore) => s.status.sessionsWidth;
+const portalWidth = (s: GlobalStore) => s.status.portalWidth || 400;
 const filePanelWidth = (s: GlobalStore) => s.status.filePanelWidth;
 const inputHeight = (s: GlobalStore) => s.status.inputHeight;
 const threadInputHeight = (s: GlobalStore) => s.status.threadInputHeight;
@@ -59,6 +60,7 @@ export const systemStatusSelectors = {
   isPgliteNotInited,
   mobileShowPortal,
   mobileShowTopic,
+  portalWidth,
   sessionGroupKeys,
   sessionWidth,
   showChatHeader,

package/src/store/serverConfig/selectors.test.ts

@@ -49,6 +49,7 @@ describe('serverConfigSelectors', () => {
         serverConfig: {
           enabledOAuthSSO: true,
           telemetry: {},
+          aiProvider: {},
         },
       });
 
@@ -63,6 +64,7 @@ describe('serverConfigSelectors', () => {
       const store = initServerConfigStore({
         serverConfig: {
           telemetry: { langfuse: true },
+          aiProvider: {},
         },
       });
 
@@ -75,6 +77,7 @@ describe('serverConfigSelectors', () => {
       const store = initServerConfigStore({
         serverConfig: {
           telemetry: {},
+          aiProvider: {},
         },
       });
 

package/src/store/serverConfig/store.test.ts

@@ -23,14 +23,14 @@ describe('createServerConfigStore', () => {
 
     expect(store.getState()).toEqual({
       featureFlags: DEFAULT_FEATURE_FLAGS,
-      serverConfig: { telemetry: {} },
+      serverConfig: { telemetry: {}, aiProvider: {} },
     });
   });
 
   it('should initialize store with custom initial state', () => {
     const initialState: Partial<ServerConfigStore> = {
       featureFlags: { edit_agent: false },
-      serverConfig: { telemetry: { langfuse: true } },
+      serverConfig: { telemetry: { langfuse: true }, aiProvider: {} },
     };
 
     const store = initServerConfigStore(initialState);
@@ -38,6 +38,7 @@ describe('createServerConfigStore', () => {
     expect(store.getState().featureFlags.edit_agent).toBeFalsy();
     expect(store.getState().serverConfig).toEqual({
       telemetry: { langfuse: true },
+      aiProvider: {},
     });
   });
 

package/src/store/serverConfig/store.ts

@@ -12,7 +12,7 @@ import { StoreApiWithSelector } from '@/utils/zustand';
 
 const initialState: ServerConfigStore = {
   featureFlags: DEFAULT_FEATURE_FLAGS,
-  serverConfig: { telemetry: {} },
+  serverConfig: { aiProvider: {}, telemetry: {} },
 };
 
 //  ===============  聚合 createStoreFn ============ //

package/src/store/user/slices/common/action.test.ts

@@ -55,6 +55,7 @@ describe('createCommonSlice', () => {
       defaultAgent: 'agent1',
       languageModel: 'model1',
       telemetry: {},
+      aiProvider: {},
     } as GlobalServerConfig;
 
     it('should not fetch user state if user is not login', async () => {

package/src/types/serverConfig.ts

@@ -20,7 +20,7 @@ export interface ServerModelProviderConfig {
 export type ServerLanguageModel = Partial<Record<GlobalLLMProviderKey, ServerModelProviderConfig>>;
 
 export interface GlobalServerConfig {
-  aiProvider?: ServerLanguageModel;
+  aiProvider: ServerLanguageModel;
   defaultAgent?: DeepPartial<UserDefaultAgent>;
   enableUploadFileToServer?: boolean;
   enabledAccessCode?: boolean;

package/src/app/(main)/settings/provider/(detail)/ollama/Checker.tsx

@@ -1,73 +0,0 @@
-import { CheckCircleFilled } from '@ant-design/icons';
-import { Alert, Highlighter } from '@lobehub/ui';
-import { Button } from 'antd';
-import { useTheme } from 'antd-style';
-import { ListResponse } from 'ollama/browser';
-import { memo } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Flexbox } from 'react-layout-kit';
-import useSWR from 'swr';
-
-import { useIsMobile } from '@/hooks/useIsMobile';
-import { ollamaService } from '@/services/ollama';
-
-const OllamaChecker = memo(() => {
-  const { t } = useTranslation('setting');
-
-  const theme = useTheme();
-
-  const { data, error, isLoading, mutate } = useSWR<ListResponse>(
-    'ollama.list',
-    ollamaService.getModels,
-    {
-      revalidateOnFocus: false,
-      revalidateOnMount: false,
-      revalidateOnReconnect: false,
-    },
-  );
-
-  const checkConnection = () => {
-    mutate().catch();
-  };
-
-  const isMobile = useIsMobile();
-
-  return (
-    <Flexbox align={isMobile ? 'flex-start' : 'flex-end'} gap={8}>
-      <Flexbox align={'center'} direction={isMobile ? 'horizontal-reverse' : 'horizontal'} gap={12}>
-        {!error && data?.models && (
-          <Flexbox gap={4} horizontal>
-            <CheckCircleFilled
-              style={{
-                color: theme.colorSuccess,
-              }}
-            />
-            {t('llm.checker.pass')}
-          </Flexbox>
-        )}
-        <Button loading={isLoading} onClick={checkConnection}>
-          {t('llm.checker.button')}
-        </Button>
-      </Flexbox>
-      {error && (
-        <Flexbox gap={8} style={{ maxWidth: '600px', width: '100%' }}>
-          <Alert
-            banner
-            extra={
-              <Flexbox>
-                <Highlighter copyButtonSize={'small'} language={'json'} type={'pure'}>
-                  {JSON.stringify(error.body || error, null, 2)}
-                </Highlighter>
-              </Flexbox>
-            }
-            message={t(`response.${error.type}` as any, { ns: 'error' })}
-            showIcon
-            type={'error'}
-          />
-        </Flexbox>
-      )}
-    </Flexbox>
-  );
-});
-
-export default OllamaChecker;