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

Update operation context for aggregation node #2798

Merged
merged 3 commits into from
Apr 16, 2024

Conversation

huaiyan
Copy link
Contributor

@huaiyan huaiyan commented Apr 15, 2024

Description

  1. Add batch run id for aggregate node, to guarantee don't touch collection table.
  2. Add attribute to mark is aggregation or not. For aggregate node, we don't write LineSummary. Then we could hide it from UX list. This is the motivation for this PR
  3. Delete _exec_aggregation_with_bulk_results method, used by nowhere.
  4. Use exec_aggregation instead of _exec_aggregation for better code structure.

All Promptflow Contribution checklist:

  • The pull request does not introduce [breaking changes].
  • CHANGELOG is updated for new features, bug fixes or other significant changes.
  • I have read the contribution guidelines.
  • Create an issue and link to the pull request to get dedicated review from promptflow team. Learn more: suggested workflow.

General Guidelines and Best Practices

  • Title of the pull request is clear and informative.
  • There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR. For more information on cleaning up the commits in your PR, see this page.

Testing Guidelines

  • Pull request includes test coverage for the included changes.

Copy link

github-actions bot commented Apr 15, 2024

promptflow-core test result

0 tests   0 ✅  0s ⏱️
0 suites  0 💤
0 files    0 ❌

Results for commit 79f9b94.

♻️ This comment has been updated with latest results.

Copy link

github-actions bot commented Apr 15, 2024

promptflow SDK CLI Azure E2E Test Result dev/robbenwang_hide_aggregation

  4 files    4 suites   4m 50s ⏱️
220 tests 192 ✅  28 💤 0 ❌
880 runs  768 ✅ 112 💤 0 ❌

Results for commit 79f9b94.

♻️ This comment has been updated with latest results.

Copy link

github-actions bot commented Apr 15, 2024

SDK CLI Global Config Test Result dev/robbenwang_hide_aggregation

4 tests   4 ✅  1m 10s ⏱️
1 suites  0 💤
1 files    0 ❌

Results for commit 79f9b94.

♻️ This comment has been updated with latest results.

Copy link

github-actions bot commented Apr 15, 2024

Executor Unit Test Result dev/robbenwang_hide_aggregation

778 tests   778 ✅  3m 42s ⏱️
  1 suites    0 💤
  1 files      0 ❌

Results for commit 79f9b94.

♻️ This comment has been updated with latest results.

Copy link

github-actions bot commented Apr 15, 2024

Executor E2E Test Result dev/robbenwang_hide_aggregation

238 tests   236 ✅  6m 27s ⏱️
  1 suites    2 💤
  1 files      0 ❌

Results for commit 79f9b94.

♻️ This comment has been updated with latest results.

Copy link

github-actions bot commented Apr 15, 2024

SDK CLI Test Result dev/robbenwang_hide_aggregation

    4 files      4 suites   53m 14s ⏱️
  596 tests   575 ✅ 21 💤 0 ❌
2 384 runs  2 300 ✅ 84 💤 0 ❌

Results for commit 79f9b94.

♻️ This comment has been updated with latest results.

@huaiyan huaiyan force-pushed the dev/robbenwang_hide_aggregation branch from d3cfd0d to ae188ed Compare April 15, 2024 10:03
@huaiyan huaiyan force-pushed the dev/robbenwang_hide_aggregation branch from ae188ed to 70937f7 Compare April 15, 2024 10:38
@huaiyan huaiyan force-pushed the dev/robbenwang_hide_aggregation branch from 70937f7 to a9abd08 Compare April 15, 2024 11:00
@huaiyan huaiyan changed the title Update operation context for evaulation run Update operation context for aggregation node Apr 15, 2024
@huaiyan huaiyan force-pushed the dev/robbenwang_hide_aggregation branch from a9abd08 to aaa8c34 Compare April 16, 2024 01:46
@liucheng-ms
Copy link
Contributor

Description

  1. Add batch run id for aggregate node, to guarantee don't touch collection table.
  2. Add attribute to mark is aggregation or not. For aggregate node, we don't write LineSummary.
  3. Delete _exec_aggregation_with_bulk_results method, used by nowhere.
  4. Use exec_aggregation instead of _exec_aggregation for better code structure.

All Promptflow Contribution checklist:

  • The pull request does not introduce [breaking changes].
  • CHANGELOG is updated for new features, bug fixes or other significant changes.
  • I have read the contribution guidelines.
  • Create an issue and link to the pull request to get dedicated review from promptflow team. Learn more: suggested workflow.

General Guidelines and Best Practices

  • Title of the pull request is clear and informative.
  • There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR. For more information on cleaning up the commits in your PR, see this page.

Testing Guidelines

  • Pull request includes test coverage for the included changes.

Could you share more context of this PR. Why do we have to make this PR? What problem does it solve?

robbenwang added 2 commits April 16, 2024 09:39
For aggregate node, we ignore writing LineSummary.

Add batch run id for aggregate node, to guarantee don't touch collection table.
When we run test case concurrently, test case may fail because of wrong operation context.
@huaiyan huaiyan merged commit a740d2c into main Apr 16, 2024
51 checks passed
@huaiyan huaiyan deleted the dev/robbenwang_hide_aggregation branch April 16, 2024 10:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants