4.8.10 test (#2601)

* perf: workflow children run params * feat: workflow userId * fix: ui size * perf: Markdown whitespace and ai images split * fix: openai sdk ts
2025-07-23 05:12:39 +00:00 · 2024-09-03 13:43:56 +08:00
parent 761e35c226
commit 9a57e94b79
43 changed files with 318 additions and 288 deletions
--- a/packages/global/core/chat/adapt.ts
+++ b/packages/global/core/chat/adapt.ts
@@ -151,12 +151,23 @@ export const GPTMessages2Chats = (
        obj === ChatRoleEnum.System &&
        item.role === ChatCompletionRequestMessageRoleEnum.System
      ) {
-        value.push({
-          type: ChatItemValueTypeEnum.text,
-          text: {
-            content: item.content
-          }
-        });
+        if (Array.isArray(item.content)) {
+          item.content.forEach((item) => [
+            value.push({
+              type: ChatItemValueTypeEnum.text,
+              text: {
+                content: item.text
+              }
+            })
+          ]);
+        } else {
+          value.push({
+            type: ChatItemValueTypeEnum.text,
+            text: {
+              content: item.content
+            }
+          });
+        }
      } else if (
        obj === ChatRoleEnum.Human &&
        item.role === ChatCompletionRequestMessageRoleEnum.User
--- a/packages/global/core/workflow/runtime/type.d.ts
+++ b/packages/global/core/workflow/runtime/type.d.ts
@@ -26,10 +26,15 @@ export type ChatDispatchProps = {
  res?: NextApiResponse;
  requestOrigin?: string;
  mode: 'test' | 'chat' | 'debug';
-  teamId: string; // App teamId
-  tmbId: string; // App tmbId
  user: UserModelSchema;
-  app: AppDetailType | AppSchema;
+
+  runningAppInfo: {
+    id: string; // May be the id of the system plug-in (cannot be used directly to look up the table)
+    teamId: string;
+    tmbId: string; // App tmbId
+  };
+  uid: string; // Who run this workflow
+
  chatId?: string;
  responseChatItemId?: string;
  histories: ChatItemType[];
@@ -50,10 +55,12 @@ export type ModuleDispatchProps<T> = ChatDispatchProps & {
 };

 export type SystemVariablesType = {
+  userId: string;
  appId: string;
  chatId?: string;
  responseChatItemId?: string;
  histories: ChatItemType[];
+  cTime: string;
 };

 /* node props */
@@ -69,7 +76,7 @@ export type RuntimeNodeItemType = {
  inputs: FlowNodeInputItemType[];
  outputs: FlowNodeOutputItemType[];

-  pluginId?: string;
+  pluginId?: string; // workflow id / plugin id
 };

 export type PluginRuntimeType = {
--- a/packages/global/core/workflow/template/constants.ts
+++ b/packages/global/core/workflow/template/constants.ts
@@ -17,7 +17,7 @@ import { RunAppModule } from './system/abandoned/runApp/index';
 import { PluginInputModule } from './system/pluginInput';
 import { PluginOutputModule } from './system/pluginOutput';
 import { RunPluginModule } from './system/runPlugin';
-import { RunAppPluginModule } from './system/runAppPlugin';
+import { RunAppNode } from './system/runApp';
 import { AiQueryExtension } from './system/queryExtension';

 import type { FlowNodeTemplateType } from '../type/node';
@@ -73,6 +73,6 @@ export const moduleTemplatesFlat: FlowNodeTemplateType[] = [
  ),
  EmptyNode,
  RunPluginModule,
-  RunAppPluginModule,
+  RunAppNode,
  RunAppModule
 ];
--- a/packages/global/core/workflow/template/system/runAppPlugin.ts
+++ b/packages/global/core/workflow/template/system/runAppPlugin.ts
@@ -3,7 +3,7 @@ import { FlowNodeTypeEnum } from '../../node/constant';
 import { FlowNodeTemplateType } from '../../type/node';
 import { getHandleConfig } from '../utils';

-export const RunAppPluginModule: FlowNodeTemplateType = {
+export const RunAppNode: FlowNodeTemplateType = {
  id: FlowNodeTypeEnum.appModule,
  templateType: FlowNodeTemplateTypeEnum.other,
  flowNodeType: FlowNodeTypeEnum.appModule,
--- a/packages/global/core/workflow/utils.ts
+++ b/packages/global/core/workflow/utils.ts
@@ -326,27 +326,6 @@ export const updatePluginInputByVariables = (
  );
 };

-/* Remove pluginInput variables from global variables
-  (completions api: Plugin input get value from global variables) 
-*/
-export const removePluginInputVariables = (
-  variables: Record<string, any>,
-  nodes: RuntimeNodeItemType[]
-) => {
-  const pluginInputNode = nodes.find((node) => node.flowNodeType === FlowNodeTypeEnum.pluginInput);
-
-  if (!pluginInputNode) return variables;
-  return Object.keys(variables).reduce(
-    (acc, key) => {
-      if (!pluginInputNode.inputs.find((input) => input.key === key)) {
-        acc[key] = variables[key];
-      }
-      return acc;
-    },
-    {} as Record<string, any>
-  );
-};
-
 // replace {{$xx.xx$}} variables for text
 export function replaceEditorVariable({
  text,
--- a/packages/global/package.json
+++ b/packages/global/package.json
@@ -11,7 +11,7 @@
    "jschardet": "3.1.1",
    "nanoid": "^4.0.1",
    "next": "14.2.5",
-    "openai": "4.53.0",
+    "openai": "4.57.0",
    "openapi-types": "^12.1.3",
    "timezones-list": "^3.0.2"
  },
--- a/packages/service/core/chat/utils.ts
+++ b/packages/service/core/chat/utils.ts
@@ -121,46 +121,22 @@ export const loadRequestMessages = async ({
    const imageRegex =
      /(https?:\/\/[^\s/$.?#].[^\s]*\.(?:png|jpe?g|gif|webp|bmp|tiff?|svg|ico|heic|avif))/i;

-    const result: { type: 'text' | 'image'; value: string }[] = [];
-    let lastIndex = 0;
-    let match;
+    const result: ChatCompletionContentPart[] = [];

-    // 使用正则表达式查找所有匹配项
-    while ((match = imageRegex.exec(input.slice(lastIndex))) !== null) {
-      const textBefore = input.slice(lastIndex, lastIndex + match.index);
-
-      // 如果图片URL前有文本，添加文本部分
-      if (textBefore) {
-        result.push({ type: 'text', value: textBefore });
-      }
-
-      // 添加图片URL
-      result.push({ type: 'image', value: match[0] });
-
-      lastIndex += match.index + match[0].length;
-    }
-
-    // 添加剩余的文本（如果有的话）
-    if (lastIndex < input.length) {
-      result.push({ type: 'text', value: input.slice(lastIndex) });
-    }
-
-    return result
-      .map((item) => {
-        if (item.type === 'text') {
-          return { type: 'text', text: item.value };
+    // 提取所有HTTPS图片URL并添加到result开头
+    const httpsImages = input.match(imageRegex) || [];
+    httpsImages.forEach((url) => {
+      result.push({
+        type: 'image_url',
+        image_url: {
+          url: url
        }
-        if (item.type === 'image') {
-          return {
-            type: 'image_url',
-            image_url: {
-              url: item.value
-            }
-          };
-        }
-        return { type: 'text', text: item.value };
-      })
-      .filter(Boolean) as ChatCompletionContentPart[];
+      });
+    });
+
+    // 添加原始input作为文本
+    result.push({ type: 'text', text: input });
+    return result;
  }
  // Load image
  const parseUserContent = async (content: string | ChatCompletionContentPart[]) => {
--- a/packages/service/core/workflow/dispatch/abandoned/runApp.ts
+++ b/packages/service/core/workflow/dispatch/abandoned/runApp.ts
@@ -31,7 +31,7 @@ type Response = DispatchNodeResultType<{

 export const dispatchAppRequest = async (props: Props): Promise<Response> => {
  const {
-    app: workflowApp,
+    runningAppInfo,
    workflowStreamResponse,
    histories,
    query,
@@ -45,7 +45,7 @@ export const dispatchAppRequest = async (props: Props): Promise<Response> => {
  // 检查该工作流的tmb是否有调用该app的权限（不是校验对话的人，是否有权限）
  const { app: appData } = await authAppByTmbId({
    appId: app.id,
-    tmbId: workflowApp.tmbId,
+    tmbId: runningAppInfo.tmbId,
    per: ReadPermissionVal
  });

@@ -61,7 +61,11 @@ export const dispatchAppRequest = async (props: Props): Promise<Response> => {

  const { flowResponses, flowUsages, assistantResponses } = await dispatchWorkFlow({
    ...props,
-    app: appData,
+    runningAppInfo: {
+      id: String(appData._id),
+      teamId: String(appData.teamId),
+      tmbId: String(appData.tmbId)
+    },
    runtimeNodes: storeNodes2RuntimeNodes(
      appData.modules,
      getWorkflowEntryNodeIds(appData.modules)
--- a/packages/service/core/workflow/dispatch/dataset/search.ts
+++ b/packages/service/core/workflow/dispatch/dataset/search.ts
@@ -37,7 +37,7 @@ export async function dispatchDatasetSearch(
  props: DatasetSearchProps
 ): Promise<DatasetSearchResponse> {
  const {
-    teamId,
+    runningAppInfo: { teamId },
    histories,
    node,
    params: {
--- a/packages/service/core/workflow/dispatch/index.ts
+++ b/packages/service/core/workflow/dispatch/index.ts
@@ -6,7 +6,8 @@ import {
 import { NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import type {
  ChatDispatchProps,
-  ModuleDispatchProps
+  ModuleDispatchProps,
+  SystemVariablesType
 } from '@fastgpt/global/core/workflow/runtime/type';
 import type { RuntimeNodeItemType } from '@fastgpt/global/core/workflow/runtime/type.d';
 import type {
@@ -554,13 +555,15 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
 /* get system variable */
 export function getSystemVariable({
  user,
-  app,
+  runningAppInfo,
  chatId,
  responseChatItemId,
-  histories = []
-}: Props) {
+  histories = [],
+  uid
+}: Props): SystemVariablesType {
  return {
-    appId: String(app._id),
+    userId: uid,
+    appId: String(runningAppInfo.id),
    chatId,
    responseChatItemId,
    histories,
--- a/packages/service/core/workflow/dispatch/interactive/userSelect.ts
+++ b/packages/service/core/workflow/dispatch/interactive/userSelect.ts
@@ -29,7 +29,7 @@ type UserSelectResponse = DispatchNodeResultType<{
 export const dispatchUserSelect = async (props: Props): Promise<UserSelectResponse> => {
  const {
    workflowStreamResponse,
-    app: { _id: appId },
+    runningAppInfo: { id: appId },
    chatId,
    node: { nodeId, isEntry },
    params: { description, userSelectOptions },
--- a/packages/service/core/workflow/dispatch/plugin/run.ts
+++ b/packages/service/core/workflow/dispatch/plugin/run.ts
@@ -13,6 +13,7 @@ import { authPluginByTmbId } from '../../../../support/permission/app/auth';
 import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
 import { computedPluginUsage } from '../../../app/plugin/utils';
 import { filterSystemVariables } from '../utils';
+import { getPluginRunUserQuery } from '../../utils';

 type RunPluginProps = ModuleDispatchProps<{
  [key: string]: any;
@@ -22,9 +23,8 @@ type RunPluginResponse = DispatchNodeResultType<{}>;
 export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPluginResponse> => {
  const {
    node: { pluginId },
-    app: workflowApp,
+    runningAppInfo,
    mode,
-    teamId,
    params: data // Plugin input
  } = props;

@@ -33,9 +33,9 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
  }

  // auth plugin
-  await authPluginByTmbId({
+  const pluginData = await authPluginByTmbId({
    appId: pluginId,
-    tmbId: workflowApp.tmbId,
+    tmbId: runningAppInfo.tmbId,
    per: ReadPermissionVal
  });

@@ -61,14 +61,21 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
      showStatus: false
    };
  });
+  const runtimeVariables = {
+    ...filterSystemVariables(props.variables),
+    appId: String(plugin.id)
+  };

  const { flowResponses, flowUsages, assistantResponses } = await dispatchWorkFlow({
    ...props,
-
-    variables: {
-      ...filterSystemVariables(props.variables),
-      appId: String(plugin.id)
+    runningAppInfo: {
+      id: String(plugin.id),
+      teamId: plugin.teamId || '',
+      tmbId: pluginData?.tmbId || ''
    },
+    variables: runtimeVariables,
+    query: getPluginRunUserQuery(plugin.nodes, runtimeVariables).value,
+    chatConfig: {},
    runtimeNodes,
    runtimeEdges: initWorkflowEdgeStatus(plugin.edges)
  });
@@ -90,7 +97,7 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
      totalPoints: usagePoints,
      pluginOutput: output?.pluginOutput,
      pluginDetail:
-        mode === 'test' && plugin.teamId === teamId
+        mode === 'test' && plugin.teamId === runningAppInfo.teamId
          ? flowResponses.filter((item) => {
              const filterArr = [FlowNodeTypeEnum.pluginOutput];
              return !filterArr.includes(item.moduleType as any);
--- a/packages/service/core/workflow/dispatch/plugin/runApp.ts
+++ b/packages/service/core/workflow/dispatch/plugin/runApp.ts
@@ -16,6 +16,7 @@ import { chatValue2RuntimePrompt, runtimePrompt2ChatsValue } from '@fastgpt/glob
 import { DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type';
 import { authAppByTmbId } from '../../../../support/permission/app/auth';
 import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
+import { getAppLatestVersion } from '../../../app/controller';

 type Props = ModuleDispatchProps<{
  [NodeInputKeyEnum.userChatInput]: string;
@@ -29,7 +30,7 @@ type Response = DispatchNodeResultType<{

 export const dispatchRunAppNode = async (props: Props): Promise<Response> => {
  const {
-    app: workflowApp,
+    runningAppInfo,
    histories,
    query,
    node: { pluginId },
@@ -49,9 +50,10 @@ export const dispatchRunAppNode = async (props: Props): Promise<Response> => {
  // Auth the app by tmbId(Not the user, but the workflow user)
  const { app: appData } = await authAppByTmbId({
    appId: pluginId,
-    tmbId: workflowApp.tmbId,
+    tmbId: runningAppInfo.tmbId,
    per: ReadPermissionVal
  });
+  const { nodes, edges, chatConfig } = await getAppLatestVersion(pluginId);

  // Auto line
  workflowStreamResponse?.({
@@ -64,27 +66,31 @@ export const dispatchRunAppNode = async (props: Props): Promise<Response> => {
  const chatHistories = getHistories(history, histories);
  const { files } = chatValue2RuntimePrompt(query);

-  // Concat variables
+  // Rewrite children app variables
  const systemVariables = filterSystemVariables(variables);
  const childrenRunVariables = {
    ...systemVariables,
-    ...childrenAppVariables
+    ...childrenAppVariables,
+    histories: chatHistories,
+    appId: String(appData._id)
  };

  const { flowResponses, flowUsages, assistantResponses } = await dispatchWorkFlow({
    ...props,
-    app: appData,
-    runtimeNodes: storeNodes2RuntimeNodes(
-      appData.modules,
-      getWorkflowEntryNodeIds(appData.modules)
-    ),
-    runtimeEdges: initWorkflowEdgeStatus(appData.edges),
+    runningAppInfo: {
+      id: String(appData._id),
+      teamId: String(appData.teamId),
+      tmbId: String(appData.tmbId)
+    },
+    runtimeNodes: storeNodes2RuntimeNodes(nodes, getWorkflowEntryNodeIds(nodes)),
+    runtimeEdges: initWorkflowEdgeStatus(edges),
    histories: chatHistories,
+    variables: childrenRunVariables,
    query: runtimePrompt2ChatsValue({
      files,
      text: userChatInput
    }),
-    variables: childrenRunVariables
+    chatConfig
  });

  const completeMessages = chatHistories.concat([
--- a/packages/service/core/workflow/dispatch/tools/customFeedback.ts
+++ b/packages/service/core/workflow/dispatch/tools/customFeedback.ts
@@ -15,7 +15,7 @@ type Response = DispatchNodeResultType<{}>;

 export const dispatchCustomFeedback = (props: Record<string, any>): Response => {
  const {
-    app: { _id: appId },
+    runningAppInfo: { id: appId },
    chatId,
    responseChatItemId: chatItemId,
    stream,
--- a/packages/service/core/workflow/dispatch/tools/http468.ts
+++ b/packages/service/core/workflow/dispatch/tools/http468.ts
@@ -42,7 +42,7 @@ const UNDEFINED_SIGN = 'UNDEFINED_SIGN';

 export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<HttpResponse> => {
  let {
-    app: { _id: appId },
+    runningAppInfo: { id: appId },
    chatId,
    responseChatItemId,
    variables,
--- a/packages/service/core/workflow/dispatch/tools/readFiles.ts
+++ b/packages/service/core/workflow/dispatch/tools/readFiles.ts
@@ -44,7 +44,7 @@ ${content.slice(0, 100)}${content.length > 100 ? '......' : ''}
 export const dispatchReadFiles = async (props: Props): Promise<Response> => {
  const {
    requestOrigin,
-    teamId,
+    runningAppInfo: { teamId },
    histories,
    chatConfig,
    params: { fileUrlList = [] }
--- a/packages/service/core/workflow/dispatch/tools/runLaf.ts
+++ b/packages/service/core/workflow/dispatch/tools/runLaf.ts
@@ -21,7 +21,7 @@ const UNDEFINED_SIGN = 'UNDEFINED_SIGN';

 export const dispatchLafRequest = async (props: LafRequestProps): Promise<LafResponse> => {
  let {
-    app: { _id: appId },
+    runningAppInfo: { id: appId },
    chatId,
    responseChatItemId,
    variables,
--- a/packages/service/core/workflow/dispatch/utils.ts
+++ b/packages/service/core/workflow/dispatch/utils.ts
@@ -5,7 +5,10 @@ import {
  WorkflowIOValueTypeEnum,
  NodeOutputKeyEnum
 } from '@fastgpt/global/core/workflow/constants';
-import { RuntimeEdgeItemType } from '@fastgpt/global/core/workflow/runtime/type';
+import {
+  RuntimeEdgeItemType,
+  SystemVariablesType
+} from '@fastgpt/global/core/workflow/runtime/type';
 import { responseWrite } from '../../../common/response';
 import { NextApiResponse } from 'next';
 import { SseResponseEventEnum } from '@fastgpt/global/core/workflow/runtime/constants';
@@ -144,8 +147,9 @@ export const removeSystemVariable = (variables: Record<string, any>) => {

  return copyVariables;
 };
-export const filterSystemVariables = (variables: Record<string, any>) => {
+export const filterSystemVariables = (variables: Record<string, any>): SystemVariablesType => {
  return {
+    userId: variables.userId,
    appId: variables.appId,
    chatId: variables.chatId,
    responseChatItemId: variables.responseChatItemId,
--- a/packages/service/core/workflow/utils.ts
+++ b/packages/service/core/workflow/utils.ts
@@ -1,5 +1,13 @@
 import { SearchDataResponseItemType } from '@fastgpt/global/core/dataset/type';
 import { countPromptTokens } from '../../common/string/tiktoken/index';
+import { getNanoid } from '@fastgpt/global/common/string/tools';
+import { ChatItemValueTypeEnum, ChatRoleEnum } from '@fastgpt/global/core/chat/constants';
+import {
+  getPluginInputsFromStoreNodes,
+  getPluginRunContent
+} from '@fastgpt/global/core/app/plugin/utils';
+import { StoreNodeItemType } from '@fastgpt/global/core/workflow/type/node';
+import { UserChatItemType } from '@fastgpt/global/core/chat/type';

 /* filter search result */
 export const filterSearchResultsByMaxChars = async (
@@ -23,3 +31,25 @@ export const filterSearchResultsByMaxChars = async (

  return results.length === 0 ? list.slice(0, 1) : results;
 };
+
+/* Get plugin runtime input user query */
+export const getPluginRunUserQuery = (
+  nodes: StoreNodeItemType[],
+  variables: Record<string, any>
+): UserChatItemType & { dataId: string } => {
+  return {
+    dataId: getNanoid(24),
+    obj: ChatRoleEnum.Human,
+    value: [
+      {
+        type: ChatItemValueTypeEnum.text,
+        text: {
+          content: getPluginRunContent({
+            pluginInputs: getPluginInputsFromStoreNodes(nodes),
+            variables
+          })
+        }
+      }
+    ]
+  };
+};
--- a/packages/service/support/permission/app/auth.ts
+++ b/packages/service/support/permission/app/auth.ts
@@ -25,11 +25,13 @@ export const authPluginByTmbId = async ({
 }) => {
  const { source } = await splitCombinePluginId(appId);
  if (source === PluginSourceEnum.personal) {
-    await authAppByTmbId({
+    const { app } = await authAppByTmbId({
      appId,
      tmbId,
      per
    });
+
+    return app;
  }
 };

--- a/packages/web/components/common/Textarea/PromptEditor/type.d.ts
+++ b/packages/web/components/common/Textarea/PromptEditor/type.d.ts
@@ -6,6 +6,7 @@ export type EditorVariablePickerType = {
  required?: boolean;
  icon?: string;
  valueType?: WorkflowIOValueTypeEnum;
+  valueDesc?: string;
 };

 export type EditorVariableLabelPickerType = {
--- a/packages/web/i18n/en/workflow.json
+++ b/packages/web/i18n/en/workflow.json
@@ -1,4 +1,11 @@
 {
+  " i18nT('workflow": {
+    "use_user_id'),\n    required": {
+      "workflow": {
+        "use_user_id": ""
+      }
+    }
+  },
  "Code": "Code",
  "about_xxx_question": "Questions about xxx",
  "add_new_input": "Add input",
@@ -123,6 +130,7 @@
  "select_another_application_to_call": "You can choose another application to call",
  "special_array_format": "Special array format, when the search result is empty, an empty array is returned.",
  "start_with": "Start with",
+  "system_variables": "System variables",
  "target_fields_description": "A target field is composed of 'description' and 'key', and multiple target fields can be extracted.",
  "template": {
    "ai_chat": "LLM chat",
@@ -143,6 +151,7 @@
  "trigger_after_application_completion": "will be triggered after the application has completely ended",
  "update_link_error": "Update link exception",
  "update_specified_node_output_or_global_variable": "You can update the output value of the specified node or update global variables",
+  "use_user_id": "User ID",
  "user_question": "User issues",
  "variable_picker_tips": "enter node name or variable name to search",
  "variable_update": "variable update",
--- a/packages/web/i18n/zh/workflow.json
+++ b/packages/web/i18n/zh/workflow.json
@@ -1,4 +1,11 @@
 {
+  " i18nT('workflow": {
+    "use_user_id'),\n    required": {
+      "workflow": {
+        "use_user_id": "使用者 ID"
+      }
+    }
+  },
  "Code": "代码",
  "about_xxx_question": "关于 xxx 的问题",
  "add_new_input": "新增输入",
@@ -123,6 +130,7 @@
  "select_another_application_to_call": "可以选择一个其他应用进行调用",
  "special_array_format": "特殊数组格式，搜索结果为空时，返回空数组。",
  "start_with": "开始为",
+  "system_variables": "系统变量",
  "target_fields_description": "由 '描述' 和 'key' 组成一个目标字段，可提取多个目标字段",
  "template": {
    "ai_chat": "AI 对话",
@@ -143,6 +151,7 @@
  "trigger_after_application_completion": "将在应用完全结束后触发",
  "update_link_error": "更新链接异常",
  "update_specified_node_output_or_global_variable": "可以更新指定节点的输出值或更新全局变量",
+  "use_user_id": "使用者 ID",
  "user_question": "用户问题",
  "variable_picker_tips": "可输入节点名或变量名搜索",
  "variable_update": "变量更新",