@lobehub/chat 0.36.1 → 0.38.0

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+## [Version 0.38.0](https://github.com/lobehub/lobe-chat/compare/v0.37.0...v0.38.0)
+
+<sup>Released on **2023-08-04**</sup>
+
+#### ✨ Features
+
+- **misc**: Add topic empty.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's improved
+
+- **misc**: Add topic empty ([b9f267c](https://github.com/lobehub/lobe-chat/commit/b9f267c))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+## [Version 0.37.0](https://github.com/lobehub/lobe-chat/compare/v0.36.1...v0.37.0)
+
+<sup>Released on **2023-08-03**</sup>
+
+#### ✨ Features
+
+- **misc**: 支持使用全局助手的设置作为默认助手的创建角色.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's improved
+
+- **misc**: 支持使用全局助手的设置作为默认助手的创建角色, closes [#44](https://github.com/lobehub/lobe-chat/issues/44) ([f91857d](https://github.com/lobehub/lobe-chat/commit/f91857d))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.36.1](https://github.com/lobehub/lobe-chat/compare/v0.36.0...v0.36.1)
 
 <sup>Released on **2023-08-03**</sup>

package/locales/en_US/empty.json

@@ -0,0 +1,6 @@
+{
+  "topic": {
+    "desc": "Click the button on the left to save the current conversation as a historical topic and start a new conversation",
+    "title": "Topic List"
+  }
+}

package/locales/en_US/setting.json

@@ -61,7 +61,10 @@
       "title": "Enable History Message Length Compression Threshold"
     },
     "enableHistoryCount": {
-      "title": "Enable History Message Count Limit"
+      "title": "Enable History Message Count Limit",
+      "alias": "Unlimited",
+      "limited": "Only include {{number}} chat messages",
+      "unlimited": "Unlimited chat history"
     },
     "historyCount": {
       "desc": "Number of history messages carried in each request",

package/locales/zh_CN/empty.json

@@ -0,0 +1,6 @@
+{
+  "topic": {
+    "desc": "点击发送左侧按钮可将当前会话保存为历史话题，并开启新一轮会话",
+    "title": "话题列表"
+  }
+}

package/locales/zh_CN/setting.json

@@ -61,7 +61,10 @@
       "title": "是否开启历史消息长度压缩阈值"
     },
     "enableHistoryCount": {
-      "title": "是否开启携带的历史消息数限制"
+      "alias": "不限制",
+      "limited": "只包含 {{number}} 条会话消息",
+      "title": "限制历史消息数",
+      "unlimited": "不限历史消息数"
     },
     "historyCount": {
       "desc": "每次请求携带的历史消息数",

package/package.json

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

package/src/components/Empty/index.tsx

@@ -0,0 +1,34 @@
+import { ActionIcon } from '@lobehub/ui';
+import { X } from 'lucide-react';
+import { memo, useState } from 'react';
+
+import { useStyles } from './style';
+
+interface EmptyProps {
+  cover: string;
+  desc: string;
+  title: string;
+}
+
+const Empty = memo<EmptyProps>(({ cover, title, desc }) => {
+  const [visiable, setVisiable] = useState(true);
+  const { styles } = useStyles();
+  if (!visiable) return null;
+  return (
+    <div className={styles.container}>
+      <ActionIcon
+        className={styles.close}
+        icon={X}
+        onClick={() => setVisiable(false)}
+        size={{ blockSize: 24, fontSize: 16 }}
+      />
+      {cover && <img alt="empty" src={cover} width="100%" />}
+      <div className={styles.content}>
+        {title && <h3>{title}</h3>}
+        {desc && <p className={styles.desc}>{desc}</p>}
+      </div>
+    </div>
+  );
+});
+
+export default Empty;

package/src/components/Empty/style.ts

@@ -0,0 +1,28 @@
+import { createStyles } from 'antd-style';
+
+export const useStyles = createStyles(({ css, token, isDarkMode }) => ({
+  close: css`
+    position: absolute;
+    top: 8px;
+    right: 8px;
+  `,
+  container: css`
+    position: relative;
+
+    overflow: hidden;
+
+    background: linear-gradient(
+      to bottom,
+      ${isDarkMode ? token.colorBgElevated : token.colorBgLayout},
+      ${token.colorBgContainer}
+    );
+    border: 1px solid ${token.colorBorderSecondary};
+    border-radius: ${token.borderRadius}px;
+  `,
+  content: css`
+    padding: 0 16px 16px;
+  `,
+  desc: css`
+    color: ${token.colorTextDescription};
+  `,
+}));

package/src/const/settings.ts

@@ -12,18 +12,12 @@ export const DEFAULT_BASE_SETTINGS: GlobalBaseSettings = {
   enableMaxTokens: true,
   endpoint: '',
   fontSize: 14,
-  frequencyPenalty: 0,
   historyCount: 24,
   language: 'zh-CN',
-  maxTokens: 2000,
-  model: LanguageModel.GPT3_5,
   neutralColor: '',
   password: '',
-  presencePenalty: 0,
   primaryColor: '',
-  temperature: 0.5,
   themeMode: 'auto',
-  topP: 1,
 };
 
 export const DEFAULT_AGENT_CONFIG: LobeAgentConfig = {

package/src/locales/default/empty.ts

@@ -0,0 +1,6 @@
+export default {
+  topic: {
+    desc: '点击发送左侧按钮可将当前会话保存为历史话题，并开启新一轮会话',
+    title: '话题列表',
+  },
+};

package/src/locales/resources/en_US.ts

@@ -1,3 +1,15 @@
-const resources = {} as const;
+import common from '../../../locales/en_US/common.json';
+import empty from '../../../locales/en_US/empty.json';
+import error from '../../../locales/en_US/error.json';
+import plugin from '../../../locales/en_US/plugin.json';
+import setting from '../../../locales/en_US/setting.json';
+
+const resources = {
+  common,
+  empty,
+  error,
+  plugin,
+  setting,
+} as const;
 
 export default resources;

package/src/locales/resources/zh_CN.ts

@@ -1,10 +1,12 @@
 import common from '../default/common';
+import empty from '../default/empty';
 import error from '../default/error';
 import plugin from '../default/plugin';
 import setting from '../default/setting';
 
 const resources = {
   common,
+  empty,
   error,
   plugin,
   setting,

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

@@ -29,7 +29,7 @@ const SessionItem: FC<SessionItemProps> = memo(({ id, active = true, loading })
   const { t } = useTranslation('common');
 
   const { styles, theme } = useStyles();
-  const [defaultModel] = useSettings((s) => [s.settings.model], shallow);
+  const [defaultModel] = useSettings((s) => [s.settings.defaultAgent.config?.model], shallow);
 
   const [
     pin,

package/src/pages/chat/[id]/Sidebar/Topic/index.tsx

@@ -1,15 +1,28 @@
+import { useThemeMode } from 'antd-style';
+import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 import { shallow } from 'zustand/shallow';
 
+import Empty from '@/components/Empty';
 import { topicSelectors, useSessionStore } from '@/store/session';
 
 import TopicItem from './TopicItem';
 
 export const Topic = () => {
   const topics = useSessionStore(topicSelectors.currentTopics);
+  const { isDarkMode } = useThemeMode();
   const [activeTopicId] = useSessionStore((s) => [s.activeTopicId], shallow);
+  const { t } = useTranslation('empty');
   return (
     <Flexbox gap={8}>
+      {topics?.length === 0 && (
+        <Empty
+          cover={`/images/empty_topic_${isDarkMode ? 'dark' : 'light'}.webp`}
+          desc={t('topic.desc')}
+          title={t('topic.title')}
+        />
+      )}
+
       <TopicItem active={!activeTopicId} fav={false} title={'默认话题'} />
 
       {topics.map(({ id, favorite, title }) => (

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

@@ -4,6 +4,7 @@ import Router from 'next/router';
 import { StateCreator } from 'zustand/vanilla';
 
 import { SessionStore, initLobeSession } from '@/store/session';
+import { useSettings } from '@/store/settings';
 import { LobeAgentSession, LobeSessions } from '@/types/session';
 import { setNamespace } from '@/utils/storeDebug';
 import { uuid } from '@/utils/uuid';
@@ -77,8 +78,9 @@ export const createSessionSlice: StateCreator<
 
     const timestamp = Date.now();
 
-    // TODO: 等 settings 里的 defaultAgent 都改好以后，做个合并即可
-    const newSession: LobeAgentSession = merge({}, initLobeSession, {
+    // 合并 settings 里的 defaultAgent
+    const globalDefaultAgent = useSettings.getState().settings.defaultAgent;
+    const newSession: LobeAgentSession = merge({}, initLobeSession, globalDefaultAgent, {
       createAt: timestamp,
       id: uuid(),
       updateAt: timestamp,

package/src/types/settings.ts

@@ -2,7 +2,6 @@ import type { NeutralColors, PrimaryColors } from '@lobehub/ui';
 import type { ThemeMode } from 'antd-style';
 
 import type { Locales } from '@/locales/resources';
-import type { LanguageModel } from '@/types/llm';
 import type { LobeAgentSession } from '@/types/session';
 
 export interface GlobalBaseSettings {
@@ -14,18 +13,12 @@ export interface GlobalBaseSettings {
   enableMaxTokens: boolean;
   endpoint: string;
   fontSize: number;
-  frequencyPenalty: number;
   historyCount: number;
   language: Locales;
-  maxTokens: number;
-  model: LanguageModel;
   neutralColor: NeutralColors | '';
   password: string;
-  presencePenalty: number;
   primaryColor: PrimaryColors | '';
-  temperature: number;
   themeMode: ThemeMode;
-  topP: number;
 }
 
 export type GlobalDefaultAgent = Partial<LobeAgentSession>;