Skip to content

Commit 44e2398

Browse files
authored
Merge branch 'main' into qunsong/rai-qa-flows
2 parents fc3bf06 + df00cd9 commit 44e2398

File tree

151 files changed

+5188
-969
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+5188
-969
lines changed

.github/workflows/promptflow-sdk-cli-test.yml

+23-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
fail-fast: false
5050
matrix:
5151
os: [ubuntu-latest]
52-
pythonVersion: ['3.8', '3.9']
52+
pythonVersion: ['3.8', '3.9', '3.10', '3.11']
5353
runs-on: ${{ matrix.os }}
5454
steps:
5555
- name: set test mode
@@ -126,6 +126,26 @@ jobs:
126126
-l eastus `
127127
-m "unittest or e2etest" `
128128
-o "${{ env.testWorkingDirectory }}/test-results-sdk-cli-executable.xml"
129+
- name: Install pfs
130+
shell: pwsh
131+
working-directory: artifacts
132+
run: |
133+
Set-PSDebug -Trace 1
134+
pip uninstall -y promptflow promptflow-sdk promptflow-tools
135+
gci ./promptflow -Recurse | % {if ($_.Name.Contains('.whl')) {python -m pip install "$($_.FullName)[pfs,azure]"}}
136+
gci ./promptflow-tools -Recurse | % {if ($_.Name.Contains('.whl')) {python -m pip install $_.FullName}}
137+
pip freeze
138+
- name: Run PFS Test
139+
shell: pwsh
140+
working-directory: ${{ env.testWorkingDirectory }}
141+
run: |
142+
python "../../scripts/building/run_coverage_tests.py" `
143+
-p promptflow `
144+
-t ${{ github.workspace }}/src/promptflow/tests/sdk_pfs_test `
145+
-l eastus `
146+
-m "e2etest" `
147+
--coverage-config ${{ github.workspace }}/src/promptflow/tests/sdk_pfs_test/.coveragerc `
148+
-o "${{ env.testWorkingDirectory }}/test-results-pfs.xml"
129149
- name: Upload Test Results
130150
if: always()
131151
uses: actions/upload-artifact@v3
@@ -134,6 +154,8 @@ jobs:
134154
path: |
135155
${{ env.testWorkingDirectory }}/*.xml
136156
${{ env.testWorkingDirectory }}/htmlcov/
157+
158+
137159
publish-test-results:
138160
name: "Publish Tests Results"
139161
needs: sdk_cli_tests

.github/workflows/promptflow-sdk-pfs-e2e-test.yml

-117
This file was deleted.

.github/workflows/samples_configuration.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- cron: "40 22 * * *" # Every day starting at 6:40 BJT
1010
pull_request:
1111
branches: [ main ]
12-
paths: [ examples/**, examples/*requirements.txt, .github/workflows/samples_configuration.yml, '!examples/flows/integrations/**' ]
12+
paths: [ examples/configuration.ipynb, .github/workflows/samples_configuration.yml ]
1313
workflow_dispatch:
1414

1515
env:

.github/workflows/samples_flowinpipeline_pipeline.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- cron: "28 19 * * *" # Every day starting at 3:28 BJT
1010
pull_request:
1111
branches: [ main ]
12-
paths: [ examples/**, .github/workflows/samples_flowinpipeline_pipeline.yml, '!examples/flows/integrations/**' ]
12+
paths: [ examples/tutorials/flow-in-pipeline/**, examples/flows/standard/web-classification/**, .github/workflows/samples_flowinpipeline_pipeline.yml, examples/requirements.txt, examples/connections/azure_openai.yml ]
1313
workflow_dispatch:
1414

1515
env:

.github/workflows/samples_flows_standard_flow_with_additional_includes.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- cron: "29 20 * * *" # Every day starting at 4:29 BJT
1010
pull_request:
1111
branches: [ main ]
12-
paths: [ examples/flows/standard/flow-with-additional-includes/**, examples/*requirements.txt, .github/workflows/samples_flows_standard_flow_with_additional_includes.yml ]
12+
paths: [ examples/flows/standard/flow-with-additional-includes/**, examples/*requirements.txt, examples/flows/standard/web-classification/**, .github/workflows/samples_flows_standard_flow_with_additional_includes.yml ]
1313
workflow_dispatch:
1414

1515
env:

.github/workflows/samples_flows_standard_flow_with_symlinks.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- cron: "41 20 * * *" # Every day starting at 4:41 BJT
1010
pull_request:
1111
branches: [ main ]
12-
paths: [ examples/flows/standard/flow-with-symlinks/**, examples/*requirements.txt, .github/workflows/samples_flows_standard_flow_with_symlinks.yml ]
12+
paths: [ examples/flows/standard/flow-with-symlinks/**, examples/*requirements.txt, examples/flows/standard/web-classification/**, .github/workflows/samples_flows_standard_flow_with_symlinks.yml ]
1313
workflow_dispatch:
1414

1515
env:

.github/workflows/samples_flows_standard_web_classification.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- cron: "13 21 * * *" # Every day starting at 5:13 BJT
1010
pull_request:
1111
branches: [ main ]
12-
paths: [ examples/flows/standard/web-classification/**, examples/*requirements.txt, examples/flows/standard/flow-with-additional-includes/**, examples/flows/standard/flow-with-symlinks/** ,.github/workflows/samples_flows_standard_web_classification.yml ]
12+
paths: [ examples/flows/standard/web-classification/**, examples/*requirements.txt, .github/workflows/samples_flows_standard_web_classification.yml ]
1313
workflow_dispatch:
1414

1515
env:

.github/workflows/samples_getstarted_flowasfunction.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- cron: "17 21 * * *" # Every day starting at 5:17 BJT
1010
pull_request:
1111
branches: [ main ]
12-
paths: [ examples/**, .github/workflows/samples_getstarted_flowasfunction.yml, '!examples/flows/integrations/**' ]
12+
paths: [ examples/tutorials/get-started/**, examples/flows/standard/web-classification/**, examples/flows/chat/basic-chat/**, .github/workflows/samples_getstarted_flowasfunction.yml, examples/requirements.txt, examples/connections/azure_openai.yml ]
1313
workflow_dispatch:
1414

1515
env:

.github/workflows/samples_getstarted_quickstart.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- cron: "55 21 * * *" # Every day starting at 5:55 BJT
1010
pull_request:
1111
branches: [ main ]
12-
paths: [ examples/**, .github/workflows/samples_getstarted_quickstart.yml, '!examples/flows/integrations/**' ]
12+
paths: [ examples/tutorials/get-started/**, examples/requirements.txt, examples/flows/standard/web-classification/**, examples/flows/evaluation/eval-classification-accuracy/**, .github/workflows/samples_getstarted_quickstart.yml, examples/connections/azure_openai.yml ]
1313
workflow_dispatch:
1414

1515
env:

.github/workflows/samples_getstarted_quickstartazure.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- cron: "24 20 * * *" # Every day starting at 4:24 BJT
1010
pull_request:
1111
branches: [ main ]
12-
paths: [ examples/**, .github/workflows/samples_getstarted_quickstartazure.yml, '!examples/flows/integrations/**' ]
12+
paths: [ examples/tutorials/get-started/**, examples/requirements.txt, examples/flows/standard/web-classification/**, examples/flows/evaluation/eval-classification-accuracy/**, .github/workflows/samples_getstarted_quickstartazure.yml, examples/connections/azure_openai.yml ]
1313
workflow_dispatch:
1414

1515
env:

.github/workflows/samples_runmanagement_cloudrunmanagement.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- cron: "24 20 * * *" # Every day starting at 4:24 BJT
1010
pull_request:
1111
branches: [ main ]
12-
paths: [ examples/**, .github/workflows/samples_runmanagement_cloudrunmanagement.yml, '!examples/flows/integrations/**' ]
12+
paths: [ examples/tutorials/run-management/**, examples/requirements.txt, examples/flows/standard/web-classification/**, .github/workflows/samples_runmanagement_cloudrunmanagement.yml, examples/connections/azure_openai.yml ]
1313
workflow_dispatch:
1414

1515
env:

.github/workflows/samples_runmanagement_runmanagement.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- cron: "51 20 * * *" # Every day starting at 4:51 BJT
1010
pull_request:
1111
branches: [ main ]
12-
paths: [ examples/**, .github/workflows/samples_runmanagement_runmanagement.yml, '!examples/flows/integrations/**' ]
12+
paths: [ examples/tutorials/run-management/**, examples/requirements.txt, examples/flows/standard/web-classification/**, .github/workflows/samples_runmanagement_runmanagement.yml, examples/connections/azure_openai.yml ]
1313
workflow_dispatch:
1414

1515
env:

.github/workflows/samples_tutorials_e2e_development_chat_with_pdf.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- cron: "1 19 * * *" # Every day starting at 3:1 BJT
1010
pull_request:
1111
branches: [ main ]
12-
paths: [ examples/**, .github/workflows/samples_tutorials_e2e_development_chat_with_pdf.yml, '!examples/flows/integrations/**' ]
12+
paths: [ examples/tutorials/e2e-development/**, examples/connections/azure_openai.yml, examples/flows/chat/chat-with-pdf/**, .github/workflows/samples_tutorials_e2e_development_chat_with_pdf.yml, examples/requirements.txt ]
1313
workflow_dispatch:
1414

1515
env:

.github/workflows/samples_tutorials_flow_deploy_azure_app_service.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- cron: "48 20 * * *" # Every day starting at 4:48 BJT
1010
pull_request:
1111
branches: [ main ]
12-
paths: [ examples/**, .github/workflows/samples_tutorials_flow_deploy_azure_app_service.yml, '!examples/flows/integrations/**' ]
12+
paths: [ examples/tutorials/flow-deploy/azure-app-service/**, examples/connections/azure_openai.yml, examples/flows/standard/web-classification/**, .github/workflows/samples_tutorials_flow_deploy_azure_app_service.yml, examples/requirements.txt ]
1313
workflow_dispatch:
1414

1515
env:

.github/workflows/samples_tutorials_flow_deploy_create_service_with_flow.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- cron: "49 22 * * *" # Every day starting at 6:49 BJT
1010
pull_request:
1111
branches: [ main ]
12-
paths: [ examples/**, .github/workflows/samples_tutorials_flow_deploy_create_service_with_flow.yml ]
12+
paths: [ examples/tutorials/flow-deploy/create-service-with-flow/**, examples/tutorials/flow-deploy/create-service-with-flow/**, .github/workflows/samples_tutorials_flow_deploy_create_service_with_flow.yml, examples/requirements.txt, examples/connections/azure_openai.yml ]
1313
workflow_dispatch:
1414

1515
env:

.github/workflows/samples_tutorials_flow_deploy_distribute_flow_as_executable_app.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- cron: "59 21 * * *" # Every day starting at 5:59 BJT
1010
pull_request:
1111
branches: [ main ]
12-
paths: [ examples/**, .github/workflows/samples_tutorials_flow_deploy_distribute_flow_as_executable_app.yml, '!examples/flows/integrations/**' ]
12+
paths: [ examples/tutorials/flow-deploy/distribute-flow-as-executable-app/**, examples/connections/azure_openai.yml, examples/flows/standard/web-classification/**, .github/workflows/samples_tutorials_flow_deploy_distribute_flow_as_executable_app.yml, examples/requirements.txt ]
1313
workflow_dispatch:
1414

1515
env:

.github/workflows/samples_tutorials_flow_deploy_docker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- cron: "53 20 * * *" # Every day starting at 4:53 BJT
1010
pull_request:
1111
branches: [ main ]
12-
paths: [ examples/**, .github/workflows/samples_tutorials_flow_deploy_docker.yml, '!examples/flows/integrations/**' ]
12+
paths: [ examples/tutorials/flow-deploy/docker/**, examples/connections/azure_openai.yml, examples/flows/standard/web-classification/**, .github/workflows/samples_tutorials_flow_deploy_docker.yml, examples/requirements.txt ]
1313
workflow_dispatch:
1414

1515
env:

.github/workflows/samples_tutorials_flow_deploy_kubernetes.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- cron: "19 19 * * *" # Every day starting at 3:19 BJT
1010
pull_request:
1111
branches: [ main ]
12-
paths: [ examples/**, .github/workflows/samples_tutorials_flow_deploy_kubernetes.yml, '!examples/flows/integrations/**' ]
12+
paths: [ examples/tutorials/flow-deploy/kubernetes/**, examples/connections/azure_openai.yml, examples/flows/standard/web-classification/**, .github/workflows/samples_tutorials_flow_deploy_kubernetes.yml, examples/requirements.txt ]
1313
workflow_dispatch:
1414

1515
env:

.github/workflows/samples_tutorials_flow_fine_tuning_evaluation_promptflow_quality_improvement.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- cron: "15 19 * * *" # Every day starting at 3:15 BJT
1010
pull_request:
1111
branches: [ main ]
12-
paths: [ examples/**, .github/workflows/samples_tutorials_flow_fine_tuning_evaluation_promptflow_quality_improvement.yml, '!examples/flows/integrations/**' ]
12+
paths: [ examples/tutorials/flow-fine-tuning-evaluation/**, examples/connections/azure_openai.yml, examples/flows/chat/basic-chat/**, examples/flows/chat/chat-math-variant/**, examples/flows/evaluation/eval-chat-math/**, .github/workflows/samples_tutorials_flow_fine_tuning_evaluation_promptflow_quality_improvement.yml, examples/requirements.txt ]
1313
workflow_dispatch:
1414

1515
env:

0 commit comments

Comments
 (0)