@lobehub/chat 0.126.5 → 0.127.1

package/src/app/settings/llm/index.tsx

@@ -0,0 +1,42 @@
+'use client';
+
+import Link from 'next/link';
+import { memo } from 'react';
+import { Trans, useTranslation } from 'react-i18next';
+
+import PageTitle from '@/components/PageTitle';
+import { MORE_MODEL_PROVIDER_REQUEST_URL } from '@/const/url';
+
+import Footer from '../features/Footer';
+import Bedrock from './Bedrock';
+import Google from './Google';
+import Moonshot from './Moonshot';
+import Ollama from './Ollama';
+import OpenAI from './OpenAI';
+import Zhipu from './Zhipu';
+
+export default memo<{ showOllama: boolean }>(({ showOllama }) => {
+  const { t } = useTranslation('setting');
+
+  return (
+    <>
+      <PageTitle title={t('tab.llm')} />
+      <OpenAI />
+      {/*<AzureOpenAI />*/}
+      <Zhipu />
+      <Moonshot />
+      <Google />
+      <Bedrock />
+      {showOllama && <Ollama />}
+      <Footer>
+        <Trans i18nKey="llm.waitingForMore" ns={'setting'}>
+          更多模型正在
+          <Link aria-label={'todo'} href={MORE_MODEL_PROVIDER_REQUEST_URL} target="_blank">
+            计划接入
+          </Link>
+          中 ，敬请期待 ✨
+        </Trans>
+      </Footer>
+    </>
+  );
+});

package/src/app/settings/llm/layout.tsx

@@ -1 +1,9 @@
-export { default } from '../layout.server';
+import { PropsWithChildren } from 'react';
+
+import { SettingsTabs } from '@/store/global/initialState';
+
+import SettingLayout from '../layout.server';
+
+export default ({ children }: PropsWithChildren) => {
+  return <SettingLayout activeTab={SettingsTabs.LLM}>{children}</SettingLayout>;
+};

package/src/app/settings/llm/page.tsx

@@ -1,42 +1,9 @@
-'use client';
+import { getServerConfig } from '@/config/server';
 
-import Link from 'next/link';
-import { memo } from 'react';
-import { Trans, useTranslation } from 'react-i18next';
+import Page from './index';
 
-import Footer from '@/app/settings/features/Footer';
-import PageTitle from '@/components/PageTitle';
-import { MORE_MODEL_PROVIDER_REQUEST_URL } from '@/const/url';
-import { useSwitchSideBarOnInit } from '@/store/global/hooks/useSwitchSettingsOnInit';
-import { SettingsTabs } from '@/store/global/initialState';
+export default () => {
+  const { ENABLE_OLLAMA } = getServerConfig();
 
-import Bedrock from './Bedrock';
-import Google from './Google';
-import Moonshot from './Moonshot';
-import OpenAI from './OpenAI';
-import Zhipu from './Zhipu';
-
-export default memo(() => {
-  useSwitchSideBarOnInit(SettingsTabs.LLM);
-  const { t } = useTranslation('setting');
-  return (
-    <>
-      <PageTitle title={t('tab.llm')} />
-      <OpenAI />
-      {/*<AzureOpenAI />*/}
-      <Zhipu />
-      <Moonshot />
-      <Google />
-      <Bedrock />
-      <Footer>
-        <Trans i18nKey="llm.waitingForMore" ns={'setting'}>
-          更多模型正在
-          <Link aria-label={'todo'} href={MORE_MODEL_PROVIDER_REQUEST_URL} target="_blank">
-            计划接入
-          </Link>
-          中 ，敬请期待 ✨
-        </Trans>
-      </Footer>
-    </>
-  );
-});
+  return <Page showOllama={ENABLE_OLLAMA} />;
+};

package/src/app/settings/tts/layout.tsx

@@ -1 +1,9 @@
-export { default } from '../layout.server';
+import { PropsWithChildren } from 'react';
+
+import { SettingsTabs } from '@/store/global/initialState';
+
+import SettingLayout from '../layout.server';
+
+export default ({ children }: PropsWithChildren) => {
+  return <SettingLayout activeTab={SettingsTabs.TTS}>{children}</SettingLayout>;
+};

package/src/app/settings/tts/page.tsx

@@ -1,3 +1,18 @@
-import Index from './index';
+'use client';
 
-export default () => <Index />;
+import { memo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import PageTitle from '@/components/PageTitle';
+
+import TTS from './TTS';
+
+export default memo(() => {
+  const { t } = useTranslation('setting');
+  return (
+    <>
+      <PageTitle title={t('tab.llm')} />
+      <TTS />
+    </>
+  );
+});

package/src/components/ModelProviderIcon/index.tsx

@@ -1,4 +1,4 @@
-import { Azure, Bedrock, Google, Moonshot, OpenAI, Zhipu } from '@lobehub/icons';
+import { Azure, Bedrock, Google, Moonshot, Ollama, OpenAI, Zhipu } from '@lobehub/icons';
 import { memo } from 'react';
 import { Center } from 'react-layout-kit';
 
@@ -42,6 +42,10 @@ const ModelProviderIcon = memo<ModelProviderIconProps>(({ provider }) => {
       return <OpenAI size={20} />;
     }
 
+    case ModelProvider.Ollama: {
+      return <Ollama size={20} />;
+    }
+
     default: {
       return null;
     }

package/src/config/modelProviders/index.ts

@@ -3,6 +3,7 @@ import { ChatModelCard } from '@/types/llm';
 import BedrockProvider from './bedrock';
 import GoogleProvider from './google';
 import MoonshotProvider from './moonshot';
+import OllamaProvider from './ollama';
 import OpenAIProvider from './openai';
 import ZhiPuProvider from './zhipu';
 
@@ -12,10 +13,12 @@ export const LOBE_DEFAULT_MODEL_LIST: ChatModelCard[] = [
   BedrockProvider.chatModels,
   GoogleProvider.chatModels,
   MoonshotProvider.chatModels,
+  OllamaProvider.chatModels,
 ].flat();
 
 export { default as BedrockProvider } from './bedrock';
 export { default as GoogleProvider } from './google';
 export { default as MoonshotProvider } from './moonshot';
+export { default as OllamaProvider } from './ollama';
 export { default as OpenAIProvider } from './openai';
 export { default as ZhiPuProvider } from './zhipu';

package/src/config/modelProviders/ollama.ts

@@ -0,0 +1,117 @@
+import { ModelProviderCard } from '@/types/llm';
+
+const Ollama: ModelProviderCard = {
+  chatModels: [
+    {
+      displayName: 'Llama2 Chat 7B',
+      functionCall: false,
+      id: 'llama2',
+      tokens: 4000,
+      vision: false,
+    },
+    {
+      displayName: 'Llama2 Chat 13B',
+      functionCall: false,
+      hidden: true,
+      id: 'llama2:13b',
+      tokens: 4000,
+      vision: false,
+    },
+    {
+      displayName: 'Llama2 Chat 70B',
+      functionCall: false,
+      hidden: true,
+      id: 'llama2:70b',
+      tokens: 4000,
+      vision: false,
+    },
+    {
+      displayName: 'Code Llama 7B',
+      functionCall: false,
+      id: 'codellama',
+      tokens: 16_000,
+      vision: false,
+    },
+    {
+      displayName: 'Code Llama 34B',
+      functionCall: false,
+      hidden: true,
+      id: 'codellama:34b',
+      tokens: 16_000,
+      vision: false,
+    },
+    {
+      displayName: 'Code Llama 70B',
+      functionCall: false,
+      hidden: true,
+      id: 'codellama:70b',
+      tokens: 16_000,
+      vision: false,
+    },
+    {
+      displayName: 'Code Llama 7B (Python)',
+      functionCall: false,
+      hidden: true,
+      id: 'codellama:python',
+      tokens: 16_000,
+      vision: false,
+    },
+    {
+      displayName: 'Mistral',
+      functionCall: false,
+      id: 'mistral',
+      tokens: 4800,
+      vision: false,
+    },
+    {
+      displayName: 'Qwen Chat 7B',
+      functionCall: false,
+      id: 'qwen:7b-chat',
+      tokens: 32_768,
+      vision: false,
+    },
+    {
+      displayName: 'Qwen Chat 14B',
+      functionCall: false,
+      hidden: true,
+      id: 'qwen:14b-chat',
+      tokens: 32_768,
+      vision: false,
+    },
+    {
+      displayName: 'Qwen Chat 70B',
+      functionCall: false,
+      hidden: true,
+      id: 'qwen:70b-chat',
+      tokens: 32_768,
+      vision: false,
+    },
+    {
+      displayName: 'LLaVA 7B',
+      functionCall: false,
+      hidden: true,
+      id: 'llava',
+      tokens: 4000,
+      vision: false,
+    },
+    {
+      displayName: 'LLaVA 13B',
+      functionCall: false,
+      hidden: true,
+      id: 'llava:13b',
+      tokens: 4000,
+      vision: false,
+    },
+    {
+      displayName: 'LLaVA 34B',
+      functionCall: false,
+      hidden: true,
+      id: 'llava:34b',
+      tokens: 4000,
+      vision: false,
+    },
+  ],
+  id: 'ollama',
+};
+
+export default Ollama;

package/src/config/server/provider.ts

@@ -33,6 +33,9 @@ declare global {
       AWS_ACCESS_KEY_ID?: string;
       AWS_SECRET_ACCESS_KEY?: string;
 
+      // Ollama Provider;
+      OLLAMA_PROXY_URL?: string;
+
       DEBUG_CHAT_COMPLETION?: string;
     }
   }
@@ -83,6 +86,9 @@ export const getProviderConfig = () => {
     AZURE_ENDPOINT: process.env.AZURE_ENDPOINT,
     USE_AZURE_OPENAI: process.env.USE_AZURE_OPENAI === '1',
 
+    ENABLE_OLLAMA: !!process.env.OLLAMA_PROXY_URL,
+    OLLAMA_PROXY_URL: process.env.OLLAMA_PROXY_URL || '',
+
     DEBUG_CHAT_COMPLETION: process.env.DEBUG_CHAT_COMPLETION === '1',
   };
 };

package/src/const/settings.ts

@@ -66,8 +66,13 @@ export const DEFAULT_LLM_CONFIG: GlobalLLMConfig = {
     apiKey: '',
     enabled: false,
   },
+  ollama: {
+    enabled: false,
+    endpoint: '',
+  },
   openAI: {
     OPENAI_API_KEY: '',
+    enabled: true,
     models: [],
   },
   zhipu: {

package/src/features/SideBar/BottomActions.tsx

@@ -20,7 +20,7 @@ import { ABOUT, CHANGELOG, DISCORD, FEEDBACK, GITHUB, WIKI } from '@/const/url';
 import DataImporter from '@/features/DataImporter';
 import { configService } from '@/services/config';
 import { GlobalStore, useGlobalStore } from '@/store/global';
-import { SettingsTabs, SidebarTabKey } from '@/store/global/initialState';
+import { SidebarTabKey } from '@/store/global/initialState';
 
 export interface BottomActionProps {
   setTab: GlobalStore['switchSideBar'];
@@ -115,7 +115,6 @@ const BottomActions = memo<BottomActionProps>(({ tab, setTab }) => {
       onClick: () => {
         setTab(SidebarTabKey.Setting);
         useGlobalStore.setState({
-          settingsTab: SettingsTabs.Common,
           sidebarKey: SidebarTabKey.Setting,
         });
         router.push('/settings/common');

package/src/layout/ResponsiveLayout.client.tsx

@@ -1,26 +1,26 @@
 'use client';
 
-import { PropsWithChildren, ReactNode, Suspense } from 'react';
+import { ReactNode, Suspense } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import FullscreenLoading from '@/components/FullscreenLoading';
 import { useIsMobile } from '@/hooks/useIsMobile';
 
-interface ServerResponsiveLayoutProps {
-  Desktop: (props: PropsWithChildren) => ReactNode;
-  Mobile: (props: PropsWithChildren) => ReactNode;
+interface ServerResponsiveLayoutProps extends Record<string, any> {
+  Desktop: (props: any) => ReactNode;
+  Mobile: (props: any) => ReactNode;
   children?: ReactNode;
 }
-const ResponsiveLayout = ({ children, Desktop, Mobile }: ServerResponsiveLayoutProps) => {
+const ResponsiveLayout = ({ children, Desktop, Mobile, ...res }: ServerResponsiveLayoutProps) => {
   const { t } = useTranslation();
   const mobile = useIsMobile();
 
   return mobile ? (
     <Suspense fallback={<FullscreenLoading title={t('layoutInitializing', { ns: 'common' })} />}>
-      <Mobile>{children}</Mobile>
+      <Mobile {...res}>{children}</Mobile>
     </Suspense>
   ) : (
-    <Desktop>{children}</Desktop>
+    <Desktop {...res}>{children}</Desktop>
   );
 };
 

package/src/layout/ResponsiveLayout.server.tsx

@@ -1,16 +1,16 @@
-import { PropsWithChildren, ReactNode } from 'react';
+import { ReactNode } from 'react';
 
 import { isMobileDevice } from '@/utils/responsive';
 
-interface ServerResponsiveLayoutProps {
-  Desktop: (props: PropsWithChildren) => ReactNode;
-  Mobile: (props: PropsWithChildren) => ReactNode;
+interface ServerResponsiveLayoutProps extends Record<string, any> {
+  Desktop: (props: any) => ReactNode;
+  Mobile: (props: any) => ReactNode;
   children?: ReactNode;
 }
-const ResponsiveLayout = ({ children, Desktop, Mobile }: ServerResponsiveLayoutProps) => {
+const ResponsiveLayout = ({ children, Desktop, Mobile, ...res }: ServerResponsiveLayoutProps) => {
   const mobile = isMobileDevice();
 
-  return mobile ? <Mobile>{children}</Mobile> : <Desktop>{children}</Desktop>;
+  return mobile ? <Mobile {...res}>{children}</Mobile> : <Desktop {...res}>{children}</Desktop>;
 };
 
 export default ResponsiveLayout;

package/src/libs/agent-runtime/error.ts

@@ -22,6 +22,9 @@ export const AgentRuntimeErrorType = {
 
   InvalidMoonshotAPIKey: 'InvalidMoonshotAPIKey',
   MoonshotBizError: 'MoonshotBizError',
+
+  InvalidOllamaArgs: 'InvalidOllamaArgs',
+  OllamaBizError: 'OllamaBizError',
 } as const;
 
 export type ILobeAgentRuntimeErrorType =

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

@@ -4,6 +4,7 @@ export { LobeBedrockAI } from './bedrock';
 export * from './error';
 export { LobeGoogleAI } from './google';
 export { LobeMoonshotAI } from './moonshot';
+export { LobeOllamaAI } from './ollama';
 export { LobeOpenAI } from './openai';
 export * from './types';
 export { AgentRuntimeError } from './utils/createError';

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

@@ -0,0 +1,80 @@
+import { OpenAIStream, StreamingTextResponse } from 'ai';
+import OpenAI from 'openai';
+
+import { LobeRuntimeAI } from '../BaseAI';
+import { AgentRuntimeErrorType } from '../error';
+import { ChatStreamPayload, ModelProvider } from '../types';
+import { AgentRuntimeError } from '../utils/createError';
+import { debugStream } from '../utils/debugStream';
+import { desensitizeUrl } from '../utils/desensitizeUrl';
+import { DEBUG_CHAT_COMPLETION } from '../utils/env';
+import { handleOpenAIError } from '../utils/handleOpenAIError';
+
+const DEFAULT_BASE_URL = 'http://127.0.0.1:11434/v1';
+
+export class LobeOllamaAI implements LobeRuntimeAI {
+  private _llm: OpenAI;
+
+  baseURL: string;
+
+  constructor(baseURL: string = DEFAULT_BASE_URL) {
+    if (!baseURL) throw AgentRuntimeError.createError(AgentRuntimeErrorType.InvalidOllamaArgs);
+
+    this._llm = new OpenAI({ apiKey: 'ollama', baseURL });
+    this.baseURL = baseURL;
+  }
+
+  async chat(payload: ChatStreamPayload) {
+    try {
+      const response = await this._llm.chat.completions.create(
+        payload as unknown as OpenAI.ChatCompletionCreateParamsStreaming,
+      );
+
+      const stream = OpenAIStream(response);
+
+      const [debug, returnStream] = stream.tee();
+
+      if (DEBUG_CHAT_COMPLETION) {
+        debugStream(debug).catch(console.error);
+      }
+
+      return new StreamingTextResponse(returnStream);
+    } catch (error) {
+      let desensitizedEndpoint = this.baseURL;
+
+      if (this.baseURL !== DEFAULT_BASE_URL) {
+        desensitizedEndpoint = desensitizeUrl(this.baseURL);
+      }
+
+      if ('status' in (error as any)) {
+        switch ((error as Response).status) {
+          case 401: {
+            throw AgentRuntimeError.chat({
+              endpoint: desensitizedEndpoint,
+              error: error as any,
+              errorType: AgentRuntimeErrorType.InvalidOllamaArgs,
+              provider: ModelProvider.Ollama,
+            });
+          }
+
+          default: {
+            break;
+          }
+        }
+      }
+
+      const { errorResult, RuntimeError } = handleOpenAIError(error);
+
+      const errorType = RuntimeError || AgentRuntimeErrorType.OllamaBizError;
+
+      throw AgentRuntimeError.chat({
+        endpoint: desensitizedEndpoint,
+        error: errorResult,
+        errorType,
+        provider: ModelProvider.Ollama,
+      });
+    }
+  }
+}
+
+export default LobeOllamaAI;

package/src/libs/agent-runtime/types/type.ts

@@ -29,6 +29,7 @@ export enum ModelProvider {
   Google = 'google',
   Mistral = 'mistral',
   Moonshot = 'moonshot',
+  Ollama = 'ollama',
   OpenAI = 'openai',
   Tongyi = 'tongyi',
   ZhiPu = 'zhipu',

package/src/locales/default/common.ts

@@ -103,6 +103,7 @@ export default {
     bedrock: 'AWS Bedrock',
     google: 'Google',
     moonshot: 'Moonshot AI',
+    ollama: 'Ollama',
     oneapi: 'One API',
     openai: 'OpenAI',
     zhipu: '智谱AI',

package/src/locales/default/error.ts

@@ -73,6 +73,9 @@ export default {
     InvalidAzureAPIKey: 'Azure API Key 不正确或为空，请检查 Azure API Key 后重试',
     AzureBizError: '请求 Azure AI 服务出错，请根据以下信息排查或重试',
 
+    InvalidOllamaArgs: 'Ollama 配置不正确，请检查 Ollama 配置后重试',
+    OllamaBizError: '请求 Ollama 服务出错，请根据以下信息排查或重试',
+
     AgentRuntimeError: 'Lobe 语言模型运行时执行出错，请根据以下信息排查或重试',
     /* eslint-enable */
   },

package/src/locales/default/setting.ts

@@ -85,6 +85,22 @@ export default {
         title: 'API Key',
       },
     },
+    Ollama: {
+      checker: {
+        desc: '测试代理地址是否正确填写',
+      },
+      customModelName: {
+        desc: '增加自定义模型，多个模型使用逗号（,）隔开',
+        placeholder: 'vicuna,llava,codellama,llama2:13b-text',
+        title: '自定义模型名称',
+      },
+      endpoint: {
+        desc: '填入 Ollama 接口代理地址，本地未额外指定可留空',
+        placeholder: 'http://127.0.0.1:11434/v1',
+        title: '接口代理地址',
+      },
+      title: 'Ollama',
+    },
     OpenAI: {
       azureApiVersion: {
         desc: 'Azure 的 API 版本，遵循 YYYY-MM-DD 格式，查阅[最新版本](https://learn.microsoft.com/zh-cn/azure/ai-services/openai/reference#chat-completions)',