@lobehub/chat 0.136.0 → 0.137.0

package/src/services/ollama.ts

@@ -0,0 +1,64 @@
+import { ListResponse, Ollama as OllamaBrowser, ProgressResponse } from 'ollama/browser';
+
+import { createErrorResponse } from '@/app/api/errorResponse';
+import { ModelProvider } from '@/libs/agent-runtime';
+import { useGlobalStore } from '@/store/global';
+import { modelProviderSelectors } from '@/store/global/selectors';
+import { ChatErrorType } from '@/types/fetch';
+import { getMessageError } from '@/utils/fetch';
+
+const DEFAULT_BASE_URL = 'http://127.0.0.1:11434/v1';
+
+class OllamaService {
+  getHost = (): string => {
+    const endpoint = modelProviderSelectors.ollamaProxyUrl(useGlobalStore.getState());
+    const url = new URL(endpoint || DEFAULT_BASE_URL);
+    return url.host;
+  };
+
+  getOllamaClient = () => {
+    return new OllamaBrowser({ host: this.getHost() });
+  };
+
+  pullModel = async (model: string): Promise<AsyncGenerator<ProgressResponse>> => {
+    let response: Response | AsyncGenerator<ProgressResponse>;
+    try {
+      response = await this.getOllamaClient().pull({ insecure: true, model, stream: true });
+      return response;
+    } catch {
+      response = createErrorResponse(ChatErrorType.OllamaServiceUnavailable, {
+        host: this.getHost(),
+        message: 'please check whether your ollama service is available',
+        provider: ModelProvider.Ollama,
+      });
+    }
+
+    if (!response.ok) {
+      const messageError = await getMessageError(response);
+      throw messageError;
+    }
+    return response.json();
+  };
+
+  getModels = async (): Promise<ListResponse> => {
+    let response: Response | ListResponse;
+    try {
+      const response = await this.getOllamaClient().list();
+      return response;
+    } catch {
+      response = createErrorResponse(ChatErrorType.OllamaServiceUnavailable, {
+        host: this.getHost(),
+        message: 'please check whether your ollama service is available',
+        provider: ModelProvider.Ollama,
+      });
+    }
+
+    if (!response.ok) {
+      const messageError = await getMessageError(response);
+      throw messageError;
+    }
+    return response.json();
+  };
+}
+
+export const ollamaService = new OllamaService();

package/src/store/global/slices/settings/selectors/modelProvider.ts

@@ -48,9 +48,6 @@ const mistralAPIKey = (s: GlobalStore) => modelProvider(s).mistral.apiKey;
 const enableMoonshot = (s: GlobalStore) => modelProvider(s).moonshot.enabled;
 const moonshotAPIKey = (s: GlobalStore) => modelProvider(s).moonshot.apiKey;
 
-const enableOllamaConfigInSettings = (s: GlobalStore) =>
-  s.serverConfig.languageModel?.ollama?.enabled || false;
-
 const enableOllama = (s: GlobalStore) => modelProvider(s).ollama.enabled;
 const ollamaProxyUrl = (s: GlobalStore) => modelProvider(s).ollama.endpoint;
 
@@ -118,27 +115,32 @@ const processChatModels = (
 };
 
 const modelSelectList = (s: GlobalStore): ModelProviderCard[] => {
-  const string = [
+  const openaiModelString = [
     s.serverConfig.customModelName,
     currentSettings(s).languageModel.openAI.customModelName,
   ]
     .filter(Boolean)
     .join(',');
 
-  const modelConfig = parseModelString(string);
+  const openaiModelConfig = parseModelString(openaiModelString);
 
-  const chatModels = processChatModels(modelConfig);
+  const openaiChatModels = processChatModels(openaiModelConfig);
 
-  const ollamaModelConfig = parseModelString(
+  const ollamaModelString = [
+    s.serverConfig.languageModel?.ollama?.customModelName,
     currentSettings(s).languageModel.ollama.customModelName,
-  );
+  ]
+    .filter(Boolean)
+    .join(',');
+
+  const ollamaModelConfig = parseModelString(ollamaModelString);
 
   const ollamaChatModels = processChatModels(ollamaModelConfig, OllamaProvider.chatModels);
 
   return [
     {
       ...OpenAIProvider,
-      chatModels,
+      chatModels: openaiChatModels,
     },
     // { ...azureModelList(s), enabled: enableAzure(s) },
     { ...ZhiPuProvider, enabled: enableZhipu(s) },
@@ -216,7 +218,6 @@ export const modelProviderSelectors = {
   moonshotAPIKey,
 
   // Ollama
-  enableOllamaConfigInSettings,
   enableOllama,
   ollamaProxyUrl,
 

package/src/store/middleware/createHyperStorage/index.ts

@@ -1,5 +1,4 @@
-import { PersistStorage } from 'zustand/middleware';
-import { StorageValue } from 'zustand/middleware/persist';
+import { PersistStorage, StorageValue } from 'zustand/middleware';
 
 import { createIndexedDB } from './indexedDB';
 import { createKeyMapper } from './keyMapper';

package/src/store/middleware/createHyperStorage/indexedDB.ts

@@ -1,5 +1,5 @@
 import { createStore, delMany, getMany, setMany } from 'idb-keyval';
-import { StorageValue } from 'zustand/middleware/persist';
+import { StorageValue } from 'zustand/middleware';
 
 export const createIndexedDB = <State extends any>(dbName: string = 'indexedDB') => ({
   getItem: async <T extends State>(name: string): Promise<StorageValue<T> | undefined> => {

package/src/store/middleware/createHyperStorage/localStorage.ts

@@ -1,4 +1,4 @@
-import { StorageValue } from 'zustand/middleware/persist';
+import { StorageValue } from 'zustand/middleware';
 
 export const createLocalStorage = <State extends any>() => ({
   getItem: <T extends State>(name: string): StorageValue<T> | undefined => {

package/src/store/middleware/createHyperStorage/urlStorage.ts

@@ -1,5 +1,5 @@
 import { isEmpty } from 'lodash-es';
-import { StorageValue } from 'zustand/middleware/persist';
+import { StorageValue } from 'zustand/middleware';
 
 interface UrlSearchHelper {
   getUrlSearch: () => string;

package/src/types/fetch.ts

@@ -7,6 +7,7 @@ export const ChatErrorType = {
   InvalidAccessCode: 'InvalidAccessCode', // 密码无效
   OpenAIBizError: 'OpenAIBizError', // OpenAI 返回的业务错误
   NoOpenAIAPIKey: 'NoOpenAIAPIKey',
+  OllamaServiceUnavailable: 'OllamaServiceUnavailable', // 未启动/检测到 Ollama 服务
 
   // ******* 客户端错误 ******* //
   BadRequest: 400,

package/tsconfig.json

@@ -10,7 +10,7 @@
     "noEmit": true,
     "esModuleInterop": true,
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",