@lobehub/chat 0.161.23 → 0.161.25

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+### [Version 0.161.25](https://github.com/lobehub/lobe-chat/compare/v0.161.24...v0.161.25)
+
+<sup>Released on **2024-05-27**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix trpc/edge path error when setting `NEXT_PUBLIC_BASE_PATH`.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix trpc/edge path error when setting `NEXT_PUBLIC_BASE_PATH`, closes [#2681](https://github.com/lobehub/lobe-chat/issues/2681) ([622b390](https://github.com/lobehub/lobe-chat/commit/622b390))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 0.161.24](https://github.com/lobehub/lobe-chat/compare/v0.161.23...v0.161.24)
+
+<sup>Released on **2024-05-27**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix the missing user id in chat compeletition and fix remove unstarred topic not working.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix the missing user id in chat compeletition and fix remove unstarred topic not working, closes [#2677](https://github.com/lobehub/lobe-chat/issues/2677) ([c9fb2de](https://github.com/lobehub/lobe-chat/commit/c9fb2de))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.161.23](https://github.com/lobehub/lobe-chat/compare/v0.161.22...v0.161.23)
 
 <sup>Released on **2024-05-27**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.161.23",
+  "version": "0.161.25",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",
@@ -82,7 +82,7 @@
   },
   "dependencies": {
     "@ant-design/icons": "^5.3.7",
-    "@anthropic-ai/sdk": "^0.20.9",
+    "@anthropic-ai/sdk": "^0.21.0",
     "@auth/core": "0.28.0",
     "@aws-sdk/client-bedrock-runtime": "^3.583.0",
     "@aws-sdk/client-s3": "^3.583.0",

package/src/app/api/chat/[provider]/route.test.ts

@@ -159,6 +159,7 @@ describe('POST handler', () => {
         accessCode: 'test-access-code',
         apiKey: 'test-api-key',
         azureApiVersion: 'v1',
+        userId: 'abc',
       });
 
       const mockParams = { provider: 'test-provider' };
@@ -176,7 +177,7 @@ describe('POST handler', () => {
       const response = await POST(request as unknown as Request, { params: mockParams });
 
       expect(response).toEqual(mockChatResponse);
-      expect(AgentRuntime.prototype.chat).toHaveBeenCalledWith(mockChatPayload);
+      expect(AgentRuntime.prototype.chat).toHaveBeenCalledWith(mockChatPayload, { user: 'abc' });
     });
 
     it('should return an error response when chat completion fails', async () => {

package/src/app/api/chat/[provider]/route.ts

@@ -25,17 +25,16 @@ export const POST = checkAuth(async (req: Request, { params, jwtPayload }) => {
 
     const tracePayload = getTracePayload(req);
 
+    let traceOptions = {};
     // If user enable trace
     if (tracePayload?.enabled) {
-      return await agentRuntime.chat(
-        data,
-        createTraceOptions(data, {
-          provider,
-          trace: tracePayload,
-        }),
-      );
+      traceOptions = createTraceOptions(data, {
+        provider,
+        trace: tracePayload,
+      });
     }
-    return await agentRuntime.chat(data);
+
+    return await agentRuntime.chat(data, { user: jwtPayload.userId, ...traceOptions });
   } catch (e) {
     const {
       errorType = ChatErrorType.InternalServerError,

package/src/const/auth.ts

@@ -35,5 +35,11 @@ export interface JWTPayload {
   awsAccessKeyId?: string;
   awsRegion?: string;
   awsSecretAccessKey?: string;
+  /**
+   * user id
+   * in client db mode it's a uuid
+   * in server db mode it's a user id
+   */
+  userId?: string;
 }
 /* eslint-enable */

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

@@ -95,6 +95,10 @@ export interface ChatCompetitionOptions {
   callback?: ChatStreamCallbacks;
   headers?: Record<string, any>;
   signal?: AbortSignal;
+  /**
+   * userId for the chat completion
+   */
+  user?: string;
 }
 
 export interface ChatCompletionFunctions {

package/src/libs/agent-runtime/utils/openaiCompatibleFactory/index.test.ts

@@ -195,18 +195,21 @@ describe('LobeOpenAICompatibleFactory', () => {
     });
 
     describe('handlePayload option', () => {
-      it('should modify request payload correctly', async () => {
+      it('should add user in payload correctly', async () => {
         const mockCreateMethod = vi.spyOn(instance['client'].chat.completions, 'create');
 
-        await instance.chat({
-          messages: [{ content: 'Hello', role: 'user' }],
-          model: 'mistralai/mistral-7b-instruct:free',
-          temperature: 0,
-        });
+        await instance.chat(
+          {
+            messages: [{ content: 'Hello', role: 'user' }],
+            model: 'mistralai/mistral-7b-instruct:free',
+            temperature: 0,
+          },
+          { user: 'abc' },
+        );
 
         expect(mockCreateMethod).toHaveBeenCalledWith(
           expect.objectContaining({
-            // 根据实际的 handlePayload 函数,添加断言
+            user: 'abc',
           }),
           expect.anything(),
         );

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

@@ -79,11 +79,14 @@ export const LobeOpenAICompatibleFactory = ({
               stream: payload.stream ?? true,
             } as OpenAI.ChatCompletionCreateParamsStreaming);
 
-        const response = await this.client.chat.completions.create(postPayload, {
-          // https://github.com/lobehub/lobe-chat/pull/318
-          headers: { Accept: '*/*' },
-          signal: options?.signal,
-        });
+        const response = await this.client.chat.completions.create(
+          { ...postPayload, user: options?.user },
+          {
+            // https://github.com/lobehub/lobe-chat/pull/318
+            headers: { Accept: '*/*' },
+            signal: options?.signal,
+          },
+        );
 
         if (postPayload.stream) {
           const [prod, useForDebug] = response.tee();

package/src/libs/trpc/client.ts

@@ -3,13 +3,14 @@ import superjson from 'superjson';
 
 import type { EdgeRouter } from '@/server/routers';
 import { createHeaderWithAuth } from '@/services/_auth';
+import { withBasePath } from '@/utils/basePath';
 
 export const edgeClient = createTRPCClient<EdgeRouter>({
   links: [
     httpBatchLink({
       headers: async () => createHeaderWithAuth(),
       transformer: superjson,
-      url: '/trpc/edge',
+      url: withBasePath('/trpc/edge'),
     }),
   ],
 });

package/src/services/_auth.ts

@@ -1,7 +1,11 @@
 import { JWTPayload, LOBE_CHAT_AUTH_HEADER } from '@/const/auth';
 import { ModelProvider } from '@/libs/agent-runtime';
 import { useUserStore } from '@/store/user';
-import { keyVaultsConfigSelectors, settingsSelectors } from '@/store/user/selectors';
+import {
+  keyVaultsConfigSelectors,
+  settingsSelectors,
+  userProfileSelectors,
+} from '@/store/user/selectors';
 import { GlobalLLMProviderKey } from '@/types/user/settings';
 import { createJWT } from '@/utils/jwt';
 
@@ -48,8 +52,9 @@ export const getProviderAuthPayload = (provider: string) => {
 
 const createAuthTokenWithPayload = async (payload = {}) => {
   const accessCode = settingsSelectors.password(useUserStore.getState());
+  const userId = userProfileSelectors.userId(useUserStore.getState());
 
-  return await createJWT<JWTPayload>({ accessCode, ...payload });
+  return await createJWT<JWTPayload>({ accessCode, userId, ...payload });
 };
 
 interface AuthParams {

package/src/store/chat/slices/topic/action.test.ts

@@ -384,11 +384,14 @@ describe('topic action', () => {
       // Set up mock state with unstarred topics
       await act(async () => {
         useChatStore.setState({
-          topics: [
-            { id: 'topic-1', favorite: false },
-            { id: 'topic-2', favorite: true },
-            { id: 'topic-3', favorite: false },
-          ] as ChatTopic[],
+          activeId: 'abc',
+          topicMaps: {
+            abc: [
+              { id: 'topic-1', favorite: false },
+              { id: 'topic-2', favorite: true },
+              { id: 'topic-3', favorite: false },
+            ] as ChatTopic[],
+          },
         });
       });
       const refreshTopicSpy = vi.spyOn(result.current, 'refreshTopic');
@@ -431,7 +434,10 @@ describe('topic action', () => {
       });
 
       // Mock the `updateTopicTitleInSummary` and `refreshTopic` for spying
-      const updateTopicTitleInSummarySpy = vi.spyOn(result.current, 'updateTopicTitleInSummary');
+      const updateTopicTitleInSummarySpy = vi.spyOn(
+        result.current,
+        'internal_updateTopicTitleInSummary',
+      );
       const refreshTopicSpy = vi.spyOn(result.current, 'refreshTopic');
 
       // Mock the `chatService.fetchPresetTaskResult` to simulate the AI response

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

@@ -3,7 +3,6 @@
 // DON'T REMOVE THE FIRST LINE
 import isEqual from 'fast-deep-equal';
 import { t } from 'i18next';
-import { produce } from 'immer';
 import useSWR, { SWRResponse, mutate } from 'swr';
 import { StateCreator } from 'zustand/vanilla';
 
@@ -37,7 +36,7 @@ export interface ChatTopicAction {
   removeAllTopics: () => Promise<void>;
   removeSessionTopics: () => Promise<void>;
   removeTopic: (id: string) => Promise<void>;
-  removeUnstarredTopic: () => void;
+  removeUnstarredTopic: () => Promise<void>;
   saveToTopic: () => Promise<string | undefined>;
   createTopic: () => Promise<string | undefined>;
 
@@ -45,11 +44,11 @@ export interface ChatTopicAction {
   duplicateTopic: (id: string) => Promise<void>;
   summaryTopicTitle: (topicId: string, messages: ChatMessage[]) => Promise<void>;
   switchTopic: (id?: string, skipRefreshMessage?: boolean) => Promise<void>;
-  updateTopicTitleInSummary: (id: string, title: string) => void;
   updateTopicTitle: (id: string, title: string) => Promise<void>;
   useFetchTopics: (sessionId: string) => SWRResponse<ChatTopic[]>;
   useSearchTopics: (keywords?: string, sessionId?: string) => SWRResponse<ChatTopic[]>;
 
+  internal_updateTopicTitleInSummary: (id: string, title: string) => void;
   internal_updateTopicLoading: (id: string, loading: boolean) => void;
   internal_createTopic: (params: CreateTopicParams) => Promise<string>;
   internal_updateTopic: (id: string, data: Partial<ChatTopic>) => Promise<void>;
@@ -133,18 +132,18 @@ export const chatTopic: StateCreator<
   },
   // update
   summaryTopicTitle: async (topicId, messages) => {
-    const { updateTopicTitleInSummary, internal_updateTopicLoading } = get();
+    const { internal_updateTopicTitleInSummary, internal_updateTopicLoading } = get();
     const topic = topicSelectors.getTopicById(topicId)(get());
     if (!topic) return;
 
-    updateTopicTitleInSummary(topicId, LOADING_FLAT);
+    internal_updateTopicTitleInSummary(topicId, LOADING_FLAT);
 
     let output = '';
 
     // 自动总结话题标题
     await chatService.fetchPresetTaskResult({
       onError: () => {
-        updateTopicTitleInSummary(topicId, topic.title);
+        internal_updateTopicTitleInSummary(topicId, topic.title);
       },
       onFinish: async (text) => {
         await get().internal_updateTopic(topicId, { title: text });
@@ -159,7 +158,7 @@ export const chatTopic: StateCreator<
           }
         }
 
-        updateTopicTitleInSummary(topicId, output);
+        internal_updateTopicTitleInSummary(topicId, output);
       },
       params: await chainSummaryTitle(messages),
       trace: get().getCurrentTracePayload({ traceName: TraceNameMap.SummaryTopicTitle, topicId }),
@@ -264,15 +263,11 @@ export const chatTopic: StateCreator<
   },
 
   // Internal process method of the topics
-  updateTopicTitleInSummary: (id, title) => {
-    const topics = produce(get().topics, (draftState) => {
-      const topic = draftState.find((i) => i.id === id);
-
-      if (!topic) return;
-      topic.title = title;
-    });
-
-    set({ topics }, false, n(`updateTopicTitleInSummary`, { id, title }));
+  internal_updateTopicTitleInSummary: (id, title) => {
+    get().internal_dispatchTopic(
+      { type: 'updateTopic', id, value: { title } },
+      'updateTopicTitleInSummary',
+    );
   },
   refreshTopic: async () => {
     return mutate([SWR_USE_FETCH_TOPIC, get().activeId]);
@@ -317,8 +312,12 @@ export const chatTopic: StateCreator<
   },
 
   internal_dispatchTopic: (payload, action) => {
-    const nextTopics = topicReducer(get().topics, payload);
+    const nextTopics = topicReducer(topicSelectors.currentTopics(get()), payload);
+    const nextMap = { ...get().topicMaps, [get().activeId]: nextTopics };
+
+    // no need to update map if is the same
+    if (isEqual(nextMap, get().topicMaps)) return;
 
-    set({ topics: nextTopics }, false, action ?? n(`dispatchTopic/${payload.type}`));
+    set({ topicMaps: nextMap }, false, action ?? n(`dispatchTopic/${payload.type}`));
   },
 });

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

@@ -9,7 +9,6 @@ export interface ChatTopicState {
   topicMaps: Record<string, ChatTopic[]>;
   topicRenamingId?: string;
   topicSearchKeywords: string;
-  topics: ChatTopic[];
   /**
    * whether topics have fetched
    */
@@ -23,6 +22,5 @@ export const initialTopicState: ChatTopicState = {
   topicLoadingIds: [],
   topicMaps: {},
   topicSearchKeywords: '',
-  topics: [],
   topicsInit: false,
 };

package/src/store/chat/slices/topic/selectors.test.ts

@@ -58,7 +58,7 @@ describe('topicSelectors', () => {
 
   describe('currentUnFavTopics', () => {
     it('should return all unfavorited topics', () => {
-      const state = merge(initialStore, { topics: topicMaps.test });
+      const state = merge(initialStore, { topicMaps, activeId: 'test' });
       const topics = topicSelectors.currentUnFavTopics(state);
       expect(topics).toEqual([topicMaps.test[1]]);
     });

package/src/store/chat/slices/topic/selectors.ts

@@ -12,7 +12,8 @@ const searchTopics = (s: ChatStore): ChatTopic[] => s.searchTopics;
 const displayTopics = (s: ChatStore): ChatTopic[] | undefined =>
   s.isSearchingTopic ? searchTopics(s) : currentTopics(s);
 
-const currentUnFavTopics = (s: ChatStore): ChatTopic[] => s.topics.filter((s) => !s.favorite);
+const currentUnFavTopics = (s: ChatStore): ChatTopic[] =>
+  currentTopics(s)?.filter((s) => !s.favorite) || [];
 
 const currentTopicLength = (s: ChatStore): number => currentTopics(s)?.length || 0;