@lobehub/chat 0.31.0 → 0.33.0

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+## [Version 0.33.0](https://github.com/lobehub/lobe-chat/compare/v0.32.0...v0.33.0)
+
+<sup>Released on **2023-07-30**</sup>
+
+#### ✨ Features
+
+- **misc**: 支持输入模板预处理.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's improved
+
+- **misc**: 支持输入模板预处理 ([84082c1](https://github.com/lobehub/lobe-chat/commit/84082c1))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+## [Version 0.32.0](https://github.com/lobehub/lobe-chat/compare/v0.31.0...v0.32.0)
+
+<sup>Released on **2023-07-30**</sup>
+
+#### ✨ Features
+
+- **misc**: 支持会话置顶.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's improved
+
+- **misc**: 支持会话置顶, closes [#32](https://github.com/lobehub/lobe-chat/issues/32) ([fc44b5d](https://github.com/lobehub/lobe-chat/commit/fc44b5d))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ## [Version 0.31.0](https://github.com/lobehub/lobe-chat/compare/v0.30.1...v0.31.0)
 
 <sup>Released on **2023-07-30**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.31.0",
+  "version": "0.33.0",
   "description": "Lobe Chat is an open-source chatbot client using LangChain, Typescript and Next.js",
   "keywords": [
     "chatbot",

package/src/pages/chat/SessionList/List/SessionItem.tsx

@@ -19,10 +19,9 @@ interface SessionItemProps {
   active?: boolean;
   id: string;
   loading?: boolean;
-  pin?: boolean;
 }
 
-const SessionItem: FC<SessionItemProps> = memo(({ id, active = true, loading, pin }) => {
+const SessionItem: FC<SessionItemProps> = memo(({ id, active = true, loading }) => {
   const ref = useRef(null);
   const isHovering = useHover(ref);
 
@@ -33,6 +32,7 @@ const SessionItem: FC<SessionItemProps> = memo(({ id, active = true, loading, pi
   const [defaultModel] = useSettings((s) => [s.settings.model], shallow);
 
   const [
+    pin,
     title,
     description,
     systemRole,
@@ -42,11 +42,13 @@ const SessionItem: FC<SessionItemProps> = memo(({ id, active = true, loading, pi
     model,
     chatLength,
     removeSession,
+    pinSession,
   ] = useSessionStore((s) => {
     const session = sessionSelectors.getSessionById(id)(s);
     const meta = session.meta;
     const systemRole = session.config.systemRole;
     return [
+      session.pinned,
       agentSelectors.getTitle(meta),
       meta.description,
       systemRole,
@@ -56,6 +58,7 @@ const SessionItem: FC<SessionItemProps> = memo(({ id, active = true, loading, pi
       session.config.model,
       chatSelectors.currentChats(s).length,
       s.removeSession,
+      s.pinSession,
     ];
   }, shallow);
 
@@ -66,8 +69,9 @@ const SessionItem: FC<SessionItemProps> = memo(({ id, active = true, loading, pi
         icon: <Icon icon={pin ? PinOff : Pin} />,
         key: 'pin',
         label: t(pin ? 'pinOff' : 'pin'),
-        // TODO: 动作绑定
-        onClick: () => {},
+        onClick: () => {
+          pinSession(id, !pin);
+        },
       },
       {
         children: [
@@ -154,7 +158,16 @@ const SessionItem: FC<SessionItemProps> = memo(({ id, active = true, loading, pi
           style={{ color: theme.colorText }}
           title={title}
         />
-        <Dropdown arrow={false} menu={{ items }} trigger={['click']}>
+        <Dropdown
+          arrow={false}
+          menu={{
+            items,
+            onClick: ({ domEvent }) => {
+              domEvent.stopPropagation();
+            },
+          }}
+          trigger={['click']}
+        >
           <ActionIcon
             className="session-remove"
             icon={MoreVertical}

package/src/store/session/slices/chat/actions/message.ts

@@ -1,3 +1,4 @@
+import { template } from 'lodash-es';
 import { StateCreator } from 'zustand/vanilla';
 
 import { LOADING_FLAT } from '@/const/message';
@@ -113,8 +114,41 @@ export const chatMessage: StateCreator<
     set({ chatLoadingId: assistantId });
     const config = agentSelectors.currentAgentConfigSafe(get());
 
+    const compiler = template(config.inputTemplate, { interpolate: /{{([\S\s]+?)}}/g });
+
+    // 对 message 做统一预处理
+
+    // 1. 替换 inputMessage 模板
+    const postMessages = !config.inputTemplate
+      ? messages
+      : messages.map((m) => {
+          if (m.role === 'user') {
+            try {
+              return { ...m, content: compiler({ text: m.content }) };
+            } catch (error) {
+              console.error(error);
+
+              return m;
+            }
+          }
+          return m;
+        });
+
+    // 2. TODO 按参数设定截断长度
+
+    // 3. 添加 systemRole
+    const { systemRole } = agentSelectors.currentAgentConfigSafe(get());
+    if (systemRole) {
+      postMessages.unshift({ content: systemRole, role: 'system' } as ChatMessage);
+    }
+
     const fetcher = () =>
-      fetchChatModel({ messages, model: config.model, ...config.params, plugins: config.plugins });
+      fetchChatModel({
+        messages: postMessages,
+        model: config.model,
+        ...config.params,
+        plugins: config.plugins,
+      });
 
     let output = '';
     let isFunctionCall = false;
@@ -154,13 +188,9 @@ export const chatMessage: StateCreator<
   realFetchAIResponse: async (messages, userMessageId) => {
     const { dispatchMessage, generateMessage, triggerFunctionCall, activeTopicId } = get();
 
-    // 添加 systemRole
-    const { systemRole, model } = agentSelectors.currentAgentConfigSafe(get());
-    if (systemRole) {
-      messages.unshift({ content: systemRole, role: 'system' } as ChatMessage);
-    }
+    const { model } = agentSelectors.currentAgentConfigSafe(get());
 
-    // 再添加一个空的信息用于放置 ai 响应，注意顺序不能反
+    // 添加一个空的信息用于放置 ai 响应，注意顺序不能反
     // 因为如果顺序反了，messages 中将包含新增的 ai message
     const mid = nanoid();
 
@@ -283,10 +313,10 @@ export const chatMessage: StateCreator<
 
     const mid = nanoid();
 
-    dispatchMessage({ id: mid, message: LOADING_FLAT, role: 'assistant', type: 'addMessage' });
-
     const chats = chatSelectors.currentChats(get());
 
+    dispatchMessage({ id: mid, message: LOADING_FLAT, role: 'assistant', type: 'addMessage' });
+
     await generateMessage(chats, mid);
   },
 });

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

@@ -31,6 +31,11 @@ export interface SessionAction {
    */
   importSessions: (sessions: LobeSessions) => void;
 
+  /**
+   * 置顶会话
+   * @param sessionId
+   */
+  pinSession: (sessionId: string, pinned?: boolean) => void;
   /**
    * 生成压缩后的消息
    * @returns 压缩后的消息
@@ -42,12 +47,13 @@ export interface SessionAction {
    * @returns void
    */
   removeSession: (sessionId: string) => void;
+
   /**
    * @title 切换会话
    * @param sessionId - 会话索引
    * @returns void
    */
-  switchSession: (sessionId?: string | 'new') => Promise<void>;
+  switchSession: (sessionId?: string) => Promise<void>;
 }
 
 export const createSessionSlice: StateCreator<
@@ -104,6 +110,19 @@ export const createSessionSlice: StateCreator<
       }),
     });
   },
+  // genShareUrl: () => {
+  //   const session = sessionSelectors.currentSession(get());
+  //   if (!session) return '';
+  //
+  //   const agent = session.config;
+  //   return genShareMessagesUrl(session.chats, agent.systemRole);
+  // },
+  pinSession: (sessionId, pinned) => {
+    const nextValue = typeof pinned === 'boolean' ? pinned : !get().sessions[sessionId].pinned;
+
+    get().dispatchSession({ id: sessionId, pinned: nextValue, type: 'toggleSessionPinned' });
+  },
+
   removeSession: (sessionId) => {
     get().dispatchSession({ id: sessionId, type: 'removeSession' });
 
@@ -122,11 +141,4 @@ export const createSessionSlice: StateCreator<
     // 新会话
     await Router.push(`/chat/${sessionId}`);
   },
-  // genShareUrl: () => {
-  //   const session = sessionSelectors.currentSession(get());
-  //   if (!session) return '';
-  //
-  //   const agent = session.config;
-  //   return genShareMessagesUrl(session.chats, agent.systemRole);
-  // },
 });

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

@@ -63,6 +63,11 @@ interface UpdateSessionAgentConfig {
   id: string;
   type: 'updateSessionConfig';
 }
+interface ToggleSessionPinned {
+  id: string;
+  pinned: boolean;
+  type: 'toggleSessionPinned';
+}
 
 export type SessionDispatch =
   | AddSession
@@ -70,7 +75,8 @@ export type SessionDispatch =
   | RemoveSession
   | UpdateSessionMeta
   | UpdateSessionAgentConfig
-  | UpdateSessionTopic;
+  | UpdateSessionTopic
+  | ToggleSessionPinned;
 
 export const sessionsReducer = (state: LobeSessions, payload: SessionDispatch): LobeSessions => {
   switch (payload.type) {
@@ -89,6 +95,16 @@ export const sessionsReducer = (state: LobeSessions, payload: SessionDispatch):
       });
     }
 
+    case 'toggleSessionPinned': {
+      return produce(state, (draft) => {
+        const { pinned, id } = payload;
+        const session = draft[id];
+        if (!session) return;
+
+        session.pinned = pinned;
+      });
+    }
+
     case 'updateSessionMeta': {
       return produce(state, (draft) => {
         const chat = draft[payload.id];

package/src/store/session/slices/session/selectors/list.ts

@@ -21,8 +21,19 @@ export const sessionList = (s: SessionStore) => {
       .map((c) => c.content)
       .join(''),
   ]);
-
-  return Object.values(filterChats).sort((a, b) => (b.updateAt || 0) - (a.updateAt || 0));
+  // 先按照 `pinned` 字段进行排序，置顶的会排在前面。然后，根据 `updateAt` 字段进行倒序排序。
+  return Object.values(filterChats).sort((a, b) => {
+    if (a.pinned && !b.pinned) {
+      return -1;
+    }
+    if (!a.pinned && b.pinned) {
+      return 1;
+    }
+    if (a.updateAt && b.updateAt) {
+      return b.updateAt - a.updateAt;
+    }
+    return 0;
+  });
 };
 
 export const getSessionById =

package/src/types/session.ts

@@ -19,6 +19,13 @@ interface LobeSessionBase extends BaseDataModel {
    * 聊天记录
    */
   chats: ChatMessageMap;
+  /**
+   * 置顶
+   */
+  pinned?: boolean;
+  /**
+   * 主题
+   */
   topics?: ChatTopicMap;
   /**
    * 每个会话的类别