From 96dbf33ab97a7e53b189c4b2b570742242d1f980 Mon Sep 17 00:00:00 2001 From: Ying Chen Date: Fri, 7 Jun 2024 14:01:18 +0800 Subject: [PATCH] Support AAD credential to support storage account with disabling account key (#3367) # Description Please add an informative description that covers that changes made by the pull request and link all relevant issues. Samples failed when azure login: https://github.com/microsoft/promptflow/actions/runs/9406919010/job/25911489619 Offline discuss with @crazygao, it seems related with Powershell issues and suggest removing the "enable-AzPSSession: true" # 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. --------- Co-authored-by: Ying Chen <2601502859@qq.com> --- .github/workflows/samples_connections.yml | 1 - .../workflows/samples_flex_flows_basic.yml | 1 - .../samples_flex_flows_chat_async_stream.yml | 1 - .../samples_flex_flows_chat_basic.yml | 1 - .../samples_flex_flows_chat_minimal.yml | 1 - .../samples_flex_flows_chat_stream.yml | 1 - ...samples_flex_flows_chat_with_functions.yml | 1 - .../samples_flex_flows_eval_checklist.yml | 1 - .../samples_flex_flows_eval_code_quality.yml | 1 - ...lex_flows_eval_criteria_with_langchain.yml | 1 - .../samples_flows_chat_chat_basic.yml | 1 - .../samples_flows_chat_chat_math_variant.yml | 1 - .../samples_flows_chat_chat_with_image.yml | 1 - .../samples_flows_chat_chat_with_pdf.yml | 1 - ...samples_flows_chat_chat_with_wikipedia.yml | 1 - ...ws_chat_use_functions_with_chat_models.yml | 1 - .../samples_flows_evaluation_eval_basic.yml | 1 - ...amples_flows_evaluation_eval_chat_math.yml | 1 - ...valuation_eval_classification_accuracy.yml | 1 - ...lows_evaluation_eval_entity_match_rate.yml | 1 - ...les_flows_evaluation_eval_groundedness.yml | 1 - ...ows_evaluation_eval_multi_turn_metrics.yml | 1 - ...evaluation_eval_perceived_intelligence.yml | 1 - ...ples_flows_evaluation_eval_qna_non_rag.yml | 1 - ..._flows_evaluation_eval_qna_rag_metrics.yml | 1 - ...ws_evaluation_eval_single_turn_metrics.yml | 1 - ...es_flows_evaluation_eval_summarization.yml | 1 - ...amples_flows_standard_autonomous_agent.yml | 1 - .../samples_flows_standard_basic.yml | 1 - ..._flows_standard_basic_with_builtin_llm.yml | 1 - ...s_flows_standard_basic_with_connection.yml | 1 - ..._standard_conditional_flow_for_if_else.yml | 1 - ...s_standard_conditional_flow_for_switch.yml | 1 - ...ws_standard_customer_intent_extraction.yml | 1 - .../samples_flows_standard_describe_image.yml | 1 - ...standard_flow_with_additional_includes.yml | 1 - ...ples_flows_standard_flow_with_symlinks.yml | 1 - .../samples_flows_standard_gen_docstring.yml | 1 - .../samples_flows_standard_maths_to_code.yml | 1 - ...lows_standard_named_entity_recognition.yml | 1 - ...les_flows_standard_question_simulation.yml | 1 - ...ples_flows_standard_web_classification.yml | 1 - .github/workflows/samples_prompty_basic.yml | 1 - .../workflows/samples_prompty_chat_basic.yml | 1 - .../samples_prompty_eval_apology.yml | 1 - .../workflows/samples_prompty_eval_basic.yml | 1 - .../samples_prompty_format_output.yml | 1 - ...e_cases_cascading_inputs_tool_showcase.yml | 1 - ...ols_use_cases_custom_llm_tool_showcase.yml | 1 - ..._type_connection_package_tool_showcase.yml | 1 - ...g_type_connection_script_tool_showcase.yml | 1 - ...cases_dynamic_list_input_tool_showcase.yml | 1 - ...utorials_e2e_development_chat_with_pdf.yml | 2 -- ...utorials_flow_deploy_azure_app_service.yml | 1 - ...s_flow_deploy_create_service_with_flow.yml | 1 - ...ploy_distribute_flow_as_executable_app.yml | 1 - .../samples_tutorials_flow_deploy_docker.yml | 1 - ...mples_tutorials_flow_deploy_kubernetes.yml | 1 - ...luation_promptflow_quality_improvement.yml | 1 - .../workflows/samples_tutorials_tracing.yml | 1 - .../requirements.txt | 3 +- .../step_azure_login.yml.jinja2 | 3 +- .../step_login_again.yml.jinja2 | 3 +- .../operations/_fileshare_storeage_helper.py | 30 ++++++++++++++++++- .../tests/sdk_cli_azure_test/conftest.py | 2 ++ 65 files changed, 35 insertions(+), 67 deletions(-) diff --git a/.github/workflows/samples_connections.yml b/.github/workflows/samples_connections.yml index 89b37f849c0..3a05b71c115 100644 --- a/.github/workflows/samples_connections.yml +++ b/.github/workflows/samples_connections.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/connections/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flex_flows_basic.yml b/.github/workflows/samples_flex_flows_basic.yml index e1f85108703..9e28a4c7f82 100644 --- a/.github/workflows/samples_flex_flows_basic.yml +++ b/.github/workflows/samples_flex_flows_basic.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flex-flows/basic/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flex_flows_chat_async_stream.yml b/.github/workflows/samples_flex_flows_chat_async_stream.yml index c102959ab34..d3167ea17f4 100644 --- a/.github/workflows/samples_flex_flows_chat_async_stream.yml +++ b/.github/workflows/samples_flex_flows_chat_async_stream.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flex-flows/chat-async-stream/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flex_flows_chat_basic.yml b/.github/workflows/samples_flex_flows_chat_basic.yml index 9dc6bf3bdb0..cfe6086dd9a 100644 --- a/.github/workflows/samples_flex_flows_chat_basic.yml +++ b/.github/workflows/samples_flex_flows_chat_basic.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flex-flows/chat-basic/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flex_flows_chat_minimal.yml b/.github/workflows/samples_flex_flows_chat_minimal.yml index 36ea4b75173..b663dceb01c 100644 --- a/.github/workflows/samples_flex_flows_chat_minimal.yml +++ b/.github/workflows/samples_flex_flows_chat_minimal.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flex-flows/chat-minimal/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flex_flows_chat_stream.yml b/.github/workflows/samples_flex_flows_chat_stream.yml index 74063a8a37e..a0943e9e8b1 100644 --- a/.github/workflows/samples_flex_flows_chat_stream.yml +++ b/.github/workflows/samples_flex_flows_chat_stream.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flex-flows/chat-stream/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flex_flows_chat_with_functions.yml b/.github/workflows/samples_flex_flows_chat_with_functions.yml index bdc9364645a..66e0a76a9eb 100644 --- a/.github/workflows/samples_flex_flows_chat_with_functions.yml +++ b/.github/workflows/samples_flex_flows_chat_with_functions.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flex-flows/chat-with-functions/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flex_flows_eval_checklist.yml b/.github/workflows/samples_flex_flows_eval_checklist.yml index 4795d8def7d..5ea10a699f8 100644 --- a/.github/workflows/samples_flex_flows_eval_checklist.yml +++ b/.github/workflows/samples_flex_flows_eval_checklist.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flex-flows/eval-checklist/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flex_flows_eval_code_quality.yml b/.github/workflows/samples_flex_flows_eval_code_quality.yml index a0fccfd8590..165350a7b0d 100644 --- a/.github/workflows/samples_flex_flows_eval_code_quality.yml +++ b/.github/workflows/samples_flex_flows_eval_code_quality.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flex-flows/eval-code-quality/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flex_flows_eval_criteria_with_langchain.yml b/.github/workflows/samples_flex_flows_eval_criteria_with_langchain.yml index 9dc3f1921fc..d925bad72c5 100644 --- a/.github/workflows/samples_flex_flows_eval_criteria_with_langchain.yml +++ b/.github/workflows/samples_flex_flows_eval_criteria_with_langchain.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flex-flows/eval-criteria-with-langchain/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_chat_chat_basic.yml b/.github/workflows/samples_flows_chat_chat_basic.yml index d1519fdd512..6154e684e1c 100644 --- a/.github/workflows/samples_flows_chat_chat_basic.yml +++ b/.github/workflows/samples_flows_chat_chat_basic.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/chat/chat-basic/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_chat_chat_math_variant.yml b/.github/workflows/samples_flows_chat_chat_math_variant.yml index 49e6e210cbe..daa291a4837 100644 --- a/.github/workflows/samples_flows_chat_chat_math_variant.yml +++ b/.github/workflows/samples_flows_chat_chat_math_variant.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/chat/chat-math-variant/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_chat_chat_with_image.yml b/.github/workflows/samples_flows_chat_chat_with_image.yml index 0bb1437d47c..4c4d30387fa 100644 --- a/.github/workflows/samples_flows_chat_chat_with_image.yml +++ b/.github/workflows/samples_flows_chat_chat_with_image.yml @@ -80,7 +80,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/chat/chat-with-image/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_chat_chat_with_pdf.yml b/.github/workflows/samples_flows_chat_chat_with_pdf.yml index e4c58ef1207..b8f0ea91d7d 100644 --- a/.github/workflows/samples_flows_chat_chat_with_pdf.yml +++ b/.github/workflows/samples_flows_chat_chat_with_pdf.yml @@ -88,7 +88,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/chat/chat-with-pdf/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_chat_chat_with_wikipedia.yml b/.github/workflows/samples_flows_chat_chat_with_wikipedia.yml index 20691302756..2c22c5f04fb 100644 --- a/.github/workflows/samples_flows_chat_chat_with_wikipedia.yml +++ b/.github/workflows/samples_flows_chat_chat_with_wikipedia.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/chat/chat-with-wikipedia/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_chat_use_functions_with_chat_models.yml b/.github/workflows/samples_flows_chat_use_functions_with_chat_models.yml index ca559be22da..18d1256dadb 100644 --- a/.github/workflows/samples_flows_chat_use_functions_with_chat_models.yml +++ b/.github/workflows/samples_flows_chat_use_functions_with_chat_models.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/chat/use_functions_with_chat_models/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_evaluation_eval_basic.yml b/.github/workflows/samples_flows_evaluation_eval_basic.yml index 43f9abc8d16..cf38bd73068 100644 --- a/.github/workflows/samples_flows_evaluation_eval_basic.yml +++ b/.github/workflows/samples_flows_evaluation_eval_basic.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/evaluation/eval-basic/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_evaluation_eval_chat_math.yml b/.github/workflows/samples_flows_evaluation_eval_chat_math.yml index 993c451e57e..f0ed5d98b21 100644 --- a/.github/workflows/samples_flows_evaluation_eval_chat_math.yml +++ b/.github/workflows/samples_flows_evaluation_eval_chat_math.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/evaluation/eval-chat-math/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_evaluation_eval_classification_accuracy.yml b/.github/workflows/samples_flows_evaluation_eval_classification_accuracy.yml index 1ae0f3aa2f4..2596020c72a 100644 --- a/.github/workflows/samples_flows_evaluation_eval_classification_accuracy.yml +++ b/.github/workflows/samples_flows_evaluation_eval_classification_accuracy.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/evaluation/eval-classification-accuracy/README.md working-directory: ${{ github.workspace }} run: | 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 0cfebb236a3..799b202cefd 100644 --- a/.github/workflows/samples_flows_evaluation_eval_entity_match_rate.yml +++ b/.github/workflows/samples_flows_evaluation_eval_entity_match_rate.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/evaluation/eval-entity-match-rate/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_evaluation_eval_groundedness.yml b/.github/workflows/samples_flows_evaluation_eval_groundedness.yml index 80220943dee..c9962820735 100644 --- a/.github/workflows/samples_flows_evaluation_eval_groundedness.yml +++ b/.github/workflows/samples_flows_evaluation_eval_groundedness.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/evaluation/eval-groundedness/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_evaluation_eval_multi_turn_metrics.yml b/.github/workflows/samples_flows_evaluation_eval_multi_turn_metrics.yml index 2dc4d97f0f5..64ed95530bf 100644 --- a/.github/workflows/samples_flows_evaluation_eval_multi_turn_metrics.yml +++ b/.github/workflows/samples_flows_evaluation_eval_multi_turn_metrics.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/evaluation/eval-multi-turn-metrics/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_evaluation_eval_perceived_intelligence.yml b/.github/workflows/samples_flows_evaluation_eval_perceived_intelligence.yml index 799768c7821..a171ebfe837 100644 --- a/.github/workflows/samples_flows_evaluation_eval_perceived_intelligence.yml +++ b/.github/workflows/samples_flows_evaluation_eval_perceived_intelligence.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/evaluation/eval-perceived-intelligence/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_evaluation_eval_qna_non_rag.yml b/.github/workflows/samples_flows_evaluation_eval_qna_non_rag.yml index 7b947413157..bcb96ff7fc0 100644 --- a/.github/workflows/samples_flows_evaluation_eval_qna_non_rag.yml +++ b/.github/workflows/samples_flows_evaluation_eval_qna_non_rag.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/evaluation/eval-qna-non-rag/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_evaluation_eval_qna_rag_metrics.yml b/.github/workflows/samples_flows_evaluation_eval_qna_rag_metrics.yml index 78d7b69e676..60e392022cf 100644 --- a/.github/workflows/samples_flows_evaluation_eval_qna_rag_metrics.yml +++ b/.github/workflows/samples_flows_evaluation_eval_qna_rag_metrics.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/evaluation/eval-qna-rag-metrics/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_evaluation_eval_single_turn_metrics.yml b/.github/workflows/samples_flows_evaluation_eval_single_turn_metrics.yml index 8926f7a6350..fe087682e5a 100644 --- a/.github/workflows/samples_flows_evaluation_eval_single_turn_metrics.yml +++ b/.github/workflows/samples_flows_evaluation_eval_single_turn_metrics.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/evaluation/eval-single-turn-metrics/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_evaluation_eval_summarization.yml b/.github/workflows/samples_flows_evaluation_eval_summarization.yml index bb6ee6c2dc3..046e15a4fc3 100644 --- a/.github/workflows/samples_flows_evaluation_eval_summarization.yml +++ b/.github/workflows/samples_flows_evaluation_eval_summarization.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/evaluation/eval-summarization/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_standard_autonomous_agent.yml b/.github/workflows/samples_flows_standard_autonomous_agent.yml index b159f8a037a..675f790262b 100644 --- a/.github/workflows/samples_flows_standard_autonomous_agent.yml +++ b/.github/workflows/samples_flows_standard_autonomous_agent.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/standard/autonomous-agent/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_standard_basic.yml b/.github/workflows/samples_flows_standard_basic.yml index 6ff2beed0f7..f0d6b37fbdd 100644 --- a/.github/workflows/samples_flows_standard_basic.yml +++ b/.github/workflows/samples_flows_standard_basic.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/standard/basic/README.md working-directory: ${{ github.workspace }} run: | 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 47983b049eb..30b03923f5c 100644 --- a/.github/workflows/samples_flows_standard_basic_with_builtin_llm.yml +++ b/.github/workflows/samples_flows_standard_basic_with_builtin_llm.yml @@ -81,7 +81,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/standard/basic-with-builtin-llm/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_standard_basic_with_connection.yml b/.github/workflows/samples_flows_standard_basic_with_connection.yml index a36f0597d88..2948f2a6dc2 100644 --- a/.github/workflows/samples_flows_standard_basic_with_connection.yml +++ b/.github/workflows/samples_flows_standard_basic_with_connection.yml @@ -81,7 +81,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/standard/basic-with-connection/README.md working-directory: ${{ github.workspace }} run: | 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 14b1f04e302..b7176e30e2b 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 @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/standard/conditional-flow-for-if-else/README.md working-directory: ${{ github.workspace }} run: | 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 0c194252ffe..66025519741 100644 --- a/.github/workflows/samples_flows_standard_conditional_flow_for_switch.yml +++ b/.github/workflows/samples_flows_standard_conditional_flow_for_switch.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/standard/conditional-flow-for-switch/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_standard_customer_intent_extraction.yml b/.github/workflows/samples_flows_standard_customer_intent_extraction.yml index 5a3be7a805e..6ee5b855cce 100644 --- a/.github/workflows/samples_flows_standard_customer_intent_extraction.yml +++ b/.github/workflows/samples_flows_standard_customer_intent_extraction.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/standard/customer-intent-extraction/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_standard_describe_image.yml b/.github/workflows/samples_flows_standard_describe_image.yml index fd31297da84..9042ad8d04b 100644 --- a/.github/workflows/samples_flows_standard_describe_image.yml +++ b/.github/workflows/samples_flows_standard_describe_image.yml @@ -80,7 +80,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/standard/describe-image/README.md working-directory: ${{ github.workspace }} run: | 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 c223e2bfb5f..d6f667ebcb4 100644 --- a/.github/workflows/samples_flows_standard_flow_with_additional_includes.yml +++ b/.github/workflows/samples_flows_standard_flow_with_additional_includes.yml @@ -81,7 +81,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/standard/flow-with-additional-includes/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_standard_flow_with_symlinks.yml b/.github/workflows/samples_flows_standard_flow_with_symlinks.yml index aa5a7bc09f3..82617b7b60b 100644 --- a/.github/workflows/samples_flows_standard_flow_with_symlinks.yml +++ b/.github/workflows/samples_flows_standard_flow_with_symlinks.yml @@ -81,7 +81,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/standard/flow-with-symlinks/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_standard_gen_docstring.yml b/.github/workflows/samples_flows_standard_gen_docstring.yml index 38defc90fe7..ad88d1faf9d 100644 --- a/.github/workflows/samples_flows_standard_gen_docstring.yml +++ b/.github/workflows/samples_flows_standard_gen_docstring.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/standard/gen-docstring/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_standard_maths_to_code.yml b/.github/workflows/samples_flows_standard_maths_to_code.yml index aa0bfa4b84f..6df98c44a4d 100644 --- a/.github/workflows/samples_flows_standard_maths_to_code.yml +++ b/.github/workflows/samples_flows_standard_maths_to_code.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/standard/maths-to-code/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_standard_named_entity_recognition.yml b/.github/workflows/samples_flows_standard_named_entity_recognition.yml index 600e09b2c51..a8539f63840 100644 --- a/.github/workflows/samples_flows_standard_named_entity_recognition.yml +++ b/.github/workflows/samples_flows_standard_named_entity_recognition.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/standard/named-entity-recognition/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_standard_question_simulation.yml b/.github/workflows/samples_flows_standard_question_simulation.yml index b2a5259c579..afa09c99cc5 100644 --- a/.github/workflows/samples_flows_standard_question_simulation.yml +++ b/.github/workflows/samples_flows_standard_question_simulation.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/standard/question-simulation/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_flows_standard_web_classification.yml b/.github/workflows/samples_flows_standard_web_classification.yml index 397baef8ed5..0d514a4278d 100644 --- a/.github/workflows/samples_flows_standard_web_classification.yml +++ b/.github/workflows/samples_flows_standard_web_classification.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/flows/standard/web-classification/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_prompty_basic.yml b/.github/workflows/samples_prompty_basic.yml index 7746c84d123..e43ff0c2930 100644 --- a/.github/workflows/samples_prompty_basic.yml +++ b/.github/workflows/samples_prompty_basic.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/prompty/basic/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_prompty_chat_basic.yml b/.github/workflows/samples_prompty_chat_basic.yml index 6855c9bffc9..ec8b54f3ae4 100644 --- a/.github/workflows/samples_prompty_chat_basic.yml +++ b/.github/workflows/samples_prompty_chat_basic.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/prompty/chat-basic/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_prompty_eval_apology.yml b/.github/workflows/samples_prompty_eval_apology.yml index bfd15e031df..837bfab8f42 100644 --- a/.github/workflows/samples_prompty_eval_apology.yml +++ b/.github/workflows/samples_prompty_eval_apology.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/prompty/eval-apology/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_prompty_eval_basic.yml b/.github/workflows/samples_prompty_eval_basic.yml index edcb9db6f3d..4d18be7353a 100644 --- a/.github/workflows/samples_prompty_eval_basic.yml +++ b/.github/workflows/samples_prompty_eval_basic.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/prompty/eval-basic/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_prompty_format_output.yml b/.github/workflows/samples_prompty_format_output.yml index a865ff831c0..00819747739 100644 --- a/.github/workflows/samples_prompty_format_output.yml +++ b/.github/workflows/samples_prompty_format_output.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/prompty/format-output/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_tools_use_cases_cascading_inputs_tool_showcase.yml b/.github/workflows/samples_tools_use_cases_cascading_inputs_tool_showcase.yml index fbaab7f7391..606fe4672c2 100644 --- a/.github/workflows/samples_tools_use_cases_cascading_inputs_tool_showcase.yml +++ b/.github/workflows/samples_tools_use_cases_cascading_inputs_tool_showcase.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/tools/use-cases/cascading-inputs-tool-showcase/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_tools_use_cases_custom_llm_tool_showcase.yml b/.github/workflows/samples_tools_use_cases_custom_llm_tool_showcase.yml index edf68bda093..aa801ff2bbf 100644 --- a/.github/workflows/samples_tools_use_cases_custom_llm_tool_showcase.yml +++ b/.github/workflows/samples_tools_use_cases_custom_llm_tool_showcase.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/tools/use-cases/custom_llm_tool_showcase/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_tools_use_cases_custom_strong_type_connection_package_tool_showcase.yml b/.github/workflows/samples_tools_use_cases_custom_strong_type_connection_package_tool_showcase.yml index 4bca66d3010..23691fa6ab9 100644 --- a/.github/workflows/samples_tools_use_cases_custom_strong_type_connection_package_tool_showcase.yml +++ b/.github/workflows/samples_tools_use_cases_custom_strong_type_connection_package_tool_showcase.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/tools/use-cases/custom-strong-type-connection-package-tool-showcase/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_tools_use_cases_custom_strong_type_connection_script_tool_showcase.yml b/.github/workflows/samples_tools_use_cases_custom_strong_type_connection_script_tool_showcase.yml index c74bb66bd38..8be7ea418d7 100644 --- a/.github/workflows/samples_tools_use_cases_custom_strong_type_connection_script_tool_showcase.yml +++ b/.github/workflows/samples_tools_use_cases_custom_strong_type_connection_script_tool_showcase.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/tools/use-cases/custom-strong-type-connection-script-tool-showcase/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_tools_use_cases_dynamic_list_input_tool_showcase.yml b/.github/workflows/samples_tools_use_cases_dynamic_list_input_tool_showcase.yml index f4c66f940ab..a5001469e19 100644 --- a/.github/workflows/samples_tools_use_cases_dynamic_list_input_tool_showcase.yml +++ b/.github/workflows/samples_tools_use_cases_dynamic_list_input_tool_showcase.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/tools/use-cases/dynamic-list-input-tool-showcase/README.md working-directory: ${{ github.workspace }} run: | 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 22279390776..d43116a9d1c 100644 --- a/.github/workflows/samples_tutorials_e2e_development_chat_with_pdf.yml +++ b/.github/workflows/samples_tutorials_e2e_development_chat_with_pdf.yml @@ -94,7 +94,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/tutorials/e2e-development/chat-with-pdf.md working-directory: ${{ github.workspace }} run: | @@ -150,7 +149,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Run backup scripts against canary workspace (scheduled runs only) if: github.event_name == 'schedule' working-directory: examples/tutorials/e2e-development 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 ba4d0091eb5..9cbc4d92fed 100644 --- a/.github/workflows/samples_tutorials_flow_deploy_azure_app_service.yml +++ b/.github/workflows/samples_tutorials_flow_deploy_azure_app_service.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/tutorials/flow-deploy/azure-app-service/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_tutorials_flow_deploy_create_service_with_flow.yml b/.github/workflows/samples_tutorials_flow_deploy_create_service_with_flow.yml index df81147ba9d..e156a1dd5c7 100644 --- a/.github/workflows/samples_tutorials_flow_deploy_create_service_with_flow.yml +++ b/.github/workflows/samples_tutorials_flow_deploy_create_service_with_flow.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/tutorials/flow-deploy/create-service-with-flow/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_tutorials_flow_deploy_distribute_flow_as_executable_app.yml b/.github/workflows/samples_tutorials_flow_deploy_distribute_flow_as_executable_app.yml index 4befcf3ba02..b65f9b15756 100644 --- a/.github/workflows/samples_tutorials_flow_deploy_distribute_flow_as_executable_app.yml +++ b/.github/workflows/samples_tutorials_flow_deploy_distribute_flow_as_executable_app.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/tutorials/flow-deploy/distribute-flow-as-executable-app/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_tutorials_flow_deploy_docker.yml b/.github/workflows/samples_tutorials_flow_deploy_docker.yml index c4a33493e09..4f0c7ffd5e9 100644 --- a/.github/workflows/samples_tutorials_flow_deploy_docker.yml +++ b/.github/workflows/samples_tutorials_flow_deploy_docker.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/tutorials/flow-deploy/docker/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_tutorials_flow_deploy_kubernetes.yml b/.github/workflows/samples_tutorials_flow_deploy_kubernetes.yml index ff71ddab068..0b5dc80a424 100644 --- a/.github/workflows/samples_tutorials_flow_deploy_kubernetes.yml +++ b/.github/workflows/samples_tutorials_flow_deploy_kubernetes.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/tutorials/flow-deploy/kubernetes/README.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_tutorials_flow_fine_tuning_evaluation_promptflow_quality_improvement.yml b/.github/workflows/samples_tutorials_flow_fine_tuning_evaluation_promptflow_quality_improvement.yml index 4096a282acb..34632b7853d 100644 --- a/.github/workflows/samples_tutorials_flow_fine_tuning_evaluation_promptflow_quality_improvement.yml +++ b/.github/workflows/samples_tutorials_flow_fine_tuning_evaluation_promptflow_quality_improvement.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/tutorials/flow-fine-tuning-evaluation/promptflow-quality-improvement.md working-directory: ${{ github.workspace }} run: | diff --git a/.github/workflows/samples_tutorials_tracing.yml b/.github/workflows/samples_tutorials_tracing.yml index e8157c2b773..80a184bff1e 100644 --- a/.github/workflows/samples_tutorials_tracing.yml +++ b/.github/workflows/samples_tutorials_tracing.yml @@ -78,7 +78,6 @@ jobs: subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{secrets.AZURE_TENANT_ID}} client-id: ${{secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true - name: Extract Steps examples/tutorials/tracing/README.md working-directory: ${{ github.workspace }} run: | diff --git a/examples/flex-flows/eval-criteria-with-langchain/requirements.txt b/examples/flex-flows/eval-criteria-with-langchain/requirements.txt index 517c2f49cc7..b498ce423a6 100644 --- a/examples/flex-flows/eval-criteria-with-langchain/requirements.txt +++ b/examples/flex-flows/eval-criteria-with-langchain/requirements.txt @@ -1,3 +1,4 @@ promptflow langchain>=0.1.5 -python-dotenv \ No newline at end of file +python-dotenv +langchain-community>=0.2.0 \ No newline at end of file diff --git a/scripts/readme/ghactions_driver/workflow_steps/step_azure_login.yml.jinja2 b/scripts/readme/ghactions_driver/workflow_steps/step_azure_login.yml.jinja2 index ae46d9b50c4..82ac37c0bbe 100644 --- a/scripts/readme/ghactions_driver/workflow_steps/step_azure_login.yml.jinja2 +++ b/scripts/readme/ghactions_driver/workflow_steps/step_azure_login.yml.jinja2 @@ -8,5 +8,4 @@ with: subscription-id: ${{ '{{' }}secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{ '{{' }}secrets.AZURE_TENANT_ID}} - client-id: ${{ '{{' }}secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true \ No newline at end of file + client-id: ${{ '{{' }}secrets.AZURE_CLIENT_ID}} \ No newline at end of file diff --git a/scripts/readme/ghactions_driver/workflow_steps/step_login_again.yml.jinja2 b/scripts/readme/ghactions_driver/workflow_steps/step_login_again.yml.jinja2 index 0d4ee3c45a8..7c855b006cc 100644 --- a/scripts/readme/ghactions_driver/workflow_steps/step_login_again.yml.jinja2 +++ b/scripts/readme/ghactions_driver/workflow_steps/step_login_again.yml.jinja2 @@ -9,5 +9,4 @@ with: subscription-id: ${{ '{{' }}secrets.AZURE_SUBSCRIPTION_ID}} tenant-id: ${{ '{{' }}secrets.AZURE_TENANT_ID}} - client-id: ${{ '{{' }}secrets.AZURE_CLIENT_ID}} - enable-AzPSSession: true \ No newline at end of file + client-id: ${{ '{{' }}secrets.AZURE_CLIENT_ID}} \ No newline at end of file diff --git a/src/promptflow-azure/promptflow/azure/operations/_fileshare_storeage_helper.py b/src/promptflow-azure/promptflow/azure/operations/_fileshare_storeage_helper.py index 78d6488d35b..9a4fdda2fe5 100644 --- a/src/promptflow-azure/promptflow/azure/operations/_fileshare_storeage_helper.py +++ b/src/promptflow-azure/promptflow/azure/operations/_fileshare_storeage_helper.py @@ -8,6 +8,7 @@ from pathlib import Path from typing import Any, Dict, Optional +from azure.ai.ml._artifacts._constants import ARTIFACT_ORIGIN from azure.ai.ml._artifacts._fileshare_storage_helper import FileStorageClient from azure.ai.ml._utils._asset_utils import ( DirectoryUploadProgressBar, @@ -27,7 +28,31 @@ class FlowFileStorageClient(FileStorageClient): def __init__(self, credential: str, file_share_name: str, account_url: str, azure_cred): - super().__init__(credential=credential, file_share_name=file_share_name, account_url=account_url) + if isinstance(credential, str): + super().__init__(credential=credential, file_share_name=file_share_name, account_url=account_url) + else: + # need add backup token intent for file share client when using AAD credential + self.directory_client = ShareDirectoryClient( + account_url=account_url, + credential=credential, + share_name=file_share_name, + directory_path=ARTIFACT_ORIGIN, + token_intent="backup", + ) + self.file_share = file_share_name + self.total_file_count = 1 + self.uploaded_file_count = 0 + self.name = None + self.version = None + self.legacy = False + + try: + self.directory_client.create_directory() + except ResourceExistsError: + pass + + self.subdirectory_client = None + try: user_alias = get_user_alias_from_credential(azure_cred) except Exception: @@ -38,11 +63,14 @@ def __init__(self, credential: str, file_share_name: str, account_url: str, azur # TODO: update this after we finalize the design for flow file storage client # create user folder if not exist for directory_path in ["Users", f"Users/{user_alias}", f"Users/{user_alias}/{PROMPTFLOW_FILE_SHARE_DIR}"]: + token_intent = None if isinstance(credential, str) else "backup" + self.directory_client = ShareDirectoryClient( account_url=account_url, credential=credential, share_name=file_share_name, directory_path=directory_path, + token_intent=token_intent, ) # try to create user folder if not exist diff --git a/src/promptflow-azure/tests/sdk_cli_azure_test/conftest.py b/src/promptflow-azure/tests/sdk_cli_azure_test/conftest.py index 20f5c8a48d0..d29b0b8adad 100644 --- a/src/promptflow-azure/tests/sdk_cli_azure_test/conftest.py +++ b/src/promptflow-azure/tests/sdk_cli_azure_test/conftest.py @@ -60,6 +60,7 @@ def is_in_ci_pipeline(): RESOURCE_ID_FORMAT = "/subscriptions/{}/resourceGroups/{}/providers/{}/workspaces/{}" MODEL_ROOT = FLOWS_DIR COUNTER_FILE = (Path(__file__) / "../count.json").resolve() +RECORDINGS_TEST_CONFIGS_ROOT = Path(PROMPTFLOW_ROOT / "../promptflow-recording/recordings").resolve() def pytest_configure(): @@ -361,6 +362,7 @@ def vcr_recording(request: pytest.FixtureRequest, user_object_id: str, tenant_id user_object_id=user_object_id, tenant_id=tenant_id, variable_recorder=variable_recorder, + recording_dir=(RECORDINGS_TEST_CONFIGS_ROOT / "azure").resolve(), ) recording.enter_vcr() request.addfinalizer(recording.exit_vcr)