feat: add support for Microsoft Entre ID

Author: manekinekko

README.md

@@ -94,6 +94,12 @@ Note that the documents are uploaded automatically when deploying the sample to
 - **Azure account**. If you're new to Azure, [get an Azure account for free](https://azure.microsoft.com/free) to get free Azure credits to get started. If you're a student, you can also get free credits with [Azure for Students](https://aka.ms/azureforstudents).
 - **Azure subscription with access enabled for the Azure OpenAI service**. You can request access with [this form](https://aka.ms/oaiapply).
 
+### Setup and configure Microsoft Entra ID
+
+This sample is using Microsoft Entra ID for authentication. To set up Microsoft Entra ID, follow these steps:
+
+TODO
+
 #### Deploy the sample
 
 1. Open a terminal and navigate to the root of the project.

api/package-lock.json

@@ -9,9 +9,9 @@
   },
   "dependencies": {
     "@azure/functions": "^4.0.0",
-    "@azure/identity": "^4.1.0",
+    "@azure/identity": "^4.2.0",
     "dotenv": "^16.4.5",
-    "openai": "^4.38.5"
+    "openai": "^4.45.0"
   },
   "devDependencies": {
     "azure-functions-core-tools": "^4.x"

api/package.json

@@ -4,43 +4,24 @@ dotenv.config();
 const { app } = require("@azure/functions");
 app.setup({ enableHttpStream: true });
 
-const OpenAI = require("openai");
+const { AzureOpenAI } = require("openai");
+const { DefaultAzureCredential, getBearerTokenProvider } = require("@azure/identity");
 
 const {
   ASSISTANT_ID,
-  AZURE_OPENAI_API_KEY,
-  AZURE_OPENAI_API_VERSION,
-  AZURE_OPENAI_ENDPOINT,
   AZURE_DEPLOYMENT_NAME,
-  // TODO: uncomment this when https://github.com/openai/openai-node/pull/718 is merged
-  //   AZURE_CLIENT_ID,
-  //   AZURE_TENANT_ID,
 } = process.env;
 
 // Important: Errors handlings are removed intentionally. If you are using this sample in production
-// please add proper errors handling.
+// please add proper error handling.
 
 async function initAzureOpenAI() {
-  // TODO: uncomment this when https://github.com/openai/openai-node/pull/718 is merged
-  //   console.log("Using Azure OpenAI (w/ AAD) ...");
-  //   const credential = new DefaultAzureCredential({
-  //     managedIdentityClientId: AZURE_CLIENT_ID,
-  //     tenantId: AZURE_TENANT_ID,
-  //   });
-  //   const { token } = await credential.getToken(
-  //     "https://cognitiveservices.azure.com/.default"
-  //   );
-  //   return new OpenAI({
-  //     baseURL: `${AZURE_OPENAI_ENDPOINT.replace(/\/+$/, "")}/openai`,
-  //     defaultQuery: { "api-version": AZURE_OPENAI_API_VERSION },
-  //     defaultHeaders: { Authorization: `Bearer ${token}` },
-  //   });
-  return new OpenAI({
-    apiKey: AZURE_OPENAI_API_KEY,
-    baseURL: `${AZURE_OPENAI_ENDPOINT.replace(/\/+$/, "")}/openai`,
-    defaultQuery: { "api-version": AZURE_OPENAI_API_VERSION },
-    defaultHeaders: { "api-key": AZURE_OPENAI_API_KEY },
-  });
+    console.log("Using Azure OpenAI (w/ Microsoft Entra ID) ...");
+    const credential = new DefaultAzureCredential();
+    const azureADTokenProvider = getBearerTokenProvider(credential, "https://cognitiveservices.azure.com/.default");
+    return new AzureOpenAI({
+      azureADTokenProvider,
+    });
 }
 
 const assistantDefinition = {