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.

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

Jump to bottom

[App] Resolve inconsistency where the flow.flows property isn't recursive leading to flow overrides #15466

Merged
merged 36 commits into from
Nov 3, 2022
Merged

[App] Resolve inconsistency where the flow.flows property isn't recursive leading to flow overrides #15466

merged 36 commits into from
Nov 3, 2022

Conversation

tchaton
Copy link
Contributor

@tchaton tchaton commented Nov 2, 2022 •
edited by github-actions bot
Loading

What does this PR do?

The main issues was the flow.flows call that collected the flows using their attribute name. If 2 flows had the same attribute name, they would ended up overriding themselves.

Fixes #<issue_number>

Does your PR introduce any breaking changes? If yes, please list them.

Before submitting

  • Was this discussed/approved via a GitHub issue? (not for typos and docs)
  • Did you read the contributor guideline, Pull Request section?
  • Did you make sure your PR does only one thing, instead of bundling different changes together?
  • Did you make sure to update the documentation with your changes? (if necessary)
  • Did you write any new necessary tests? (not for typos and docs)
  • Did you verify new and existing tests pass locally with your changes?
  • Did you list all the breaking changes introduced by this pull request?
  • Did you update the CHANGELOG? (not for typos, docs, test updates, or minor internal changes/refactors)

PR review

Anyone in the community is welcome to review the PR.
Before you start reviewing, make sure you have read the review guidelines. In short, see the following bullet-list:

  • Is this pull request ready for review? (if not, please submit in draft mode)
  • Check that all items from Before submitting are resolved
  • Make sure the title is self-explanatory and the description concisely explains the PR
  • Add labels and milestones (and optionally projects) to the PR so it can be classified

Did you have fun?

Make sure you had fun coding 🙃

cc @Borda

@tchaton tchaton self-assigned this Nov 2, 2022
@tchaton tchaton added the bug Something isn't working label Nov 2, 2022
@github-actions github-actions bot added the app (removed) Generic label for Lightning App package label Nov 2, 2022
@tchaton tchaton added this to the v1.8.x milestone Nov 2, 2022
@tchaton tchaton changed the title Resolve consistency bug with returning flows from dict and list Resolve a bug where not all the flows would be collected and could override themselves Nov 2, 2022
@tchaton tchaton changed the title Resolve a bug where not all the flows would be collected and could override themselves [App] Resolve a bug where not all the flows would be collected and could override themselves Nov 2, 2022
@tchaton tchaton changed the title [App] Resolve a bug where not all the flows would be collected and could override themselves [App] Resolve inconsistency where the flows isn't recursive leading to flow overrides Nov 2, 2022
@tchaton tchaton changed the title [App] Resolve inconsistency where the flows isn't recursive leading to flow overrides [App] Resolve inconsistency where the flow.flows property isn't recursive leading to flow overrides Nov 2, 2022
@tchaton tchaton enabled auto-merge (squash) November 2, 2022 20:13
lantiga
lantiga requested changes Nov 2, 2022
View reviewed changes
Copy link
Collaborator

@lantiga lantiga left a comment

Choose a reason for hiding this comment

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

A couple of comments to address

src/lightning_app/core/queues.py Show resolved Hide resolved
src/lightning_app/utilities/tree.py Show resolved Hide resolved
@mergify mergify bot added the ready PRs ready to be merged label Nov 2, 2022
@mergify mergify bot added has conflicts and removed ready PRs ready to be merged labels Nov 3, 2022
@mergify mergify bot added ready PRs ready to be merged and removed has conflicts ready PRs ready to be merged labels Nov 3, 2022
@lantiga lantiga disabled auto-merge November 3, 2022 21:51
@lantiga lantiga enabled auto-merge (squash) November 3, 2022 21:52
@lantiga lantiga merged commit 921dc1c into master Nov 3, 2022
@lantiga lantiga deleted the resolve_lightning_flow_bug branch November 3, 2022 22:10
Borda pushed a commit that referenced this pull request Nov 5, 2022
@tchaton @Borda
[App] Resolve inconsistency where the flow.flows property isn't rec…
5d8fbc8 
…ursive leading to flow overrides (#15466)

* update

* update

* update

* update

* update

* resolve attachment

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

(cherry picked from commit 921dc1c)
lexierule pushed a commit that referenced this pull request Nov 10, 2022
@tchaton @lexierule
[App] Resolve inconsistency where the flow.flows property isn't rec…
7820d2a 
…ursive leading to flow overrides (#15466)

* update

* update

* update

* update

* update

* resolve attachment

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

(cherry picked from commit 921dc1c)
@nicolai86 nicolai86 mentioned this pull request Dec 7, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@manskx manskx manskx approved these changes

@awaelchli awaelchli awaelchli approved these changes

@lantiga lantiga lantiga approved these changes

@hhsecond hhsecond Awaiting requested review from hhsecond

Assignees

@tchaton tchaton

Labels
app (removed) Generic label for Lightning App package bug Something isn't working ready PRs ready to be merged
Projects
No open projects
Frameworks Planning
Status: Done
Milestone
v1.8.x
Development

Successfully merging this pull request may close these issues.
4 participants
@tchaton @lantiga @awaelchli @manskx