@lobehub/chat 0.90.1 → 0.90.3

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+### [Version 0.90.3](https://github.com/lobehub/lobe-chat/compare/v0.90.2...v0.90.3)
+
+<sup>Released on **2023-10-17**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix ActionBar props and regenerate btn with error message.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix ActionBar props and regenerate btn with error message, closes [#337](https://github.com/lobehub/lobe-chat/issues/337) ([246e8fd](https://github.com/lobehub/lobe-chat/commit/246e8fd))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 0.90.2](https://github.com/lobehub/lobe-chat/compare/v0.90.1...v0.90.2)
+
+<sup>Released on **2023-10-17**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Refactor OpenAIStreamPayload with chat name.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Refactor OpenAIStreamPayload with chat name ([a799530](https://github.com/lobehub/lobe-chat/commit/a799530))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.90.1](https://github.com/lobehub/lobe-chat/compare/v0.90.0...v0.90.1)
 
 <sup>Released on **2023-10-17**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.90.1",
+  "version": "0.90.3",
   "description": "An open-source, extensible (Function Calling), high-performance chatbot framework. It supports one-click free deployment of your private ChatGPT/LLM web application",
   "keywords": [
     "chatbot",

package/src/app/api/openai/{createChatCompletion.ts → chat/createChatCompletion.ts}

@@ -3,11 +3,11 @@ import OpenAI from 'openai';
 
 import { createErrorResponse } from '@/app/api/openai/errorResponse';
 import { ChatErrorType } from '@/types/fetch';
-import { OpenAIStreamPayload } from '@/types/openai';
+import { OpenAIChatStreamPayload } from '@/types/openai/chat';
 
 interface CreateChatCompletionOptions {
   openai: OpenAI;
-  payload: OpenAIStreamPayload;
+  payload: OpenAIChatStreamPayload;
 }
 
 export const createChatCompletion = async ({ payload, openai }: CreateChatCompletionOptions) => {

package/src/app/api/openai/chat/route.ts

@@ -3,18 +3,18 @@ import OpenAI from 'openai';
 import { getServerConfig } from '@/config/server';
 import { getOpenAIAuthFromRequest } from '@/const/fetch';
 import { ChatErrorType, ErrorType } from '@/types/fetch';
-import { OpenAIStreamPayload } from '@/types/openai';
+import { OpenAIChatStreamPayload } from '@/types/openai/chat';
 
 import { checkAuth } from '../../auth';
 import { createAzureOpenai } from '../createAzureOpenai';
-import { createChatCompletion } from '../createChatCompletion';
 import { createOpenai } from '../createOpenai';
 import { createErrorResponse } from '../errorResponse';
+import { createChatCompletion } from './createChatCompletion';
 
 export const runtime = 'edge';
 
 export const POST = async (req: Request) => {
-  const payload = (await req.json()) as OpenAIStreamPayload;
+  const payload = (await req.json()) as OpenAIChatStreamPayload;
 
   const { apiKey, accessCode, endpoint, useAzure, apiVersion } = getOpenAIAuthFromRequest(req);
 

package/src/app/chat/features/Conversation/ChatList/Messages/Assistant.tsx

@@ -13,12 +13,11 @@ import { Flexbox } from 'react-layout-kit';
 
 import { useSessionStore } from '@/store/session';
 import { agentSelectors } from '@/store/session/slices/agentConfig';
-import { currentFunctionCallProps } from '@/store/session/slices/chat/selectors/chat';
+import { chatSelectors } from '@/store/session/slices/chat/selectors';
 import { isFunctionMessage } from '@/utils/message';
 
 import FunctionCall from '../Plugins/FunctionCall';
 import { DefautMessage } from './Default';
-import { SystemActionsBar } from './System';
 
 const useStyles = createStyles(({ css }) => ({
   container: css`
@@ -34,7 +33,7 @@ const useStyles = createStyles(({ css }) => ({
 
 export const AssistantMessage: RenderMessage = memo(
   ({ id, plugin, function_call, content, ...props }) => {
-    const genFunctionCallProps = useSessionStore(currentFunctionCallProps);
+    const genFunctionCallProps = useSessionStore(chatSelectors.currentFunctionCallProps);
 
     if (!isFunctionMessage(content)) return <DefautMessage content={content} id={id} {...props} />;
 
@@ -65,16 +64,15 @@ export const AssistantMessageExtra: RenderMessageExtra = memo(({ extra, function
   );
 });
 
-export const AssistantActionsBar: RenderAction = memo(({ text, error, id, ...props }) => {
+export const AssistantActionsBar: RenderAction = memo(({ text, error, id, onActionClick }) => {
   const { regenerate, edit, copy, divider, del } = useChatListActionsBar(text);
   if (id === 'default') return;
-  if (error) return <SystemActionsBar id={id} text={text} {...props} />;
   return (
     <ActionIconGroup
-      dropdownMenu={[edit, copy, regenerate, divider, del]}
-      items={[regenerate, copy]}
+      dropdownMenu={error ? [regenerate, divider, del] : [edit, copy, regenerate, divider, del]}
+      items={[regenerate]}
+      onActionClick={onActionClick}
       type="ghost"
-      {...props}
     />
   );
 });

package/src/app/chat/features/Conversation/ChatList/Messages/Function.tsx

@@ -3,14 +3,14 @@ import { memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
 import { useSessionStore } from '@/store/session';
-import { currentFunctionCallProps } from '@/store/session/slices/chat/selectors/chat';
+import { chatSelectors } from '@/store/session/selectors';
 
 import FunctionCall from '../Plugins/FunctionCall';
 import PluginMessage from '../Plugins/PluginMessage';
 
 export const FunctionMessage: RenderMessage = memo(
   ({ id, content, plugin, function_call, ...props }) => {
-    const genFunctionCallProps = useSessionStore(currentFunctionCallProps);
+    const genFunctionCallProps = useSessionStore(chatSelectors.currentFunctionCallProps);
     const fcProps = genFunctionCallProps({ content, function_call, id, plugin });
 
     return (
@@ -29,14 +29,14 @@ export const FunctionMessage: RenderMessage = memo(
   },
 );
 
-export const FunctionActionsBar: RenderAction = memo(({ text, ...props }) => {
+export const FunctionActionsBar: RenderAction = memo(({ text, onActionClick }) => {
   const { regenerate, divider, del } = useChatListActionsBar(text);
   return (
     <ActionIconGroup
       dropdownMenu={[regenerate, divider, del]}
       items={[regenerate]}
+      onActionClick={onActionClick}
       type="ghost"
-      {...props}
     />
   );
 });

package/src/app/chat/features/Conversation/ChatList/Messages/System.tsx

@@ -1,7 +1,9 @@
 import { ActionIconGroup, RenderAction, useChatListActionsBar } from '@lobehub/ui';
 import { memo } from 'react';
 
-export const SystemActionsBar: RenderAction = memo(({ text, ...props }) => {
+export const SystemActionsBar: RenderAction = memo(({ text, onActionClick }) => {
   const { del } = useChatListActionsBar(text);
-  return <ActionIconGroup dropdownMenu={[del]} items={[]} type="ghost" {...props} />;
+  return (
+    <ActionIconGroup dropdownMenu={[del]} items={[]} onActionClick={onActionClick} type="ghost" />
+  );
 });

package/src/app/chat/features/Conversation/ChatList/Messages/User.tsx

@@ -1,14 +1,14 @@
 import { ActionIconGroup, RenderAction, useChatListActionsBar } from '@lobehub/ui';
 import { memo } from 'react';
 
-export const UserActionsBar: RenderAction = memo(({ text, ...props }) => {
+export const UserActionsBar: RenderAction = memo(({ text, onActionClick }) => {
   const { regenerate, edit, copy, divider, del } = useChatListActionsBar(text);
   return (
     <ActionIconGroup
       dropdownMenu={[edit, copy, regenerate, divider, del]}
       items={[regenerate, edit]}
+      onActionClick={onActionClick}
       type="ghost"
-      {...props}
     />
   );
 });

package/src/prompts/agent.ts

@@ -1,7 +1,7 @@
-import { OpenAIStreamPayload } from '@/types/openai';
+import { OpenAIChatStreamPayload } from '@/types/openai/chat';
 
 // 自动起名
-export const promptSummaryAgentName = (content: string): Partial<OpenAIStreamPayload> => ({
+export const promptSummaryAgentName = (content: string): Partial<OpenAIChatStreamPayload> => ({
   messages: [
     {
       content: `你是一名擅长起名的起名大师，你需要将用户的描述总结为 20 个字以内的角色，格式要求如下：
@@ -32,7 +32,7 @@ export const promptSummaryAgentName = (content: string): Partial<OpenAIStreamPay
 });
 
 // 自动挑选 emoji 和背景色
-export const promptPickEmoji = (content: string): Partial<OpenAIStreamPayload> => ({
+export const promptPickEmoji = (content: string): Partial<OpenAIChatStreamPayload> => ({
   messages: [
     {
       content: '你是一名非常懂设计与时尚的设计师，你需要从用户的描述中匹配一个合适的 emoji。',
@@ -61,7 +61,7 @@ export const promptPickEmoji = (content: string): Partial<OpenAIStreamPayload> =
   ],
 });
 
-export const promptSummaryDescription = (content: string): Partial<OpenAIStreamPayload> => ({
+export const promptSummaryDescription = (content: string): Partial<OpenAIChatStreamPayload> => ({
   messages: [
     {
       content:

package/src/prompts/chat.ts

@@ -1,10 +1,10 @@
 import { chatHelpers } from '@/store/session/helpers';
 import { LanguageModel } from '@/types/llm';
-import { OpenAIChatMessage, OpenAIStreamPayload } from '@/types/openai';
+import { OpenAIChatMessage, OpenAIChatStreamPayload } from '@/types/openai/chat';
 
 export const promptSummaryTitle = async (
   messages: OpenAIChatMessage[],
-): Promise<Partial<OpenAIStreamPayload>> => {
+): Promise<Partial<OpenAIChatStreamPayload>> => {
   const finalMessages: OpenAIChatMessage[] = [
     {
       content:

package/src/services/chatModel.ts

@@ -2,7 +2,7 @@ import { merge } from 'lodash-es';
 
 import { pluginSelectors, usePluginStore } from '@/store/plugin';
 import { initialLobeAgentConfig } from '@/store/session/initialState';
-import type { ChatCompletionFunctions, OpenAIStreamPayload } from '@/types/openai';
+import type { ChatCompletionFunctions, OpenAIChatStreamPayload } from '@/types/openai/chat';
 
 import { createHeaderWithOpenAI } from './_header';
 import { OPENAI_URLS } from './_url';
@@ -15,7 +15,7 @@ interface FetchChatModelOptions {
  * 专门用于对话的 fetch
  */
 export const fetchChatModel = (
-  { plugins: enabledPlugins, ...params }: Partial<OpenAIStreamPayload>,
+  { plugins: enabledPlugins, ...params }: Partial<OpenAIChatStreamPayload>,
   options?: FetchChatModelOptions,
 ) => {
   const payload = merge(

package/src/store/plugin/selectors.ts

@@ -2,7 +2,7 @@ import { uniqBy } from 'lodash-es';
 
 import { PLUGIN_SCHEMA_SEPARATOR } from '@/const/plugin';
 import { pluginHelpers } from '@/store/plugin/helpers';
-import { ChatCompletionFunctions } from '@/types/openai';
+import { ChatCompletionFunctions } from '@/types/openai/chat';
 
 import { PluginStoreState } from './initialState';
 

package/src/store/session/slices/chat/helpers.ts

@@ -1,4 +1,4 @@
-import { OpenAIChatMessage } from '@/types/openai';
+import { OpenAIChatMessage } from '@/types/openai/chat';
 import { encodeAsync } from '@/utils/tokenizer';
 
 export const getMessagesTokenCount = async (messages: OpenAIChatMessage[]) =>

package/src/store/session/slices/chat/selectors/index.ts

@@ -3,6 +3,7 @@ import {
   currentChats,
   currentChatsWithGuideMessage,
   currentChatsWithHistoryConfig,
+  currentFunctionCallProps,
   getChatsById,
 } from './chat';
 import { currentTopics, getTopicMessages } from './topic';
@@ -12,6 +13,7 @@ export const chatSelectors = {
   currentChats,
   currentChatsWithGuideMessage,
   currentChatsWithHistoryConfig,
+  currentFunctionCallProps,
   getChatsById,
 };
 

package/src/types/{openai.ts → openai/chat.ts}

@@ -20,7 +20,7 @@ export interface OpenAIChatMessage {
 /**
  * @title OpenAI Stream Payload
  */
-export interface OpenAIStreamPayload {
+export interface OpenAIChatStreamPayload {
   /**
    * @title 控制生成文本中的惩罚系数，用于减少重复性
    * @default 0