@lobehub/chat 1.49.9 → 1.49.11

package/src/database/repositories/aiInfra/index.ts

@@ -5,9 +5,16 @@ import { AiModelModel } from '@/database/server/models/aiModel';
 import { AiProviderModel } from '@/database/server/models/aiProvider';
 import { LobeChatDatabase } from '@/database/type';
 import { AIChatModelCard, AiModelSourceEnum, AiProviderModelListItem } from '@/types/aiModel';
-import { AiProviderListItem, EnabledAiModel } from '@/types/aiProvider';
+import {
+  AiProviderDetailItem,
+  AiProviderListItem,
+  AiProviderRuntimeState,
+  EnabledAiModel,
+} from '@/types/aiProvider';
 import { ProviderConfig } from '@/types/user/settings';
-import { mergeArrayById } from '@/utils/merge';
+import { merge, mergeArrayById } from '@/utils/merge';
+
+type DecryptUserKeyVaults = (encryptKeyVaultsStr: string | null) => Promise<any>;
 
 export class AiInfraRepos {
   private userId: string;
@@ -112,6 +119,30 @@ export class AiInfraRepos {
     return mergeArrayById(defaultModels, aiModels) as AiProviderModelListItem[];
   };
 
+  getAiProviderRuntimeState = async (
+    decryptor?: DecryptUserKeyVaults,
+  ): Promise<AiProviderRuntimeState> => {
+    const result = await this.aiProviderModel.getAiProviderRuntimeConfig(decryptor);
+
+    const runtimeConfig = result;
+
+    Object.entries(result).forEach(([key, value]) => {
+      runtimeConfig[key] = merge(this.providerConfigs[key] || {}, value);
+    });
+
+    const enabledAiProviders = await this.getUserEnabledProviderList();
+
+    const enabledAiModels = await this.getEnabledModels();
+
+    return { enabledAiModels, enabledAiProviders, runtimeConfig };
+  };
+
+  getAiProviderDetail = async (id: string, decryptor?: DecryptUserKeyVaults) => {
+    const config = await this.aiProviderModel.getAiProviderById(id, decryptor);
+
+    return merge(this.providerConfigs[id] || {}, config) as AiProviderDetailItem;
+  };
+
   /**
    * Fetch builtin models from config
    */

package/src/database/server/models/aiProvider.ts

@@ -202,7 +202,11 @@ export class AiProviderModel {
 
     const keyVaults = !!result.keyVaults ? await decrypt(result.keyVaults) : {};
 
-    return { ...result, keyVaults } as AiProviderDetailItem;
+    return {
+      ...result,
+      fetchOnClient: typeof result.fetchOnClient === 'boolean' ? result.fetchOnClient : undefined,
+      keyVaults,
+    } as AiProviderDetailItem;
   };
 
   getAiProviderRuntimeConfig = async (decryptor?: DecryptUserKeyVaults) => {

package/src/features/Conversation/Error/OllamaBizError/SetupGuide.tsx

@@ -1,219 +1,12 @@
-import { Highlighter, Snippet, TabsNav } from '@lobehub/ui';
-import { Steps } from 'antd';
-import { createStyles } from 'antd-style';
-import Link from 'next/link';
-import { readableColor } from 'polished';
 import { memo } from 'react';
-import { Trans, useTranslation } from 'react-i18next';
-import { Flexbox } from 'react-layout-kit';
 
+import OllamaSetupGuide from '@/components/OllamaSetupGuide';
 import { ErrorActionContainer } from '@/features/Conversation/Error/style';
 
-const useStyles = createStyles(({ css, prefixCls, token }) => ({
-  steps: css`
-    margin-block-start: 32px;
-    &.${prefixCls}-steps-small .${prefixCls}-steps-item-title {
-      margin-block-end: 16px;
-      font-size: 16px;
-      font-weight: bold;
-    }
-
-    .${prefixCls}-steps-item-description {
-      margin-block-end: 24px;
-    }
-
-    .${prefixCls}-steps-icon {
-      color: ${readableColor(token.colorPrimary)} !important;
-    }
-  `,
-}));
-
 const SetupGuide = memo(() => {
-  const { styles } = useStyles();
-  const { t } = useTranslation('modelProvider');
   return (
     <ErrorActionContainer style={{ paddingBlock: 0 }}>
-      <TabsNav
-        items={[
-          {
-            children: (
-              <Steps
-                className={styles.steps}
-                direction={'vertical'}
-                items={[
-                  {
-                    description: (
-                      <Trans i18nKey={'ollama.setup.install.description'} ns={'modelProvider'}>
-                        请确认你已经开启 Ollama ，如果没有安装 Ollama ，请前往官网
-                        <Link href={'https://ollama.com/download'}>下载</Link>
-                      </Trans>
-                    ),
-                    status: 'process',
-                    title: t('ollama.setup.install.title'),
-                  },
-                  {
-                    description: (
-                      <Flexbox gap={8}>
-                        {t('ollama.setup.cors.description')}
-
-                        <Flexbox gap={8}>
-                          {t('ollama.setup.cors.macos')}
-                          <Snippet language={'bash'}>
-                            {/* eslint-disable-next-line react/no-unescaped-entities */}
-                            launchctl setenv OLLAMA_ORIGINS "*"
-                          </Snippet>
-                          {t('ollama.setup.cors.reboot')}
-                        </Flexbox>
-                      </Flexbox>
-                    ),
-                    status: 'process',
-                    title: t('ollama.setup.cors.title'),
-                  },
-                ]}
-                size={'small'}
-              />
-            ),
-            key: 'macos',
-            label: 'macOS',
-          },
-          {
-            children: (
-              <Steps
-                className={styles.steps}
-                direction={'vertical'}
-                items={[
-                  {
-                    description: (
-                      <Trans i18nKey={'ollama.setup.install.description'} ns={'modelProvider'}>
-                        请确认你已经开启 Ollama ，如果没有安装 Ollama ，请前往官网
-                        <Link href={'https://ollama.com/download'}>下载</Link>
-                      </Trans>
-                    ),
-                    status: 'process',
-                    title: t('ollama.setup.install.title'),
-                  },
-                  {
-                    description: (
-                      <Flexbox gap={8}>
-                        {t('ollama.setup.cors.description')}
-                        <div>{t('ollama.setup.cors.windows')}</div>
-                        <div>{t('ollama.setup.cors.reboot')}</div>
-                      </Flexbox>
-                    ),
-                    status: 'process',
-                    title: t('ollama.setup.cors.title'),
-                  },
-                ]}
-                size={'small'}
-              />
-            ),
-            key: 'windows',
-            label: t('ollama.setup.install.windowsTab'),
-          },
-          {
-            children: (
-              <Steps
-                className={styles.steps}
-                direction={'vertical'}
-                items={[
-                  {
-                    description: (
-                      <Flexbox gap={8}>
-                        {t('ollama.setup.install.linux.command')}
-                        <Snippet language={'bash'}>
-                          curl -fsSL https://ollama.com/install.sh | sh
-                        </Snippet>
-                        <div>
-                          <Trans i18nKey={'ollama.setup.install.linux.manual'} ns={'modelProvider'}>
-                            或者，你也可以参考
-                            <Link href={'https://github.com/ollama/ollama/blob/main/docs/linux.md'}>
-                              Linux 手动安装指南
-                            </Link>
-                            。
-                          </Trans>
-                        </div>
-                      </Flexbox>
-                    ),
-                    status: 'process',
-                    title: t('ollama.setup.install.title'),
-                  },
-                  {
-                    description: (
-                      <Flexbox gap={8}>
-                        <div>{t('ollama.setup.cors.description')}</div>
-
-                        <div>{t('ollama.setup.cors.linux.systemd')}</div>
-                        {/* eslint-disable-next-line react/no-unescaped-entities */}
-                        <Snippet language={'bash'}> sudo systemctl edit ollama.service</Snippet>
-                        {t('ollama.setup.cors.linux.env')}
-                        <Highlighter
-                          // eslint-disable-next-line react/no-children-prop
-                          children={`[Service]
-
-Environment="OLLAMA_ORIGINS=*"`}
-                          fileName={'ollama.service'}
-                          fullFeatured
-                          language={'bash'}
-                          showLanguage
-                        />
-                        {t('ollama.setup.cors.linux.reboot')}
-                      </Flexbox>
-                    ),
-                    status: 'process',
-                    title: t('ollama.setup.cors.title'),
-                  },
-                ]}
-                size={'small'}
-              />
-            ),
-            key: 'linux',
-            label: 'Linux',
-          },
-          {
-            children: (
-              <Steps
-                className={styles.steps}
-                direction={'vertical'}
-                items={[
-                  {
-                    description: (
-                      <Flexbox gap={8}>
-                        {t('ollama.setup.install.description')}
-                        <div>{t('ollama.setup.install.docker')}</div>
-                        <Snippet language={'bash'}>docker pull ollama/ollama</Snippet>
-                      </Flexbox>
-                    ),
-                    status: 'process',
-                    title: t('ollama.setup.install.title'),
-                  },
-                  {
-                    description: (
-                      <Flexbox gap={8}>
-                        {t('ollama.setup.cors.description')}
-                        <Highlighter
-                          fileName={'ollama.service'}
-                          fullFeatured
-                          language={'bash'}
-                          showLanguage
-                        >
-                          {/* eslint-disable-next-line react/no-unescaped-entities */}
-                          docker run -d --gpus=all -v ollama:/root/.ollama -e OLLAMA_ORIGINS="*" -p
-                          11434:11434 --name ollama ollama/ollama
-                        </Highlighter>
-                      </Flexbox>
-                    ),
-                    status: 'process',
-                    title: t('ollama.setup.cors.title'),
-                  },
-                ]}
-                size={'small'}
-              />
-            ),
-            key: 'docker',
-            label: 'Docker',
-          },
-        ]}
-      />
+      <OllamaSetupGuide />
     </ErrorActionContainer>
   );
 });

package/src/features/Conversation/components/MarkdownElements/Thinking/remarkPlugin.ts

@@ -32,7 +32,14 @@ export const createRemarkCustomTagPlugin = (tag: string) => () => {
 
         // 转换为 Markdown 字符串
         const content = contentNodes
-          .map((n: any) => toMarkdown(n))
+          .map((n: any) => {
+            // fix https://github.com/lobehub/lobe-chat/issues/5668
+            if (n.type === 'paragraph') {
+              return n.children.map((child: any) => child.value).join('');
+            }
+
+            return toMarkdown(n);
+          })
           .join('\n\n')
           .trim();
 

package/src/libs/agent-runtime/ollama/index.ts

@@ -79,7 +79,7 @@ export class LobeOllamaAI implements LobeRuntimeAI {
 
       throw AgentRuntimeError.chat({
         error: {
-          ...e.error,
+          ...(typeof e.error !== 'string' ? e.error : undefined),
           message: String(e.error?.message || e.message),
           name: e.name,
           status_code: e.status_code,

package/src/locales/default/components.ts

@@ -88,6 +88,32 @@ export default {
     emptyModel: '没有启用的模型，请前往设置开启',
     provider: '提供商',
   },
+  OllamaSetupGuide: {
+    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 (预览版)',
+    },
+  },
   Thinking: {
     thinking: '深度思考中...',
     thought: '已深度思考（用时 {{duration}} 秒）',

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/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;