Skip to content

feat: Node execution conditions #1888

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
merged 1 commit into from
Dec 23, 2024
Merged

feat: Node execution conditions #1888

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
14 changes: 11 additions & 3 deletions apps/application/flow/workflow_manage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,9 +676,17 @@ def get_next_node_list(self, current_node, current_node_result):
self.get_node_cls_by_id(edge.targetNodeId, self.get_up_node_id_list(edge.targetNodeId)))
else:
for edge in self.flow.edges:
if edge.sourceNodeId == current_node.id and self.dependent_node_been_executed(edge.targetNodeId):
node_list.append(
self.get_node_cls_by_id(edge.targetNodeId, self.get_up_node_id_list(edge.targetNodeId)))
if edge.sourceNodeId == current_node.id:
next_node = [node for node in self.flow.nodes if node.id == edge.targetNodeId]
if len(next_node) == 0:
continue
if next_node[0].properties.get('condition', "AND") == 'AND':
if self.dependent_node_been_executed(edge.targetNodeId):
node_list.append(
self.get_node_cls_by_id(edge.targetNodeId, self.get_up_node_id_list(edge.targetNodeId)))
else:
node_list.append(
self.get_node_cls_by_id(edge.targetNodeId, self.get_up_node_id_list(edge.targetNodeId)))
return node_list

def get_reference_field(self, node_id: str, fields: List[str]):
Copy link
Contributor Author

@shaohuzhang1 shaohuzhang1 Dec 23, 2024

Choose a reason for hiding this comment

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

This code snippet appears to implement a method that determines which nodes should be processed next based on certain conditions. Here are some potential problems and optimizations:

Potential Issues:

  1. List Comprehension in Loop:

    • The line next_node = [node for node in self.flow.nodes if node.id == edge.targetNodeId] iterates over all nodes once per iteration of the main loop. This is unnecessary when you only need one target node from each connection.

  2. Multiple Returns:

    • If multiple nodes have the same targetNodeId, this code will append them all, but it won't stop after the first match. Consider adding a flag to break out of the function once a match is found to optimize performance for cases where duplicates exist.

  3. Condition Handling:

    • The code checks whether the condition property exists before accessing it (if next_node[0].properties.get('condition', "AND")). However, if condition doesn't exist, it will use "AND" as default, assuming every condition has been met. Make sure this default behavior aligns with your needs.

  4. Code Reusability:

    • The function get_next_node_list could benefit from reusing logic in helper functions like checking dependencies and getting node classes by ID.

Suggestions:

  1. Simplify Condition Check:

    if edge.sourceNodeId == current_node.id:
    # Determine if condition matches OR/AND rule
    if self._should_process_and_rule(node_id, edge.targetNodeId):
        node_list.append(self.get_node_cls_by_id(edge.targetNodeId, self.get_up_node_id_list(edge.targetNodeId)))

  2. Use Helper Function for Node Retrieval:
    Create a helper function _get_target_nodes that fetches and returns target nodes directly without iterating multiple times per edge.

  3. Add Debugging Information:
    Insert print statements or logging to trace execution flow and identify bottlenecks more easily.

Overall, improving efficiency and ensuring robust conditional handling would make the code cleaner and potentially faster under certain scenarios.

Expand Down
17 changes: 14 additions & 3 deletions ui/src/workflow/common/NodeContainer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
placement="bottom-start"
>
<el-button text>
<img src="@/assets/icon_or.svg" alt="" v-if="condition==='OR'">
<img src="@/assets/icon_and.svg" alt="" v-if="condition==='AND'">
<img src="@/assets/icon_or.svg" alt="" v-if="condition === 'OR'" />
<img src="@/assets/icon_and.svg" alt="" v-if="condition === 'AND'" />
</el-button>
<template #dropdown>
<div style="width: 280px" class="p-12-16">
Expand Down Expand Up @@ -152,8 +152,19 @@ const height = ref<{
})
const showAnchor = ref<boolean>(false)
const anchorData = ref<any>()
const condition = ref('AND')

const condition = computed({
set: (v) => {
set(props.nodeModel.properties, 'condition', v)
},
get: () => {
if (props.nodeModel.properties.condition) {
return props.nodeModel.properties.condition
}
set(props.nodeModel.properties, 'condition', 'AND')
return true
}
})
const showNode = computed({
set: (v) => {
set(props.nodeModel.properties, 'showNode', v)
Copy link
Contributor Author

@shaohuzhang1 shaohuzhang1 Dec 23, 2024

Choose a reason for hiding this comment

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

The code you provided has some improvements and optimizations that can be made:

Improvements:

  1. Computed Property Optimization: The use of computed properties for condition and showNode is a good practice. This allows Vue to efficiently update these properties when data changes, but it's important that they reflect the state correctly without re-setting values unnecessarily.

  2. String Comparison with Single Equal Sign: Replace single equals signs (=) with triple equal signs (===) for strict equality comparisons in methods like set. Using three equal signs ensures no type coercion occurs, which makes the comparison clearer and less prone to error.

  3. Code Formatting Consistency: Ensure consistent spacing around operators, braces, and commas to improve readability. This improves maintainability.

  4. Image Source Path Correction: Ensure the image paths are correct and accessible relative to the directory where this script runs. If images are located outside the assets folder, adjust their paths accordingly.

Optimize Conditional Rendering:

Instead of using conditional rendering inside the template directly (using v-if), consider restructuring the logic so that conditionally rendered elements remain part of the DOM and only visible based on their conditions. This can sometimes be more efficient than creating or destroying them dynamically during component updates.

Here's an updated version of your code incorporating these suggestions):

<template>
  <!-- Rest of the template remains unchanged -->

<script lang="ts">
import { defineComponent } from 'vue'
// Import other necessary components here

export default defineComponent({
  setup(props) {
    const set = (...args: any[]) => console.log(args) // Placeholder function
    
    const height = ref<{ top?: number; bottom?: number }>({
      // initialization
    })
    
    const showAnchor = ref(false)
    const anchorData = ref({})
    
    const condition = computed(() => {
      return props.nodeModel.properties?.condition || 'AND'
    })
    
    const showNode = computed(() => {
      return props.nodeModel.properties.showNode ?? true
    })
    
    // Other methods and computed properties...
  }
})
</script>

<!-- Reset CSS and styling -->
<style scoped src="./YourStylesheet.css"></style>

This revised approach maintains simplicity while improving robustness for future modifications.

Expand Down
Loading