temp

labring · Jul 11, 2024 · b919744 · b919744
1 parent c2d08fb
commit b919744
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 29 deletions.
diff --git a/packages/global/core/chat/constants.ts b/packages/global/core/chat/constants.ts
@@ -22,8 +22,7 @@ export enum ChatFileTypeEnum {
 export enum ChatItemValueTypeEnum {
   text = 'text',
   file = 'file',
-  tool = 'tool',
-  plugin = 'plugin'
+  tool = 'tool'
 }
 
 export enum ChatSourceEnum {

diff --git a/packages/global/core/chat/type.d.ts b/packages/global/core/chat/type.d.ts
@@ -42,7 +42,7 @@ export type ChatWithAppSchema = Omit<ChatSchema, 'appId'> & {
 };
 
 export type UserChatItemValueItemType = {
-  type: ChatItemValueTypeEnum.text | ChatItemValueTypeEnum.file | ChatItemValueTypeEnum.plugin;
+  type: ChatItemValueTypeEnum.text | ChatItemValueTypeEnum.file;
   text?: {
     content: string;
   };

diff --git a/packages/global/core/workflow/utils.ts b/packages/global/core/workflow/utils.ts
@@ -192,9 +192,13 @@ export const getElseIFLabel = (i: number) => {
   return i === 0 ? IfElseResultEnum.IF : `${IfElseResultEnum.ELSE_IF} ${i}`;
 };
 
-export const updateNodeInputs = (nodes: RuntimeNodeItemType[], variables: Record<string, any>) => {
+// add value to plugin input node when run plugin
+export const updatePluginInputNodeInputs = (
+  nodes: RuntimeNodeItemType[],
+  variables: Record<string, any>
+) => {
   return nodes.map((node) =>
-    node.nodeId === nodes[0].nodeId
+    node.flowNodeType === FlowNodeTypeEnum.pluginInput
       ? {
           ...node,
           inputs: node.inputs.map((input) => {

diff --git a/...onents/ChatBox/components/ChatContent.tsx → ...ents/ChatBox/components/AIResponseBox.tsx b/...onents/ChatBox/components/ChatContent.tsx → ...ents/ChatBox/components/AIResponseBox.tsx
@@ -12,26 +12,23 @@ import { ChatItemValueTypeEnum } from '@fastgpt/global/core/chat/constants';
 import {
   AIChatItemValueItemType,
   ChatSiteItemType,
-  SystemChatItemValueItemType,
   UserChatItemValueItemType
 } from '@fastgpt/global/core/chat/type';
 import React from 'react';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 
 type props = {
-  value: UserChatItemValueItemType | SystemChatItemValueItemType | AIChatItemValueItemType;
+  value: UserChatItemValueItemType | AIChatItemValueItemType;
   index: number;
-  contentkey: string;
   chat: ChatSiteItemType;
   isLastChild: boolean;
   isChatting: boolean;
   questionGuides: string[];
 };
 
-const ChatContent = ({
+const AIResponseBox = ({
   value,
   index,
-  contentkey,
   chat,
   isLastChild,
   isChatting,
@@ -55,15 +52,14 @@ ${JSON.stringify(questionGuides)}`;
 
     return (
       <Markdown
-        key={contentkey}
         source={source}
         showAnimation={isLastChild && isChatting && index === chat.value.length - 1}
       />
     );
   }
   if (value.type === ChatItemValueTypeEnum.tool && value.tools) {
     return (
-      <Box key={contentkey}>
+      <Box>
         {value.tools.map((tool) => {
           const toolParams = (() => {
             try {
@@ -135,4 +131,4 @@ ${toolResponse}`}
   return null;
 };
 
-export default React.memo(ChatContent);
+export default React.memo(AIResponseBox);
diff --git a/projects/app/src/components/ChatBox/components/ChatItem.tsx b/projects/app/src/components/ChatBox/components/ChatItem.tsx
@@ -10,7 +10,7 @@ import { ChatRoleEnum, ChatStatusEnum } from '@fastgpt/global/core/chat/constant
 import FilesBlock from './FilesBox';
 import { ChatBoxContext } from '../Provider';
 import { useContextSelector } from 'use-context-selector';
-import ChatContent from './ChatContent';
+import AIResponseBox from './AIResponseBox';
 
 const colorMap = {
   [ChatStatusEnum.loading]: {
@@ -84,9 +84,8 @@ const ChatItem = ({
           const key = `${chat.dataId}-ai-${i}`;
 
           return (
-            <ChatContent
+            <AIResponseBox
               key={key}
-              contentkey={key}
               value={value}
               index={i}
               chat={chat}

diff --git a/projects/app/src/components/ChatBox/components/PluginBox.tsx b/projects/app/src/components/ChatBox/components/PluginBox.tsx
@@ -5,7 +5,7 @@ import { useState } from 'react';
 import { Control, Controller, FieldValues, UseFormHandleSubmit } from 'react-hook-form';
 import { ChatSiteItemType } from '@fastgpt/global/core/chat/type';
 import { ChatBoxInputType, StartChatFnProps } from '../type';
-import ChatContent from './ChatContent';
+import AIResponseBox from './AIResponseBox';
 import Markdown from '@/components/Markdown';
 import { ResponseBox } from './WholeResponseModal';
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
@@ -25,8 +25,6 @@ const PluginBox = ({
   sendPrompt,
   chatHistories,
   isChatting,
-  shareId,
-  teamId,
   onStartChat
 }: {
   chatType: `${ChatTypeEnum}`;
@@ -48,8 +46,6 @@ const PluginBox = ({
   }) => void;
   chatHistories: ChatSiteItemType[];
   isChatting: boolean;
-  shareId: string | undefined;
-  teamId: string | undefined;
   onStartChat?: (e: StartChatFnProps) => Promise<
     StreamResponseType & {
       isNewChat?: boolean;
@@ -201,9 +197,8 @@ const PluginBox = ({
                       {chatHistories[1]?.value.map((value, i) => {
                         const key = `${chatHistories[1].dataId}-ai-${i}`;
                         return (
-                          <ChatContent
+                          <AIResponseBox
                             key={key}
-                            contentkey={key}
                             value={value}
                             index={i}
                             chat={chatHistories[1]}

diff --git a/projects/app/src/components/ChatBox/index.tsx b/projects/app/src/components/ChatBox/index.tsx
@@ -1085,8 +1085,6 @@ const ChatBox = (
             sendPrompt={sendPrompt}
             chatHistories={chatHistories}
             isChatting={isChatting}
-            shareId={shareId}
-            teamId={teamId}
             onStartChat={onStartChat}
           />
         )}

diff --git a/projects/app/src/pages/api/v1/chat/completions.ts b/projects/app/src/pages/api/v1/chat/completions.ts
@@ -50,7 +50,7 @@ import { NextAPI } from '@/service/middleware/entry';
 import { getAppLatestVersion } from '@fastgpt/service/core/app/controller';
 import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
 import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
-import { updateNodeInputs } from '@fastgpt/global/core/workflow/utils';
+import { updatePluginInputNodeInputs } from '@fastgpt/global/core/workflow/utils';
 
 type FastGptWebChatProps = {
   chatId?: string; // undefined: nonuse history, '': new chat, 'xxxxx': use history
@@ -202,7 +202,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
           responseChatItemId,
           runtimeNodes:
             appType === AppTypeEnum.plugin
-              ? updateNodeInputs(
+              ? updatePluginInputNodeInputs(
                   storeNodes2RuntimeNodes(nodes, getDefaultEntryNodeIds(nodes)),
                   variables
                 )

diff --git a/projects/app/src/pages/app/detail/components/useChatTest.tsx b/projects/app/src/pages/app/detail/components/useChatTest.tsx
@@ -19,7 +19,7 @@ import { StoreEdgeItemType } from '@fastgpt/global/core/workflow/type/edge';
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
 import { ChatTypeEnum } from '@/components/ChatBox/constants';
 import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
-import { updateNodeInputs } from '@fastgpt/global/core/workflow/utils';
+import { updatePluginInputNodeInputs } from '@fastgpt/global/core/workflow/utils';
 
 export const useChatTest = ({
   nodes,
@@ -49,7 +49,7 @@ export const useChatTest = ({
           prompt: appDetail.type === AppTypeEnum.plugin ? [] : chatList[chatList.length - 2].value,
           nodes:
             appDetail.type === AppTypeEnum.plugin
-              ? updateNodeInputs(
+              ? updatePluginInputNodeInputs(
                   storeNodes2RuntimeNodes(nodes, getDefaultEntryNodeIds(nodes)),
                   variables
                 )