Commit 1f9c8d32 by Archer Committed by GitHub

fix: child app run error (#5876)

parent edf06a0f
...@@ -16,3 +16,4 @@ description: 'FastGPT V4.14.1 更新说明' ...@@ -16,3 +16,4 @@ description: 'FastGPT V4.14.1 更新说明'
1. Debug 模式下,交互节点无法正常使用。 1. Debug 模式下,交互节点无法正常使用。
2. 富文本编辑器 tab 空格未对齐。 2. 富文本编辑器 tab 空格未对齐。
3. 嵌套运行 Agent 时候,跳过节点队列未初始化,导致无法正常运行。
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
"document/content/docs/introduction/development/custom-models/ollama.mdx": "2025-08-05T23:20:39+08:00", "document/content/docs/introduction/development/custom-models/ollama.mdx": "2025-08-05T23:20:39+08:00",
"document/content/docs/introduction/development/custom-models/xinference.mdx": "2025-08-05T23:20:39+08:00", "document/content/docs/introduction/development/custom-models/xinference.mdx": "2025-08-05T23:20:39+08:00",
"document/content/docs/introduction/development/design/dataset.mdx": "2025-07-23T21:35:03+08:00", "document/content/docs/introduction/development/design/dataset.mdx": "2025-07-23T21:35:03+08:00",
"document/content/docs/introduction/development/design/design_plugin.mdx": "2025-11-04T16:58:12+08:00", "document/content/docs/introduction/development/design/design_plugin.mdx": "2025-11-06T14:47:55+08:00",
"document/content/docs/introduction/development/docker.mdx": "2025-11-05T14:16:14+08:00", "document/content/docs/introduction/development/docker.mdx": "2025-11-05T14:16:14+08:00",
"document/content/docs/introduction/development/faq.mdx": "2025-08-12T22:22:18+08:00", "document/content/docs/introduction/development/faq.mdx": "2025-08-12T22:22:18+08:00",
"document/content/docs/introduction/development/intro.mdx": "2025-09-29T11:34:11+08:00", "document/content/docs/introduction/development/intro.mdx": "2025-09-29T11:34:11+08:00",
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
"document/content/docs/introduction/guide/knowledge_base/websync.mdx": "2025-08-05T23:20:39+08:00", "document/content/docs/introduction/guide/knowledge_base/websync.mdx": "2025-08-05T23:20:39+08:00",
"document/content/docs/introduction/guide/knowledge_base/yuque_dataset.mdx": "2025-09-17T22:29:56+08:00", "document/content/docs/introduction/guide/knowledge_base/yuque_dataset.mdx": "2025-09-17T22:29:56+08:00",
"document/content/docs/introduction/guide/plugins/bing_search_plugin.mdx": "2025-07-23T21:35:03+08:00", "document/content/docs/introduction/guide/plugins/bing_search_plugin.mdx": "2025-07-23T21:35:03+08:00",
"document/content/docs/introduction/guide/plugins/dev_system_tool.mdx": "2025-11-04T16:58:12+08:00", "document/content/docs/introduction/guide/plugins/dev_system_tool.mdx": "2025-11-06T14:47:55+08:00",
"document/content/docs/introduction/guide/plugins/doc2x_plugin_guide.mdx": "2025-07-23T21:35:03+08:00", "document/content/docs/introduction/guide/plugins/doc2x_plugin_guide.mdx": "2025-07-23T21:35:03+08:00",
"document/content/docs/introduction/guide/plugins/google_search_plugin_guide.mdx": "2025-07-23T21:35:03+08:00", "document/content/docs/introduction/guide/plugins/google_search_plugin_guide.mdx": "2025-07-23T21:35:03+08:00",
"document/content/docs/introduction/guide/plugins/searxng_plugin_guide.mdx": "2025-07-23T21:35:03+08:00", "document/content/docs/introduction/guide/plugins/searxng_plugin_guide.mdx": "2025-07-23T21:35:03+08:00",
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
"document/content/docs/protocol/terms.en.mdx": "2025-08-03T22:37:45+08:00", "document/content/docs/protocol/terms.en.mdx": "2025-08-03T22:37:45+08:00",
"document/content/docs/protocol/terms.mdx": "2025-08-03T22:37:45+08:00", "document/content/docs/protocol/terms.mdx": "2025-08-03T22:37:45+08:00",
"document/content/docs/toc.en.mdx": "2025-08-04T13:42:36+08:00", "document/content/docs/toc.en.mdx": "2025-08-04T13:42:36+08:00",
"document/content/docs/toc.mdx": "2025-11-05T21:56:32+08:00", "document/content/docs/toc.mdx": "2025-11-06T14:47:55+08:00",
"document/content/docs/upgrading/4-10/4100.mdx": "2025-08-02T19:38:37+08:00", "document/content/docs/upgrading/4-10/4100.mdx": "2025-08-02T19:38:37+08:00",
"document/content/docs/upgrading/4-10/4101.mdx": "2025-09-08T20:07:20+08:00", "document/content/docs/upgrading/4-10/4101.mdx": "2025-09-08T20:07:20+08:00",
"document/content/docs/upgrading/4-11/4110.mdx": "2025-08-05T23:20:39+08:00", "document/content/docs/upgrading/4-11/4110.mdx": "2025-08-05T23:20:39+08:00",
...@@ -114,8 +114,8 @@ ...@@ -114,8 +114,8 @@
"document/content/docs/upgrading/4-13/4130.mdx": "2025-11-04T15:06:39+08:00", "document/content/docs/upgrading/4-13/4130.mdx": "2025-11-04T15:06:39+08:00",
"document/content/docs/upgrading/4-13/4131.mdx": "2025-09-30T15:47:06+08:00", "document/content/docs/upgrading/4-13/4131.mdx": "2025-09-30T15:47:06+08:00",
"document/content/docs/upgrading/4-13/4132.mdx": "2025-10-21T11:46:53+08:00", "document/content/docs/upgrading/4-13/4132.mdx": "2025-10-21T11:46:53+08:00",
"document/content/docs/upgrading/4-14/4140.mdx": "2025-11-05T14:16:14+08:00", "document/content/docs/upgrading/4-14/4140.mdx": "2025-11-06T15:43:00+08:00",
"document/content/docs/upgrading/4-14/4141.mdx": "2025-11-06T13:25:49+08:00", "document/content/docs/upgrading/4-14/4141.mdx": "2025-11-06T15:43:00+08:00",
"document/content/docs/upgrading/4-8/40.mdx": "2025-08-02T19:38:37+08:00", "document/content/docs/upgrading/4-8/40.mdx": "2025-08-02T19:38:37+08:00",
"document/content/docs/upgrading/4-8/41.mdx": "2025-08-02T19:38:37+08:00", "document/content/docs/upgrading/4-8/41.mdx": "2025-08-02T19:38:37+08:00",
"document/content/docs/upgrading/4-8/42.mdx": "2025-08-02T19:38:37+08:00", "document/content/docs/upgrading/4-8/42.mdx": "2025-08-02T19:38:37+08:00",
...@@ -197,4 +197,4 @@ ...@@ -197,4 +197,4 @@
"document/content/docs/use-cases/external-integration/openapi.mdx": "2025-09-29T11:34:11+08:00", "document/content/docs/use-cases/external-integration/openapi.mdx": "2025-09-29T11:34:11+08:00",
"document/content/docs/use-cases/external-integration/wecom.mdx": "2025-09-16T14:22:28+08:00", "document/content/docs/use-cases/external-integration/wecom.mdx": "2025-09-16T14:22:28+08:00",
"document/content/docs/use-cases/index.mdx": "2025-07-24T14:23:04+08:00" "document/content/docs/use-cases/index.mdx": "2025-07-24T14:23:04+08:00"
} }
\ No newline at end of file
...@@ -36,8 +36,8 @@ export const HttpNode468: FlowNodeTemplateType = { ...@@ -36,8 +36,8 @@ export const HttpNode468: FlowNodeTemplateType = {
selectValueTypeList: Object.values(WorkflowIOValueTypeEnum), selectValueTypeList: Object.values(WorkflowIOValueTypeEnum),
showDescription: false, showDescription: false,
showDefaultValue: true showDefaultValue: true
} },
// deprecated: true deprecated: false
}, },
{ {
key: NodeInputKeyEnum.httpMethod, key: NodeInputKeyEnum.httpMethod,
......
...@@ -162,7 +162,6 @@ export async function dispatchWorkFlow({ ...@@ -162,7 +162,6 @@ export async function dispatchWorkFlow({
histories, histories,
timezone, timezone,
externalProvider, externalProvider,
defaultSkipNodeQueue: data.lastInteractive?.skipNodeQueue || data.defaultSkipNodeQueue,
variables: defaultVariables, variables: defaultVariables,
workflowDispatchDeep: 0, workflowDispatchDeep: 0,
usageId: newUsageId, usageId: newUsageId,
...@@ -192,7 +191,6 @@ export const runWorkflow = async (data: RunWorkflowProps): Promise<DispatchFlowR ...@@ -192,7 +191,6 @@ export const runWorkflow = async (data: RunWorkflowProps): Promise<DispatchFlowR
res, res,
runtimeNodes = [], runtimeNodes = [],
runtimeEdges = [], runtimeEdges = [],
defaultSkipNodeQueue,
histories = [], histories = [],
variables = {}, variables = {},
externalProvider, externalProvider,
...@@ -791,6 +789,7 @@ export const runWorkflow = async (data: RunWorkflowProps): Promise<DispatchFlowR ...@@ -791,6 +789,7 @@ export const runWorkflow = async (data: RunWorkflowProps): Promise<DispatchFlowR
node, node,
runtimeEdges runtimeEdges
}); });
const nodeRunResult = await (() => { const nodeRunResult = await (() => {
if (status === 'run') { if (status === 'run') {
// All source edges status to waiting // All source edges status to waiting
...@@ -972,7 +971,7 @@ export const runWorkflow = async (data: RunWorkflowProps): Promise<DispatchFlowR ...@@ -972,7 +971,7 @@ export const runWorkflow = async (data: RunWorkflowProps): Promise<DispatchFlowR
const workflowQueue = await new Promise<WorkflowQueue>((resolve) => { const workflowQueue = await new Promise<WorkflowQueue>((resolve) => {
const workflowQueue = new WorkflowQueue({ const workflowQueue = new WorkflowQueue({
resolve, resolve,
defaultSkipNodeQueue defaultSkipNodeQueue: data.lastInteractive?.skipNodeQueue || data.defaultSkipNodeQueue
}); });
entryNodes.forEach((node) => { entryNodes.forEach((node) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment