Scope Ollama resilience settings to Web/Program.cs and restore ServiceDefaults (#6850)

Move Ollama-specific HTTP client resiliency configuration out of Extensions.cs in ServiceDefaults to an extension method called later in Web/Program.cs.

Author: ViveliDuCh

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/.template.config/template.json

@@ -64,6 +64,12 @@
           "*.sln"
         ]
       },
+      {
+        "condition": "(!IsAspire || !IsOllama)",
+        "exclude": [
+          "ChatWithCustomData-CSharp.Web/OllamaResilienceHandlerExtensions.cs"
+        ]
+      },
       {
         "condition": "(IsAspire)",
         "exclude": [

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.ServiceDefaults/Extensions.cs

@@ -29,21 +29,8 @@ public static TBuilder AddServiceDefaults<TBuilder>(this TBuilder builder) where
             http.RemoveAllResilienceHandlers();
 #pragma warning restore EXTEXP0001
 
-#if (IsOllama)
-            // Turn on resilience by default
-            http.AddStandardResilienceHandler(config =>
-            {
-                // Extend the HTTP Client timeout for Ollama
-                config.AttemptTimeout.Timeout = TimeSpan.FromMinutes(3);
-
-                // Must be at least double the AttemptTimeout to pass options validation
-                config.CircuitBreaker.SamplingDuration = TimeSpan.FromMinutes(10);
-                config.TotalRequestTimeout.Timeout = TimeSpan.FromMinutes(10);
-            });
-#else
             // Turn on resilience by default
             http.AddStandardResilienceHandler();
-#endif
 
             // Turn on service discovery by default
             http.AddServiceDiscovery();

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/OllamaResilienceHandlerExtensions.cs

@@ -0,0 +1,34 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace ChatWithCustomData_CSharp.Web.Services;
+
+public static class OllamaResilienceHandlerExtensions
+{
+    public static IServiceCollection AddOllamaResilienceHandler(this IServiceCollection services)
+    {
+        services.ConfigureHttpClientDefaults(http =>
+        {
+#pragma warning disable EXTEXP0001 // RemoveAllResilienceHandlers is experimental
+            http.RemoveAllResilienceHandlers();
+#pragma warning restore EXTEXP0001
+
+            // Turn on resilience by default
+            http.AddStandardResilienceHandler(config =>
+            {
+                // Extend the HTTP Client timeout for Ollama
+                config.AttemptTimeout.Timeout = TimeSpan.FromMinutes(3);
+
+                // Must be at least double the AttemptTimeout to pass options validation
+                config.CircuitBreaker.SamplingDuration = TimeSpan.FromMinutes(10);
+                config.TotalRequestTimeout.Timeout = TimeSpan.FromMinutes(10);
+            });
+
+            // Turn on service discovery by default
+            http.AddServiceDiscovery();
+        });
+
+        return services;
+    }
+}
+

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Program.Aspire.cs

@@ -50,6 +50,13 @@
 #endif
 builder.Services.AddScoped<DataIngestor>();
 builder.Services.AddSingleton<SemanticSearch>();
+#if (IsOllama)
+// Applies robust HTTP resilience settings for all HttpClients in the Web project,
+// not across the entire solution. It's aimed at supporting Ollama scenarios due
+// to its self-hosted nature and potentially slow responses.
+// Remove this if you want to use the global or a different HTTP resilience policy instead.
+builder.Services.AddOllamaResilienceHandler();
+#endif
 
 var app = builder.Build();
 

test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/aichatweb.Ollama_Qdrant.verified/aichatweb/aichatweb.ServiceDefaults/Extensions.cs

@@ -30,15 +30,7 @@ public static TBuilder AddServiceDefaults<TBuilder>(this TBuilder builder) where
 #pragma warning restore EXTEXP0001
 
             // Turn on resilience by default
-            http.AddStandardResilienceHandler(config =>
-            {
-                // Extend the HTTP Client timeout for Ollama
-                config.AttemptTimeout.Timeout = TimeSpan.FromMinutes(3);
-
-                // Must be at least double the AttemptTimeout to pass options validation
-                config.CircuitBreaker.SamplingDuration = TimeSpan.FromMinutes(10);
-                config.TotalRequestTimeout.Timeout = TimeSpan.FromMinutes(10);
-            });
+            http.AddStandardResilienceHandler();
 
             // Turn on service discovery by default
             http.AddServiceDiscovery();

test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/aichatweb.Ollama_Qdrant.verified/aichatweb/aichatweb.Web/OllamaResilienceHandlerExtensions.cs

@@ -0,0 +1,34 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace aichatweb.Web.Services;
+
+public static class OllamaResilienceHandlerExtensions
+{
+    public static IServiceCollection AddOllamaResilienceHandler(this IServiceCollection services)
+    {
+        services.ConfigureHttpClientDefaults(http =>
+        {
+#pragma warning disable EXTEXP0001 // RemoveAllResilienceHandlers is experimental
+            http.RemoveAllResilienceHandlers();
+#pragma warning restore EXTEXP0001
+
+            // Turn on resilience by default
+            http.AddStandardResilienceHandler(config =>
+            {
+                // Extend the HTTP Client timeout for Ollama
+                config.AttemptTimeout.Timeout = TimeSpan.FromMinutes(3);
+
+                // Must be at least double the AttemptTimeout to pass options validation
+                config.CircuitBreaker.SamplingDuration = TimeSpan.FromMinutes(10);
+                config.TotalRequestTimeout.Timeout = TimeSpan.FromMinutes(10);
+            });
+
+            // Turn on service discovery by default
+            http.AddServiceDiscovery();
+        });
+
+        return services;
+    }
+}
+

test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/aichatweb.Ollama_Qdrant.verified/aichatweb/aichatweb.Web/Program.cs

@@ -20,6 +20,11 @@
 builder.Services.AddQdrantCollection<Guid, IngestedDocument>("data-aichatweb-documents");
 builder.Services.AddScoped<DataIngestor>();
 builder.Services.AddSingleton<SemanticSearch>();
+// Applies robust HTTP resilience settings for all HttpClients in the Web project,
+// not across the entire solution. It's aimed at supporting Ollama scenarios due
+// to its self-hosted nature and potentially slow responses.
+// Remove this if you want to use the global or a different HTTP resilience policy instead.
+builder.Services.AddOllamaResilienceHandler();
 
 var app = builder.Build();