Skip to content

Conversation

jeffhandley
Copy link
Member

@jeffhandley jeffhandley commented Apr 16, 2025

This PR accumulates bug fixes and improvements to Microsoft.Extensions.AI.Templates to prepare for publishing version 9.4.0-preview.2* of the package from the release/9.4 branch. Commits from the following PRs have been cherry-picked into the branch:

  1. Add missing reference to M.E.AI.OpenAI in chat template #6275
  2. Update README.md with keyless auth guidance #6261
  3. Add note on extending timeout for Ollama client #6258
  4. Update chat template dependencies, fix OpenAI/Aspire config, and address build warnings #6280

Changes from these PRs were removed for compatibility with the 9.4.0 versions:

  1. Branding updates for 9.5 #6233
  2. Rename EmbeddingGeneratorExtensions.GenerateEmbedding extension methods #6295
  3. Rename ChatThreadId to ConversationId #6300
Microsoft Reviewers: Open in CodeFlow

@jeffhandley jeffhandley self-assigned this Apr 16, 2025
@jeffhandley jeffhandley requested review from a team as code owners April 16, 2025 06:20
Copy link
Contributor

@RussKie RussKie left a comment

Choose a reason for hiding this comment

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

Approving the infra side

@jozkee
Copy link
Member

jozkee commented Apr 16, 2025

For #6280, from commit 28e9922 onwards until the end, I don't see the commits being ported here, is that OK?

@jeffhandley
Copy link
Member Author

For #6280, from commit 28e9922 onwards until the end, I don't see the commits being ported here, is that OK?

The commit SHAs differ because of having to resolve conflicts and undo some changes from main, but all commits should now be represented. Some show as out of order because of how the merge commits came in too.

MackinnonBuck and others added 4 commits April 16, 2025 16:24
* Update README.md

* Update src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/README.md

Co-authored-by: Jon Galloway <[email protected]>

---------

Co-authored-by: Jon Galloway <[email protected]>
* Add note on extending timeout for Ollama client

Standard HttpClient timeout of 10 seconds applied by Service Defaults under .NET Aspire is likely too short for Ollama calls. Add note with code to extend this timeout.

* Update src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/README.Aspire.md

Co-authored-by: Copilot <[email protected]>

* Update src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/README.Aspire.md

Co-authored-by: Mackinnon Buck <[email protected]>

---------

Co-authored-by: Copilot <[email protected]>
Co-authored-by: Mackinnon Buck <[email protected]>
…ess build warnings (#6280)

* Update chat template dependencies

* Update test snapshots

* Update Aspire version

* Revert Aspire + update CommunityToolkit.Aspire

* Open README in VS after project creation

* Add Known Issue to Aspire README for Qdrant

* Update survey template URL

* Set the Project Template package version to -preview.2

* Update template baseline

* Update template pinned versions

* Do not append template args to snapshot names

* Fix vector store index in the README. Add an AzureAISearch template test.

* Add a note to the Aspire README for trusting the development certificate

* Use AddOpenAIClient for OpenAI and AddAzureOpenAIClient for Azure OpenAI

* Remove duplicated using System.ClientModel

* Update Aspire README to specify the exception thrown for the known issue

* Augment the Aspire README for more Docker notes for Ollama and Qdrant

* Fix Microsoft.Extensions.Http.Resilience warnings with separate pinned versions

* Update test baseline for: Rename EmbeddingGeneratorExtensions.GenerateEmbedding extension methods (#6295)

* Add --managed-identity to the template developer README

* Apply the Ollama timeout recommendation in the template code

* Call http.RemoveAllResilienceHandlers before adding the handler

* Update template test baseline

---------

Co-authored-by: Jeff Handley <[email protected]>
Co-authored-by: David Cantu <[email protected]>
@jeffhandley jeffhandley force-pushed the release-staging/9.4 branch from 7dd3fe2 to 105af46 Compare April 17, 2025 01:28
@jeffhandley
Copy link
Member Author

@jozkee FYI after merging Update chat template dependencies, fix OpenAI/Aspire config, and address build warnings (#6280), I rebuilt the branch for this PR by cherry-picking the squashed commit from that PR. The commits for this PR now cleanly match the list of PRs to be included, but the file changes were exactly the same.

@jeffhandley jeffhandley merged commit 874d612 into release/9.4 Apr 17, 2025
6 checks passed
@jeffhandley jeffhandley deleted the release-staging/9.4 branch April 17, 2025 02:08
@jeffhandley jeffhandley added the area-ai-templates Microsoft.Extensions.AI.Templates label May 9, 2025
@github-actions github-actions bot locked and limited conversation to collaborators Jun 8, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-ai-templates Microsoft.Extensions.AI.Templates
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants