Skip to content
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

fix: nesting of conditional branches causing streaming output error #14065

Merged
merged 6 commits into from
Mar 11, 2025

Conversation

Nov1c444
Copy link
Collaborator

@Nov1c444 Nov1c444 commented Feb 20, 2025

Summary

Fixed an issue: When multiple conditional branches are connected, the streaming output of subsequent conditional branches will fail.

Fix #13626
Fix #15162

Screenshots

Before After
image image

Checklist

Important

Please review the checklist below before submitting your pull request.

  • This change requires a documentation update, included: Dify Document
  • I understand that this PR may be closed in case there was no previous discussion or issues. (This doesn't apply to typos!)
  • I've added a test for each change that was introduced, and I tried as much as possible to make a single atomic change.
  • I've updated the documentation accordingly.
  • I ran dev/reformat(backend) and cd web && npx lint-staged(frontend) to appease the lint gods

Sorry, something went wrong.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
… fail.
@dosubot dosubot bot added size:XS This PR changes 0-9 lines, ignoring generated files. 🐞 bug Something isn't working labels Feb 20, 2025
@Nov1c444 Nov1c444 marked this pull request as draft February 20, 2025 02:30
@Nov1c444 Nov1c444 changed the title fix: conditional node in parallel execution cause streaming output error fix: nesting of conditional branches causing streaming output error Feb 21, 2025
@Nov1c444 Nov1c444 marked this pull request as ready for review February 24, 2025 01:05
@Nov1c444 Nov1c444 marked this pull request as draft February 24, 2025 01:11
@Nov1c444 Nov1c444 marked this pull request as ready for review February 24, 2025 06:49
@dosubot dosubot bot added size:S This PR changes 10-29 lines, ignoring generated files. and removed size:XS This PR changes 0-9 lines, ignoring generated files. labels Feb 24, 2025
@Nov1c444 Nov1c444 requested a review from crazywoola March 4, 2025 02:57
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Mar 11, 2025
@crazywoola crazywoola merged commit b817036 into main Mar 11, 2025
10 checks passed
@crazywoola crazywoola deleted the fix/condition-stream-output-error branch March 11, 2025 12:30
Scorpion1221 added a commit to yybht155/dify that referenced this pull request Mar 12, 2025
* commit '5019547d33eefa870786e5f981907ff2314a639a': (128 commits)
  fix: can not test custom tool (langgenius#15606)
  fix: no attribute error (langgenius#15597)
  fix: trace return null cause page crash (langgenius#15588)
  fix: set marketplace feature to false in feature_service.py (langgenius#15578)
  feat: env MAX_TOOLS_NUM (langgenius#15431)
  chore: use TenantAccountRole instead of TenantAccountJoinRole (langgenius#15514)
  fix: dataset editor (langgenius#15218)
  fix:message api doc (langgenius#15568)
  chore: remove unused parameter (langgenius#15558)
  feat: add debounced enter key submission to install form (langgenius#15445) (langgenius#15542)
  fix: invoke_error is not callable (langgenius#15555)
  fix: workflow loop node break conditions (langgenius#15549)
  fix: remove size prop in PlanBadge component because UpgradeBtn size … (langgenius#15544)
  feat: add click-away and mounting logic to agent setting component (langgenius#15521)
  chore: update opendal version (langgenius#14343)
  fix: nesting of conditional branches causing streaming output error (langgenius#14065)
  fix: update version to 1.0.1 in configuration and Docker files (langgenius#15478)
  fix notion page display (langgenius#15508)
  support workspace billing info (langgenius#15510)
  fix: update placeholders in version info modal to indicate optional field (langgenius#15499)
  ...

# Conflicts:
#	api/poetry.lock
#	web/pnpm-lock.yaml
@zhudongwork
Copy link

Could you please help take a look at this issue #15700 ? It's very similar to your situation.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🐞 bug Something isn't working lgtm This PR has been approved by a maintainer size:S This PR changes 10-29 lines, ignoring generated files.
Projects
None yet
3 participants