@lobehub/chat 0.148.8 → 0.148.10

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

@@ -50,7 +50,7 @@ describe('LobeZeroOneAI', () => {
       // Act
       const result = await instance.chat({
         messages: [{ content: 'Hello', role: 'user' }],
-        model: 'mistralai/mistral-7b-instruct:free',
+        model: 'yi-34b-chat-0205',
         temperature: 0,
       });
 
@@ -69,7 +69,7 @@ describe('LobeZeroOneAI', () => {
       const result = await instance.chat({
         max_tokens: 1024,
         messages: [{ content: 'Hello', role: 'user' }],
-        model: 'mistralai/mistral-7b-instruct:free',
+        model: 'yi-34b-chat-0205',
         temperature: 0.7,
         top_p: 1,
       });
@@ -79,7 +79,7 @@ describe('LobeZeroOneAI', () => {
         {
           max_tokens: 1024,
           messages: [{ content: 'Hello', role: 'user' }],
-          model: 'mistralai/mistral-7b-instruct:free',
+          model: 'yi-34b-chat-0205',
           temperature: 0.7,
           top_p: 1,
         },
@@ -89,7 +89,7 @@ describe('LobeZeroOneAI', () => {
     });
 
     describe('Error', () => {
-      it('should return OpenRouterBizError with an openai error response when OpenAI.APIError is thrown', async () => {
+      it('should return ZeroOneBizError with an openai error response when OpenAI.APIError is thrown', async () => {
         // Arrange
         const apiError = new OpenAI.APIError(
           400,
@@ -109,7 +109,7 @@ describe('LobeZeroOneAI', () => {
         try {
           await instance.chat({
             messages: [{ content: 'Hello', role: 'user' }],
-            model: 'mistralai/mistral-7b-instruct:free',
+            model: 'yi-34b-chat-0205',
             temperature: 0,
           });
         } catch (e) {
@@ -125,7 +125,7 @@ describe('LobeZeroOneAI', () => {
         }
       });
 
-      it('should throw AgentRuntimeError with InvalidOpenRouterAPIKey if no apiKey is provided', async () => {
+      it('should throw AgentRuntimeError with InvalidZeroOneAPIKey if no apiKey is provided', async () => {
         try {
           new LobeZeroOneAI({});
         } catch (e) {
@@ -133,7 +133,7 @@ describe('LobeZeroOneAI', () => {
         }
       });
 
-      it('should return OpenRouterBizError with the cause when OpenAI.APIError is thrown with cause', async () => {
+      it('should return ZeroOneBizError with the cause when OpenAI.APIError is thrown with cause', async () => {
         // Arrange
         const errorInfo = {
           stack: 'abc',
@@ -149,7 +149,7 @@ describe('LobeZeroOneAI', () => {
         try {
           await instance.chat({
             messages: [{ content: 'Hello', role: 'user' }],
-            model: 'mistralai/mistral-7b-instruct:free',
+            model: 'yi-34b-chat-0205',
             temperature: 0,
           });
         } catch (e) {
@@ -165,7 +165,7 @@ describe('LobeZeroOneAI', () => {
         }
       });
 
-      it('should return OpenRouterBizError with an cause response with desensitize Url', async () => {
+      it('should return ZeroOneBizError with an cause response with desensitize Url', async () => {
         // Arrange
         const errorInfo = {
           stack: 'abc',
@@ -185,7 +185,7 @@ describe('LobeZeroOneAI', () => {
         try {
           await instance.chat({
             messages: [{ content: 'Hello', role: 'user' }],
-            model: 'mistralai/mistral-7b-instruct:free',
+            model: 'yi-34b-chat-0205',
             temperature: 0,
           });
         } catch (e) {
@@ -201,7 +201,7 @@ describe('LobeZeroOneAI', () => {
         }
       });
 
-      it('should throw an InvalidOpenRouterAPIKey error type on 401 status code', async () => {
+      it('should throw an InvalidZeroOneAPIKey error type on 401 status code', async () => {
         // Mock the API call to simulate a 401 error
         const error = new Error('Unauthorized') as any;
         error.status = 401;
@@ -210,7 +210,7 @@ describe('LobeZeroOneAI', () => {
         try {
           await instance.chat({
             messages: [{ content: 'Hello', role: 'user' }],
-            model: 'mistralai/mistral-7b-instruct:free',
+            model: 'yi-34b-chat-0205',
             temperature: 0,
           });
         } catch (e) {
@@ -234,7 +234,7 @@ describe('LobeZeroOneAI', () => {
         try {
           await instance.chat({
             messages: [{ content: 'Hello', role: 'user' }],
-            model: 'mistralai/mistral-7b-instruct:free',
+            model: 'yi-34b-chat-0205',
             temperature: 0,
           });
         } catch (e) {
@@ -265,7 +265,7 @@ describe('LobeZeroOneAI', () => {
                   id: 'chatcmpl-8xDx5AETP8mESQN7UB30GxTN2H1SO',
                   object: 'chat.completion.chunk',
                   created: 1709125675,
-                  model: 'mistralai/mistral-7b-instruct:free',
+                  model: 'yi-34b-chat-0205',
                   system_fingerprint: 'fp_86156a94a0',
                   choices: [
                     { index: 0, delta: { content: 'hello' }, logprobs: null, finish_reason: null },
@@ -287,7 +287,7 @@ describe('LobeZeroOneAI', () => {
         const result = await instance.chat(
           {
             messages: [{ content: 'Hello', role: 'user' }],
-            model: 'mistralai/mistral-7b-instruct:free',
+            model: 'yi-34b-chat-0205',
             temperature: 0,
           },
           { callback: mockCallback, headers: mockHeaders },
@@ -335,7 +335,7 @@ describe('LobeZeroOneAI', () => {
         // 假设的测试函数调用，你可能需要根据实际情况调整
         await instance.chat({
           messages: [{ content: 'Hello', role: 'user' }],
-          model: 'mistralai/mistral-7b-instruct:free',
+          model: 'yi-34b-chat-0205',
           temperature: 0,
         });
 

package/src/locales/default/chat.ts

@@ -50,13 +50,17 @@ export default {
   sessionGroup: {
     config: '分组管理',
     confirmRemoveGroupAlert: '即将删除该分组，删除后该分组的助手将移动到默认列表，请确认你的操作',
+    createAgentSuccess: '助手创建成功',
     createGroup: '添加新分组',
-    createSuccess: '创建成功',
+    createSuccess: '分组创建成功',
+    creatingAgent: '助手创建中...',
     inputPlaceholder: '请输入分组名称...',
     moveGroup: '移动到分组',
     newGroup: '新分组',
     rename: '重命名分组',
     renameSuccess: '重命名成功',
+    sortSuccess: '重新排序成功',
+    sorting: '分组排序更新中...',
     tooLong: '分组名称长度需在 1-20 之内',
   },
   shareModal: {
@@ -126,6 +130,6 @@ export default {
     dragDesc: '拖拽文件到这里，支持上传多个图片。按住 Shift 直接发送图片',
     dragFileDesc: '拖拽图片和文件到这里，支持上传多个图片和文件。按住 Shift 直接发送图片或文件',
     dragFileTitle: '上传文件',
-    dragTitle: '上传图片'
+    dragTitle: '上传图片',
   },
 };

package/src/locales/default/welcome.ts

@@ -1,6 +1,7 @@
 export default {
   button: {
     import: '导入配置',
+    market: '逛逛市场',
     start: '立即开始',
   },
   header: '欢迎使用',

package/src/migrations/FromV3ToV4/fixtures/ollama-output-v4.json

@@ -47,7 +47,6 @@
             {
               "displayName": "LLaVA 7B",
               "enabled": true,
-              "functionCall": false,
               "id": "llava",
               "tokens": 4000,
               "vision": true

package/src/services/config.ts

@@ -65,31 +65,15 @@ class ConfigService {
 
       case 'all': {
         await this.importSettings(config.state.settings);
-
-        const sessionGroups = await this.importSessionGroups(config.state.sessionGroups);
-
-        const [sessions, messages, topics] = await Promise.all([
-          this.importSessions(config.state.sessions),
-          this.importMessages(config.state.messages),
-          this.importTopics(config.state.topics),
-        ]);
-
-        return {
-          messages: this.mapImportResult(messages),
-          sessionGroups: this.mapImportResult(sessionGroups),
-          sessions: this.mapImportResult(sessions),
-          topics: this.mapImportResult(topics),
-        };
       }
+      // all and sessions have the same data process, so we can fall through
 
+      // eslint-disable-next-line no-fallthrough
       case 'sessions': {
         const sessionGroups = await this.importSessionGroups(config.state.sessionGroups);
-
-        const [sessions, messages, topics] = await Promise.all([
-          this.importSessions(config.state.sessions),
-          this.importMessages(config.state.messages),
-          this.importTopics(config.state.topics),
-        ]);
+        const sessions = await this.importSessions(config.state.sessions);
+        const topics = await this.importTopics(config.state.topics);
+        const messages = await this.importMessages(config.state.messages);
 
         return {
           messages: this.mapImportResult(messages),

package/src/services/message/client.ts

@@ -62,4 +62,14 @@ export class ClientService implements IMessageService {
   async removeAllMessages() {
     return MessageModel.clearTable();
   }
+
+  async hasMessages() {
+    const number = await this.countMessages();
+    return number > 0;
+  }
+
+  async messageCountToCheckTrace() {
+    const number = await this.countMessages();
+    return number >= 4;
+  }
 }

package/src/services/message/index.ts

@@ -9,16 +9,4 @@ import { ClientService } from './client';
 
 export type { CreateMessageParams } from './type';
 
-class MessageService extends ClientService {
-  async hasMessages() {
-    const number = await this.countMessages();
-    return number > 0;
-  }
-
-  async messageCountToCheckTrace() {
-    const number = await this.countMessages();
-    return number >= 4;
-  }
-}
-
-export const messageService = new MessageService();
+export const messageService = new ClientService();

package/src/services/message/type.ts

@@ -30,4 +30,7 @@ export interface IMessageService {
   removeMessage(id: string): Promise<any>;
   removeMessages(assistantId: string, topicId?: string): Promise<any>;
   removeAllMessages(): Promise<any>;
+
+  hasMessages(): Promise<boolean>;
+  messageCountToCheckTrace(): Promise<boolean>;
 }

package/src/services/session/client.ts

@@ -64,6 +64,9 @@ export class ClientService implements ISessionService {
   async countSessions() {
     return SessionModel.count();
   }
+  async hasSessions() {
+    return (await this.countSessions()) === 0;
+  }
 
   async searchSessions(keyword: string) {
     return SessionModel.queryByKeyword(keyword);

package/src/services/session/type.ts

@@ -2,11 +2,13 @@
 import { DeepPartial } from 'utility-types';
 
 import { LobeAgentConfig } from '@/types/agent';
+import { BatchTaskResult } from '@/types/service';
 import {
   ChatSessionList,
   LobeAgentSession,
   LobeSessionType,
   LobeSessions,
+  SessionGroupId,
   SessionGroupItem,
   SessionGroups,
 } from '@/types/session';
@@ -19,9 +21,13 @@ export interface ISessionService {
   getGroupedSessions(): Promise<ChatSessionList>;
   getSessionsByType(type: 'agent' | 'group' | 'all'): Promise<LobeSessions>;
   countSessions(): Promise<number>;
+  hasSessions(): Promise<boolean>;
   searchSessions(keyword: string): Promise<LobeSessions>;
 
-  updateSession(id: string, data: Partial<Pick<LobeAgentSession, 'group' | 'meta'>>): Promise<any>;
+  updateSession(
+    id: string,
+    data: Partial<{ group?: SessionGroupId; pinned?: boolean }>,
+  ): Promise<any>;
   updateSessionConfig(id: string, config: DeepPartial<LobeAgentConfig>): Promise<any>;
 
   removeSession(id: string): Promise<any>;
@@ -32,7 +38,7 @@ export interface ISessionService {
   // ************************************** //
 
   createSessionGroup(name: string, sort?: number): Promise<string>;
-  batchCreateSessionGroups(groups: SessionGroups): Promise<any>;
+  batchCreateSessionGroups(groups: SessionGroups): Promise<BatchTaskResult>;
 
   getSessionGroups(): Promise<SessionGroupItem[]>;
 

package/src/services/topic/client.ts

@@ -5,7 +5,7 @@ import { CreateTopicParams, ITopicService, QueryTopicParams } from './type';
 
 export class ClientService implements ITopicService {
   async createTopic(params: CreateTopicParams): Promise<string> {
-    const item = await TopicModel.create(params);
+    const item = await TopicModel.create(params as any);
 
     if (!item) {
       throw new Error('topic create Error');

package/src/services/topic/type.ts

@@ -1,10 +1,11 @@
 /* eslint-disable typescript-sort-keys/interface */
+import { BatchTaskResult } from '@/types/service';
 import { ChatTopic } from '@/types/topic';
 
 export interface CreateTopicParams {
   favorite?: boolean;
   messages?: string[];
-  sessionId: string;
+  sessionId?: string | null;
   title: string;
 }
 
@@ -16,7 +17,7 @@ export interface QueryTopicParams {
 
 export interface ITopicService {
   createTopic(params: CreateTopicParams): Promise<string>;
-  batchCreateTopics(importTopics: ChatTopic[]): Promise<any>;
+  batchCreateTopics(importTopics: ChatTopic[]): Promise<BatchTaskResult>;
   cloneTopic(id: string, newTitle?: string): Promise<string>;
 
   getTopics(params: QueryTopicParams): Promise<ChatTopic[]>;

package/src/store/global/slices/settings/actions/llm.test.ts

@@ -110,7 +110,6 @@ describe('LLMSettingsSliceAction', () => {
       // Assert that setModelProviderConfig was not called
       expect(ollamaList?.chatModels.find((c) => c.id === 'llava')).toEqual({
         displayName: 'LLaVA 7B',
-        functionCall: false,
         enabled: true,
         id: 'llava',
         tokens: 4000,

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

@@ -85,7 +85,7 @@ describe('modelProviderSelectors', () => {
   });
 
   describe('modelEnabledFiles', () => {
-    it.skip('should return false if the model does not have file ability', () => {
+    it('should return false if the model does not have file ability', () => {
       const enabledFiles = modelProviderSelectors.isModelEnabledFiles('gpt-4-vision-preview')(
         useGlobalStore.getState(),
       );

package/src/store/session/slices/session/action.ts

@@ -1,5 +1,4 @@
 import { t } from 'i18next';
-import { produce } from 'immer';
 import useSWR, { SWRResponse, mutate } from 'swr';
 import { DeepPartial } from 'utility-types';
 import { StateCreator } from 'zustand/vanilla';
@@ -11,12 +10,20 @@ import { sessionService } from '@/services/session';
 import { useGlobalStore } from '@/store/global';
 import { settingsSelectors } from '@/store/global/selectors';
 import { SessionStore } from '@/store/session';
-import { ChatSessionList, LobeAgentSession, LobeSessionType, LobeSessions } from '@/types/session';
+import {
+  ChatSessionList,
+  LobeAgentSession,
+  LobeSessionGroups,
+  LobeSessionType,
+  LobeSessions,
+  SessionGroupId,
+} from '@/types/session';
 import { merge } from '@/utils/merge';
 import { setNamespace } from '@/utils/storeDebug';
 
 import { agentSelectors } from '../agent/selectors';
 import { initLobeSession } from './initialState';
+import { SessionDispatch, sessionsReducer } from './reducers';
 import { sessionSelectors } from './selectors';
 
 const n = setNamespace('session');
@@ -24,6 +31,7 @@ const n = setNamespace('session');
 const FETCH_SESSIONS_KEY = 'fetchSessions';
 const SEARCH_SESSIONS_KEY = 'searchSessions';
 
+/* eslint-disable typescript-sort-keys/interface */
 export interface SessionAction {
   /**
    * active the session
@@ -44,6 +52,8 @@ export interface SessionAction {
     isSwitchSession?: boolean,
   ) => Promise<string>;
   duplicateSession: (id: string) => Promise<void>;
+  updateSessionGroupId: (sessionId: string, groupId: string) => Promise<void>;
+
   /**
    * Pins or unpins a session.
    */
@@ -52,17 +62,26 @@ export interface SessionAction {
    * re-fetch the data
    */
   refreshSessions: (params?: SWRRefreshParams<ChatSessionList>) => Promise<void>;
-
   /**
    * remove session
    * @param id - sessionId
    */
-  removeSession: (id: string) => void;
-  /**
-   * A custom hook that uses SWR to fetch sessions data.
-   */
+  removeSession: (id: string) => Promise<void>;
+
   useFetchSessions: () => SWRResponse<ChatSessionList>;
   useSearchSessions: (keyword?: string) => SWRResponse<any>;
+
+  internal_dispatchSessions: (payload: SessionDispatch) => void;
+  internal_updateSession: (
+    id: string,
+    data: Partial<{ group?: SessionGroupId; meta?: any; pinned?: boolean }>,
+  ) => Promise<void>;
+  internal_processSessions: (
+    sessions: LobeSessions,
+    customGroups: LobeSessionGroups,
+    actions?: string,
+  ) => void;
+  /* eslint-enable */
 }
 
 export const createSessionSlice: StateCreator<
@@ -101,7 +120,6 @@ export const createSessionSlice: StateCreator<
 
     return id;
   },
-
   duplicateSession: async (id) => {
     const { activeSession, refreshSessions } = get();
     const session = sessionSelectors.getSessionById(id)(get());
@@ -135,63 +153,12 @@ export const createSessionSlice: StateCreator<
     activeSession(newId);
   },
 
-  pinSession: async (sessionId, pinned) => {
-    await get().refreshSessions({
-      action: async () => {
-        await sessionService.updateSession(sessionId, { pinned });
-      },
-      // 乐观更新
-      optimisticData: produce((draft) => {
-        if (!draft) return;
-
-        const session = draft.all.find((i) => i.id === sessionId);
-        if (!session) return;
-
-        session.pinned = pinned;
-
-        if (pinned) {
-          draft.pinned.unshift(session);
-
-          if (session.group === 'default') {
-            const index = draft.default.findIndex((i) => i.id === sessionId);
-            draft.default.splice(index, 1);
-          } else {
-            const customGroup = draft.customGroup.find((group) => group.id === session.group);
-
-            if (customGroup) {
-              const index = customGroup.children.findIndex((i) => i.id === sessionId);
-              customGroup.children.splice(index, 1);
-            }
-          }
-        } else {
-          const index = draft.pinned.findIndex((i) => i.id === sessionId);
-          if (index !== -1) {
-            draft.pinned.splice(index, 1);
-          }
-
-          if (session.group === 'default') {
-            draft.default.push(session);
-          } else {
-            const customGroup = draft.customGroup.find((group) => group.id === session.group);
-            if (customGroup) {
-              customGroup.children.push(session);
-            }
-          }
-        }
-      }),
-    });
+  pinSession: async (id, pinned) => {
+    await get().internal_updateSession(id, { pinned });
   },
 
-  refreshSessions: async (params) => {
-    if (params) {
-      // @ts-ignore
-      await mutate(FETCH_SESSIONS_KEY, params.action, {
-        optimisticData: params.optimisticData,
-        // we won't need to make the action's data go into cache ,or the display will be
-        // old -> optimistic -> undefined -> new
-        populateCache: false,
-      });
-    } else await mutate(FETCH_SESSIONS_KEY);
+  refreshSessions: async () => {
+    await mutate(FETCH_SESSIONS_KEY);
   },
 
   removeSession: async (sessionId) => {
@@ -204,8 +171,10 @@ export const createSessionSlice: StateCreator<
     }
   },
 
-  // TODO: 这里的逻辑需要优化，后续不应该是直接请求一个大的 sessions 数据
-  // 最好拆成一个 all 请求，然后在前端完成 groupBy 的分组逻辑
+  updateSessionGroupId: async (sessionId, group) => {
+    await get().internal_updateSession(sessionId, { group });
+  },
+
   useFetchSessions: () =>
     useClientDataSWR<ChatSessionList>(FETCH_SESSIONS_KEY, sessionService.getGroupedSessions, {
       onSuccess: (data) => {
@@ -217,20 +186,14 @@ export const createSessionSlice: StateCreator<
         // TODO：后续的根本解法应该是解除 inbox 和 session 的数据耦合
         // 避免互相依赖的情况出现
 
-        set(
-          {
-            customSessionGroups: data.customGroup,
-            defaultSessions: data.default,
-            isSessionsFirstFetchFinished: true,
-            pinnedSessions: data.pinned,
-            sessions: data.all,
-          },
-          false,
-          n('useFetchSessions/onSuccess', data),
+        get().internal_processSessions(
+          data.sessions,
+          data.sessionGroups,
+          n('useFetchSessions/updateData') as any,
         );
+        set({ isSessionsFirstFetchFinished: true }, false, n('useFetchSessions/onSuccess', data));
       },
     }),
-
   useSearchSessions: (keyword) =>
     useSWR<LobeSessions>(
       [SEARCH_SESSIONS_KEY, keyword],
@@ -241,4 +204,39 @@ export const createSessionSlice: StateCreator<
       },
       { revalidateOnFocus: false, revalidateOnMount: false },
     ),
+
+  /* eslint-disable sort-keys-fix/sort-keys-fix */
+  internal_dispatchSessions: (payload) => {
+    const nextSessions = sessionsReducer(get().sessions, payload);
+    get().internal_processSessions(nextSessions, get().sessionGroups);
+  },
+  internal_updateSession: async (id, data) => {
+    get().internal_dispatchSessions({ type: 'updateSession', id, value: data });
+
+    await sessionService.updateSession(id, data);
+    await get().refreshSessions();
+  },
+  internal_processSessions: (sessions, sessionGroups) => {
+    const customGroups = sessionGroups.map((item) => ({
+      ...item,
+      children: sessions.filter((i) => i.group === item.id && !i.pinned),
+    }));
+
+    const defaultGroup = sessions.filter(
+      (item) => (!item.group || item.group === 'default') && !item.pinned,
+    );
+    const pinnedGroup = sessions.filter((item) => item.pinned);
+
+    set(
+      {
+        customSessionGroups: customGroups,
+        defaultSessions: defaultGroup,
+        pinnedSessions: pinnedGroup,
+        sessionGroups,
+        sessions,
+      },
+      false,
+      n('processSessions'),
+    );
+  },
 });

package/src/store/session/slices/session/initialState.ts

@@ -1,6 +1,11 @@
 import { DEFAULT_AGENT_META } from '@/const/meta';
 import { DEFAULT_AGENT_CONFIG } from '@/const/settings';
-import { CustomSessionGroup, LobeAgentSession, LobeSessionType } from '@/types/session';
+import {
+  CustomSessionGroup,
+  LobeAgentSession,
+  LobeSessionGroups,
+  LobeSessionType,
+} from '@/types/session';
 
 export const initLobeSession: LobeAgentSession = {
   config: DEFAULT_AGENT_CONFIG,
@@ -24,6 +29,7 @@ export interface SessionState {
   isSessionsFirstFetchFinished: boolean;
   pinnedSessions: LobeAgentSession[];
   searchKeywords: string;
+  sessionGroups: LobeSessionGroups;
   sessionSearchKeywords?: string;
   /**
    * it means defaultSessions
@@ -40,5 +46,6 @@ export const initialSessionState: SessionState = {
   isSessionsFirstFetchFinished: false,
   pinnedSessions: [],
   searchKeywords: '',
+  sessionGroups: [],
   sessions: [],
 };