Using the built-in method to register a HttpClient in .NET for Ollama…

…Sharp (#534) This means that we can leverage the configurations applied to HttpClient via ServiceDefault around stuff like resiliancy, rather than creating a HttpClient in isolation that is not aware of any of that configuration. No new tests are added as there's not we could easily test with this, but all existing tests should continue to pass Fixes #474
CommunityToolkit · Mar 9, 2025 · e8a05ec · e8a05ec
1 parent 54e3acc
commit e8a05ec
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 13 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -36,6 +36,7 @@
     <PackageVersion Include="Microsoft.Extensions.AI" Version="$(MEAIVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="$(DotNetExtensionsVersion)" />
     <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="$(DotNetExtensionsVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="$(DotNetExtensionsVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(DotNetExtensionsVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
     <!-- .NET packages -->

diff --git a/src/CommunityToolkit.Aspire.OllamaSharp/AspireOllamaSharpExtensions.cs b/src/CommunityToolkit.Aspire.OllamaSharp/AspireOllamaSharpExtensions.cs
@@ -131,6 +131,23 @@ private static AspireOllamaApiClientBuilder AddOllamaClientInternal(
 
         configureSettings?.Invoke(settings);
 
+        string httpClientKey = $"{connectionName}_httpClient";
+
+        builder.Services.AddHttpClient(httpClientKey, client =>
+        {
+            if (settings.Endpoint is not null)
+            {
+                client.BaseAddress = settings.Endpoint;
+            }
+            else
+            {
+                throw new InvalidOperationException(
+                    $"An OllamaApiClient could not be configured. Ensure valid connection information was provided in 'ConnectionStrings:{connectionName}' or either " +
+                    $"{nameof(settings.Endpoint)} must be provided " +
+                    $"in the '{configurationSectionName}' configuration section.");
+            }
+        });
+
         if (serviceKey is not null)
         {
             builder.Services.AddKeyedSingleton(serviceKey, (sp, _) => ConfigureOllamaClient(sp));
@@ -147,22 +164,16 @@ private static AspireOllamaApiClientBuilder AddOllamaClientInternal(
 
         IOllamaApiClient ConfigureOllamaClient(IServiceProvider serviceProvider)
         {
-            if (settings.Endpoint is not null)
+            HttpClient httpClient = serviceProvider.GetRequiredService<IHttpClientFactory>().CreateClient(httpClientKey);
+
+            OllamaApiClient client = new(httpClient);
+            if (!string.IsNullOrWhiteSpace(settings.SelectedModel))
             {
-                var client = new OllamaApiClient(new HttpClient { BaseAddress = settings.Endpoint });
-                if (!string.IsNullOrWhiteSpace(settings.SelectedModel))
-                {
-                    client.SelectedModel = settings.SelectedModel;
-                    client.Config.Model = settings.SelectedModel;
-                }
-
-                return client;
+                client.SelectedModel = settings.SelectedModel;
+                client.Config.Model = settings.SelectedModel;
             }
 
-            throw new InvalidOperationException(
-                        $"An OllamaApiClient could not be configured. Ensure valid connection information was provided in 'ConnectionStrings:{connectionName}' or either " +
-                        $"{nameof(settings.Endpoint)} must be provided " +
-                        $"in the '{configurationSectionName}' configuration section.");
+            return client;
         }
     }
 

diff --git a/src/CommunityToolkit.Aspire.OllamaSharp/CommunityToolkit.Aspire.OllamaSharp.csproj b/src/CommunityToolkit.Aspire.OllamaSharp/CommunityToolkit.Aspire.OllamaSharp.csproj
@@ -10,6 +10,7 @@
     <PackageReference Include="Microsoft.Extensions.AI" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
     <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
+    <PackageReference Include="Microsoft.Extensions.Http" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
     <PackageReference Include="OllamaSharp" />
   </ItemGroup>