name

dc1599ba · archer · 53a4d9db · dc1599ba · dc1599ba · dc1599ba
Commit dc1599ba authored Jul 17, 2023 by archer
21 changed files
--- a/client/src/api/chat.ts
+++ b/client/src/api/chat.ts
@@ -4,7 +4,7 @@ import type { InitChatResponse, InitShareChatResponse } from './response/chat';
 import { RequestPaging } from '../types/index';
 import type { ShareChatSchema } from '@/types/mongoSchema';
 import type { ShareChatEditType } from '@/types/app';
-import type { QuoteItemType } from '@/pages/api/openapi/modules/kb/search';
+import type { QuoteItemType } from '@/pages/api/app/modules/kb/search';
 import type { Props as UpdateHistoryProps } from '@/pages/api/chat/history/updateChatHistory';
 /**

--- a/client/src/api/fetch.ts
+++ b/client/src/api/fetch.ts
 import { sseResponseEventEnum } from '@/constants/chat';
 import { getErrText } from '@/utils/tools';
 import { parseStreamChunk } from '@/utils/adapt';
-import { QuoteItemType } from '@/pages/api/openapi/modules/kb/search';
+import { QuoteItemType } from '@/pages/api/app/modules/kb/search';
 import { rawSearchKey } from '@/constants/chat';
 interface StreamFetchProps {

--- a/client/src/components/ChatBox/QuoteModal.tsx
+++ b/client/src/components/ChatBox/QuoteModal.tsx
@@ -17,7 +17,7 @@ import { useQuery } from '@tanstack/react-query';
 import { getHistoryQuote, updateHistoryQuote } from '@/api/chat';
 import { useToast } from '@/hooks/useToast';
 import { getErrText } from '@/utils/tools';
-import { QuoteItemType } from '@/pages/api/openapi/modules/kb/search';
+import { QuoteItemType } from '@/pages/api/app/modules/kb/search';
 const QuoteModal = ({
  historyId,

--- a/client/src/components/ChatBox/index.tsx
+++ b/client/src/components/ChatBox/index.tsx
@@ -34,7 +34,7 @@ import dynamic from 'next/dynamic';
 const QuoteModal = dynamic(() => import('./QuoteModal'));
 import styles from './index.module.scss';
-import { QuoteItemType } from '@/pages/api/openapi/modules/kb/search';
+import { QuoteItemType } from '@/pages/api/app/modules/kb/search';
 const textareaMinH = '22px';
 export type StartChatFnProps = {

--- a/client/src/constants/app.ts
+++ b/client/src/constants/app.ts
@@ -38,7 +38,7 @@ export const appTemplates: (AppItemType & { avatar: string; intro: string })[] =
        intro: '用户输入的内容。该模块通常作为应用的入口，用户在发送消息后会首先执行该模块。',
        type: 'initInput',
        flowType: 'questionInput',
-        url: '/openapi/modules/init/userChatInput',
+        url: '/app/modules/init/userChatInput',
        inputs: [
          {
            key: 'userChatInput',
@@ -72,7 +72,7 @@ export const appTemplates: (AppItemType & { avatar: string; intro: string })[] =
        intro: 'AI 大模型对话',
        flowType: 'chatNode',
        type: 'http',
-        url: '/openapi/modules/chat/gpt',
+        url: '/app/modules/chat/gpt',
        inputs: [
          {
            key: 'model',
@@ -203,7 +203,7 @@ export const appTemplates: (AppItemType & { avatar: string; intro: string })[] =
        intro: '用户输入的内容。该模块通常作为应用的入口，用户在发送消息后会首先执行该模块。',
        type: 'initInput',
        flowType: 'historyNode',
-        url: '/openapi/modules/init/history',
+        url: '/app/modules/init/history',
        inputs: [
          {
            key: 'maxContext',
@@ -254,7 +254,7 @@ export const appTemplates: (AppItemType & { avatar: string; intro: string })[] =
        intro: '用户输入的内容。该模块通常作为应用的入口，用户在发送消息后会首先执行该模块。',
        type: 'initInput',
        flowType: 'questionInput',
-        url: '/openapi/modules/init/userChatInput',
+        url: '/app/modules/init/userChatInput',
        inputs: [
          {
            key: 'userChatInput',
@@ -292,7 +292,7 @@ export const appTemplates: (AppItemType & { avatar: string; intro: string })[] =
        intro: '用户输入的内容。该模块通常作为应用的入口，用户在发送消息后会首先执行该模块。',
        type: 'initInput',
        flowType: 'historyNode',
-        url: '/openapi/modules/init/history',
+        url: '/app/modules/init/history',
        inputs: [
          {
            key: 'maxContext',
@@ -335,7 +335,7 @@ export const appTemplates: (AppItemType & { avatar: string; intro: string })[] =
        intro: 'AI 大模型对话',
        flowType: 'chatNode',
        type: 'http',
-        url: '/openapi/modules/chat/gpt',
+        url: '/app/modules/chat/gpt',
        inputs: [
          {
            key: 'model',
@@ -466,7 +466,7 @@ export const appTemplates: (AppItemType & { avatar: string; intro: string })[] =
        intro: '去知识库中搜索对应的答案。可作为 AI 对话引用参考。',
        flowType: 'kbSearchNode',
        type: 'http',
-        url: '/openapi/modules/kb/search',
+        url: '/app/modules/kb/search',
        inputs: [
          {
            key: 'kb_ids',
@@ -609,7 +609,7 @@ export const appTemplates: (AppItemType & { avatar: string; intro: string })[] =
        intro: '用户输入的内容。该模块通常作为应用的入口，用户在发送消息后会首先执行该模块。',
        type: 'initInput',
        flowType: 'questionInput',
-        url: '/openapi/modules/init/userChatInput',
+        url: '/app/modules/init/userChatInput',
        inputs: [
          {
            key: 'userChatInput',
@@ -643,7 +643,7 @@ export const appTemplates: (AppItemType & { avatar: string; intro: string })[] =
        intro: 'OpenAI GPT 大模型对话。',
        flowType: 'chatNode',
        type: 'http',
-        url: '/openapi/modules/chat/gpt',
+        url: '/app/modules/chat/gpt',
        inputs: [
          {
            key: 'model',
@@ -774,7 +774,7 @@ export const appTemplates: (AppItemType & { avatar: string; intro: string })[] =
        intro: '用户输入的内容。该模块通常作为应用的入口，用户在发送消息后会首先执行该模块。',
        type: 'initInput',
        flowType: 'historyNode',
-        url: '/openapi/modules/init/history',
+        url: '/app/modules/init/history',
        inputs: [
          {
            key: 'maxContext',
@@ -876,7 +876,7 @@ export const appTemplates: (AppItemType & { avatar: string; intro: string })[] =
  {
    id: 'CQ',
    avatar: '/imgs/module/cq.png',
-    name: '意图识别 + 知识库',
+    name: '问题分类 + 知识库',
    intro: '先对用户的问题进行分类，再根据不同类型问题，执行不同的操作',
    modules: [
      {
@@ -885,7 +885,7 @@ export const appTemplates: (AppItemType & { avatar: string; intro: string })[] =
        intro: '用户输入的内容。该模块通常作为应用的入口，用户在发送消息后会首先执行该模块。',
        type: 'initInput',
        flowType: 'questionInput',
-        url: '/openapi/modules/init/userChatInput',
+        url: '/app/modules/init/userChatInput',
        inputs: [
          {
            key: 'userChatInput',
@@ -927,7 +927,7 @@ export const appTemplates: (AppItemType & { avatar: string; intro: string })[] =
        intro: '用户输入的内容。该模块通常作为应用的入口，用户在发送消息后会首先执行该模块。',
        type: 'initInput',
        flowType: 'historyNode',
-        url: '/openapi/modules/init/history',
+        url: '/app/modules/init/history',
        inputs: [
          {
            key: 'maxContext',
@@ -970,7 +970,7 @@ export const appTemplates: (AppItemType & { avatar: string; intro: string })[] =
        intro: 'OpenAI GPT 大模型对话。',
        flowType: 'chatNode',
        type: 'http',
-        url: '/openapi/modules/chat/gpt',
+        url: '/app/modules/chat/gpt',
        inputs: [
          {
            key: 'model',
@@ -1101,7 +1101,7 @@ export const appTemplates: (AppItemType & { avatar: string; intro: string })[] =
        intro: '去知识库中搜索对应的答案。可作为 AI 对话引用参考。',
        flowType: 'kbSearchNode',
        type: 'http',
-        url: '/openapi/modules/kb/search',
+        url: '/app/modules/kb/search',
        inputs: [
          {
            key: 'kb_ids',
@@ -1208,7 +1208,7 @@ export const appTemplates: (AppItemType & { avatar: string; intro: string })[] =
        intro: '用户输入的内容。该模块通常作为应用的入口，用户在发送消息后会首先执行该模块。',
        type: 'initInput',
        flowType: 'historyNode',
-        url: '/openapi/modules/init/history',
+        url: '/app/modules/init/history',
        inputs: [
          {
            key: 'maxContext',
@@ -1303,11 +1303,11 @@ export const appTemplates: (AppItemType & { avatar: string; intro: string })[] =
      },
      {
        logo: '/imgs/module/cq.png',
-        name: '意图识别',
+        name: '问题分类',
        intro: '可以判断用户问题属于哪方面问题，从而执行不同的操作。',
        type: 'http',
-        url: '/openapi/modules/agent/recognizeIntention',
+        url: '/app/modules/agent/classifyQuestion',
-        flowType: 'recognizeIntention',
+        flowType: 'classifyQuestion',
        inputs: [
          {
            key: 'systemPrompt',

--- a/client/src/constants/flow/ModuleTemplate.ts
+++ b/client/src/constants/flow/ModuleTemplate.ts
@@ -36,7 +36,7 @@ export const UserInputModule: AppModuleTemplateItemType = {
  intro: '用户输入的内容。该模块通常作为应用的入口，用户在发送消息后会首先执行该模块。',
  type: AppModuleItemTypeEnum.initInput,
  flowType: FlowModuleTypeEnum.questionInputNode,
-  url: '/openapi/modules/init/userChatInput',
+  url: '/app/modules/init/userChatInput',
  inputs: [
    {
      key: SystemInputEnum.userChatInput,
@@ -59,7 +59,7 @@ export const HistoryModule: AppModuleTemplateItemType = {
  intro: '用户输入的内容。该模块通常作为应用的入口，用户在发送消息后会首先执行该模块。',
  type: AppModuleItemTypeEnum.initInput,
  flowType: FlowModuleTypeEnum.historyNode,
-  url: '/openapi/modules/init/history',
+  url: '/app/modules/init/history',
  inputs: [
    {
      key: 'maxContext',
@@ -92,7 +92,7 @@ export const ChatModule: AppModuleTemplateItemType = {
  intro: 'AI 大模型对话',
  flowType: FlowModuleTypeEnum.chatNode,
  type: AppModuleItemTypeEnum.http,
-  url: '/openapi/modules/chat/gpt',
+  url: '/app/modules/chat/gpt',
  inputs: [
    {
      key: 'model',
@@ -176,7 +176,7 @@ export const KBSearchModule: AppModuleTemplateItemType = {
  intro: '去知识库中搜索对应的答案。可作为 AI 对话引用参考。',
  flowType: FlowModuleTypeEnum.kbSearchNode,
  type: AppModuleItemTypeEnum.http,
-  url: '/openapi/modules/kb/search',
+  url: '/app/modules/kb/search',
  inputs: [
    {
      key: 'kb_ids',
@@ -283,13 +283,13 @@ export const TFSwitchModule: AppModuleTemplateItemType = {
    }
  ]
 };
-export const RecognizeIntentionModule: AppModuleTemplateItemType = {
+export const ClassifyQuestionModule: AppModuleTemplateItemType = {
  logo: '/imgs/module/cq.png',
-  name: '意图识别',
+  name: '问题分类',
  intro: '可以判断用户问题属于哪方面问题，从而执行不同的操作。',
  type: AppModuleItemTypeEnum.http,
-  url: '/openapi/modules/agent/recognizeIntention',
+  url: '/app/modules/agent/classifyQuestion',
-  flowType: FlowModuleTypeEnum.recognizeIntention,
+  flowType: FlowModuleTypeEnum.classifyQuestion,
  inputs: [
    {
      key: 'systemPrompt',
@@ -353,6 +353,6 @@ export const ModuleTemplates = [
  },
  {
    label: 'Agent',
-    list: [RecognizeIntentionModule]
+    list: [ClassifyQuestionModule]
  }
 ];
--- a/client/src/constants/flow/index.ts
+++ b/client/src/constants/flow/index.ts
@@ -26,7 +26,7 @@ export enum FlowModuleTypeEnum {
  kbSearchNode = 'kbSearchNode',
  tfSwitchNode = 'tfSwitchNode',
  answerNode = 'answerNode',
-  recognizeIntention = 'recognizeIntention'
+  classifyQuestion = 'classifyQuestion'
 }
 export const edgeOptions = {

--- a/client/src/pages/api/admin/initv4.ts
+++ b/client/src/pages/api/admin/initv4.ts
--- a/client/src/pages/api/openapi/modules/agent/recognizeIntention.ts
+++ b/client/src/pages/api/openapi/modules/agent/recognizeIntention.ts
@@ -6,15 +6,16 @@ import { ChatContextFilter } from '@/service/utils/chat/index';
 import type { ChatItemType } from '@/types/chat';
 import { ChatRoleEnum } from '@/constants/chat';
 import { getOpenAIApi, axiosConfig } from '@/service/ai/openai';
-import type { RecognizeIntentionAgentItemType } from '@/types/app';
+import type { ClassifyQuestionAgentItemType } from '@/types/app';
 import { countModelPrice, pushTaskBillListItem } from '@/service/events/pushBill';
 import { getModel } from '@/service/utils/data';
+import { authUser } from '@/service/utils/auth';
 export type Props = {
  systemPrompt?: string;
  history?: ChatItemType[];
  userChatInput: string;
-  agents: RecognizeIntentionAgentItemType[];
+  agents: ClassifyQuestionAgentItemType[];
  billId?: string;
 };
 export type Response = { history: ChatItemType[] };
@@ -24,6 +25,7 @@ const agentFunName = 'agent_user_question';
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
  try {
+    await authUser({ req, authRoot: true });
    let { userChatInput } = req.body as Props;
    if (!userChatInput) {
@@ -114,7 +116,7 @@ export async function classifyQuestion({
  await pushTaskBillListItem({
    billId,
-    moduleName: 'Recognize Intention',
+    moduleName: 'Classify Question',
    amount: countModelPrice({ model: agentModel, tokens: totalTokens }),
    model: getModel(agentModel)?.name,
    tokenLen: totalTokens

--- a/client/src/pages/api/openapi/modules/agent/extract.ts
+++ b/client/src/pages/api/openapi/modules/agent/extract.ts
@@ -6,12 +6,13 @@ import { ChatContextFilter } from '@/service/utils/chat/index';
 import type { ChatItemType } from '@/types/chat';
 import { ChatRoleEnum } from '@/constants/chat';
 import { getOpenAIApi, axiosConfig } from '@/service/ai/openai';
-import type { RecognizeIntentionAgentItemType } from '@/types/app';
+import type { ClassifyQuestionAgentItemType } from '@/types/app';
+import { authUser } from '@/service/utils/auth';
 export type Props = {
  history?: ChatItemType[];
  userChatInput: string;
-  agents: RecognizeIntentionAgentItemType[];
+  agents: ClassifyQuestionAgentItemType[];
  description: string;
 };
 export type Response = { history: ChatItemType[] };
@@ -21,6 +22,8 @@ const agentFunName = 'agent_extract_data';
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
  try {
+    await authUser({ req, authRoot: true });
    const response = await extract(req.body);
    jsonRes(res, {

--- a/client/src/pages/api/openapi/modules/chat/gpt.ts
+++ b/client/src/pages/api/openapi/modules/chat/gpt.ts
@@ -13,6 +13,7 @@ import { getOpenAIApi, axiosConfig } from '@/service/ai/openai';
 import { SpecificInputEnum } from '@/constants/app';
 import { getChatModel } from '@/service/utils/data';
 import { countModelPrice, pushTaskBillListItem } from '@/service/events/pushBill';
+import { authUser } from '@/service/utils/auth';
 export type Props = {
  model: `${OpenAiChatEnum}`;
@@ -31,6 +32,8 @@ export type Response = { [SpecificInputEnum.answerText]: string; totalTokens: nu
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
  let { model, temperature = 0, stream } = req.body as Props;
  try {
+    await authUser({ req, authRoot: true });
    const response = await chatCompletion({
      ...req.body,
      res,

--- a/client/src/pages/api/openapi/modules/init/history.tsx
+++ b/client/src/pages/api/openapi/modules/init/history.tsx
--- a/client/src/pages/api/openapi/modules/init/userChatInput.tsx
+++ b/client/src/pages/api/openapi/modules/init/userChatInput.tsx
--- a/client/src/pages/api/openapi/modules/kb/search.ts
+++ b/client/src/pages/api/openapi/modules/kb/search.ts
@@ -5,9 +5,10 @@ import { withNextCors } from '@/service/utils/tools';
 import type { ChatItemType } from '@/types/chat';
 import { ChatRoleEnum, rawSearchKey } from '@/constants/chat';
 import { modelToolMap } from '@/utils/plugin';
-import { getVector } from '../../plugin/vector';
+import { getVector } from '@/pages/api/openapi/plugin/vector';
 import { countModelPrice, pushTaskBillListItem } from '@/service/events/pushBill';
 import { getModel } from '@/service/utils/data';
+import { authUser } from '@/service/utils/auth';
 export type QuoteItemType = {
  kb_id: string;
@@ -34,6 +35,8 @@ type Response = {
 export default withNextCors(async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
  try {
+    await authUser({ req, authRoot: true });
    const { kb_ids = [], userChatInput } = req.body as Props;
    if (!userChatInput || !Array.isArray(kb_ids)) {

--- a/client/src/pages/app/detail/components/edit/components/NodeRINode.tsx
+++ b/client/src/pages/app/detail/components/edit/components/NodeRINode.tsx
@@ -6,7 +6,7 @@ import { FlowModuleItemType } from '@/types/flow';
 import Divider from './modules/Divider';
 import Container from './modules/Container';
 import RenderInput from './render/RenderInput';
-import type { RecognizeIntentionAgentItemType } from '@/types/app';
+import type { ClassifyQuestionAgentItemType } from '@/types/app';
 import { Handle, Position } from 'reactflow';
 import { customAlphabet } from 'nanoid';
 const nanoid = customAlphabet('abcdefghijklmnopqrstuvwxyz1234567890', 4);
@@ -30,7 +30,7 @@ const NodeRINode = ({
              value: agents = []
            }: {
              key: string;
-              value?: RecognizeIntentionAgentItemType[];
+              value?: ClassifyQuestionAgentItemType[];
            }) => (
              <Box>
                {agents.map((item, i) => (

--- a/client/src/pages/app/detail/components/edit/index.tsx
+++ b/client/src/pages/app/detail/components/edit/index.tsx
@@ -70,7 +70,7 @@ const nodeTypes = {
  [FlowModuleTypeEnum.kbSearchNode]: NodeKbSearch,
  [FlowModuleTypeEnum.tfSwitchNode]: NodeTFSwitch,
  [FlowModuleTypeEnum.answerNode]: NodeAnswer,
-  [FlowModuleTypeEnum.recognizeIntention]: NodeRINode
+  [FlowModuleTypeEnum.classifyQuestion]: NodeRINode
 };
 const edgeTypes = {
  buttonedge: ButtonEdge

--- a/client/src/service/api/request.ts
+++ b/client/src/service/api/request.ts
@@ -18,8 +18,10 @@ export const moduleFetch = ({ url, data, res }: Props) =>
      const requestUrl = url.startsWith('/') ? `${baseUrl}${url}` : url;
      const response = await fetch(requestUrl, {
        method: 'POST',
+        // @ts-ignore
        headers: {
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/json',
+          rootkey: process.env.ROOT_KEY
        },
        body: JSON.stringify(data),
        signal: abortSignal.signal

--- a/client/src/service/models/app.ts
+++ b/client/src/service/models/app.ts
@@ -50,6 +50,48 @@ const AppSchema = new Schema({
  modules: {
    type: Array,
    default: []
+  },
+  chat: {
+    relatedKbs: {
+      type: [Schema.Types.ObjectId],
+      ref: 'kb',
+      default: []
+    },
+    searchSimilarity: {
+      type: Number,
+      default: 0.8
+    },
+    searchLimit: {
+      type: Number,
+      default: 5
+    },
+    searchEmptyText: {
+      type: String,
+      default: ''
+    },
+    systemPrompt: {
+      type: String,
+      default: ''
+    },
+    limitPrompt: {
+      type: String,
+      default: ''
+    },
+    maxToken: {
+      type: Number,
+      default: 4000,
+      min: 100
+    },
+    temperature: {
+      type: Number,
+      min: 0,
+      max: 10,
+      default: 0
+    },
+    chatModel: {
+      // 聊天时使用的模型
+      type: String
+    }
  }
 });

--- a/client/src/service/utils/auth.ts
+++ b/client/src/service/utils/auth.ts
@@ -3,7 +3,6 @@ import jwt from 'jsonwebtoken';
 import Cookie from 'cookie';
 import { App, OpenApi, User, ShareChat, KB } from '../mongo';
 import type { AppSchema } from '@/types/mongoSchema';
-import { defaultApp } from '@/constants/model';
 import { formatPrice } from '@/utils/user';
 import { ERROR_ENUM } from '../errorCode';

--- a/client/src/types/app.d.ts
+++ b/client/src/types/app.d.ts
@@ -42,7 +42,7 @@ export type ShareChatEditType = {
 /* agent */
 /* question classify */
-export type RecognizeIntentionAgentItemType = {
+export type ClassifyQuestionAgentItemType = {
  value: string;
  key: string;
 };

--- a/client/src/types/mongoSchema.d.ts
+++ b/client/src/types/mongoSchema.d.ts
@@ -44,6 +44,17 @@ export interface AppSchema {
    collection: number;
  };
  modules: AppModuleItemType[];
+  chat: {
+    relatedKbs: string[];
+    searchSimilarity: number;
+    searchLimit: number;
+    searchEmptyText: string;
+    systemPrompt: string;
+    limitPrompt: string;
+    temperature: number;
+    maxToken: number;
+    chatModel: ChatModelType; // 聊天时用的模型，训练后就是训练的模型
+  };
 }
 export interface CollectionSchema {