PR feedback: Add an extension method to handle Ollama's resilience handler settings instead of the hardcoded calls in Web/Program.cs

Author: ViveliDuCh

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

@@ -60,10 +60,17 @@
           "ChatWithCustomData-CSharp.AppHost/**",
           "ChatWithCustomData-CSharp.ServiceDefaults/**",
           "ChatWithCustomData-CSharp.Web/Program.Aspire.cs",
+          "ChatWithCustomData-CSharp.Web/AspireOllamaResilienceHandlerExtensions.cs",
           "README.Aspire.md",
           "*.sln"
         ]
       },
+      {
+        "condition": "(IsAspire && !IsOllama)",
+        "exclude": [
+          "ChatWithCustomData-CSharp.Web/AspireOllamaResilienceHandlerExtensions.cs"
+        ]
+      },
       {
         "condition": "(IsAspire)",
         "exclude": [

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

@@ -0,0 +1,34 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace ChatWithCustomData_CSharp.Web.Services;
+
+public static class AspireOllamaResilienceHandlerExtensions
+{
+    public static IServiceCollection AddOllamaHttpClientResilience(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

@@ -51,36 +51,11 @@
 builder.Services.AddScoped<DataIngestor>();
 builder.Services.AddSingleton<SemanticSearch>();
 #if (IsOllama)
-// Get the IHttpClientBuilder for chat_httpClient
-var chatClientBuilder = builder.Services.AddHttpClient("chat_httpClient");
-#pragma warning disable EXTEXP0001 // RemoveAllResilienceHandlers is experimental
-chatClientBuilder.RemoveAllResilienceHandlers();
-#pragma warning restore EXTEXP0001
-// Override resilience for this client
-chatClientBuilder.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);
-});
-chatClientBuilder.AddServiceDiscovery();
-// Get the IHttpClientBuilder for embeddings_httpClient
-var embeddingsClientBuilder = builder.Services.AddHttpClient("embeddings_httpClient");
-#pragma warning disable EXTEXP0001 // RemoveAllResilienceHandlers is experimental
-embeddingsClientBuilder.RemoveAllResilienceHandlers();
-#pragma warning restore EXTEXP0001
-// Override resilience for this client
-embeddingsClientBuilder.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);
-});
-embeddingsClientBuilder.AddServiceDiscovery();
+// 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.AddOllamaHttpClientResilience();
 #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/AspireOllamaResilienceHandlerExtensions.cs

@@ -0,0 +1,34 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace aichatweb.Web.Services;
+
+public static class AspireOllamaResilienceHandlerExtensions
+{
+    public static IServiceCollection AddOllamaHttpClientResilience(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.AddOllamaHttpClientResilience();
 
 var app = builder.Build();