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

Distinguish flex flow and dag flow(use flow.flex.yaml for flex flow, flow.dag.yaml for dag flow) #2626

Merged
merged 10 commits into from
Apr 7, 2024

Conversation

Stephen1993
Copy link
Contributor

@Stephen1993 Stephen1993 commented Apr 3, 2024

Description

Please add an informative description that covers that changes made by the pull request and link all relevant issues.

It is necessary to distinguish between the flow yaml used by the eager flow and the dag flow (flex yaml and dag yaml), and modify the code to enable the eager flow to use flex yaml correctly and to enable the code to automatically recognize flex yaml and dag flex, which is divided into two steps:

  1. Distinguishing between flow.flex.yaml and flow.dag.yaml is what this PR is doing.
  2. Modify the code and migrate eager flow to flex flow. This PR is currently working on this.

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.

@Stephen1993 Stephen1993 requested review from a team as code owners April 3, 2024 05:16
@github-actions github-actions bot added sdk prompt flow SDK promptflow labels Apr 3, 2024
Copy link

github-actions bot commented Apr 3, 2024

promptflow-core test result

 12 files   12 suites   2m 59s ⏱️
 11 tests  11 ✅ 0 💤 0 ❌
132 runs  132 ✅ 0 💤 0 ❌

Results for commit 7baf7ef.

♻️ This comment has been updated with latest results.

Copy link

github-actions bot commented Apr 3, 2024

promptflow SDK CLI Azure E2E Test Result chenyzhang/distinguish_flex_and_dag

  4 files    4 suites   3m 59s ⏱️
202 tests 182 ✅ 20 💤 0 ❌
808 runs  728 ✅ 80 💤 0 ❌

Results for commit 7baf7ef.

♻️ This comment has been updated with latest results.

Copy link

github-actions bot commented Apr 3, 2024

SDK CLI Test Result chenyzhang/distinguish_flex_and_dag

   12 files     12 suites   48m 39s ⏱️
  549 tests   530 ✅ 19 💤 0 ❌
2 196 runs  2 120 ✅ 76 💤 0 ❌

Results for commit 7baf7ef.

♻️ This comment has been updated with latest results.

Copy link

github-actions bot commented Apr 7, 2024

SDK CLI Global Config Test Result chenyzhang/distinguish_flex_and_dag

3 tests   3 ✅  49s ⏱️
1 suites  0 💤
1 files    0 ❌

Results for commit 7baf7ef.

♻️ This comment has been updated with latest results.

@Stephen1993 Stephen1993 changed the title distinguish flex and dag flow Distinguish flex flow and dag flow(use flow.flex.yaml for flex flow, flow.dag.yaml for dag flow) Apr 7, 2024
wangchao1230
wangchao1230 previously approved these changes Apr 7, 2024
@Stephen1993 Stephen1993 merged commit 2046a3a into main Apr 7, 2024
48 checks passed
@Stephen1993 Stephen1993 deleted the chenyzhang/distinguish_flex_and_dag branch April 7, 2024 08:09
Stephen1993 added a commit that referenced this pull request Apr 8, 2024
…to obtain the flow path and flow file. (#2662)

# Description

Please add an informative description that covers that changes made by
the pull request and link all relevant issues.

Base this [PR](#2626):
Distinguish flex flow and dag flow(use flow.flex.yaml for flex flow,
flow.dag.yaml for dag flow),
And next [PR](#2548):
Migrate the yaml used by the eager flow to flow.flex.yaml, code support
both flow.flex.yaml and flow.dag.yaml.

To standardize the construction method of flow paths and flow files:
1. Delete **DAG_FILE_NAME** constant and use the **resolve_flow_path**
function to obtain the flow path and flow file.
2. Using **FLOW_DAG_YAML** instead of **DAG_FILE_NAME** .

# All Promptflow Contribution checklist:
- [x] **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](../CONTRIBUTING.md).**
- [ ] **Create an issue and link to the pull request to get dedicated
review from promptflow team. Learn more: [suggested
workflow](../CONTRIBUTING.md#suggested-workflow).**

## General Guidelines and Best Practices
- [x] 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](https://github.com/Azure/azure-powershell/blob/master/documentation/development-docs/cleaning-up-commits.md).

### Testing Guidelines
- [ ] Pull request includes test coverage for the included changes.
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.

3 participants