update samples

microsoft · May 7, 2024 · 3d8650b · 3d8650b
1 parent cac9ead
commit 3d8650b
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 12 deletions.
diff --git a/js/samples/04.ai-apps/d.assistants-mathBot/src/bot.ts b/js/samples/04.ai-apps/d.assistants-mathBot/src/bot.ts
@@ -1,26 +1,34 @@
 import { Application, preview, AI } from '@microsoft/teams-ai';
 import { MemoryStorage, TurnContext } from 'botbuilder';
 
-if (!process.env.AZURE_OPENAI_KEY || !process.env.AZURE_OPENAI_ENDPOINT) {
+if (!(process.env.AZURE_OPENAI_KEY && process.env.AZURE_OPENAI_ENDPOINT) && !process.env.OPENAI_KEY) {
     throw new Error(
-        'Missing environment variables - please check that AZURE_OPENAI_KEY and AZURE_OPENAI_ENDPOINT is set.'
+        'Missing environment variables - please check that (AZURE_OPENAI_KEY and AZURE_OPENAI_ENDPOINT) or OPENAI_KEY is set.'
     );
 }
 
+let apiKey = '';
+let endpoint;
+if (process.env.AZURE_OPENAI_KEY) {
+    apiKey = process.env.AZURE_OPENAI_KEY;
+    endpoint = process.env.AZURE_OPENAI_ENDPOINT;
+} else if (process.env.OPENAI_KEY) {
+    apiKey = process.env.OPENAI_KEY;
+}
 const { AssistantsPlanner } = preview;
 
 // Create Assistant if no ID is provided, this will require you to restart the program and fill in the process.env.ASSISTANT_ID afterwards.
 if (!process.env.ASSISTANT_ID) {
     (async () => {
         const assistant = await AssistantsPlanner.createAssistant(
-            process.env.AZURE_OPENAI_KEY!, // To use OpenAI, Replace `AZURE_OPENAI_KEY` with `OPENAI_KEY`
+            apiKey,
             {
                 name: 'Math Tutor',
                 instructions: 'You are a personal math tutor. Write and run code to answer math questions.',
                 tools: [{ type: 'code_interpreter' }],
                 model: 'gpt-4'
             },
-            process.env.AZURE_OPENAI_ENDPOINT! // To use OpenAI, comment this out.
+            endpoint
         );
 
         console.log(`Created a new assistant with an ID of: ${assistant.id}`);
@@ -30,8 +38,8 @@ if (!process.env.ASSISTANT_ID) {
 
 // Create Assistant Planner
 const planner = new AssistantsPlanner({
-    apiKey: process.env.AZURE_OPENAI_KEY!, // To use OpenAI, Replace `AZURE_OPENAI_KEY` with `OPENAI_KEY`
-    endpoint: process.env.AZURE_OPENAI_ENDPOINT!, // To use OpenAI, comment this out.
+    apiKey: apiKey,
+    endpoint: endpoint,
     assistant_id: process.env.ASSISTANT_ID!
 });
 

diff --git a/js/samples/04.ai-apps/e.assistants-orderBot/src/bot.ts b/js/samples/04.ai-apps/e.assistants-orderBot/src/bot.ts
@@ -3,19 +3,28 @@ import { CardFactory, MemoryStorage, MessageFactory, TurnContext } from 'botbuil
 import { Order } from './foodOrderViewSchema';
 import { generateCardForOrder } from './foodOrderCard';
 
-if (!process.env.AZURE_OPENAI_KEY || !process.env.AZURE_OPENAI_ENDPOINT) {
+if (!(process.env.AZURE_OPENAI_KEY && process.env.AZURE_OPENAI_ENDPOINT) && !process.env.OPENAI_KEY) {
     throw new Error(
-        'Missing environment variables - please check that AZURE_OPENAI_KEY and AZURE_OPENAI_ENDPOINT is set.'
+        'Missing environment variables - please check that (AZURE_OPENAI_KEY and AZURE_OPENAI_ENDPOINT) or OPENAI_KEY is set.'
     );
 }
 
+let apiKey = '';
+let endpoint;
+if (process.env.AZURE_OPENAI_KEY) {
+    apiKey = process.env.AZURE_OPENAI_KEY;
+    endpoint = process.env.AZURE_OPENAI_ENDPOINT;
+} else if (process.env.OPENAI_KEY) {
+    apiKey = process.env.OPENAI_KEY;
+}
+
 const { AssistantsPlanner } = preview;
 
 // Create Assistant if no ID is provided, this will require you to restart the program and fill in the process.env.ASSISTANT_ID afterwards.
 if (!process.env.ASSISTANT_ID) {
     (async () => {
         const assistant = await AssistantsPlanner.createAssistant(
-            process.env.AZURE_OPENAI_KEY!,
+            apiKey,
             {
                 name: 'Order Bot',
                 instructions: [
@@ -36,7 +45,7 @@ if (!process.env.ASSISTANT_ID) {
                 ],
                 model: 'gpt-4'
             },
-            process.env.AZURE_OPENAI_ENDPOINT!
+            endpoint
         );
 
         console.log(`Created a new assistant with an ID of: ${assistant.id}`);
@@ -46,8 +55,8 @@ if (!process.env.ASSISTANT_ID) {
 
 // Create Assistant Planner
 const planner = new AssistantsPlanner({
-    apiKey: process.env.AZURE_OPENAI_KEY!,
-    endpoint: process.env.AZURE_OPENAI_ENDPOINT,
+    apiKey: apiKey,
+    endpoint: endpoint,
     assistant_id: process.env.ASSISTANT_ID!
 });