Adding Ollama Aspire integration

Directory.Packages.props

@@ -22,6 +22,8 @@
     <PackageVersion Include="Aspire.RabbitMQ.Client" Version="$(AspireVersion)" />
     <PackageVersion Include="Aspire.StackExchange.Redis" Version="$(AspireVersion)" />
     <PackageVersion Include="Aspire.Azure.AI.OpenAI" Version="$(AspireUnstablePackagesVersion)" />
+    <PackageVersion Include="CommunityToolkit.Aspire.Hosting.Ollama" Version="9.0.0" />
+    <PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="9.0.0" />
     <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="$(AspireVersion)" />
     <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="$(AspireVersion)" />
     <!-- Version together with Asp.Versioning -->
@@ -93,6 +95,6 @@
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
     <PackageVersion Include="Yarp.ReverseProxy" Version="2.2.0" />
     <PackageVersion Include="IdentityModel" Version="7.0.0" />
-    <PackageVersion Include="Scalar.AspNetCore" Version="1.2.36"/>
+    <PackageVersion Include="Scalar.AspNetCore" Version="1.2.36" />
   </ItemGroup>
-</Project>
+</Project>

src/Catalog.API/Catalog.API.csproj

@@ -13,6 +13,7 @@
   <ItemGroup>
     <PackageReference Include="Asp.Versioning.Http" />
     <PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" />
+    <PackageReference Include="CommunityToolkit.Aspire.OllamaSharp" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/Catalog.API/Extensions/Extensions.cs

@@ -29,14 +29,14 @@ public static void AddApplicationServices(this IHostApplicationBuilder builder)
         builder.Services.AddOptions<CatalogOptions>()
             .BindConfiguration(nameof(CatalogOptions));
 
-        if (builder.Configuration["AI:Ollama:Endpoint"] is string ollamaEndpoint && !string.IsNullOrWhiteSpace(ollamaEndpoint))
+        if (builder.Configuration["OllamaEnabled"] is string ollamaEnabled && bool.Parse(ollamaEnabled))
         {
+            builder.AddKeyedOllamaSharpEmbeddingGenerator("embedding");
             builder.Services.AddEmbeddingGenerator<string, Embedding<float>>(b => b
                 .UseOpenTelemetry()
                 .UseLogging()
-                .Use(new OllamaEmbeddingGenerator(
-                    new Uri(ollamaEndpoint),
-                    builder.Configuration["AI:Ollama:EmbeddingModel"])));
+                // Use the OllamaSharp embedding generator
+                .Use(b.Services.GetRequiredKeyedService<IEmbeddingGenerator<string, Embedding<float>>>("embedding")));
         }
         else if (!string.IsNullOrWhiteSpace(builder.Configuration.GetConnectionString("openai")))
         {

src/WebApp/Extensions/Extensions.cs

@@ -98,16 +98,15 @@ public static void AddAuthenticationServices(this IHostApplicationBuilder builde
 
     private static void AddAIServices(this IHostApplicationBuilder builder)
     {
-        string? ollamaEndpoint = builder.Configuration["AI:Ollama:Endpoint"];
-        if (!string.IsNullOrWhiteSpace(ollamaEndpoint))
+        if (builder.Configuration["OllamaEnabled"] is string ollamaEnabled && bool.Parse(ollamaEnabled))
         {
+            builder.AddKeyedOllamaSharpChatClient("chat");
             builder.Services.AddChatClient(b => b
                 .UseFunctionInvocation()
                 .UseOpenTelemetry(configure: t => t.EnableSensitiveData = true)
                 .UseLogging()
-                .Use(new OllamaChatClient(
-                    new Uri(ollamaEndpoint),
-                    builder.Configuration["AI:Ollama:ChatModel"] ?? "llama3.1")));
+                // Use the OllamaSharp chat client
+                .Use(b.Services.GetRequiredKeyedService<IChatClient>("chat")));
         }
         else
         {

src/WebApp/WebApp.csproj

@@ -19,6 +19,7 @@
   <ItemGroup>
     <PackageReference Include="Asp.Versioning.Http.Client" />
     <PackageReference Include="Aspire.Azure.AI.OpenAI" />
+    <PackageReference Include="CommunityToolkit.Aspire.OllamaSharp" />
     <PackageReference Include="Microsoft.Extensions.ServiceDiscovery.Yarp" />
     <PackageReference Include="Microsoft.Extensions.AI" />
     <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />

src/eShop.AppHost/Program.cs

@@ -81,6 +81,26 @@
     builder.AddOpenAI(catalogApi, webApp);
 }
 
+bool useOllama = false;
+if (useOllama)
+{
+    var ollama = builder.AddOllama("ollama")
+        .WithDataVolume()
+        .WithOpenWebUI();
+    var embeddings = ollama.AddModel("embedding", "all-minilm");
+    var chat = ollama.AddModel("chat", "llama3.1");
+
+    // WaitFor blocked pending: https://github.com/CommunityToolkit/Aspire/issues/256
+    catalogApi.WithReference(embeddings)
+        .WithEnvironment("OllamaEnabled", "true")
+        //.WaitFor(embeddings)
+        ;
+    webApp.WithReference(chat)
+        .WithEnvironment("OllamaEnabled", "true")
+        //.WaitFor(chat)
+        ;
+}
+
 // Wire up the callback urls (self referencing)
 webApp.WithEnvironment("CallBackUrl", webApp.GetEndpoint(launchProfileName));
 webhooksClient.WithEnvironment("CallBackUrl", webhooksClient.GetEndpoint(launchProfileName));

src/eShop.AppHost/eShop.AppHost.csproj

@@ -16,6 +16,7 @@
     <PackageReference Include="Aspire.Hosting.Redis" />
     <PackageReference Include="Aspire.Hosting.PostgreSQL" />
     <PackageReference Include="Aspire.Hosting.Azure.CognitiveServices" />
+    <PackageReference Include="CommunityToolkit.Aspire.Hosting.Ollama" />
   </ItemGroup>
 
   <ItemGroup>