From 26e7e04796ce447fc4cded243f0c5f403b1cc54e Mon Sep 17 00:00:00 2001 From: Philip Gao Date: Fri, 22 Sep 2023 18:49:17 +0800 Subject: [PATCH] Alter canary workspace (#600) # Description Alter canary workspace # 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.** - [x] **I have read the [contribution guidelines](../CONTRIBUTING.md).** ## General Guidelines and Best Practices - [x] Title of the pull request is clear and informative. - [x] 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 - [x] Pull request includes test coverage for the included changes. --- .github/workflows/samples_configuration.yml | 2 +- .github/workflows/samples_connections.yml | 4 ++-- .github/workflows/samples_connections_connection.yml | 2 +- .github/workflows/samples_flows_chat_basic_chat.yml | 4 ++-- .github/workflows/samples_flows_chat_chat_with_pdf.yml | 4 ++-- .github/workflows/samples_flows_chat_chat_with_wikipedia.yml | 4 ++-- .../workflows/samples_flows_chat_chatwithpdf_chatwithpdf.yml | 2 +- .../samples_flows_chat_chatwithpdf_chatwithpdfazure.yml | 2 +- .github/workflows/samples_flows_evaluation_eval_basic.yml | 4 ++-- ...samples_flows_evaluation_eval_classification_accuracy.yml | 4 ++-- .../samples_flows_evaluation_eval_entity_match_rate.yml | 4 ++-- .../workflows/samples_flows_evaluation_eval_groundedness.yml | 4 ++-- .../samples_flows_evaluation_eval_perceived_intelligence.yml | 4 ++-- .../workflows/samples_flows_standard_autonomous_agent.yml | 4 ++-- .github/workflows/samples_flows_standard_basic.yml | 4 ++-- .../samples_flows_standard_basic_with_builtin_llm.yml | 4 ++-- .../samples_flows_standard_basic_with_connection.yml | 4 ++-- .../samples_flows_standard_conditional_flow_for_if_else.yml | 4 ++-- .../samples_flows_standard_conditional_flow_for_switch.yml | 4 ++-- .../samples_flows_standard_customer_intent_extraction.yml | 4 ++-- .../samples_flows_standard_flow_with_additional_includes.yml | 4 ++-- .../workflows/samples_flows_standard_flow_with_symlinks.yml | 4 ++-- .github/workflows/samples_flows_standard_gen_docstring.yml | 4 ++-- .github/workflows/samples_flows_standard_maths_to_code.yml | 4 ++-- .../samples_flows_standard_named_entity_recognition.yml | 4 ++-- .../workflows/samples_flows_standard_web_classification.yml | 4 ++-- .github/workflows/samples_getstarted_quickstart.yml | 2 +- .github/workflows/samples_getstarted_quickstartazure.yml | 2 +- .../workflows/samples_runmanagement_cloudrunmanagement.yml | 2 +- .../samples_tutorials_e2e_development_chat_with_pdf.yml | 4 ++-- .../samples_tutorials_flow_deploy_azure_app_service.yml | 4 ++-- .github/workflows/samples_tutorials_flow_deploy_docker.yml | 4 ++-- .../workflows/samples_tutorials_flow_deploy_kubernetes.yml | 4 ++-- examples/README.md | 1 + examples/flows/chat/chat-with-pdf/chat-with-pdf.ipynb | 4 ++-- .../ghactions_driver/readme_templates/README.md.jinja2 | 4 ++-- .../workflow_steps/step_extract_steps_and_run.yml.jinja2 | 2 +- .../step_extract_steps_and_run_gpt4.yml.jinja2 | 2 +- .../workflow_templates/basic_workflow.yml.jinja2 | 2 +- .../workflow_templates/basic_workflow_replace.yml.jinja2 | 2 +- .../workflow_templates/pdf_workflow.yml.jinja2 | 2 +- scripts/readme/readme.py | 2 +- scripts/readme/readme_generator.py | 3 +-- scripts/readme/workflow_generator.py | 5 ++--- 44 files changed, 73 insertions(+), 74 deletions(-) diff --git a/.github/workflows/samples_configuration.yml b/.github/workflows/samples_configuration.yml index aee61d9be66..be3365ab4ae 100644 --- a/.github/workflows/samples_configuration.yml +++ b/.github/workflows/samples_configuration.yml @@ -19,7 +19,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Azure Login uses: azure/login@v1 with: diff --git a/.github/workflows/samples_connections.yml b/.github/workflows/samples_connections.yml index ef033eb018f..8942eaf6d6d 100644 --- a/.github/workflows/samples_connections.yml +++ b/.github/workflows/samples_connections.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -74,7 +74,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_connections_connection.yml b/.github/workflows/samples_connections_connection.yml index 28e2c0449b9..033eddb32a3 100644 --- a/.github/workflows/samples_connections_connection.yml +++ b/.github/workflows/samples_connections_connection.yml @@ -19,7 +19,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Azure Login uses: azure/login@v1 with: diff --git a/.github/workflows/samples_flows_chat_basic_chat.yml b/.github/workflows/samples_flows_chat_basic_chat.yml index 2e5f2a5fa9f..34384f0797b 100644 --- a/.github/workflows/samples_flows_chat_basic_chat.yml +++ b/.github/workflows/samples_flows_chat_basic_chat.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -74,7 +74,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_flows_chat_chat_with_pdf.yml b/.github/workflows/samples_flows_chat_chat_with_pdf.yml index 6be45c5c9bc..f72b12f8ab7 100644 --- a/.github/workflows/samples_flows_chat_chat_with_pdf.yml +++ b/.github/workflows/samples_flows_chat_chat_with_pdf.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -82,7 +82,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_flows_chat_chat_with_wikipedia.yml b/.github/workflows/samples_flows_chat_chat_with_wikipedia.yml index e71491b3972..f8e9e148641 100644 --- a/.github/workflows/samples_flows_chat_chat_with_wikipedia.yml +++ b/.github/workflows/samples_flows_chat_chat_with_wikipedia.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -74,7 +74,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_flows_chat_chatwithpdf_chatwithpdf.yml b/.github/workflows/samples_flows_chat_chatwithpdf_chatwithpdf.yml index 54fca7c0558..afebca7d8f1 100644 --- a/.github/workflows/samples_flows_chat_chatwithpdf_chatwithpdf.yml +++ b/.github/workflows/samples_flows_chat_chatwithpdf_chatwithpdf.yml @@ -19,7 +19,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Setup Python 3.9 environment uses: actions/setup-python@v4 with: diff --git a/.github/workflows/samples_flows_chat_chatwithpdf_chatwithpdfazure.yml b/.github/workflows/samples_flows_chat_chatwithpdf_chatwithpdfazure.yml index 15081d5e87f..4c07d3de868 100644 --- a/.github/workflows/samples_flows_chat_chatwithpdf_chatwithpdfazure.yml +++ b/.github/workflows/samples_flows_chat_chatwithpdf_chatwithpdfazure.yml @@ -19,7 +19,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Setup Python 3.9 environment uses: actions/setup-python@v4 with: diff --git a/.github/workflows/samples_flows_evaluation_eval_basic.yml b/.github/workflows/samples_flows_evaluation_eval_basic.yml index 645a1076d0b..9767fb4293d 100644 --- a/.github/workflows/samples_flows_evaluation_eval_basic.yml +++ b/.github/workflows/samples_flows_evaluation_eval_basic.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -74,7 +74,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_flows_evaluation_eval_classification_accuracy.yml b/.github/workflows/samples_flows_evaluation_eval_classification_accuracy.yml index 7cb97436fe5..69312ee9ed9 100644 --- a/.github/workflows/samples_flows_evaluation_eval_classification_accuracy.yml +++ b/.github/workflows/samples_flows_evaluation_eval_classification_accuracy.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -74,7 +74,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_flows_evaluation_eval_entity_match_rate.yml b/.github/workflows/samples_flows_evaluation_eval_entity_match_rate.yml index 69fa0e64c92..7923c278536 100644 --- a/.github/workflows/samples_flows_evaluation_eval_entity_match_rate.yml +++ b/.github/workflows/samples_flows_evaluation_eval_entity_match_rate.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -74,7 +74,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_flows_evaluation_eval_groundedness.yml b/.github/workflows/samples_flows_evaluation_eval_groundedness.yml index 583b43e5c91..d99c086ed49 100644 --- a/.github/workflows/samples_flows_evaluation_eval_groundedness.yml +++ b/.github/workflows/samples_flows_evaluation_eval_groundedness.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -74,7 +74,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_flows_evaluation_eval_perceived_intelligence.yml b/.github/workflows/samples_flows_evaluation_eval_perceived_intelligence.yml index 0a926e4b294..53b84efc377 100644 --- a/.github/workflows/samples_flows_evaluation_eval_perceived_intelligence.yml +++ b/.github/workflows/samples_flows_evaluation_eval_perceived_intelligence.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -74,7 +74,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_flows_standard_autonomous_agent.yml b/.github/workflows/samples_flows_standard_autonomous_agent.yml index 7489910451f..b5f3846346c 100644 --- a/.github/workflows/samples_flows_standard_autonomous_agent.yml +++ b/.github/workflows/samples_flows_standard_autonomous_agent.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -74,7 +74,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_flows_standard_basic.yml b/.github/workflows/samples_flows_standard_basic.yml index 52f423a783f..af3f2bf1969 100644 --- a/.github/workflows/samples_flows_standard_basic.yml +++ b/.github/workflows/samples_flows_standard_basic.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -74,7 +74,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_flows_standard_basic_with_builtin_llm.yml b/.github/workflows/samples_flows_standard_basic_with_builtin_llm.yml index 8075c508648..a49602b2a61 100644 --- a/.github/workflows/samples_flows_standard_basic_with_builtin_llm.yml +++ b/.github/workflows/samples_flows_standard_basic_with_builtin_llm.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -77,7 +77,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_flows_standard_basic_with_connection.yml b/.github/workflows/samples_flows_standard_basic_with_connection.yml index cd4c68511e5..7d1c8532800 100644 --- a/.github/workflows/samples_flows_standard_basic_with_connection.yml +++ b/.github/workflows/samples_flows_standard_basic_with_connection.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -77,7 +77,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_flows_standard_conditional_flow_for_if_else.yml b/.github/workflows/samples_flows_standard_conditional_flow_for_if_else.yml index de28a68a527..82a5170737b 100644 --- a/.github/workflows/samples_flows_standard_conditional_flow_for_if_else.yml +++ b/.github/workflows/samples_flows_standard_conditional_flow_for_if_else.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -74,7 +74,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_flows_standard_conditional_flow_for_switch.yml b/.github/workflows/samples_flows_standard_conditional_flow_for_switch.yml index 91a1e2eacbc..76fb8581ba2 100644 --- a/.github/workflows/samples_flows_standard_conditional_flow_for_switch.yml +++ b/.github/workflows/samples_flows_standard_conditional_flow_for_switch.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -74,7 +74,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_flows_standard_customer_intent_extraction.yml b/.github/workflows/samples_flows_standard_customer_intent_extraction.yml index 5d5d4cbdab6..954742a7351 100644 --- a/.github/workflows/samples_flows_standard_customer_intent_extraction.yml +++ b/.github/workflows/samples_flows_standard_customer_intent_extraction.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -74,7 +74,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_flows_standard_flow_with_additional_includes.yml b/.github/workflows/samples_flows_standard_flow_with_additional_includes.yml index 1b9ba7c2aa3..70644f1e18d 100644 --- a/.github/workflows/samples_flows_standard_flow_with_additional_includes.yml +++ b/.github/workflows/samples_flows_standard_flow_with_additional_includes.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -77,7 +77,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_flows_standard_flow_with_symlinks.yml b/.github/workflows/samples_flows_standard_flow_with_symlinks.yml index 207623249f0..be750c0003e 100644 --- a/.github/workflows/samples_flows_standard_flow_with_symlinks.yml +++ b/.github/workflows/samples_flows_standard_flow_with_symlinks.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -77,7 +77,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_flows_standard_gen_docstring.yml b/.github/workflows/samples_flows_standard_gen_docstring.yml index f37a314df61..c47e64af796 100644 --- a/.github/workflows/samples_flows_standard_gen_docstring.yml +++ b/.github/workflows/samples_flows_standard_gen_docstring.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -74,7 +74,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_flows_standard_maths_to_code.yml b/.github/workflows/samples_flows_standard_maths_to_code.yml index d6b2c708933..8a0f8d38511 100644 --- a/.github/workflows/samples_flows_standard_maths_to_code.yml +++ b/.github/workflows/samples_flows_standard_maths_to_code.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -74,7 +74,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_flows_standard_named_entity_recognition.yml b/.github/workflows/samples_flows_standard_named_entity_recognition.yml index ef3277a2d93..be4de0366e6 100644 --- a/.github/workflows/samples_flows_standard_named_entity_recognition.yml +++ b/.github/workflows/samples_flows_standard_named_entity_recognition.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -74,7 +74,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_flows_standard_web_classification.yml b/.github/workflows/samples_flows_standard_web_classification.yml index cd7c1781efa..6c0f80a237c 100644 --- a/.github/workflows/samples_flows_standard_web_classification.yml +++ b/.github/workflows/samples_flows_standard_web_classification.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -74,7 +74,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_getstarted_quickstart.yml b/.github/workflows/samples_getstarted_quickstart.yml index 8289b196a4d..374d9bf9cda 100644 --- a/.github/workflows/samples_getstarted_quickstart.yml +++ b/.github/workflows/samples_getstarted_quickstart.yml @@ -19,7 +19,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Azure Login uses: azure/login@v1 with: diff --git a/.github/workflows/samples_getstarted_quickstartazure.yml b/.github/workflows/samples_getstarted_quickstartazure.yml index ac46d7c7dba..b439d33b3e8 100644 --- a/.github/workflows/samples_getstarted_quickstartazure.yml +++ b/.github/workflows/samples_getstarted_quickstartazure.yml @@ -19,7 +19,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Azure Login uses: azure/login@v1 with: diff --git a/.github/workflows/samples_runmanagement_cloudrunmanagement.yml b/.github/workflows/samples_runmanagement_cloudrunmanagement.yml index 72169318f3e..fc49fd9d3d7 100644 --- a/.github/workflows/samples_runmanagement_cloudrunmanagement.yml +++ b/.github/workflows/samples_runmanagement_cloudrunmanagement.yml @@ -19,7 +19,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Azure Login uses: azure/login@v1 with: diff --git a/.github/workflows/samples_tutorials_e2e_development_chat_with_pdf.yml b/.github/workflows/samples_tutorials_e2e_development_chat_with_pdf.yml index e6a696aa7f7..16a1cf806db 100644 --- a/.github/workflows/samples_tutorials_e2e_development_chat_with_pdf.yml +++ b/.github/workflows/samples_tutorials_e2e_development_chat_with_pdf.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -82,7 +82,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_tutorials_flow_deploy_azure_app_service.yml b/.github/workflows/samples_tutorials_flow_deploy_azure_app_service.yml index 5834f7a19a3..26231aa0526 100644 --- a/.github/workflows/samples_tutorials_flow_deploy_azure_app_service.yml +++ b/.github/workflows/samples_tutorials_flow_deploy_azure_app_service.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -74,7 +74,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_tutorials_flow_deploy_docker.yml b/.github/workflows/samples_tutorials_flow_deploy_docker.yml index 66da874aee6..1491a48f271 100644 --- a/.github/workflows/samples_tutorials_flow_deploy_docker.yml +++ b/.github/workflows/samples_tutorials_flow_deploy_docker.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -74,7 +74,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/.github/workflows/samples_tutorials_flow_deploy_kubernetes.yml b/.github/workflows/samples_tutorials_flow_deploy_kubernetes.yml index d6db115ed45..b6a0478f3bd 100644 --- a/.github/workflows/samples_tutorials_flow_deploy_kubernetes.yml +++ b/.github/workflows/samples_tutorials_flow_deploy_kubernetes.yml @@ -23,7 +23,7 @@ jobs: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ github.workspace }}/examples/config.json + run: echo '${{ secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ github.workspace }}/examples/config.json - name: Prepare requirements working-directory: examples run: | @@ -74,7 +74,7 @@ jobs: export aoai_api_endpoint=${{ secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ always() }} diff --git a/examples/README.md b/examples/README.md index 7d389790148..107c3094725 100644 --- a/examples/README.md +++ b/examples/README.md @@ -29,6 +29,7 @@ | [chat-with-pdf](tutorials/e2e-development/chat-with-pdf.md) | [![samples_tutorials_e2e_development_chat_with_pdf](https://github.com/microsoft/promptflow/actions/workflows/samples_tutorials_e2e_development_chat_with_pdf.yml/badge.svg?branch=main)](https://github.com/microsoft/promptflow/actions/workflows/samples_tutorials_e2e_development_chat_with_pdf.yml) | Retrieval Augmented Generation (or RAG) has become a prevalent pattern to build intelligent application with Large Language Models (or LLMs) since it can infuse external knowledge into the model, which is not trained with those up-to-date or proprietary information | | [azure-app-service](tutorials/flow-deploy/azure-app-service/README.md) | [![samples_tutorials_flow_deploy_azure_app_service](https://github.com/microsoft/promptflow/actions/workflows/samples_tutorials_flow_deploy_azure_app_service.yml/badge.svg?branch=main)](https://github.com/microsoft/promptflow/actions/workflows/samples_tutorials_flow_deploy_azure_app_service.yml) | This example demos how to deploy a flow using Azure App Service | | [docker](tutorials/flow-deploy/docker/README.md) | [![samples_tutorials_flow_deploy_docker](https://github.com/microsoft/promptflow/actions/workflows/samples_tutorials_flow_deploy_docker.yml/badge.svg?branch=main)](https://github.com/microsoft/promptflow/actions/workflows/samples_tutorials_flow_deploy_docker.yml) | This example demos how to deploy flow as a docker app | +| [kubernetes](tutorials/flow-deploy/kubernetes/README.md) | [![samples_tutorials_flow_deploy_kubernetes](https://github.com/microsoft/promptflow/actions/workflows/samples_tutorials_flow_deploy_kubernetes.yml/badge.svg?branch=main)](https://github.com/microsoft/promptflow/actions/workflows/samples_tutorials_flow_deploy_kubernetes.yml) | This example demos how to deploy flow as a Kubernetes app | ### Flows ([flows](flows)) diff --git a/examples/flows/chat/chat-with-pdf/chat-with-pdf.ipynb b/examples/flows/chat/chat-with-pdf/chat-with-pdf.ipynb index 45ca7f5dc03..1f9692e57f4 100644 --- a/examples/flows/chat/chat-with-pdf/chat-with-pdf.ipynb +++ b/examples/flows/chat/chat-with-pdf/chat-with-pdf.ipynb @@ -130,7 +130,7 @@ "\n", "config_2k_context = {\n", " \"EMBEDDING_MODEL_DEPLOYMENT_NAME\": \"text-embedding-ada-002\",\n", - " \"CHAT_MODEL_DEPLOYMENT_NAME\": \"gpt-4\", # change this to the name of your deployment if you're using Azure OpenAI\n", + " \"CHAT_MODEL_DEPLOYMENT_NAME\": \"gpt-4\", # change this to the name of your deployment if you're using Azure OpenAI\n", " \"PROMPT_TOKEN_LIMIT\": 2000,\n", " \"MAX_COMPLETION_TOKENS\": 256,\n", " \"VERBOSE\": True,\n", @@ -241,7 +241,7 @@ "source": [ "config_3k_context = {\n", " \"EMBEDDING_MODEL_DEPLOYMENT_NAME\": \"text-embedding-ada-002\",\n", - " \"CHAT_MODEL_DEPLOYMENT_NAME\": \"gpt-4\", # change this to the name of your deployment if you're using Azure OpenAI\n", + " \"CHAT_MODEL_DEPLOYMENT_NAME\": \"gpt-4\", # change this to the name of your deployment if you're using Azure OpenAI\n", " \"PROMPT_TOKEN_LIMIT\": 3000,\n", " \"MAX_COMPLETION_TOKENS\": 256,\n", " \"VERBOSE\": True,\n", diff --git a/scripts/readme/ghactions_driver/readme_templates/README.md.jinja2 b/scripts/readme/ghactions_driver/readme_templates/README.md.jinja2 index a5c7b5e71e9..099742e013b 100644 --- a/scripts/readme/ghactions_driver/readme_templates/README.md.jinja2 +++ b/scripts/readme/ghactions_driver/readme_templates/README.md.jinja2 @@ -7,7 +7,7 @@ **Install dependencies** -- Bootstrap your python environment. +- Bootstrap your python environment. - e.g: create a new [conda](https://conda.io/projects/conda/en/latest/user-guide/getting-started.html) environment. `conda create -n pf-examples python=3.9`. - install required packages in python environment : `pip install -r requirements.txt` - show installed sdk: `pip show promptflow` @@ -30,7 +30,7 @@ ### Flows ([flows](flows)) -#### [Standard flows](flows/standard/) +#### [Standard flows](flows/standard/) | path | status | description | ------|--------|------------- diff --git a/scripts/readme/ghactions_driver/workflow_steps/step_extract_steps_and_run.yml.jinja2 b/scripts/readme/ghactions_driver/workflow_steps/step_extract_steps_and_run.yml.jinja2 index 0d2e74a859c..08bb3c24017 100644 --- a/scripts/readme/ghactions_driver/workflow_steps/step_extract_steps_and_run.yml.jinja2 +++ b/scripts/readme/ghactions_driver/workflow_steps/step_extract_steps_and_run.yml.jinja2 @@ -13,7 +13,7 @@ export aoai_api_endpoint=${{ '{{' }} secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ '{{' }} secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ '{{' }} secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ '{{' }} secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ '{{' }} secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ '{{' }} always() }} diff --git a/scripts/readme/ghactions_driver/workflow_steps/step_extract_steps_and_run_gpt4.yml.jinja2 b/scripts/readme/ghactions_driver/workflow_steps/step_extract_steps_and_run_gpt4.yml.jinja2 index 0d2e74a859c..08bb3c24017 100644 --- a/scripts/readme/ghactions_driver/workflow_steps/step_extract_steps_and_run_gpt4.yml.jinja2 +++ b/scripts/readme/ghactions_driver/workflow_steps/step_extract_steps_and_run_gpt4.yml.jinja2 @@ -13,7 +13,7 @@ export aoai_api_endpoint=${{ '{{' }} secrets.AOAI_API_ENDPOINT_TEST }} export test_workspace_sub_id=${{ '{{' }} secrets.TEST_WORKSPACE_SUB_ID }} export test_workspace_rg=${{ '{{' }} secrets.TEST_WORKSPACE_RG }} - export test_workspace_name=${{ '{{' }} secrets.TEST_WORKSPACE_NAME }} + export test_workspace_name=${{ '{{' }} secrets.TEST_WORKSPACE_NAME_CANARY }} bash bash_script.sh - name: Pip List for Debug if : ${{ '{{' }} always() }} diff --git a/scripts/readme/ghactions_driver/workflow_templates/basic_workflow.yml.jinja2 b/scripts/readme/ghactions_driver/workflow_templates/basic_workflow.yml.jinja2 index 3f48bb5920d..31f8e904648 100644 --- a/scripts/readme/ghactions_driver/workflow_templates/basic_workflow.yml.jinja2 +++ b/scripts/readme/ghactions_driver/workflow_templates/basic_workflow.yml.jinja2 @@ -5,7 +5,7 @@ steps: - name: Checkout repository uses: actions/checkout@v3 - name: Generate config.json - run: echo ${{ '{{' }} secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ '{{' }} github.workspace }}/examples/config.json + run: echo '${{ '{{' }} secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ '{{' }} github.workspace }}/examples/config.json - name: Azure Login uses: azure/login@v1 with: diff --git a/scripts/readme/ghactions_driver/workflow_templates/basic_workflow_replace.yml.jinja2 b/scripts/readme/ghactions_driver/workflow_templates/basic_workflow_replace.yml.jinja2 index 92b00a8b1f3..537c1459077 100644 --- a/scripts/readme/ghactions_driver/workflow_templates/basic_workflow_replace.yml.jinja2 +++ b/scripts/readme/ghactions_driver/workflow_templates/basic_workflow_replace.yml.jinja2 @@ -9,7 +9,7 @@ steps: with: python-version: "3.9" - name: Generate config.json - run: echo ${{ '{{' }} secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ '{{' }} github.workspace }}/examples/config.json + run: echo '${{ '{{' }} secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ '{{' }} github.workspace }}/examples/config.json {%- filter indent(width=2) -%} {% for step in steps %} {{ step.get_workflow_step() }}{% endfor %} diff --git a/scripts/readme/ghactions_driver/workflow_templates/pdf_workflow.yml.jinja2 b/scripts/readme/ghactions_driver/workflow_templates/pdf_workflow.yml.jinja2 index ff8808aa691..0b843f5dd75 100644 --- a/scripts/readme/ghactions_driver/workflow_templates/pdf_workflow.yml.jinja2 +++ b/scripts/readme/ghactions_driver/workflow_templates/pdf_workflow.yml.jinja2 @@ -5,7 +5,7 @@ steps: - name: Checkout repository uses: actions/checkout@v3 - name: Generate config.json - run: echo ${{ '{{' }} secrets.TEST_WORKSPACE_CONFIG_JSON }} > ${{ '{{' }} github.workspace }}/examples/config.json + run: echo '${{ '{{' }} secrets.TEST_WORKSPACE_CONFIG_JSON_CANARY }}' > ${{ '{{' }} github.workspace }}/examples/config.json - name: Setup Python 3.9 environment uses: actions/setup-python@v4 with: diff --git a/scripts/readme/readme.py b/scripts/readme/readme.py index b56771a70b1..28157f7864c 100644 --- a/scripts/readme/readme.py +++ b/scripts/readme/readme.py @@ -46,7 +46,7 @@ def get_readme_description_first_sentence(readme) -> str: if sentence == "": sentence += line.strip() elif line.strip() != "": - sentence += line.strip() + sentence += ' ' + line.strip() return sentence except Exception: print(f"Error during reading {readme}") diff --git a/scripts/readme/readme_generator.py b/scripts/readme/readme_generator.py index e6017f132ca..25ee017c6d0 100644 --- a/scripts/readme/readme_generator.py +++ b/scripts/readme/readme_generator.py @@ -36,12 +36,11 @@ def no_readme_generation_filter(item: Path, index, array) -> bool: return False # generate readme -def main(input_glob, output_files=None): +def main(input_glob, output_files=[]): globs = [sorted(Path(ReadmeStepsManage.git_base_dir()).glob(p)) for p in input_glob] readme_items = sorted([j for i in globs for j in i]) readme_items = local_filter(no_readme_generation_filter, readme_items) - output_files = output_files if output_files else [] for readme in readme_items: readme_telemetry = Telemetry() workflow_name = readme.relative_to(ReadmeStepsManage.git_base_dir()) diff --git a/scripts/readme/workflow_generator.py b/scripts/readme/workflow_generator.py index ac813e8c7bd..073f9065fd6 100644 --- a/scripts/readme/workflow_generator.py +++ b/scripts/readme/workflow_generator.py @@ -98,8 +98,7 @@ def write_notebook_workflow(notebook, name, output_telemetry=Telemetry()): output_telemetry.gh_working_dir = gh_working_dir -def write_workflows(notebooks, output_telemetries=None): - output_telemetries = output_telemetries if output_telemetries else [] +def write_workflows(notebooks, output_telemetries=[]): # process notebooks for notebook in notebooks: # get notebook name @@ -143,7 +142,7 @@ def no_readme_generation_filter(item, index, array) -> bool: return False # not generate readme -def main(input_glob, output_files=None): +def main(input_glob, output_files=[]): # get list of workflows notebooks = _get_paths(