From f2245daca1cfa2e78bb30943a7282cb94a413c5b Mon Sep 17 00:00:00 2001 From: Philip Gao Date: Thu, 7 Dec 2023 11:37:33 +0800 Subject: [PATCH 1/2] Change executor pipeline coverage following code owners. (#1413) # Description Change executor pipeline coverage following code owners. # 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 - [ ] 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. --- .github/workflows/promptflow-executor-e2e-test.yml | 14 +++++++++++++- .../workflows/promptflow-executor-unit-test.yml | 14 +++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.github/workflows/promptflow-executor-e2e-test.yml b/.github/workflows/promptflow-executor-e2e-test.yml index 617fe9fd850..059bd54fb27 100644 --- a/.github/workflows/promptflow-executor-e2e-test.yml +++ b/.github/workflows/promptflow-executor-e2e-test.yml @@ -4,7 +4,19 @@ on: - cron: "40 20 * * *" # Every day starting at 4:40 BJT pull_request_target: paths: - - src/promptflow/** + - src/promptflow/* + - src/promptflow/promptflow/* + - src/promptflow/promptflow/_core/** + - src/promptflow/promptflow/_internal/** + - src/promptflow/promptflow/_utils/** + - src/promptflow/promptflow/batch/** + - src/promptflow/promptflow/contracts/** + - src/promptflow/promptflow/entities/** + - src/promptflow/promptflow/executor/** + - src/promptflow/promptflow/integrations/** + - src/promptflow/promptflow/storage/** + - src/promptflow/tests/* + - src/promptflow/tests/executor/** - scripts/building/** - .github/workflows/promptflow-executor-e2e-test.yml workflow_dispatch: diff --git a/.github/workflows/promptflow-executor-unit-test.yml b/.github/workflows/promptflow-executor-unit-test.yml index 2a532b3cf5e..896994c595e 100644 --- a/.github/workflows/promptflow-executor-unit-test.yml +++ b/.github/workflows/promptflow-executor-unit-test.yml @@ -4,7 +4,19 @@ on: - cron: "40 19 * * *" # Every day starting at 3:40 BJT pull_request_target: paths: - - src/promptflow/** + - src/promptflow/* + - src/promptflow/promptflow/* + - src/promptflow/promptflow/_core/** + - src/promptflow/promptflow/_internal/** + - src/promptflow/promptflow/_utils/** + - src/promptflow/promptflow/batch/** + - src/promptflow/promptflow/contracts/** + - src/promptflow/promptflow/entities/** + - src/promptflow/promptflow/executor/** + - src/promptflow/promptflow/integrations/** + - src/promptflow/promptflow/storage/** + - src/promptflow/tests/* + - src/promptflow/tests/executor/** - scripts/building/** - .github/workflows/promptflow-executor-unit-test.yml workflow_dispatch: From e381b87a97911f795c16c60e0bb58fe286cd210e Mon Sep 17 00:00:00 2001 From: Peiwen Gao <111329184+PeiwenGaoMS@users.noreply.github.com> Date: Thu, 7 Dec 2023 12:06:02 +0800 Subject: [PATCH 2/2] [Internal][Executor] Fix executor ci tests (#1416) # Description Fix executor ci tests # 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](../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 - [ ] 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. --- .../tests/executor/e2etests/test_csharp_executor_proxy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/promptflow/tests/executor/e2etests/test_csharp_executor_proxy.py b/src/promptflow/tests/executor/e2etests/test_csharp_executor_proxy.py index 086dd1d6d8c..f8e1b34abcd 100644 --- a/src/promptflow/tests/executor/e2etests/test_csharp_executor_proxy.py +++ b/src/promptflow/tests/executor/e2etests/test_csharp_executor_proxy.py @@ -82,7 +82,7 @@ def create( ) -> "MockCSharpExecutorProxy": """Create a new executor""" port = cls.find_available_port() - process = multiprocessing.Process(target=run_executor_server, args=(port,)) + process = multiprocessing.Process(target=run_executor_server, args=(int(port),)) process.start() return cls(process, port)