resolve merge conflicts

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: Ayaz-Microsoft

.github/workflows/import-sample-data-postgresql.yml

@@ -143,11 +143,6 @@ jobs:
         with:
           python-version: '3.11'
 
-      - name: Upgrade Azure CLI and install extensions
-        run: |
-          az upgrade --yes --all
-          az extension add --name rdbms-connect --upgrade --yes || true
-
       - name: Discover PostgreSQL Server from Resource Group
         env:
           INPUT_RESOURCE_GROUP_NAME: ${{ inputs.RESOURCE_GROUP_NAME }}

code/create_app.py

@@ -742,15 +742,32 @@ def speech_config():
         """Get the speech config for Azure Speech."""
         try:
             logger.info("Method speech_config started")
-            speech_key = env_helper.AZURE_SPEECH_KEY or get_speech_key(env_helper)
 
-            response = requests.post(
-                f"{env_helper.AZURE_SPEECH_REGION_ENDPOINT}sts/v1.0/issueToken",
-                headers={
-                    "Ocp-Apim-Subscription-Key": speech_key,
-                },
-                timeout=5,
-            )
+            if env_helper.AZURE_AUTH_TYPE == "rbac":
+                credential = get_azure_credential(
+                    env_helper.MANAGED_IDENTITY_CLIENT_ID
+                )
+                token = credential.get_token(
+                    "https://cognitiveservices.azure.com/.default"
+                )
+                response = requests.post(
+                    f"{env_helper.AZURE_SPEECH_REGION_ENDPOINT}sts/v1.0/issueToken",
+                    headers={
+                        "Authorization": f"Bearer {token.token}",
+                    },
+                    timeout=5,
+                )
+            else:
+                speech_key = env_helper.AZURE_SPEECH_KEY or get_speech_key(
+                    env_helper
+                )
+                response = requests.post(
+                    f"{env_helper.AZURE_SPEECH_REGION_ENDPOINT}sts/v1.0/issueToken",
+                    headers={
+                        "Ocp-Apim-Subscription-Key": speech_key,
+                    },
+                    timeout=5,
+                )
 
             if response.status_code == 200:
                 return {

code/frontend/src/components/Answer/Answer.test.tsx

@@ -736,10 +736,9 @@ describe("Answer.tsx", () => {
   });
   test('test the api thow error', async () => {
     (global.fetch as jest.Mock).mockResolvedValueOnce({ ok: false })
-    const consoleSpy = jest.spyOn(console, 'log');
-    let renderref
+    const consoleSpy = jest.spyOn(console, 'error').mockImplementation(() => undefined);
     await act(async () => {
-      renderref = render(
+      render(
         <Answer
           answer={{
             answer: componentPropsWithCitations.answer.answer,
@@ -752,8 +751,15 @@ describe("Answer.tsx", () => {
         />
       );
     });
+    const playBtn = screen.getByRole('button', {
+      name: /speak/i
+    });
+
+    await act(async () => {
+      fireEvent.click(playBtn);
+    });
+
     expect(consoleSpy).toHaveBeenCalled();
-    // Restore the original console.log
     consoleSpy.mockRestore();
   });
   // test('test speech', async () => {

code/frontend/src/components/Answer/Answer.tsx

@@ -69,10 +69,16 @@ export const Answer = ({
     toggleIsRefAccordionOpen();
   };
 
-  const initializeSynthesizer = () => {
+  const initializeSynthesizer = (
+    token: string = synthesizerData.token,
+    region: string = synthesizerData.region
+  ) => {
+    if (!token || !region) {
+      return null;
+    }
     const speechConfig = sdk.SpeechConfig.fromAuthorizationToken(
-      synthesizerData.token,
-      synthesizerData.region
+      token,
+      region
     );
     const newAudioDestination = new SpeechSDK.SpeakerAudioDestination();
     const audioConfig =
@@ -87,41 +93,32 @@ export const Answer = ({
       clearTimeout(playbackTimeout);
     }
     setRemainingDuration(0);
+    return newSynthesizer;
   };
 
   useEffect(() => {
-    if (synthesizerData.token != "") {
-      initializeSynthesizer();
-
-      return () => {
-        if (synthesizer) {
-          synthesizer.close();
-        }
-        if (audioDestination) {
-          audioDestination.close();
-        }
-        if (playbackTimeout) {
-          clearTimeout(playbackTimeout);
-        }
-      };
-    }
-  }, [index, synthesizerData]);
-
-  useEffect(() => {
-    const fetchSythesizerData = async () => {
-      const response = await fetch("/api/speech");
-      try {
-        if (!response.ok) {
-          throw new Error("Network response was not ok");
-        }
-        const data = await response.json();
-        setSynthesizerData({ token: data.token, region: data.region });
-      } catch (e) {
-        console.log(e);
+    return () => {
+      if (synthesizer) {
+        synthesizer.close();
+      }
+      if (audioDestination) {
+        audioDestination.close();
+      }
+      if (playbackTimeout) {
+        clearTimeout(playbackTimeout);
       }
     };
-    fetchSythesizerData();
-  }, []);
+  }, [synthesizer, audioDestination, playbackTimeout]);
+
+  const fetchSythesizerData = async (): Promise<{ token: string; region: string }> => {
+    const response = await fetch("/api/speech");
+    if (!response.ok) {
+      throw new Error("Network response was not ok");
+    }
+    const data = await response.json();
+    setSynthesizerData({ token: data.token, region: data.region });
+    return { token: data.token, region: data.region };
+  };
 
   useEffect(() => {
     if (!isActive && synthesizer && isSpeaking) {
@@ -193,10 +190,12 @@ export const Answer = ({
     return "";
   };
 
-  const startSpeech = () => {
-    if (synthesizer) {
+  const startSpeech = (
+    activeSynthesizer: SpeechSDK.SpeechSynthesizer | null = synthesizer
+  ) => {
+    if (activeSynthesizer) {
       const text = getAnswerText();
-      synthesizer?.speakTextAsync(
+      activeSynthesizer.speakTextAsync(
         text,
         (result) => {
           if (
@@ -261,8 +260,30 @@ export const Answer = ({
         }
       }
     } else {
-      onSpeak(index, "speak", resetSpeech);
-      startSpeech();
+      const startSpeechPlayback = async () => {
+        try {
+          if (!synthesizer) {
+            let token = synthesizerData.token;
+            let region = synthesizerData.region;
+            if (!synthesizerData.token || !synthesizerData.region) {
+              const speechData = await fetchSythesizerData();
+              token = speechData.token;
+              region = speechData.region;
+            }
+            const newSynthesizer = initializeSynthesizer(token, region);
+            onSpeak(index, "speak", resetSpeech);
+            startSpeech(newSynthesizer);
+            return;
+          }
+
+          onSpeak(index, "speak", resetSpeech);
+          startSpeech();
+        } catch (error) {
+          console.error("Error initializing speech synthesis:", error);
+        }
+      };
+
+      void startSpeechPlayback();
     }
   };
 

code/tests/test_create_app.py

@@ -92,6 +92,7 @@ def env_helper_mock():
             AZURE_SEARCH_SEMANTIC_SEARCH_CONFIG
         )
         env_helper.SHOULD_STREAM = True
+        env_helper.AZURE_AUTH_TYPE = "keys"
         env_helper.is_auth_type_keys.return_value = True
         env_helper.CONVERSATION_FLOW = ConversationFlow.CUSTOM.value
 
@@ -128,25 +129,24 @@ def test_returns_speech_token_using_keys(
             timeout=5,
         )
 
-    @patch("create_app.CognitiveServicesManagementClient")
+    @patch("create_app.get_azure_credential")
     @patch("create_app.requests")
     def test_returns_speech_token_using_rbac(
         self,
         requests: MagicMock,
-        CognitiveServicesManagementClientMock: MagicMock,
+        get_azure_credential_mock: MagicMock,
         env_helper_mock: MagicMock,
         client: FlaskClient,
     ):
         """Test that the speech token is returned correctly when using RBAC."""
         # given
+        env_helper_mock.AZURE_AUTH_TYPE = "rbac"
         env_helper_mock.AZURE_SPEECH_KEY = None
+        env_helper_mock.MANAGED_IDENTITY_CLIENT_ID = "mock-client-id"
 
-        mock_cognitive_services_client_mock = (
-            CognitiveServicesManagementClientMock.return_value
-        )
-        mock_cognitive_services_client_mock.accounts.list_keys.return_value = MagicMock(
-            key1="mock-key1", key2="mock-key2"
-        )
+        mock_credential = MagicMock()
+        mock_credential.get_token.return_value = MagicMock(token="mock-aad-token")
+        get_azure_credential_mock.return_value = mock_credential
 
         mock_response: MagicMock = requests.post.return_value
         mock_response.text = "speech-token"
@@ -163,10 +163,14 @@ def test_returns_speech_token_using_rbac(
             "languages": AZURE_SPEECH_RECOGNIZER_LANGUAGES,
         }
 
+        get_azure_credential_mock.assert_called_once_with("mock-client-id")
+        mock_credential.get_token.assert_called_once_with(
+            "https://cognitiveservices.azure.com/.default"
+        )
         requests.post.assert_called_once_with(
             f"{AZURE_SPEECH_REGION_ENDPOINT}sts/v1.0/issueToken",
             headers={
-                "Ocp-Apim-Subscription-Key": "mock-key1",
+                "Authorization": "Bearer mock-aad-token",
             },
             timeout=5,
         )

docs/create_new_app_registration.md

@@ -20,7 +20,7 @@
 
 ![Redirect URL](images/AddRedirectURL.png)
 
-6. Click on `+ Add a platform`.
+6. Click on `+ Add redirect URI`.
 
 ![+ Add platform](images/AddPlatform.png)
 

docs/images/AddDetails.png

@@ -30,7 +30,7 @@ param webAppName string = resourceBaseName
 param location string = resourceGroup().location
 
 // Compute resources for your Web App
-resource serverfarm 'Microsoft.Web/serverfarms@2024-04-01' = {
+resource serverfarm 'Microsoft.Web/serverfarms@2021-02-01' = {
   kind: 'app'
   location: location
   name: serverfarmsName
@@ -40,10 +40,13 @@ resource serverfarm 'Microsoft.Web/serverfarms@2024-04-01' = {
 }
 
 // Web App that hosts your bot
-resource webApp 'Microsoft.Web/sites@2024-04-01' = {
+resource webApp 'Microsoft.Web/sites@2021-02-01' = {
   kind: 'app'
   location: location
   name: webAppName
+  identity: {
+    type: 'SystemAssigned'
+  }
   properties: {
     serverFarmId: serverfarm.id
     httpsOnly: true