Optimize the project structure and introduce DDD design (#394)

projects/app/src/service/common/api/plugins.ts

@@ -0,0 +1,15 @@
+import { POST } from './request';
+
+export const postTextCensor = (data: { text: string }) =>
+  POST<{ code?: number; message: string }>('/plugins/censor/text_baidu', data)
+    .then((res) => {
+      if (res?.code === 5000) {
+        return Promise.reject(res);
+      }
+    })
+    .catch((err) => {
+      if (err?.code === 5000) {
+        return Promise.reject(err.message);
+      }
+      return Promise.resolve('');
+    });

projects/app/src/service/common/api/request.ts

@@ -0,0 +1,120 @@
+import axios, { Method, InternalAxiosRequestConfig, AxiosResponse } from 'axios';
+
+interface ConfigType {
+  headers?: { [key: string]: string };
+  hold?: boolean;
+  timeout?: number;
+}
+interface ResponseDataType {
+  code: number;
+  message: string;
+  data: any;
+}
+
+/**
+ * 请求开始
+ */
+function requestStart(config: InternalAxiosRequestConfig): InternalAxiosRequestConfig {
+  if (config.headers) {
+    config.headers.rootkey = process.env.ROOT_KEY;
+  }
+
+  return config;
+}
+
+/**
+ * 请求成功,检查请求头
+ */
+function responseSuccess(response: AxiosResponse<ResponseDataType>) {
+  return response;
+}
+/**
+ * 响应数据检查
+ */
+function checkRes(data: ResponseDataType) {
+  if (data === undefined) {
+    console.log('error->', data, 'data is empty');
+    return Promise.reject('服务器异常');
+  } else if (data?.code && (data.code < 200 || data.code >= 400)) {
+    return Promise.reject(data);
+  }
+  return data.data;
+}
+
+/**
+ * 响应错误
+ */
+function responseError(err: any) {
+  if (!err) {
+    return Promise.reject({ message: '未知错误' });
+  }
+  if (typeof err === 'string') {
+    return Promise.reject({ message: err });
+  }
+
+  if (err?.response?.data) {
+    return Promise.reject(err?.response?.data);
+  }
+  return Promise.reject(err);
+}
+
+/* 创建请求实例 */
+const instance = axios.create({
+  timeout: 60000, // 超时时间
+  headers: {
+    'content-type': 'application/json'
+  }
+});
+
+/* 请求拦截 */
+instance.interceptors.request.use(requestStart, (err) => Promise.reject(err));
+/* 响应拦截 */
+instance.interceptors.response.use(responseSuccess, (err) => Promise.reject(err));
+
+export function request(url: string, data: any, config: ConfigType, method: Method): any {
+  if (!global.systemEnv?.pluginBaseUrl) {
+    return Promise.reject('商业版插件加载中...');
+  }
+
+  /* 去空 */
+  for (const key in data) {
+    if (data[key] === null || data[key] === undefined) {
+      delete data[key];
+    }
+  }
+
+  return instance
+    .request({
+      baseURL: global.systemEnv.pluginBaseUrl,
+      url,
+      method,
+      data: ['POST', 'PUT'].includes(method) ? data : null,
+      params: !['POST', 'PUT'].includes(method) ? data : null,
+      ...config // 用户自定义配置，可以覆盖前面的配置
+    })
+    .then((res) => checkRes(res.data))
+    .catch((err) => responseError(err));
+}
+
+/**
+ * api请求方式
+ * @param {String} url
+ * @param {Any} params
+ * @param {Object} config
+ * @returns
+ */
+export function GET<T>(url: string, params = {}, config: ConfigType = {}): Promise<T> {
+  return request(url, params, config, 'GET');
+}
+
+export function POST<T>(url: string, data = {}, config: ConfigType = {}): Promise<T> {
+  return request(url, data, config, 'POST');
+}
+
+export function PUT<T>(url: string, data = {}, config: ConfigType = {}): Promise<T> {
+  return request(url, data, config, 'PUT');
+}
+
+export function DELETE<T>(url: string, data = {}, config: ConfigType = {}): Promise<T> {
+  return request(url, data, config, 'DELETE');
+}

projects/app/src/service/events/generateQA.ts

@@ -9,7 +9,7 @@ import type { ChatCompletionRequestMessage } from '@fastgpt/core/ai/type';
 import { addLog } from '../utils/tools';
 import { splitText2Chunks } from '@/utils/file';
 import { replaceVariable } from '@/utils/common/tools/text';
-import { Prompt_AgentQA } from '@/prompts/core/agent';
+import { Prompt_AgentQA } from '@/global/core/prompt/agent';
 import { pushDataToKb } from '@/pages/api/core/dataset/data/pushData';
 
 const reduceQueue = () => {

projects/app/src/service/moduleDispatch/agent/classifyQuestion.ts

@@ -9,7 +9,7 @@ import { SpecialInputKeyEnum } from '@/constants/flow';
 import { FlowModuleTypeEnum } from '@/constants/flow';
 import type { ModuleDispatchProps } from '@/types/core/chat/type';
 import { replaceVariable } from '@/utils/common/tools/text';
-import { Prompt_CQJson } from '@/prompts/core/agent';
+import { Prompt_CQJson } from '@/global/core/prompt/agent';
 import { defaultCQModel } from '@/pages/api/system/getInitData';
 
 type Props = ModuleDispatchProps<{

projects/app/src/service/moduleDispatch/agent/extract.ts

@@ -7,7 +7,7 @@ import type { ContextExtractAgentItemType } from '@/types/app';
 import { ContextExtractEnum } from '@/constants/flow/flowField';
 import { FlowModuleTypeEnum } from '@/constants/flow';
 import type { ModuleDispatchProps } from '@/types/core/chat/type';
-import { Prompt_ExtractJson } from '@/prompts/core/agent';
+import { Prompt_ExtractJson } from '@/global/core/prompt/agent';
 import { replaceVariable } from '@/utils/common/tools/text';
 import { defaultExtractModel } from '@/pages/api/system/getInitData';
 

projects/app/src/service/moduleDispatch/chat/oneapi.ts

@@ -10,12 +10,12 @@ import { TaskResponseKeyEnum } from '@/constants/chat';
 import { getChatModel } from '@/service/utils/data';
 import { countModelPrice } from '@/service/common/bill/push';
 import { ChatModelItemType } from '@/types/model';
-import { textCensor } from '@/api/service/plugins';
+import { postTextCensor } from '@/service/common/api/plugins';
 import { ChatCompletionRequestMessageRoleEnum } from '@fastgpt/core/ai/constant';
 import { AppModuleItemType } from '@/types/app';
 import { countMessagesTokens, sliceMessagesTB } from '@/utils/common/tiktoken';
 import { adaptChat2GptMessages } from '@/utils/common/adapt/message';
-import { defaultQuotePrompt, defaultQuoteTemplate } from '@/prompts/core/AIChat';
+import { defaultQuotePrompt, defaultQuoteTemplate } from '@/global/core/prompt/AIChat';
 import type { AIChatProps } from '@/types/core/aiChat';
 import { replaceVariable } from '@/utils/common/tools/text';
 import { FlowModuleTypeEnum } from '@/constants/flow';
@@ -77,7 +77,7 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp
   });
 
   if (modelConstantsData.censor) {
-    await textCensor({
+    await postTextCensor({
       text: `${systemPrompt}
       ${quoteText}
       ${userChatInput}

projects/app/src/service/moduleDispatch/tools/answer.ts

@@ -7,6 +7,7 @@ export type AnswerProps = ModuleDispatchProps<{
 }>;
 export type AnswerResponse = {
   finish: boolean;
+  [TaskResponseKeyEnum.answerText]: string;
 };
 
 export const dispatchAnswer = (props: Record<string, any>): AnswerResponse => {
@@ -17,17 +18,20 @@ export const dispatchAnswer = (props: Record<string, any>): AnswerResponse => {
     inputs: { text = '' }
   } = props as AnswerProps;
 
+  const formatText = typeof text === 'string' ? text : JSON.stringify(text, null, 2);
+
   if (stream) {
     sseResponse({
       res,
       event: detail ? sseResponseEventEnum.answer : undefined,
       data: textAdaptGptResponse({
-        text
+        text: formatText
       })
     });
   }
 
   return {
-    finish: true
+    finish: true,
+    [TaskResponseKeyEnum.answerText]: formatText
   };
 };