@lobehub/chat 0.4.1 → 0.4.3

package/CHANGELOG.md

@@ -2,6 +2,57 @@
 
 # Changelog
 
+### [Version 0.4.3](https://github.com/lobehub/lobe-chat/compare/v0.4.2...v0.4.3)
+
+<sup>Released on **2023-07-22**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: 优化 edit 代码结构.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: 优化 edit 代码结构 ([fdb3a3f](https://github.com/lobehub/lobe-chat/commit/fdb3a3f))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 0.4.2](https://github.com/lobehub/lobe-chat/compare/v0.4.1...v0.4.2)
+
+<sup>Released on **2023-07-22**</sup>
+
+#### 💄 Styles
+
+- **misc**: Fix input style, fix layout.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Styles
+
+- **misc**: Fix input style ([504bd64](https://github.com/lobehub/lobe-chat/commit/504bd64))
+- **misc**: Fix layout ([2d83aff](https://github.com/lobehub/lobe-chat/commit/2d83aff))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.4.1](https://github.com/lobehub/lobe-chat/compare/v0.4.0...v0.4.1)
 
 <sup>Released on **2023-07-22**</sup>

package/package.json

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

package/src/pages/chat/[id]/Config/index.tsx

@@ -12,8 +12,8 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 import { shallow } from 'zustand/shallow';
 
+import HeaderSpacing from '@/components/HeaderSpacing';
 import { CHAT_SIDEBAR_WIDTH } from '@/const/layoutTokens';
-import HeaderSpacing from '@/features/HeaderSpacing';
 import { useSessionStore } from '@/store/session';
 
 import ReadMode from './ReadMode';

package/src/pages/chat/[id]/Conversation/index.tsx

@@ -1,14 +1,14 @@
 import { memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
-import HeaderSpacing from '@/features/HeaderSpacing';
+import HeaderSpacing from '@/components/HeaderSpacing';
 import ChatInput from '@/pages/chat/[id]/Conversation/Input';
 
 import ChatList from './ChatList';
 
 const Conversation = () => {
   return (
-    <Flexbox flex={1}>
+    <Flexbox flex={1} style={{ position: 'relative' }}>
       <div style={{ flex: 1, overflowY: 'scroll' }}>
         <HeaderSpacing />
         <ChatList />

package/src/pages/chat/[id]/edit/{Prompt.tsx → AgentConfig/Prompt.tsx}

@@ -8,7 +8,7 @@ import { shallow } from 'zustand/shallow';
 
 import { agentSelectors, useSessionStore } from '@/store/session';
 
-import { FormItem } from './FormItem';
+import { FormItem } from '../FormItem';
 
 export const useStyles = createStyles(({ css, token }) => ({
   input: css`
@@ -46,9 +46,10 @@ const Prompt = () => {
             updateAgentConfig({ systemRole: e });
           }}
           onEditingChange={setEditing}
+          showEditWhenEmpty
           value={systemRole}
         />
-        {!editing && (
+        {!editing && !!systemRole && (
           <Flexbox direction={'horizontal-reverse'}>
             <Button
               onClick={() => {

package/src/pages/chat/[id]/edit/{AgentConfig.tsx → AgentConfig/index.tsx}

@@ -7,9 +7,9 @@ import { shallow } from 'zustand/shallow';
 import { agentSelectors, useSessionStore } from '@/store/session';
 import { LanguageModel } from '@/types/llm';
 
-import { FormItem } from './FormItem';
+import { FormItem } from '../FormItem';
+import { useStyles } from '../style';
 import Prompt from './Prompt';
-import { useStyles } from './style';
 
 const AgentConfig = () => {
   const { t } = useTranslation('common');

package/src/pages/chat/[id]/edit/{AgentMeta.tsx → AgentMeta/index.tsx}

@@ -8,8 +8,8 @@ import { shallow } from 'zustand/shallow';
 
 import { agentSelectors, useSessionStore } from '@/store/session';
 
-import { FormItem } from './FormItem';
-import { useStyles } from './style';
+import { FormItem } from '../FormItem';
+import { useStyles } from '../style';
 
 const AgentMeta = () => {
   const { t } = useTranslation('common');

package/src/pages/chat/[id]/edit/index.page.tsx

@@ -7,7 +7,7 @@ import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
-import HeaderSpacing from '@/features/HeaderSpacing';
+import HeaderSpacing from '@/components/HeaderSpacing';
 
 import ChatLayout from '../../layout';
 import AgentConfig from './AgentConfig';

package/src/pages/chat/[id]/index.page.tsx

@@ -23,9 +23,9 @@ const Chat = memo(() => {
       <Head>
         <title>{pageTitle}</title>
       </Head>
-      <Flexbox id={'lobe-conversion-container'} style={{ height: '100vh', position: 'relative' }}>
+      <Flexbox id={'lobe-conversion-container'} style={{ height: '100vh' }}>
         <Header />
-        <Flexbox flex={1} horizontal>
+        <Flexbox flex={1} height={'calc(100vh - 64px)'} horizontal>
           <Conversation />
           <Config />
         </Flexbox>

package/src/pages/setting/index.page.tsx

@@ -3,7 +3,7 @@ import { memo, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
-import HeaderSpacing from '@/features/HeaderSpacing';
+import HeaderSpacing from '@/components/HeaderSpacing';
 import { createI18nNext } from '@/locales/create';
 import ChatLayout from '@/pages/chat/layout';
 

package/src/store/settings/action.ts

@@ -7,11 +7,33 @@ import type { SidebarTabKey } from './initialState';
 import { DEFAULT_SETTINGS, GlobalSettingsState } from './initialState';
 import type { SettingsStore } from './store';
 
+/**
+ * 设置操作
+ */
 export interface SettingsAction {
+  /**
+   * 重置设置
+   */
   resetSettings: () => void;
+  /**
+   * 设置全局设置
+   * @param settings - 全局设置
+   */
   setGlobalSettings: (settings: GlobalSettingsState) => void;
+  /**
+   * 设置部分配置设置
+   * @param settings - 部分配置设置
+   */
   setSettings: (settings: Partial<ConfigSettings>) => void;
+  /**
+   * 设置主题模式
+   * @param themeMode - 主题模式
+   */
   setThemeMode: (themeMode: ThemeMode) => void;
+  /**
+   * 切换侧边栏选项
+   * @param key - 选中的侧边栏选项
+   */
   switchSideBar: (key: SidebarTabKey) => void;
 }
 

package/src/store/settings/initialState.ts

@@ -1,6 +1,8 @@
 import type { ConfigSettings } from '@/types/exportConfig';
+import { LanguageModel } from '@/types/llm';
 
 export type SidebarTabKey = 'chat' | 'market';
+
 export const DEFAULT_SETTINGS: ConfigSettings = {
   accessCode: '',
   avatar: '',
@@ -14,7 +16,7 @@ export const DEFAULT_SETTINGS: ConfigSettings = {
   historyCount: 24,
   language: 'zh-CN',
   maxTokens: 2000,
-  model: 'gpt-3.5-turbo',
+  model: LanguageModel.GPT3_5,
   neutralColor: '',
   presencePenalty: 0,
   primaryColor: '',

package/src/types/exportConfig.ts

@@ -1,6 +1,8 @@
 import type { NeutralColors, PrimaryColors } from '@lobehub/ui';
 import { ThemeMode } from 'antd-style';
 
+import { LanguageModel } from '@/types/llm';
+
 import { Locales } from './locale';
 
 /**
@@ -19,7 +21,7 @@ export interface ConfigSettings {
   historyCount: number;
   language: Locales;
   maxTokens: number;
-  model: string;
+  model: LanguageModel;
   neutralColor: NeutralColors | '';
   presencePenalty: number;
   primaryColor: PrimaryColors | '';

package/tsconfig.json

@@ -18,7 +18,7 @@
     "baseUrl": ".",
     "types": ["vitest/globals"],
     "paths": {
-      "@/*": ["src/*"]
+      "@/*": ["./src/*"]
     }
   },
   "exclude": ["node_modules"],

package/src/helpers/prompt.test.ts

@@ -1,36 +0,0 @@
-import { ChatMessage } from '@lobehub/ui';
-
-import { getInputVariablesFromMessages } from '@/helpers/prompt';
-
-describe('getInputVariablesFromMessages 方法', () => {
-  it('应当在输入为空数组时返回空数组', () => {
-    const result = getInputVariablesFromMessages([]);
-    expect(result).toEqual([]);
-  });
-
-  it('应当在输入消息不包含变量时返回空数组', () => {
-    const input: ChatMessage[] = [{ role: 'user', content: 'Hello, how are you?' }];
-    const result = getInputVariablesFromMessages(input);
-    expect(result).toEqual([]);
-  });
-
-  it('应当在输入消息包含变量时返回包含变量、模板和消息索引的对象数组', () => {
-    const input: ChatMessage[] = [
-      { role: 'user', content: 'Hello {name}, how are you?' },
-      { role: 'user', content: 'My name is {name}' },
-    ];
-    const expectedOutput = ['name'];
-    const result = getInputVariablesFromMessages(input);
-    expect(result).toEqual(expectedOutput);
-  });
-
-  it('多个变量的情况', () => {
-    const input: ChatMessage[] = [
-      { role: 'user', content: 'Hello {name}, how are {you}?' },
-      { role: 'user', content: 'My name is {name}' },
-    ];
-    const expectedOutput = ['name', 'you'];
-    const result = getInputVariablesFromMessages(input);
-    expect(result).toEqual(expectedOutput);
-  });
-});

package/src/helpers/prompt.ts

@@ -1,36 +0,0 @@
-import { ChatMessage } from '@lobehub/ui';
-import {
-  AIMessagePromptTemplate,
-  ChatPromptTemplate,
-  HumanMessagePromptTemplate,
-  SystemMessagePromptTemplate,
-} from 'langchain/prompts';
-
-export const getChatPromptTemplate = (chatMessages: ChatMessage[]) =>
-  ChatPromptTemplate.fromPromptMessages(
-    chatMessages.map((m) => {
-      switch (m.role) {
-        default:
-        case 'user': {
-          return HumanMessagePromptTemplate.fromTemplate(m.content);
-        }
-
-        case 'system': {
-          return SystemMessagePromptTemplate.fromTemplate(m.content);
-        }
-
-        case 'assistant': {
-          return AIMessagePromptTemplate.fromTemplate(m.content);
-        }
-      }
-    }),
-  );
-export const getInputVariablesFromMessages = (chatMessages: ChatMessage[]) => {
-  let inputVariables: string[] = [];
-  try {
-    const chatPrompt = getChatPromptTemplate(chatMessages);
-    inputVariables = chatPrompt.inputVariables;
-  } catch {}
-
-  return inputVariables;
-};