Visitar URL original
Scope Ollama resilience settings to Web/Program.cs and restore ServiceDefaults by ViveliDuCh · Pull Request #6850 · dotnet/extensions · GitHub
Skip to content

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

Merged
ViveliDuCh merged 3 commits into
dotnet:mainfrom
ViveliDuCh:ollama-issue
Sep 30, 2025
Merged

Scope Ollama resilience settings to Web/Program.cs and restore ServiceDefaults#6850
ViveliDuCh merged 3 commits into
dotnet:mainfrom
ViveliDuCh:ollama-issue

Conversation

@ViveliDuCh

@ViveliDuCh ViveliDuCh commented Sep 25, 2025 •
edited
Loading

Copy link
Copy Markdown
Member

Fixes #6331

Restore standard global HTTP client resilience configuration in ServiceDefaults/Program.cs, removing Ollama-specific timeouts and settings. Apply extended timeouts and custom resilience handlers only to chat_httpClient and embeddings_httpClient in Web/Program.cs using RemoveAllResilienceHandlers and AddStandardResilienceHandler. Scope Ollama configuration to the web project to prevent unintended global changes and align with .NET Aspire template conventions.

Microsoft Reviewers: Open in CodeFlow

@ViveliDuCh
ViveliDuCh requested a review from jozkee September 25, 2025 14:56
@ViveliDuCh ViveliDuCh self-assigned this Sep 25, 2025
@ViveliDuCh ViveliDuCh added area-ai Microsoft.Extensions.AI libraries area-ai-templates Microsoft.Extensions.AI.Templates and removed area-ai Microsoft.Extensions.AI libraries labels Sep 25, 2025
jozkee
jozkee reviewed Sep 25, 2025
View reviewed changes
Comment thread ...tensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Program.Aspire.cs Resolved
@ViveliDuCh
ViveliDuCh requested a review from jozkee September 29, 2025 22:08
@ViveliDuCh
ViveliDuCh marked this pull request as ready for review September 29, 2025 22:48
@ViveliDuCh
ViveliDuCh requested a review from a team as a code owner September 29, 2025 22:48
Copilot AI review requested due to automatic review settings September 29, 2025 22:48
Copilot AI reviewed Sep 29, 2025
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR scopes Ollama-specific HTTP resilience settings to the web project only, restoring standard global HTTP client configuration in ServiceDefaults. The change prevents unintended global configuration changes and aligns with .NET Aspire template conventions by keeping Ollama-specific timeouts isolated to where they're needed.

Key changes:

  • Moved Ollama-specific resilience configuration from ServiceDefaults to Web project
  • Created dedicated extension method for Ollama HTTP client resilience settings
  • Updated template configuration to conditionally include the new extension file

Reviewed Changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.

File Description
Program.Aspire.cs Adds conditional call to Ollama-specific HTTP resilience configuration
AspireOllamaResilienceHandlerExtensions.cs New extension method containing Ollama-specific HTTP client resilience settings
Extensions.cs Removes Ollama-specific configuration, restores standard resilience handler
template.json Updates template configuration to conditionally include new extension file

Comment thread ...es/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/OllamaResilienceHandlerExtensions.cs Resolved
@ViveliDuCh
PR feedback: Add an extension method to handle Ollama's resilience ha…
3c3ebe6 
…ndler settings instead of the hardcoded calls in Web/Program.cs
@ViveliDuCh
ViveliDuCh requested a review from Copilot September 30, 2025 15:35
Copilot AI reviewed Sep 30, 2025
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

Copilot reviewed 7 out of 7 changed files in this pull request and generated no new comments.

jeffhandley
jeffhandley reviewed Sep 30, 2025
View reviewed changes
Comment thread ...ates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/.template.config/template.json Resolved
Comment thread ...es/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/OllamaResilienceHandlerExtensions.cs Resolved
Comment thread .../ChatWithCustomData/ChatWithCustomData-CSharp.Web/AspireOllamaResilienceHandlerExtensions.cs Resolved
@ViveliDuCh
ViveliDuCh merged commit 588babc into dotnet:main Sep 30, 2025
@ViveliDuCh
ViveliDuCh deleted the ollama-issue branch September 30, 2025 21:32
jeffhandley pushed a commit to jeffhandley/extensions that referenced this pull request Oct 1, 2025
@ViveliDuCh @jeffhandley
Scope Ollama resilience settings to Web/Program.cs and restore Servic…
27156b2 
…eDefaults (dotnet#6850)

Move Ollama-specific HTTP client resiliency configuration out of Extensions.cs in ServiceDefaults to an extension method called later in Web/Program.cs.
@jeffhandley jeffhandley mentioned this pull request Oct 1, 2025
Merged
jeffhandley pushed a commit that referenced this pull request Oct 2, 2025
@ViveliDuCh @jeffhandley
Scope Ollama resilience settings to Web/Program.cs and restore Servic…
8f68f90 
…eDefaults (#6850)

Move Ollama-specific HTTP client resiliency configuration out of Extensions.cs in ServiceDefaults to an extension method called later in Web/Program.cs.
This was referenced Oct 14, 2025
Closed
Merged
Merged
Merged
This was referenced Oct 29, 2025
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Open
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
@github-actions github-actions Bot locked and limited conversation to collaborators Oct 31, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@jongalloway jongalloway jongalloway left review comments
@jeffhandley jeffhandley jeffhandley left review comments
Copilot code review Copilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@jozkee jozkee jozkee approved these changes
@MackinnonBuck MackinnonBuck Awaiting requested review from MackinnonBuck

Assignees

@ViveliDuCh ViveliDuCh

Labels

area-ai-templates Microsoft.Extensions.AI.Templates

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

AI Chat Template - Ollama resiliency modification should be in web app, not service defaults

6 participants

@ViveliDuCh @jongalloway @jeffhandley @MackinnonBuck @jozkee