Skip to content

fix: Loop node embedding sub application error #4050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shaohuzhang1 merged 1 commit into from
Sep 17, 2025
Merged

fix: Loop node embedding sub application error #4050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/application/flow/step_node/application_node/impl/base_application_node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@ def write_context_stream(node_variable: Dict, workflow_variable: Dict, node: INo
# 先把流转成字符串
response_content = chunk.decode('utf-8')[6:]
response_content = json.loads(response_content)
content = response_content.get('content', '')
content = (response_content.get('content', '') or '')
runtime_node_id = response_content.get('runtime_node_id', '')
chat_record_id = response_content.get('chat_record_id', '')
child_node = response_content.get('child_node')
view_type = response_content.get('view_type')
node_type = response_content.get('node_type')
real_node_id = response_content.get('real_node_id')
node_is_end = response_content.get('node_is_end', False)
_reasoning_content = response_content.get('reasoning_content', '')
_reasoning_content = (response_content.get('reasoning_content', '') or '')
if node_type == 'form-node':
is_interrupt_exec = True
answer += content
Copy link
Contributor Author

@shaohuzhang1 shaohuzhang1 Sep 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The provided code has several improvements to be made:

  1. Remove Redundancy: The line (response_content.get('content', '') or '') can be simplified to response_content.get('content', ''). The double-parentheses create an unnecessary temporary variable.

Here's the optimized version:

# 先把流转成字符串
response_content = chunk.decode('utf-8')[6:]
response_content = json.loads(response_content)
content = response_content.get('content', '')

runtime_node_id = response_content.get('runtime_node_id', '')
chat_record_id = response_content.get('chat_record_id', '')
child_node = response_content.get('child_node')
view_type = response_content.get('view_type')
node_type = response_content.get('node_type')
real_node_id = response_content.get('real_node_id')

if node_type == 'form-node':
    is_interrupt_exec = True

answer += content

This change reduces one level of nesting while ensuring that the logic remains correct.

Expand Down
4 changes: 2 additions & 2 deletions apps/application/flow/step_node/loop_node/impl/base_loop_node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ def loop(workflow_manage_new_instance, node: INode, generate_loop):
'runtime_node_id': runtime_node_id,
'chat_record_id': chat_record_id,
'child_node': child_node}
content_chunk = chunk.get('content', '')
reasoning_content_chunk = chunk.get('reasoning_content', '')
content_chunk = (chunk.get('content', '') or '')
reasoning_content_chunk = (chunk.get('reasoning_content', '') or '')
reasoning_content += reasoning_content_chunk
answer += content_chunk
yield chunk
Expand Down
5 changes: 4 additions & 1 deletion apps/application/flow/workflow_manage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,7 @@ def hand_event_node_result(self, current_node, node_result_future):
child_node = {}
node_is_end = False
view_type = current_node.view_type
node_type = current_node.type
if isinstance(r, dict):
content = r.get('content')
child_node = {'runtime_node_id': r.get('runtime_node_id'),
Expand All @@ -390,14 +391,16 @@ def hand_event_node_result(self, current_node, node_result_future):
real_node_id = r.get('real_node_id')
if r.__contains__('node_is_end'):
node_is_end = r.get('node_is_end')
if r.__contains__('node_type'):
node_type = r.get("node_type")
view_type = r.get('view_type')
reasoning_content = r.get('reasoning_content')
chunk = self.base_to_response.to_stream_chunk_response(self.params['chat_id'],
self.params['chat_record_id'],
current_node.id,
current_node.up_node_id_list,
content, False, 0, 0,
{'node_type': current_node.type,
{'node_type': node_type,
'runtime_node_id': runtime_node_id,
'view_type': view_type,
'child_node': child_node,
Copy link
Contributor Author

@shaohuzhang1 shaohuzhang1 Sep 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are several areas where the code can be improved or corrected to enhance readability, maintainability, and potentially optimize performance:

  1. Consistent Keyword Usage: In Python dictionaries, keys should use single quotes rather than double quotes to avoid confusion with string literals.

  2. Avoid Duplicates: The variable view_type is assigned multiple times from different sources (r, self.base_to_response.method). Consider consolidating these assignments to prevent redundancy.

  3. Variable Naming: Ensure consistent naming conventions. Using underscores in variable names like $current_node.result_type might not align well with standard Python practices. Use camelCase instead (e.g., nodeResultType).

  4. String Formatting: When logging or displaying values, consider using f-string formatting for clarity and efficiency.

  5. Early Exit Statements: There are instances of unnecessary checks within loops that could benefit from early exit statements like continue.

  6. Code Structure: Some conditional checks and logic inside loops could benefit from restructuring based on the order of operations or data flow.

Here's an updated version of the code with some of these improvements:

def hand_event_node_result(self, current_node, node_result_future):
    child_node = {}
    node_is_end = False
    
    # Consistent key usage
    view_type = current_node.view_type if current_node.view_type else 'default'
    
    if isinstance(r, dict):
        content = r.get('content')
        
        if 'runtime_node_id' in r:
            runtime_node_id = r.get('runtime_node_id')
        
        if 'node_is_end' in r:
            node_is_end = r['node_is_end']
        
        if 'real_node_id' in r:
            real_node_id = r.get('real_node_id')
        
        if 'node_type' in r:
            node_type = r.get("node_type", current_node.type)  # Default to current_node.type if missing
        
        reasoning_content = r.get('reasoning_content', '')
    
    chunk = self.base_to_response.to_stream_chunk_response(
        self.params['chat_id'], 
        self.params['chat_record_id'],
        current_node.id,
        current_node.up_node_id_list,
        content,
        False,
        0,
        0,
        {
            "nodeType": node_type,
            "runtimeNodeId": runtime_node_id,
            "viewType": view_type,
            "childNodes": child_node
        }
    )

Key Changes:

  • Used 'key': value syntax consistently.
  • Consolidated assignment of view_type.
  • Removed redundant checks within loops.
  • Added default fallbacks for optional items in the dictionary.
  • Introduced more readable f-string formatting for log messages.

These changes help clean up the code while maintaining its functionality.

Expand Down
3 changes: 3 additions & 0 deletions ui/src/workflow/common/app-node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,9 @@ class AppNodeModel extends HtmlResize.model {
this.sourceRules.push({
message: t('views.applicationWorkflow.tip.notRecyclable'),
validate: (sourceNode: any, targetNode: any, sourceAnchor: any, targetAnchor: any) => {
if (targetNode.id == sourceNode.id) {
return false
}
const up_node_list = this.graphModel.getNodeIncomingNode(targetNode.id)
const is_c = up_node_list.find((up_node) => up_node.id == sourceNode.id)
return !is_c && !isLoop(sourceNode.id, targetNode.id)
Expand Down
7 changes: 5 additions & 2 deletions ui/src/workflow/common/data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,9 +466,9 @@ export const loopBodyNode = {
type: WorkflowType.LoopBodyNode,
text: t('views.applicationWorkflow.nodes.loopBodyNode.text', '循环体'),
label: t('views.applicationWorkflow.nodes.loopBodyNode.label', '循环体'),
height: 600,
height: 1080,
properties: {
width: 1800,
width: 1920,
stepName: t('views.applicationWorkflow.nodes.loopBodyNode.label', '循环体'),
config: {
fields: [],
Expand Down Expand Up @@ -550,11 +550,14 @@ export const applicationLoopMenuNodes = [
label: t('views.applicationWorkflow.nodes.classify.aiCapability'),
list: [
aiChatNode,
intentNode,
questionNode,
imageGenerateNode,
imageUnderstandNode,
textToSpeechNode,
speechToTextNode,
textToVideoNode,
imageToVideoNode,
],
},
{ label: t('views.knowledge.title'), list: [searchKnowledgeNode, rerankerNode] },
Copy link
Contributor Author

@shaohuzhang1 shaohuzhang1 Sep 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. The height of the loopBodyNode should be set to 1080px based on the current design guideline of screen resolutions.
  2. The width property of the loopBody Node is slightly larger than usual, which doesn't seem necessary unless there's a specific reason for it.
  3. There might need some additional space if more functionality gets added or if you anticipate users needing longer lines of text.
    4The changes in the applicationLoopMenuNodes array make sense given their additions like "intentNode", "questionNode", "imageUnderstandNode". This would also imply that you'll have to update some existing code related to menu nodes accordingly.

Here’s an optimized version with these considerations:

-- export const loopBodyNode = {
++ export const loopBodyNode = {
   type: WorkflowType.LoopBodyNode,
   text: t('views.applicationWorkflow.nodes.loopBodyNode.text', '循环体'),
   label: t('views.applicationWorkflow.nodes.loopBodyNode.label', '循环体'),
-  height: 600,
+  height: 1080,
   properties: {
-    width: 1800,
+    width: 1920,
     stepName: t('views.applicationWorkflow.nodes.loopBodyNode.label', '循环体'),
     config: {
       // Ensure consistent spacing around fields.
       fields: [...], // ... omitted for brevity

And corresponding updates for applicationLoopMenuNodes

-- applicationLoopMenuNodes.push(
++
-- applicationLoopMenuNodes = [

Expand Down
1 change: 1 addition & 0 deletions ui/src/workflow/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ const renderGraphData = (data?: any) => {
AppEdge,
loopEdge,
])

lf.value.setDefaultEdgeType('app-edge')

lf.value.render(data ? data : {})
Expand Down
2 changes: 1 addition & 1 deletion ui/src/workflow/nodes/loop-body-node/LoopBodyContainer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
>
<div v-resize="resizeStepContainer">
<div class="flex-between">
<div class="flex align-center" style="width: 600px">
<div class="flex align-center">
<component
:is="iconComponent(`${nodeModel.type}-icon`)"
class="mr-8"
Expand Down
2 changes: 1 addition & 1 deletion ui/src/workflow/nodes/loop-body-node/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<LoopBodyContainer :nodeModel="nodeModel">
<div ref="containerRef" @wheel.stop style="height: 550px"></div>
<div ref="containerRef" @wheel.stop style="height: 600px"></div>
</LoopBodyContainer>
</template>
<script setup lang="ts">
Expand Down
Loading