fix: Embedding retries

Author: Benjamin Michaelis

Directory.Packages.props

@@ -49,6 +49,7 @@
     <PackageVersion Include="NuGet.Protocol" Version="6.12.5" />
     <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="10.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="10.0.1-preview.1.25571.5" />
     <PackageVersion Include="ModelContextProtocol" Version="0.3.0-preview.4" />
     <PackageVersion Include="ModelContextProtocol.AspNetCore" Version="0.3.0-preview.4" />
     <PackageVersion Include="Moq" Version="4.20.72" />

EssentialCSharp.Chat.Shared/EssentialCSharp.Chat.Common.csproj

@@ -6,6 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Identity" />
+    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
     <PackageReference Include="Microsoft.SemanticKernel" />
     <PackageReference Include="Microsoft.SemanticKernel.Connectors.PgVector" />
     <PackageReference Include="ModelContextProtocol" />

EssentialCSharp.Chat.Shared/Extensions/ServiceCollectionExtensions.cs

@@ -2,6 +2,7 @@
 using Azure.Core;
 using Azure.Identity;
 using EssentialCSharp.Chat.Common.Services;
+using Microsoft.Extensions.AI;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.SemanticKernel;
@@ -56,10 +57,12 @@ public static IServiceCollection AddAzureOpenAIServices(
         // Add PostgreSQL vector store with managed identity support
         services.AddPostgresVectorStoreWithManagedIdentity(postgresConnectionString, credential);
 
-        services.AddAzureOpenAIEmbeddingGenerator(
-            aiOptions.VectorGenerationDeploymentName,
-            aiOptions.Endpoint,
-            credential);
+        services.AddEmbeddingGenerator(sp =>
+            sp.GetRequiredService<AzureOpenAIClient>()
+              .GetEmbeddingClient(aiOptions.VectorGenerationDeploymentName)
+              .AsIEmbeddingGenerator())
+            .UseLogging()
+            .UseOpenTelemetry();
 #pragma warning restore SKEXP0010
 
         // Register shared AI services
@@ -227,10 +230,12 @@ public static IServiceCollection AddAzureOpenAIServicesWithApiKey(
         // Add PostgreSQL vector store using the NpgsqlDataSource from DI
         services.AddPostgresVectorStore();
 
-        services.AddAzureOpenAIEmbeddingGenerator(
-            aiOptions.VectorGenerationDeploymentName,
-            aiOptions.Endpoint,
-            apiKey);
+        services.AddEmbeddingGenerator(sp =>
+            sp.GetRequiredService<AzureOpenAIClient>()
+              .GetEmbeddingClient(aiOptions.VectorGenerationDeploymentName)
+              .AsIEmbeddingGenerator())
+            .UseLogging()
+            .UseOpenTelemetry();
 #pragma warning restore SKEXP0010
 
         // Register shared AI services

EssentialCSharp.Chat.Shared/Services/EmbeddingService.cs

@@ -36,24 +36,16 @@ public async Task GenerateBookContentEmbeddingsAndUploadToVectorStore(IEnumerabl
         await collection.EnsureCollectionDeletedAsync(cancellationToken);
         await collection.EnsureCollectionExistsAsync(cancellationToken);
 
-        ParallelOptions parallelOptions = new()
-        {
-            MaxDegreeOfParallelism = 5,
-            CancellationToken = cancellationToken
-        };
-
         int uploadedCount = 0;
 
-        await Parallel.ForEachAsync(bookContents, parallelOptions, async (chunk, cancellationToken) =>
+        foreach (var chunk in bookContents)
         {
-            // Generate the text embedding using the new method.
+            cancellationToken.ThrowIfCancellationRequested();
             chunk.TextEmbedding = await GenerateEmbeddingAsync(chunk.ChunkText, cancellationToken);
-
             await collection.UpsertAsync(chunk, cancellationToken);
             Console.WriteLine($"Uploaded chunk '{chunk.Id}' to collection '{collectionName}' for file '{chunk.FileName}' with heading '{chunk.Heading}'.");
-
-            Interlocked.Increment(ref uploadedCount);
-        });
+            uploadedCount++;
+        }
         Console.WriteLine($"Successfully generated embeddings and uploaded {uploadedCount} chunks to collection '{collectionName}'.");
     }
 }

EssentialCSharp.Web/Program.cs

@@ -1,5 +1,4 @@
 using System.Threading.RateLimiting;
-using Azure.Identity;
 using EssentialCSharp.Chat.Common.Extensions;
 using EssentialCSharp.Web.Areas.Identity.Data;
 using EssentialCSharp.Web.Areas.Identity.Services.PasswordValidators;