Update Azure.AI.OpenAI package

Author: jelledruyts

src/Azure.AISearch.WebApp/Azure.AISearch.WebApp.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.AI.OpenAI" Version="1.0.0-beta.7" />
+    <PackageReference Include="Azure.AI.OpenAI" Version="1.0.0-beta.9" />
     <PackageReference Include="Azure.Search.Documents" Version="11.5.0-beta.4" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.17.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.20" />

src/Azure.AISearch.WebApp/Services/AzureOpenAIEmbeddingService.cs

@@ -18,7 +18,7 @@ public AzureOpenAIEmbeddingService(AppSettings settings)
 
     public async Task<IReadOnlyList<float>> GetEmbeddingAsync(string text)
     {
-        var response = await this.openAIClient.GetEmbeddingsAsync(this.embeddingDeploymentName, new EmbeddingsOptions(text));
-        return response.Value.Data[0].Embedding;
+        var response = await this.openAIClient.GetEmbeddingsAsync(new EmbeddingsOptions(this.embeddingDeploymentName, new[] { text }));
+        return response.Value.Data[0].Embedding.ToArray();
     }
 }

src/Azure.AISearch.WebApp/Services/AzureOpenAISearchService.cs

@@ -35,7 +35,7 @@ public async Task<SearchResponse> SearchAsync(SearchRequest request)
         ArgumentNullException.ThrowIfNull(request.Query);
 
         var searchResponse = new SearchResponse();
-        var chatCompletionsOptions = new ChatCompletionsOptions();
+        var chatCompletionsOptions = new ChatCompletionsOptions { DeploymentName = this.settings.OpenAIGptDeployment };
         chatCompletionsOptions.Messages.Add(new ChatMessage(ChatRole.System, request.SystemRoleInformation));
 
         if (request.History != null && request.History.Any())
@@ -59,7 +59,7 @@ public async Task<SearchResponse> SearchAsync(SearchRequest request)
             };
         }
 
-        var serviceResponse = await this.client.GetChatCompletionsAsync(this.settings.OpenAIGptDeployment, chatCompletionsOptions);
+        var serviceResponse = await this.client.GetChatCompletionsAsync(chatCompletionsOptions);
 
         if (serviceResponse == null || !serviceResponse.Value.Choices.Any())
         {
@@ -110,10 +110,9 @@ private AzureCognitiveSearchChatExtensionConfiguration GetAzureCognitiveSearchDa
         ArgumentNullException.ThrowIfNull(this.settings.OpenAIEndpoint);
         ArgumentNullException.ThrowIfNull(this.settings.OpenAIApiKey);
         var useDocumentsIndex = request.SearchIndex == SearchIndexType.Documents;
-        return new AzureCognitiveSearchChatExtensionConfiguration
+        var configuration = new AzureCognitiveSearchChatExtensionConfiguration
         {
             SearchEndpoint = new Uri(this.settings.SearchServiceUrl),
-            SearchKey = new AzureKeyCredential(this.settings.SearchServiceAdminKey),
             IndexName = useDocumentsIndex ? this.settings.SearchIndexNameBlobDocuments : this.settings.SearchIndexNameBlobChunks,
             FieldMappingOptions = new AzureCognitiveSearchIndexFieldMappingOptions
             {
@@ -126,9 +125,14 @@ private AzureCognitiveSearchChatExtensionConfiguration GetAzureCognitiveSearchDa
             ShouldRestrictResultScope = request.LimitToDataSource, // Limit responses to data from the data source only
             QueryType = GetQueryType(request),
             SemanticConfiguration = request.IsSemanticSearch ? Constants.ConfigurationNames.SemanticConfigurationNameDefault : null,
-            EmbeddingEndpoint = request.IsVectorSearch ? new Uri(new Uri(this.settings.OpenAIEndpoint), $"openai/deployments/{this.settings.OpenAIEmbeddingDeployment}/embeddings?api-version={this.settings.OpenAIApiVersion}") : null,
-            EmbeddingKey = request.IsVectorSearch ? new AzureKeyCredential(this.settings.OpenAIApiKey) : null
+            EmbeddingEndpoint = request.IsVectorSearch ? new Uri(new Uri(this.settings.OpenAIEndpoint), $"openai/deployments/{this.settings.OpenAIEmbeddingDeployment}/embeddings?api-version={this.settings.OpenAIApiVersion}") : null
         };
+        configuration.SetSearchKey(this.settings.SearchServiceAdminKey);
+        if (request.IsVectorSearch)
+        {
+            configuration.SetEmbeddingKey(this.settings.OpenAIApiKey);
+        }
+        return configuration;
     }
 
     private AzureCognitiveSearchQueryType GetQueryType(SearchRequest request)