Adding Ollama Aspire integration (#625)

* Adding Ollama Aspire integration Using the Ollama hosting integration from the Community Toolkit in the app host. There is a conditional in place that will not enable ollama support by default. Using the OllamaSharp client integration to provide the IChatClient and IEmbeddingGenerator implementations * Using the updated MEAI structure * Following the pattern for OpenAI with Ollama registration * Removing usage of Keyed services for non-keyed registrations * Update Directory.Packages.props Co-authored-by: Eric Erhardt <[email protected]> * Removing appsettings from old ollama design --------- Co-authored-by: Eric Erhardt <[email protected]>
dotnet · Jan 3, 2025 · cd3f752 · cd3f752
1 parent cc4c3bf
commit cd3f752
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 18 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -26,6 +26,8 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageVersion>
+    <PackageVersion Include="CommunityToolkit.Aspire.Hosting.Ollama" Version="9.1.0" />
+    <PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="9.1.0" />
     <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="$(AspireVersion)" />
     <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="$(AspireVersion)" />
     <!-- Version together with Asp.Versioning -->
@@ -99,4 +101,4 @@
     <PackageVersion Include="IdentityModel" Version="7.0.0" />
     <PackageVersion Include="Scalar.AspNetCore" Version="1.2.72"/>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/Catalog.API/Catalog.API.csproj b/src/Catalog.API/Catalog.API.csproj
@@ -17,6 +17,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>

diff --git a/src/Catalog.API/Extensions/Extensions.cs b/src/Catalog.API/Extensions/Extensions.cs
@@ -37,12 +37,12 @@ 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.Services.AddEmbeddingGenerator(new OllamaEmbeddingGenerator(ollamaEndpoint, builder.Configuration["AI:Ollama:EmbeddingModel"]))
+            builder.AddOllamaSharpEmbeddingGenerator("embedding");
+            builder.Services.AddEmbeddingGenerator(b => b.GetRequiredService<IEmbeddingGenerator<string, Embedding<float>>>())
                 .UseOpenTelemetry()
-                .UseLogging()
-                .Build();
+                .UseLogging();
         }
         else if (!string.IsNullOrWhiteSpace(builder.Configuration.GetConnectionString("openai")))
         {

diff --git a/src/Catalog.API/appsettings.json b/src/Catalog.API/appsettings.json
@@ -27,10 +27,6 @@
   "AI": {
     "OpenAI": {
       "EmbeddingModel": "text-embedding-3-small"
-    },
-    "Ollama": {
-      "Endpoint": "",
-      "EmbeddingModel": "all-minilm"
     }
   }
 }
diff --git a/src/WebApp/Extensions/Extensions.cs b/src/WebApp/Extensions/Extensions.cs
@@ -98,14 +98,13 @@ 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.Services.AddChatClient(new OllamaChatClient(ollamaEndpoint, builder.Configuration["AI:Ollama:ChatModel"] ?? "llama3.1"))
+            builder.AddOllamaSharpChatClient("chat");
+            builder.Services.AddChatClient(b => b.GetRequiredService<IChatClient>())
                 .UseFunctionInvocation()
                 .UseOpenTelemetry(configure: t => t.EnableSensitiveData = true)
-                .UseLogging()
-                .Build();
+                .UseLogging();
         }
         else
         {

diff --git a/src/WebApp/WebApp.csproj b/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" />

diff --git a/src/WebApp/appsettings.json b/src/WebApp/appsettings.json
@@ -13,10 +13,6 @@
   "AI": {
     "OpenAI": {
       //"ChatModel": ""
-    },
-    "Ollama": {
-      "Endpoint": "",
-      "ChatModel": "llama3.1"
     }
   }
 }
diff --git a/src/eShop.AppHost/Extensions.cs b/src/eShop.AppHost/Extensions.cs
@@ -75,4 +75,28 @@ public static IDistributedApplicationBuilder AddOpenAI(this IDistributedApplicat
 
         return builder;
     }
+
+    /// <summary>
+    /// Configures eShop projects to use Ollama for text embedding and chat.
+    /// </summary>
+    public static IDistributedApplicationBuilder AddOllama(this IDistributedApplicationBuilder builder,
+        IResourceBuilder<ProjectResource> catalogApi,
+        IResourceBuilder<ProjectResource> webApp)
+    {
+        var ollama = builder.AddOllama("ollama")
+            .WithDataVolume()
+            .WithGPUSupport()
+            .WithOpenWebUI();
+        var embeddings = ollama.AddModel("embedding", "all-minilm");
+        var chat = ollama.AddModel("chat", "llama3.1");
+
+        catalogApi.WithReference(embeddings)
+            .WithEnvironment("OllamaEnabled", "true")
+            .WaitFor(embeddings);
+        webApp.WithReference(chat)
+            .WithEnvironment("OllamaEnabled", "true")
+            .WaitFor(chat);
+
+        return builder;
+    }
 }
diff --git a/src/eShop.AppHost/Program.cs b/src/eShop.AppHost/Program.cs
@@ -81,6 +81,12 @@
     builder.AddOpenAI(catalogApi, webApp);
 }
 
+bool useOllama = false;
+if (useOllama)
+{
+    builder.AddOllama(catalogApi, webApp);
+}
+
 // Wire up the callback urls (self referencing)
 webApp.WithEnvironment("CallBackUrl", webApp.GetEndpoint(launchProfileName));
 webhooksClient.WithEnvironment("CallBackUrl", webhooksClient.GetEndpoint(launchProfileName));

diff --git a/src/eShop.AppHost/eShop.AppHost.csproj b/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>