-
Notifications
You must be signed in to change notification settings - Fork 18.9k
Fix: prevent workflow early termination when Answer node completes before parallel nodes in IF/ELSE branch #27602
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.
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
Open
runzhezhang11
wants to merge
7
commits into
langgenius:main
Choose a base branch
from
runzhezhang11:fix/if-else-parallel-answer-27583
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+32
−4
Open
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
33c5d11
Update coordinator.py
runzhezhang11 2b90123
Update graph_state_manager.py
runzhezhang11 635e55e
Update graph_state_manager.py
runzhezhang11 7d9200d
Update graph_engine.py
runzhezhang11 95e3dd4
[autofix.ci] apply automated fixes
autofix-ci[bot] 82421dc
Update api/core/workflow/graph_engine/response_coordinator/coordinato…
runzhezhang11 b2a5a3d
Merge branch 'main' into fix/if-else-parallel-answer-27583
runzhezhang11 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,13 +4,16 @@ | |
|
|
||
| import threading | ||
| from collections.abc import Sequence | ||
| from typing import TypedDict, final | ||
| from typing import TYPE_CHECKING, TypedDict, final | ||
|
|
||
| from core.workflow.enums import NodeState | ||
| from core.workflow.graph import Edge, Graph | ||
|
|
||
| from .ready_queue import ReadyQueue | ||
|
|
||
| if TYPE_CHECKING: | ||
| from .response_coordinator import ResponseStreamCoordinator | ||
|
|
||
|
|
||
| class EdgeStateAnalysis(TypedDict): | ||
| """Analysis result for edge states.""" | ||
|
|
@@ -22,16 +25,20 @@ class EdgeStateAnalysis(TypedDict): | |
|
|
||
| @final | ||
| class GraphStateManager: | ||
| def __init__(self, graph: Graph, ready_queue: ReadyQueue) -> None: | ||
| def __init__( | ||
| self, graph: Graph, ready_queue: ReadyQueue, response_coordinator: "ResponseStreamCoordinator | None" = None | ||
| ) -> None: | ||
|
Comment on lines
+29
to
+30
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| """ | ||
| Initialize the state manager. | ||
|
|
||
| Args: | ||
| graph: The workflow graph | ||
| ready_queue: Queue for nodes ready to execute | ||
| response_coordinator: Optional response stream coordinator for checking pending sessions | ||
| """ | ||
| self._graph = graph | ||
| self._ready_queue = ready_queue | ||
| self._response_coordinator = response_coordinator | ||
| self._lock = threading.RLock() | ||
|
|
||
| # Execution tracking state | ||
|
|
@@ -251,12 +258,21 @@ def is_execution_complete(self) -> bool: | |
| Execution is complete when: | ||
| - Ready queue is empty | ||
| - No nodes are executing | ||
| - No pending response sessions (if response coordinator is available) | ||
|
|
||
| Returns: | ||
| True if execution is complete | ||
| """ | ||
| with self._lock: | ||
| return self._ready_queue.empty() and len(self._executing_nodes) == 0 | ||
| basic_complete = self._ready_queue.empty() and len(self._executing_nodes) == 0 | ||
|
|
||
| if not basic_complete: | ||
| return False | ||
|
|
||
| if self._response_coordinator and self._response_coordinator.has_pending_sessions(): | ||
| return False | ||
|
|
||
| return True | ||
|
|
||
| def get_queue_depth(self) -> int: | ||
| """ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
_response_coordinatoris not initialized before being passed to theGraphStateManager. This could lead to aNameErrorifGraphStateManagertries to use it before it's assigned. Ensure_response_coordinatoris initialized before_state_manager.