From 7f2d866a8a31c71be8507df54fd09d02fb525e77 Mon Sep 17 00:00:00 2001
From: Ying Chen <2601502859@qq.com>
Date: Mon, 3 Jun 2024 17:24:46 +0800
Subject: [PATCH 01/11] use add to access storage account

---
 .../azure/operations/_artifact_utilities.py   | 28 ++++++++++++++
 .../operations/_fileshare_storeage_helper.py  | 37 ++++++++++++++++++-
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/src/promptflow-azure/promptflow/azure/operations/_artifact_utilities.py b/src/promptflow-azure/promptflow/azure/operations/_artifact_utilities.py
index c4c5cf23011..ac49c7eba10 100644
--- a/src/promptflow-azure/promptflow/azure/operations/_artifact_utilities.py
+++ b/src/promptflow-azure/promptflow/azure/operations/_artifact_utilities.py
@@ -44,6 +44,7 @@
 from azure.storage.filedatalake import FileSasPermissions, generate_file_sas
 
 from promptflow._utils.logger_utils import LoggerFactory
+from promptflow.exceptions import UserErrorException
 
 from ._fileshare_storeage_helper import FlowFileStorageClient
 
@@ -85,6 +86,12 @@ def get_datastore_info(operations: DatastoreOperations, name: str) -> Dict[str,
         except Exception as e:  # pylint: disable=broad-except
             if not hasattr(credentials, "sas_token"):
                 datastore_info["credential"] = operations._credential
+
+                from azure.mgmt.authorization import AuthorizationManagementClient
+
+                client = AuthorizationManagementClient(datastore_info["credential"], operations._subscription_id)
+                scope = f"/subscriptions/{operations._subscription_id}/resourceGroups/{operations._resource_group_name}"
+                check_scope_rbac_role(client, scope)
             else:
                 raise e
 
@@ -103,6 +110,27 @@ def get_datastore_info(operations: DatastoreOperations, name: str) -> Dict[str,
     return datastore_info
 
 
+def check_scope_rbac_role(client, scope: str, role_name: str = "Storage Blob Data Contributor"):
+    # Get the role assignments for the user
+    role_assignments = client.role_assignments.list_for_scope(scope)
+    # Get all role definitions
+    role_definitions = client.role_definitions.list(scope)
+
+    # Find the ID of the role_name
+    role_id = next((definition.id for definition in role_definitions if definition.role_name == role_name), None)
+
+    # Check if the user has the role
+    if role_id is not None:
+        for assignment in role_assignments:
+            if assignment.role_definition_id == role_id:
+                module_logger.debug(f"User has the {role_name} role")
+                break
+        else:
+            raise UserErrorException(f"User does not have the {role_name} role")
+    else:
+        raise UserErrorException(f"Role {role_name} not found")
+
+
 def list_logs_in_datastore(ds_info: Dict[str, str], prefix: str, legacy_log_folder_name: str) -> Dict[str, str]:
     """Returns a dictionary of file name to blob or data lake uri with SAS token, matching the structure of
     RunDetails.logFiles.
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..b3bde4cdda8 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, LEGACY_ARTIFACT_DIRECTORY
 from azure.ai.ml._artifacts._fileshare_storage_helper import FileStorageClient
 from azure.ai.ml._utils._asset_utils import (
     DirectoryUploadProgressBar,
@@ -27,7 +28,38 @@
 
 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.legacy_directory_client = ShareDirectoryClient(
+                account_url=account_url,
+                credential=credential,
+                share_name=file_share_name,
+                directory_path=LEGACY_ARTIFACT_DIRECTORY,
+                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 +70,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

From ee9268104ca524f821b86bfc9016290c65b3206e Mon Sep 17 00:00:00 2001
From: Ying Chen <2601502859@qq.com>
Date: Mon, 3 Jun 2024 17:52:58 +0800
Subject: [PATCH 02/11] update recording conftest

---
 src/promptflow-azure/tests/sdk_cli_azure_test/conftest.py | 2 ++
 1 file changed, 2 insertions(+)

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)

From 2128b1c2bb4cb6c76ed52f04c07e4045ae6882be Mon Sep 17 00:00:00 2001
From: Ying Chen <2601502859@qq.com>
Date: Tue, 4 Jun 2024 12:49:35 +0800
Subject: [PATCH 03/11] add dependency

---
 src/promptflow-azure/pyproject.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/promptflow-azure/pyproject.toml b/src/promptflow-azure/pyproject.toml
index c6e78b07c5d..8a78968bb2f 100644
--- a/src/promptflow-azure/pyproject.toml
+++ b/src/promptflow-azure/pyproject.toml
@@ -46,6 +46,7 @@ azure-ai-ml = ">=1.14.0,<2.0.0"
 azure-cosmos = ">=4.5.1,<5.0.0"  # used to upload trace to cloud
 pyjwt = ">=2.4.0,<3.0.0"  # requirement of control plane SDK
 promptflow-devkit = "<2.0.0"
+azure-mgmt-authorization = ">=1.0.0"  # used to get role assignments
 
 [tool.poetry.group.dev.dependencies]
 pre-commit = "*"

From a0de1ecee6f108ad3bddb8640c4043699e7d5577 Mon Sep 17 00:00:00 2001
From: Ying Chen <2601502859@qq.com>
Date: Wed, 5 Jun 2024 16:28:32 +0800
Subject: [PATCH 04/11] change workspace to eastus

---
 src/promptflow-azure/tests/_constants.py  | 2 +-
 src/promptflow-devkit/tests/_constants.py | 2 +-
 src/promptflow/tests/_constants.py        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/promptflow-azure/tests/_constants.py b/src/promptflow-azure/tests/_constants.py
index 9929a01ff68..1f23b6921c9 100644
--- a/src/promptflow-azure/tests/_constants.py
+++ b/src/promptflow-azure/tests/_constants.py
@@ -8,7 +8,7 @@
 # below constants are used for pfazure and global config tests
 DEFAULT_SUBSCRIPTION_ID = "96aede12-2f73-41cb-b983-6d11a904839b"
 DEFAULT_RESOURCE_GROUP_NAME = "promptflow"
-DEFAULT_WORKSPACE_NAME = "promptflow-eastus2euap"
+DEFAULT_WORKSPACE_NAME = "promptflow-eastus"
 DEFAULT_COMPUTE_INSTANCE_NAME = "ci-lin-cpu-sp"
 DEFAULT_RUNTIME_NAME = "test-runtime-ci"
 DEFAULT_REGISTRY_NAME = "promptflow-preview"
diff --git a/src/promptflow-devkit/tests/_constants.py b/src/promptflow-devkit/tests/_constants.py
index 9929a01ff68..1f23b6921c9 100644
--- a/src/promptflow-devkit/tests/_constants.py
+++ b/src/promptflow-devkit/tests/_constants.py
@@ -8,7 +8,7 @@
 # below constants are used for pfazure and global config tests
 DEFAULT_SUBSCRIPTION_ID = "96aede12-2f73-41cb-b983-6d11a904839b"
 DEFAULT_RESOURCE_GROUP_NAME = "promptflow"
-DEFAULT_WORKSPACE_NAME = "promptflow-eastus2euap"
+DEFAULT_WORKSPACE_NAME = "promptflow-eastus"
 DEFAULT_COMPUTE_INSTANCE_NAME = "ci-lin-cpu-sp"
 DEFAULT_RUNTIME_NAME = "test-runtime-ci"
 DEFAULT_REGISTRY_NAME = "promptflow-preview"
diff --git a/src/promptflow/tests/_constants.py b/src/promptflow/tests/_constants.py
index 7a96abec0e0..3600f6d4cc9 100644
--- a/src/promptflow/tests/_constants.py
+++ b/src/promptflow/tests/_constants.py
@@ -10,7 +10,7 @@
 # below constants are used for pfazure and global config tests
 DEFAULT_SUBSCRIPTION_ID = "96aede12-2f73-41cb-b983-6d11a904839b"
 DEFAULT_RESOURCE_GROUP_NAME = "promptflow"
-DEFAULT_WORKSPACE_NAME = "promptflow-eastus2euap"
+DEFAULT_WORKSPACE_NAME = "promptflow-eastus"
 DEFAULT_COMPUTE_INSTANCE_NAME = "ci-lin-cpu-sp"
 DEFAULT_RUNTIME_NAME = "test-runtime-ci"
 DEFAULT_REGISTRY_NAME = "promptflow-preview"

From 1e6a72f2fa354de2907b3e37b9e388080f895ae9 Mon Sep 17 00:00:00 2001
From: Ying Chen <2601502859@qq.com>
Date: Wed, 5 Jun 2024 16:29:19 +0800
Subject: [PATCH 05/11] add role

---
 .../azure/operations/_artifact_utilities.py   | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/promptflow-azure/promptflow/azure/operations/_artifact_utilities.py b/src/promptflow-azure/promptflow/azure/operations/_artifact_utilities.py
index ac49c7eba10..ea5b4c48b6c 100644
--- a/src/promptflow-azure/promptflow/azure/operations/_artifact_utilities.py
+++ b/src/promptflow-azure/promptflow/azure/operations/_artifact_utilities.py
@@ -91,7 +91,8 @@ def get_datastore_info(operations: DatastoreOperations, name: str) -> Dict[str,
 
                 client = AuthorizationManagementClient(datastore_info["credential"], operations._subscription_id)
                 scope = f"/subscriptions/{operations._subscription_id}/resourceGroups/{operations._resource_group_name}"
-                check_scope_rbac_role(client, scope)
+                role_name_list = ["Storage Blob Data Contributor", "AzureML Data Scientist"]
+                check_scope_rbac_role(client, scope, role_name_list)
             else:
                 raise e
 
@@ -110,25 +111,26 @@ def get_datastore_info(operations: DatastoreOperations, name: str) -> Dict[str,
     return datastore_info
 
 
-def check_scope_rbac_role(client, scope: str, role_name: str = "Storage Blob Data Contributor"):
+def check_scope_rbac_role(client, scope: str, role_name_list: list):
     # Get the role assignments for the user
     role_assignments = client.role_assignments.list_for_scope(scope)
     # Get all role definitions
     role_definitions = client.role_definitions.list(scope)
 
     # Find the ID of the role_name
-    role_id = next((definition.id for definition in role_definitions if definition.role_name == role_name), None)
-
-    # Check if the user has the role
-    if role_id is not None:
-        for assignment in role_assignments:
-            if assignment.role_definition_id == role_id:
-                module_logger.debug(f"User has the {role_name} role")
-                break
+    for role_name in role_name_list:
+        role_id = next((definition.id for definition in role_definitions if definition.role_name == role_name), None)
+
+        # Check if the user has the role
+        if role_id is not None:
+            for assignment in role_assignments:
+                if assignment.role_definition_id == role_id:
+                    module_logger.debug(f"User has the {role_name} role")
+                    break
+            else:
+                raise UserErrorException(f"User does not have the {role_name} role")
         else:
-            raise UserErrorException(f"User does not have the {role_name} role")
-    else:
-        raise UserErrorException(f"Role {role_name} not found")
+            raise UserErrorException(f"Role {role_name} not found")
 
 
 def list_logs_in_datastore(ds_info: Dict[str, str], prefix: str, legacy_log_folder_name: str) -> Dict[str, str]:

From d4aa2eee127e2771cc48c497799d4256230046a2 Mon Sep 17 00:00:00 2001
From: Ying Chen <2601502859@qq.com>
Date: Wed, 5 Jun 2024 16:36:11 +0800
Subject: [PATCH 06/11] remove role assginment

---
 .../azure/operations/_artifact_utilities.py   | 30 -------------------
 src/promptflow-azure/pyproject.toml           |  1 -
 2 files changed, 31 deletions(-)

diff --git a/src/promptflow-azure/promptflow/azure/operations/_artifact_utilities.py b/src/promptflow-azure/promptflow/azure/operations/_artifact_utilities.py
index ea5b4c48b6c..c4c5cf23011 100644
--- a/src/promptflow-azure/promptflow/azure/operations/_artifact_utilities.py
+++ b/src/promptflow-azure/promptflow/azure/operations/_artifact_utilities.py
@@ -44,7 +44,6 @@
 from azure.storage.filedatalake import FileSasPermissions, generate_file_sas
 
 from promptflow._utils.logger_utils import LoggerFactory
-from promptflow.exceptions import UserErrorException
 
 from ._fileshare_storeage_helper import FlowFileStorageClient
 
@@ -86,13 +85,6 @@ def get_datastore_info(operations: DatastoreOperations, name: str) -> Dict[str,
         except Exception as e:  # pylint: disable=broad-except
             if not hasattr(credentials, "sas_token"):
                 datastore_info["credential"] = operations._credential
-
-                from azure.mgmt.authorization import AuthorizationManagementClient
-
-                client = AuthorizationManagementClient(datastore_info["credential"], operations._subscription_id)
-                scope = f"/subscriptions/{operations._subscription_id}/resourceGroups/{operations._resource_group_name}"
-                role_name_list = ["Storage Blob Data Contributor", "AzureML Data Scientist"]
-                check_scope_rbac_role(client, scope, role_name_list)
             else:
                 raise e
 
@@ -111,28 +103,6 @@ def get_datastore_info(operations: DatastoreOperations, name: str) -> Dict[str,
     return datastore_info
 
 
-def check_scope_rbac_role(client, scope: str, role_name_list: list):
-    # Get the role assignments for the user
-    role_assignments = client.role_assignments.list_for_scope(scope)
-    # Get all role definitions
-    role_definitions = client.role_definitions.list(scope)
-
-    # Find the ID of the role_name
-    for role_name in role_name_list:
-        role_id = next((definition.id for definition in role_definitions if definition.role_name == role_name), None)
-
-        # Check if the user has the role
-        if role_id is not None:
-            for assignment in role_assignments:
-                if assignment.role_definition_id == role_id:
-                    module_logger.debug(f"User has the {role_name} role")
-                    break
-            else:
-                raise UserErrorException(f"User does not have the {role_name} role")
-        else:
-            raise UserErrorException(f"Role {role_name} not found")
-
-
 def list_logs_in_datastore(ds_info: Dict[str, str], prefix: str, legacy_log_folder_name: str) -> Dict[str, str]:
     """Returns a dictionary of file name to blob or data lake uri with SAS token, matching the structure of
     RunDetails.logFiles.
diff --git a/src/promptflow-azure/pyproject.toml b/src/promptflow-azure/pyproject.toml
index 8a78968bb2f..c6e78b07c5d 100644
--- a/src/promptflow-azure/pyproject.toml
+++ b/src/promptflow-azure/pyproject.toml
@@ -46,7 +46,6 @@ azure-ai-ml = ">=1.14.0,<2.0.0"
 azure-cosmos = ">=4.5.1,<5.0.0"  # used to upload trace to cloud
 pyjwt = ">=2.4.0,<3.0.0"  # requirement of control plane SDK
 promptflow-devkit = "<2.0.0"
-azure-mgmt-authorization = ">=1.0.0"  # used to get role assignments
 
 [tool.poetry.group.dev.dependencies]
 pre-commit = "*"

From 5b2b1d480220c5b69104b53033257cf84cd431b3 Mon Sep 17 00:00:00 2001
From: Ying Chen <2601502859@qq.com>
Date: Wed, 5 Jun 2024 16:41:08 +0800
Subject: [PATCH 07/11] remove legacy_directory_client

---
 .../azure/operations/_fileshare_storeage_helper.py       | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

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 b3bde4cdda8..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,7 +8,7 @@
 from pathlib import Path
 from typing import Any, Dict, Optional
 
-from azure.ai.ml._artifacts._constants import ARTIFACT_ORIGIN, LEGACY_ARTIFACT_DIRECTORY
+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,
@@ -39,13 +39,6 @@ def __init__(self, credential: str, file_share_name: str, account_url: str, azur
                 directory_path=ARTIFACT_ORIGIN,
                 token_intent="backup",
             )
-            self.legacy_directory_client = ShareDirectoryClient(
-                account_url=account_url,
-                credential=credential,
-                share_name=file_share_name,
-                directory_path=LEGACY_ARTIFACT_DIRECTORY,
-                token_intent="backup",
-            )
             self.file_share = file_share_name
             self.total_file_count = 1
             self.uploaded_file_count = 0

From 6960c6ad39e5ad0213244b032f4c3fddf9bdcdf3 Mon Sep 17 00:00:00 2001
From: Ying Chen <2601502859@qq.com>
Date: Thu, 6 Jun 2024 17:58:37 +0800
Subject: [PATCH 08/11] update example ci

---
 .github/workflows/samples_connections.yml                      | 1 -
 .github/workflows/samples_flex_flows_basic.yml                 | 1 -
 .github/workflows/samples_flex_flows_chat_async_stream.yml     | 1 -
 .github/workflows/samples_flex_flows_chat_basic.yml            | 1 -
 .github/workflows/samples_flex_flows_chat_minimal.yml          | 1 -
 .github/workflows/samples_flex_flows_chat_stream.yml           | 1 -
 .github/workflows/samples_flex_flows_chat_with_functions.yml   | 1 -
 .github/workflows/samples_flex_flows_eval_checklist.yml        | 1 -
 .github/workflows/samples_flex_flows_eval_code_quality.yml     | 1 -
 .../samples_flex_flows_eval_criteria_with_langchain.yml        | 1 -
 .github/workflows/samples_flows_chat_chat_basic.yml            | 1 -
 .github/workflows/samples_flows_chat_chat_math_variant.yml     | 1 -
 .github/workflows/samples_flows_chat_chat_with_image.yml       | 1 -
 .github/workflows/samples_flows_chat_chat_with_pdf.yml         | 1 -
 .github/workflows/samples_flows_chat_chat_with_wikipedia.yml   | 1 -
 .../samples_flows_chat_use_functions_with_chat_models.yml      | 1 -
 .github/workflows/samples_flows_evaluation_eval_basic.yml      | 1 -
 .github/workflows/samples_flows_evaluation_eval_chat_math.yml  | 1 -
 .../samples_flows_evaluation_eval_classification_accuracy.yml  | 1 -
 .../samples_flows_evaluation_eval_entity_match_rate.yml        | 1 -
 .../workflows/samples_flows_evaluation_eval_groundedness.yml   | 1 -
 .../samples_flows_evaluation_eval_multi_turn_metrics.yml       | 1 -
 .../samples_flows_evaluation_eval_perceived_intelligence.yml   | 1 -
 .../workflows/samples_flows_evaluation_eval_qna_non_rag.yml    | 1 -
 .../samples_flows_evaluation_eval_qna_rag_metrics.yml          | 1 -
 .../samples_flows_evaluation_eval_single_turn_metrics.yml      | 1 -
 .../workflows/samples_flows_evaluation_eval_summarization.yml  | 1 -
 .github/workflows/samples_flows_standard_autonomous_agent.yml  | 1 -
 .github/workflows/samples_flows_standard_basic.yml             | 1 -
 .../samples_flows_standard_basic_with_builtin_llm.yml          | 1 -
 .../workflows/samples_flows_standard_basic_with_connection.yml | 1 -
 .../samples_flows_standard_conditional_flow_for_if_else.yml    | 1 -
 .../samples_flows_standard_conditional_flow_for_switch.yml     | 1 -
 .../samples_flows_standard_customer_intent_extraction.yml      | 1 -
 .github/workflows/samples_flows_standard_describe_image.yml    | 1 -
 .../samples_flows_standard_flow_with_additional_includes.yml   | 1 -
 .../workflows/samples_flows_standard_flow_with_symlinks.yml    | 1 -
 .github/workflows/samples_flows_standard_gen_docstring.yml     | 1 -
 .github/workflows/samples_flows_standard_maths_to_code.yml     | 1 -
 .../samples_flows_standard_named_entity_recognition.yml        | 1 -
 .../workflows/samples_flows_standard_question_simulation.yml   | 1 -
 .../workflows/samples_flows_standard_web_classification.yml    | 1 -
 .github/workflows/samples_prompty_basic.yml                    | 1 -
 .github/workflows/samples_prompty_chat_basic.yml               | 1 -
 .github/workflows/samples_prompty_eval_apology.yml             | 1 -
 .github/workflows/samples_prompty_eval_basic.yml               | 1 -
 .github/workflows/samples_prompty_format_output.yml            | 1 -
 .../samples_tools_use_cases_cascading_inputs_tool_showcase.yml | 1 -
 .../samples_tools_use_cases_custom_llm_tool_showcase.yml       | 1 -
 ...ses_custom_strong_type_connection_package_tool_showcase.yml | 1 -
 ...ases_custom_strong_type_connection_script_tool_showcase.yml | 1 -
 ...amples_tools_use_cases_dynamic_list_input_tool_showcase.yml | 1 -
 .../samples_tutorials_e2e_development_chat_with_pdf.yml        | 2 --
 .../samples_tutorials_flow_deploy_azure_app_service.yml        | 1 -
 .../samples_tutorials_flow_deploy_create_service_with_flow.yml | 1 -
 ...tutorials_flow_deploy_distribute_flow_as_executable_app.yml | 1 -
 .github/workflows/samples_tutorials_flow_deploy_docker.yml     | 1 -
 .github/workflows/samples_tutorials_flow_deploy_kubernetes.yml | 1 -
 ...w_fine_tuning_evaluation_promptflow_quality_improvement.yml | 1 -
 .github/workflows/samples_tutorials_tracing.yml                | 1 -
 docs/tutorials/index.md                                        | 2 --
 .../workflow_steps/step_azure_login.yml.jinja2                 | 3 +--
 .../workflow_steps/step_login_again.yml.jinja2                 | 3 +--
 63 files changed, 2 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/docs/tutorials/index.md b/docs/tutorials/index.md
index 647404e4b62..7f0e54aeda0 100644
--- a/docs/tutorials/index.md
+++ b/docs/tutorials/index.md
@@ -33,8 +33,6 @@ This section contains a collection of flow samples and step-by-step tutorials.
 |Rag|[Tutorial: chat with pdf](https://github.com/microsoft/promptflow/blob/main/examples/tutorials/e2e-development/chat-with-pdf.md)| 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|
 |Rag|[Tutorial: how prompt flow helps on quality improvement](https://github.com/microsoft/promptflow/blob/main/examples/tutorials/flow-fine-tuning-evaluation/promptflow-quality-improvement.md)| This tutorial is designed to enhance your understanding of improving flow quality through prompt tuning and evaluation|
 |Rag|[Chat with pdf - test, evaluation and experimentation](https://github.com/microsoft/promptflow/blob/main/examples/flows/chat/chat-with-pdf/chat-with-pdf.ipynb)|A tutorial of chat-with-pdf flow that allows user ask questions about the content of a PDF file and get answers|
-|Rag|[Develop copilot with promptflow](https://github.com/microsoft/promptflow/blob/main/examples/tutorials/develop-copilot-with-promptflow/develop-copilot-with-promptflow.md)| In this tutorial, we will provide a detailed walkthrough on creating a RAG-based copilot using the Azure Machine Learning promptflow toolkit|
-|Rag|[How to generate test data based on documents](https://github.com/microsoft/promptflow/blob/main/examples/tutorials/generate-test-data/README.md)| In this doc, you will learn how to generate test data based on your documents for RAG app|
 |Rag|[Chat with pdf in azure](https://github.com/microsoft/promptflow/blob/main/examples/flows/chat/chat-with-pdf/chat-with-pdf-azure.ipynb)|A tutorial of chat-with-pdf flow that executes in Azure AI|
 
 
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

From 51890cbe2551c8deea77c4df6ed470005fafcb85 Mon Sep 17 00:00:00 2001
From: Ying Chen <2601502859@qq.com>
Date: Fri, 7 Jun 2024 11:01:26 +0800
Subject: [PATCH 09/11] add langchain-community dependency

---
 .../flex-flows/eval-criteria-with-langchain/requirements.txt   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

From a2db2efaaef66d7136b9fcdd26befedbc4f023de Mon Sep 17 00:00:00 2001
From: Ying Chen <2601502859@qq.com>
Date: Fri, 7 Jun 2024 11:29:59 +0800
Subject: [PATCH 10/11] revert

---
 docs/tutorials/index.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/tutorials/index.md b/docs/tutorials/index.md
index 7f0e54aeda0..647404e4b62 100644
--- a/docs/tutorials/index.md
+++ b/docs/tutorials/index.md
@@ -33,6 +33,8 @@ This section contains a collection of flow samples and step-by-step tutorials.
 |Rag|[Tutorial: chat with pdf](https://github.com/microsoft/promptflow/blob/main/examples/tutorials/e2e-development/chat-with-pdf.md)| 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|
 |Rag|[Tutorial: how prompt flow helps on quality improvement](https://github.com/microsoft/promptflow/blob/main/examples/tutorials/flow-fine-tuning-evaluation/promptflow-quality-improvement.md)| This tutorial is designed to enhance your understanding of improving flow quality through prompt tuning and evaluation|
 |Rag|[Chat with pdf - test, evaluation and experimentation](https://github.com/microsoft/promptflow/blob/main/examples/flows/chat/chat-with-pdf/chat-with-pdf.ipynb)|A tutorial of chat-with-pdf flow that allows user ask questions about the content of a PDF file and get answers|
+|Rag|[Develop copilot with promptflow](https://github.com/microsoft/promptflow/blob/main/examples/tutorials/develop-copilot-with-promptflow/develop-copilot-with-promptflow.md)| In this tutorial, we will provide a detailed walkthrough on creating a RAG-based copilot using the Azure Machine Learning promptflow toolkit|
+|Rag|[How to generate test data based on documents](https://github.com/microsoft/promptflow/blob/main/examples/tutorials/generate-test-data/README.md)| In this doc, you will learn how to generate test data based on your documents for RAG app|
 |Rag|[Chat with pdf in azure](https://github.com/microsoft/promptflow/blob/main/examples/flows/chat/chat-with-pdf/chat-with-pdf-azure.ipynb)|A tutorial of chat-with-pdf flow that executes in Azure AI|
 
 

From a949bac5012ff783c83634c7631b221a7510567a Mon Sep 17 00:00:00 2001
From: Ying Chen <2601502859@qq.com>
Date: Fri, 7 Jun 2024 12:28:53 +0800
Subject: [PATCH 11/11] revert

---
 src/promptflow-azure/tests/_constants.py  | 2 +-
 src/promptflow-devkit/tests/_constants.py | 2 +-
 src/promptflow/tests/_constants.py        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/promptflow-azure/tests/_constants.py b/src/promptflow-azure/tests/_constants.py
index 1f23b6921c9..9929a01ff68 100644
--- a/src/promptflow-azure/tests/_constants.py
+++ b/src/promptflow-azure/tests/_constants.py
@@ -8,7 +8,7 @@
 # below constants are used for pfazure and global config tests
 DEFAULT_SUBSCRIPTION_ID = "96aede12-2f73-41cb-b983-6d11a904839b"
 DEFAULT_RESOURCE_GROUP_NAME = "promptflow"
-DEFAULT_WORKSPACE_NAME = "promptflow-eastus"
+DEFAULT_WORKSPACE_NAME = "promptflow-eastus2euap"
 DEFAULT_COMPUTE_INSTANCE_NAME = "ci-lin-cpu-sp"
 DEFAULT_RUNTIME_NAME = "test-runtime-ci"
 DEFAULT_REGISTRY_NAME = "promptflow-preview"
diff --git a/src/promptflow-devkit/tests/_constants.py b/src/promptflow-devkit/tests/_constants.py
index 1f23b6921c9..9929a01ff68 100644
--- a/src/promptflow-devkit/tests/_constants.py
+++ b/src/promptflow-devkit/tests/_constants.py
@@ -8,7 +8,7 @@
 # below constants are used for pfazure and global config tests
 DEFAULT_SUBSCRIPTION_ID = "96aede12-2f73-41cb-b983-6d11a904839b"
 DEFAULT_RESOURCE_GROUP_NAME = "promptflow"
-DEFAULT_WORKSPACE_NAME = "promptflow-eastus"
+DEFAULT_WORKSPACE_NAME = "promptflow-eastus2euap"
 DEFAULT_COMPUTE_INSTANCE_NAME = "ci-lin-cpu-sp"
 DEFAULT_RUNTIME_NAME = "test-runtime-ci"
 DEFAULT_REGISTRY_NAME = "promptflow-preview"
diff --git a/src/promptflow/tests/_constants.py b/src/promptflow/tests/_constants.py
index 3600f6d4cc9..7a96abec0e0 100644
--- a/src/promptflow/tests/_constants.py
+++ b/src/promptflow/tests/_constants.py
@@ -10,7 +10,7 @@
 # below constants are used for pfazure and global config tests
 DEFAULT_SUBSCRIPTION_ID = "96aede12-2f73-41cb-b983-6d11a904839b"
 DEFAULT_RESOURCE_GROUP_NAME = "promptflow"
-DEFAULT_WORKSPACE_NAME = "promptflow-eastus"
+DEFAULT_WORKSPACE_NAME = "promptflow-eastus2euap"
 DEFAULT_COMPUTE_INSTANCE_NAME = "ci-lin-cpu-sp"
 DEFAULT_RUNTIME_NAME = "test-runtime-ci"
 DEFAULT_REGISTRY_NAME = "promptflow-preview"