v4.4.5-3 (#357)

2025-07-30 02:12:38 +00:00 · 2023-09-26 21:17:13 +08:00
parent a11e0bd9c3
commit 11848b8f44
34 changed files with 395 additions and 62 deletions
--- a/projects/app/src/pages/api/chat/init.ts
+++ b/projects/app/src/pages/api/chat/init.ts
@@ -6,7 +6,7 @@ import { authUser } from '@/service/utils/auth';
 import { ChatItemType } from '@/types/chat';
 import { authApp } from '@/service/utils/auth';
 import type { ChatSchema } from '@/types/mongoSchema';
-import { getGuideModules, getChatModelNameList } from '@/components/ChatBox/utils';
+import { getChatModelNameList, getGuideModule } from '@/components/ChatBox/utils';
 import { TaskResponseKeyEnum } from '@/constants/chat';

 /* 初始化我的聊天框，需要身份验证 */
@@ -81,7 +81,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
        chatId,
        appId,
        app: {
-          ...getGuideModules(app.modules),
+          userGuideModule: getGuideModule(app.modules),
          chatModels: getChatModelNameList(app.modules),
          name: app.name,
          avatar: app.avatar,
--- a/projects/app/src/pages/api/core/ai/agent/createQuestionGuide.ts
+++ b/projects/app/src/pages/api/core/ai/agent/createQuestionGuide.ts
@@ -0,0 +1,77 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@/service/response';
+import { connectToDatabase } from '@/service/mongo';
+import { authUser } from '@/service/utils/auth';
+import { CreateQuestionGuideProps } from '@/api/core/ai/agent/type';
+import { getAIChatApi } from '@fastgpt/core/aiApi/config';
+import { Prompt_QuestionGuide } from '@/prompts/core/agent';
+import { pushQuestionGuideBill } from '@/service/common/bill/push';
+import { defaultQGModel } from '@/pages/api/system/getInitData';
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
+  try {
+    await connectToDatabase();
+    const { messages } = req.body as CreateQuestionGuideProps;
+    const { user } = await authUser({ req, authToken: true, authApiKey: true, authBalance: true });
+
+    if (!user) {
+      throw new Error('user not found');
+    }
+    const qgModel = global.qgModel || defaultQGModel;
+
+    const chatAPI = getAIChatApi(user.openaiAccount);
+
+    const { data } = await chatAPI.createChatCompletion({
+      model: qgModel.model,
+      temperature: 0,
+      max_tokens: 200,
+      messages: [
+        ...messages,
+        {
+          role: 'user',
+          content: Prompt_QuestionGuide
+        }
+      ],
+      stream: false
+    });
+
+    const answer = data.choices?.[0].message?.content || '';
+    const totalTokens = data.usage?.total_tokens || 0;
+
+    const start = answer.indexOf('[');
+    const end = answer.lastIndexOf(']');
+
+    if (start === -1 || end === -1) {
+      return jsonRes(res, {
+        data: []
+      });
+    }
+
+    const jsonStr = answer
+      .substring(start, end + 1)
+      .replace(/(\\n|\\)/g, '')
+      .replace(/  /g, '');
+
+    try {
+      jsonRes(res, {
+        data: JSON.parse(jsonStr)
+      });
+
+      pushQuestionGuideBill({
+        tokens: totalTokens,
+        userId: user._id
+      });
+
+      return;
+    } catch (error) {
+      return jsonRes(res, {
+        data: []
+      });
+    }
+  } catch (err) {
+    jsonRes(res, {
+      code: 500,
+      error: err
+    });
+  }
+}
--- a/projects/app/src/pages/api/support/outLink/init.ts
+++ b/projects/app/src/pages/api/support/outLink/init.ts
@@ -4,7 +4,7 @@ import { connectToDatabase, OutLink, User } from '@/service/mongo';
 import type { InitShareChatResponse } from '@/api/response/chat';
 import { authApp } from '@/service/utils/auth';
 import { HUMAN_ICON } from '@/constants/chat';
-import { getChatModelNameList, getGuideModules } from '@/components/ChatBox/utils';
+import { getChatModelNameList, getGuideModule } from '@/components/ChatBox/utils';
 import { authShareChatInit } from '@/service/support/outLink/auth';

 /* init share chat window */
@@ -46,7 +46,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
      data: {
        userAvatar: user?.avatar || HUMAN_ICON,
        app: {
-          ...getGuideModules(app.modules),
+          userGuideModule: getGuideModule(app.modules),
          chatModels: getChatModelNameList(app.modules),
          name: app.name,
          avatar: app.avatar,
--- a/projects/app/src/pages/api/system/getInitData.ts
+++ b/projects/app/src/pages/api/system/getInitData.ts
@@ -97,6 +97,14 @@ export const defaultCQModel: FunctionModelItemType = {
  prompt: '',
  functionCall: true
 };
+export const defaultQGModel: FunctionModelItemType = {
+  model: 'gpt-3.5-turbo',
+  name: 'FastAI-4k',
+  maxToken: 4000,
+  price: 1.5,
+  prompt: '',
+  functionCall: false
+};

 const defaultVectorModels: VectorModelItemType[] = [
  {
@@ -130,6 +138,7 @@ export async function getInitConfig() {
    global.qaModel = res.QAModel || defaultQAModel;
    global.extractModel = res.ExtractModel || defaultExtractModel;
    global.cqModel = res.CQModel || defaultCQModel;
+    global.qgModel = res.QGModel || defaultQGModel;
    global.vectorModels = res.VectorModels || defaultVectorModels;
  } catch (error) {
    setDefaultData();
@@ -143,6 +152,9 @@ export function setDefaultData() {
  global.chatModels = defaultChatModels;
  global.qaModel = defaultQAModel;
  global.vectorModels = defaultVectorModels;
+  global.extractModel = defaultExtractModel;
+  global.cqModel = defaultCQModel;
+  global.qgModel = defaultQGModel;
 }

 export function getSystemVersion() {
--- a/projects/app/src/pages/app/detail/components/AdEdit/components/ChatTest.tsx
+++ b/projects/app/src/pages/app/detail/components/AdEdit/components/ChatTest.tsx
@@ -15,7 +15,7 @@ import { streamFetch } from '@/api/fetch';
 import MyTooltip from '@/components/MyTooltip';
 import { useUserStore } from '@/store/user';
 import ChatBox, { type ComponentRef, type StartChatFnProps } from '@/components/ChatBox';
-import { getGuideModules } from '@/components/ChatBox/utils';
+import { getGuideModule } from '@/components/ChatBox/utils';

 export type ChatTestComponentRef = {
  resetChatTest: () => void;
@@ -114,7 +114,7 @@ const ChatTest = (
            appAvatar={app.avatar}
            userAvatar={userInfo?.avatar}
            showMarkIcon
-            {...getGuideModules(modules)}
+            userGuideModule={getGuideModule(modules)}
            onStartChat={startChat}
            onDelMessage={() => {}}
          />
--- a/projects/app/src/pages/app/detail/components/AdEdit/components/Nodes/NodeUserGuide.tsx
+++ b/projects/app/src/pages/app/detail/components/AdEdit/components/Nodes/NodeUserGuide.tsx
@@ -4,19 +4,20 @@ import {
  Box,
  Flex,
  Textarea,
-  Button,
+  useTheme,
  Table,
  Thead,
  Tbody,
  Tr,
  Th,
  Td,
-  TableContainer
+  TableContainer,
+  Switch
 } from '@chakra-ui/react';
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
 import { FlowModuleItemType } from '@/types/flow';
 import { SystemInputEnum } from '@/constants/app';
-import { welcomeTextTip, variableTip } from '@/constants/flow/ModuleTemplate';
+import { welcomeTextTip, variableTip, questionGuideTip } from '@/constants/flow/ModuleTemplate';

 import VariableEditModal, { addVariable } from '../../../VariableEditModal';
 import MyIcon from '@/components/Icon';
@@ -26,14 +27,18 @@ import NodeCard from '../modules/NodeCard';
 import { VariableItemType } from '@/types/app';

 const NodeUserGuide = ({ data }: NodeProps<FlowModuleItemType>) => {
+  const theme = useTheme();
  return (
    <>
      <NodeCard minW={'300px'} {...data}>
        <Container borderTop={'2px solid'} borderTopColor={'myGray.200'}>
          <WelcomeText data={data} />
-          <Box mt={3}>
+          <Box pt={4} pb={2}>
            <ChatStartVariable data={data} />
          </Box>
+          <Box pt={3} borderTop={theme.borders.base}>
+            <QuestionGuide data={data} />
+          </Box>
        </Container>
      </NodeCard>
    </>
@@ -196,3 +201,40 @@ function ChatStartVariable({ data }: { data: FlowModuleItemType }) {
    </>
  );
 }
+
+function QuestionGuide({ data }: { data: FlowModuleItemType }) {
+  const { inputs, moduleId, onChangeNode } = data;
+  const questionGuide = useMemo(
+    () =>
+      (inputs.find((item) => item.key === SystemInputEnum.questionGuide)?.value as boolean) ||
+      false,
+    [inputs]
+  );
+
+  return (
+    <Flex alignItems={'center'}>
+      <MyIcon name={'questionGuide'} mr={2} w={'16px'} />
+      <Box>下一步指引</Box>
+      <MyTooltip label={questionGuideTip} forceShow>
+        <QuestionOutlineIcon display={['none', 'inline']} ml={1} />
+      </MyTooltip>
+      <Box flex={1} />
+      <Switch
+        isChecked={questionGuide}
+        size={'lg'}
+        onChange={(e) => {
+          const value = e.target.checked;
+          onChangeNode({
+            moduleId,
+            key: SystemInputEnum.questionGuide,
+            type: 'inputs',
+            value: {
+              ...inputs.find((item) => item.key === SystemInputEnum.questionGuide),
+              value
+            }
+          });
+        }}
+      />
+    </Flex>
+  );
+}
--- a/projects/app/src/pages/app/detail/components/BasicEdit/index.tsx
+++ b/projects/app/src/pages/app/detail/components/BasicEdit/index.tsx
@@ -16,7 +16,8 @@ import {
  useDisclosure,
  Button,
  IconButton,
-  Text
+  Text,
+  Switch
 } from '@chakra-ui/react';
 import { useUserStore } from '@/store/user';
 import { useQuery } from '@tanstack/react-query';
@@ -34,7 +35,8 @@ import { formatPrice } from '@fastgpt/common/bill/index';
 import {
  ChatModelSystemTip,
  ChatModelLimitTip,
-  welcomeTextTip
+  welcomeTextTip,
+  questionGuideTip
 } from '@/constants/flow/ModuleTemplate';
 import { AppModuleItemType, VariableItemType } from '@/types/app';
 import { useRequest } from '@/hooks/useRequest';
@@ -46,7 +48,7 @@ import { useToast } from '@/hooks/useToast';
 import { AppSchema } from '@/types/mongoSchema';
 import { delModelById } from '@/api/app';
 import { useTranslation } from 'react-i18next';
-import { getGuideModules } from '@/components/ChatBox/utils';
+import { getGuideModule } from '@/components/ChatBox/utils';

 import dynamic from 'next/dynamic';
 import MySelect from '@/components/Select';
@@ -89,6 +91,7 @@ const Settings = ({ appId }: { appId: string }) => {
  const { register, setValue, getValues, reset, handleSubmit, control } = useForm<EditFormType>({
    defaultValues: getDefaultAppForm()
  });
+
  const {
    fields: variables,
    append: appendVariable,
@@ -157,7 +160,9 @@ const Settings = ({ appId }: { appId: string }) => {
  const appModule2Form = useCallback(() => {
    const formVal = appModules2Form(appDetail.modules);
    reset(formVal);
-    setRefresh((state) => !state);
+    setTimeout(() => {
+      setRefresh((state) => !state);
+    }, 100);
  }, [appDetail.modules, reset]);

  const { mutate: onSubmitSave, isLoading: isSaving } = useRequest({
@@ -536,6 +541,26 @@ const Settings = ({ appId }: { appId: string }) => {
        </Grid>
      </Box>

+      <Box mt={5} {...BoxStyles}>
+        <Flex alignItems={'center'}>
+          <MyIcon name={'questionGuide'} mr={2} w={'16px'} />
+          <Box>下一步指引</Box>
+          <MyTooltip label={questionGuideTip} forceShow>
+            <QuestionOutlineIcon display={['none', 'inline']} ml={1} />
+          </MyTooltip>
+          <Box flex={1} />
+          <Switch
+            isChecked={getValues('questionGuide')}
+            size={'lg'}
+            onChange={(e) => {
+              const value = e.target.checked;
+              setValue('questionGuide', value);
+              setRefresh((state) => !state);
+            }}
+          />
+        </Flex>
+      </Box>
+
      <ConfirmSaveModal />
      <ConfirmDelModal />
      {settingAppInfo && (
@@ -678,7 +703,7 @@ const ChatTest = ({ appId }: { appId: string }) => {
          appAvatar={appDetail.avatar}
          userAvatar={userInfo?.avatar}
          showMarkIcon
-          {...getGuideModules(modules)}
+          userGuideModule={getGuideModule(modules)}
          onStartChat={startChat}
          onDelMessage={() => {}}
        />
--- a/projects/app/src/pages/app/detail/components/Logs.tsx
+++ b/projects/app/src/pages/app/detail/components/Logs.tsx
@@ -293,8 +293,7 @@ function DetailLogsModal({
            feedbackType={'admin'}
            showMarkIcon
            showVoiceIcon={false}
-            variableModules={chat?.app.variableModules}
-            welcomeText={chat?.app.welcomeText}
+            userGuideModule={chat?.app?.userGuideModule}
          />
        </Box>
      </Flex>
--- a/projects/app/src/pages/app/detail/components/OutLink/Share.tsx
+++ b/projects/app/src/pages/app/detail/components/OutLink/Share.tsx
@@ -97,7 +97,7 @@ const Share = ({ appId }: { appId: string }) => {
                  <Th>金额限制(￥)</Th>
                  <Th>IP限流（人/分钟）</Th>
                  <Th>过期时间</Th>
-                  <Th>token校验</Th>
+                  <Th>身份校验</Th>
                </>
              )}
              <Th>最后使用时间</Th>
--- a/projects/app/src/pages/chat/index.tsx
+++ b/projects/app/src/pages/chat/index.tsx
@@ -361,9 +361,8 @@ const Chat = ({ appId, chatId }: { appId: string; chatId: string }) => {
                chatId={chatId}
                appAvatar={chatData.app.avatar}
                userAvatar={userInfo?.avatar}
-                variableModules={chatData.app.variableModules}
+                userGuideModule={chatData.app?.userGuideModule}
                feedbackType={'user'}
-                welcomeText={chatData.app.welcomeText}
                onUpdateVariable={(e) => {}}
                onStartChat={startChat}
                onDelMessage={delOneHistoryItem}
--- a/projects/app/src/pages/chat/share.tsx
+++ b/projects/app/src/pages/chat/share.tsx
@@ -245,8 +245,7 @@ const OutLink = ({
              ref={ChatBoxRef}
              appAvatar={shareChatData.app.avatar}
              userAvatar={shareChatData.userAvatar}
-              variableModules={shareChatData.app.variableModules}
-              welcomeText={shareChatData.app.welcomeText}
+              userGuideModule={shareChatData.app?.userGuideModule}
              feedbackType={'user'}
              onUpdateVariable={(e) => {
                setShareChatData((state) => ({