fix: Cherry-pick PR #14487: Fix OpenAI model configuration in Azure AI Search template (#14490)

* Initial plan

* Cherry-pick #14487: fix openai model in azure ai search template for dev branch

- Add conditional OpenAI model configuration in app.js.tpl and app.ts.tpl
- Fix API key reference from azureOpenAIApiKey to apiKey for OpenAI scenarios
- Ensures proper model configuration for both OpenAI and Azure OpenAI

---------

Co-authored-by: copilot-swe-agent[bot] <[email protected]>

Author: Copilot

templates/vsc/js/custom-copilot-rag-azure-ai-search/src/app/app.js.tpl

@@ -85,12 +85,20 @@ app.on('message', async ({ send, activity }) => {
     const prompt = new ChatPrompt({
       messages,
       instructions: enhancedInstructions,
+      {{#useOpenAI}}
+      model: new OpenAIChatModel({
+        model: config.openAIModelName,
+        apiKey: config.openAIKey
+      })
+      {{/useOpenAI}}
+      {{#useAzureOpenAI}}
       model: new OpenAIChatModel({
         model: config.azureOpenAIDeploymentName,
         apiKey: config.azureOpenAIKey,
         endpoint: config.azureOpenAIEndpoint,
         apiVersion: "2024-10-21"
       })
+      {{/useAzureOpenAI}}
     });
 
     const response = await prompt.send(activity.text);

templates/vsc/js/custom-copilot-rag-azure-ai-search/src/app/azureAISearchDataSource.js.tpl

@@ -104,7 +104,7 @@ class AzureAISearchDataSource {
     async getEmbeddingVector(text) {
         {{#useOpenAI}}
         const client = new OpenAI({
-            apiKey: this.options.azureOpenAIApiKey
+            apiKey: this.options.apiKey
         });
         const result = await client.embeddings.create({
             input: text,

templates/vsc/ts/custom-copilot-rag-azure-ai-search/src/app/app.ts.tpl

@@ -86,12 +86,20 @@ app.on('message', async ({ send, activity }) => {
     const prompt = new ChatPrompt({
       messages,
       instructions: enhancedInstructions,
+      {{#useOpenAI}}
+      model: new OpenAIChatModel({
+        model: config.openAIModelName,
+        apiKey: config.openAIKey
+      })
+      {{/useOpenAI}}
+      {{#useAzureOpenAI}}
       model: new OpenAIChatModel({
         model: config.azureOpenAIDeploymentName,
         apiKey: config.azureOpenAIKey,
         endpoint: config.azureOpenAIEndpoint,
         apiVersion: "2024-10-21"
       })
+      {{/useAzureOpenAI}}
     });
 
     const response = await prompt.send(activity.text);

templates/vsc/ts/custom-copilot-rag-azure-ai-search/src/app/azureAISearchDataSource.ts.tpl

@@ -168,7 +168,7 @@ export class AzureAISearchDataSource {
     private async getEmbeddingVector(text: string): Promise<number[]> {
         {{#useOpenAI}}
         const client = new OpenAI({
-            apiKey: this.options.azureOpenAIApiKey
+            apiKey: this.options.apiKey
         });
         const result = await client.embeddings.create({
             input: text,