Visitar URL original
AI Templates - Fixes for Ollama and OpenAI scenarios by jmatthiesen · Pull Request #5855 · dotnet/extensions · GitHub
Skip to content

AI Templates - Fixes for Ollama and OpenAI scenarios - #5855

Merged
jmatthiesen merged 10 commits into
mainfrom
jmatthiesen/templateFixes
Feb 10, 2025
Merged

AI Templates - Fixes for Ollama and OpenAI scenarios#5855
jmatthiesen merged 10 commits into
mainfrom
jmatthiesen/templateFixes

Conversation

@jmatthiesen

@jmatthiesen jmatthiesen commented Feb 7, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor

Fixes several issues for the different combinations of environment choices:

  • Fixed Azure AI Search integration by adding a check in the data ingestor to see if there are documents to delete before trying to delete them.
  • Adjusted the main chat prompt so that citations work with Ollama/Llama3.2 after recent changes - verified it works for all other supported AI model providers
  • Fixed using statements when pairing OpenAI with Azure AI Search (was missing a using Azure statement)
  • Removed the Attach Media button after a recent decision to not include that for now.
  • Fixed the conditionals in Chat.razor to include the proper code for Ollama.
Microsoft Reviewers: Open in CodeFlow

jmatthiesen
jmatthiesen commented Feb 7, 2025
View reviewed changes
Comment thread ....AI.Templates/src/ChatWithCustomData/ChatWithCustomData.Web/Components/Pages/Chat/Chat.razor Resolved
jmatthiesen
jmatthiesen commented Feb 7, 2025
View reviewed changes
Comment thread ...I.Templates/src/ChatWithCustomData/ChatWithCustomData.Web/Services/Ingestion/DataIngestor.cs Resolved
@dotnet-comment-bot

dotnet-comment-bot commented Feb 7, 2025

Copy link
Copy Markdown
Collaborator

‼️ Found issues ‼️

Project Coverage Type Expected Actual
Microsoft.Extensions.AI.Ollama Line 80 78.25 🔻
Microsoft.Extensions.Caching.Hybrid Line 86 82.85 🔻
Microsoft.Gen.MetadataExtractor Line 98 57.35 🔻
Microsoft.Gen.MetadataExtractor Branch 98 62.5 🔻

🎉 Good job! The coverage increased 🎉
Update MinCodeCoverage in the project files.

Project Expected Actual
Microsoft.Extensions.AI 88 89
Microsoft.Extensions.AI.OpenAI 77 78
Microsoft.Extensions.AI.Abstractions 83 84

Full code coverage report: https://dev.azure.com/dnceng-public/public/_build/results?buildId=943766&view=codecoverage-tab

SteveSandersonMS
SteveSandersonMS reviewed Feb 7, 2025
View reviewed changes
Comment thread ....AI.Templates/src/ChatWithCustomData/ChatWithCustomData.Web/Components/Pages/Chat/Chat.razor Resolved
@jmatthiesen @SteveSandersonMS
Apply suggestions from code review
4319f4a 
Co-authored-by: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
@dotnet-comment-bot

dotnet-comment-bot commented Feb 7, 2025

Copy link
Copy Markdown
Collaborator

‼️ Found issues ‼️

Project Coverage Type Expected Actual
Microsoft.Extensions.Caching.Hybrid Line 86 82.77 🔻
Microsoft.Gen.MetadataExtractor Line 98 57.35 🔻
Microsoft.Gen.MetadataExtractor Branch 98 62.5 🔻
Microsoft.Extensions.AI.Ollama Line 80 78.25 🔻

🎉 Good job! The coverage increased 🎉
Update MinCodeCoverage in the project files.

Project Expected Actual
Microsoft.Extensions.AI.Abstractions 83 84
Microsoft.Extensions.AI 88 89
Microsoft.Extensions.AI.OpenAI 77 78

Full code coverage report: https://dev.azure.com/dnceng-public/public/_build/results?buildId=944406&view=codecoverage-tab

MackinnonBuck
MackinnonBuck reviewed Feb 7, 2025
View reviewed changes
Comment thread 1 Resolved
@dotnet-comment-bot

dotnet-comment-bot commented Feb 7, 2025

Copy link
Copy Markdown
Collaborator

‼️ Found issues ‼️

Project Coverage Type Expected Actual
Microsoft.Extensions.AI.Ollama Line 80 78.11 🔻
Microsoft.Gen.MetadataExtractor Line 98 57.35 🔻
Microsoft.Gen.MetadataExtractor Branch 98 62.5 🔻
Microsoft.Extensions.Caching.Hybrid Line 86 82.77 🔻

🎉 Good job! The coverage increased 🎉
Update MinCodeCoverage in the project files.

Project Expected Actual
Microsoft.Extensions.AI.AzureAIInference 91 92
Microsoft.Extensions.AI 88 89
Microsoft.Extensions.AI.Abstractions 83 85

Full code coverage report: https://dev.azure.com/dnceng-public/public/_build/results?buildId=944923&view=codecoverage-tab

@jmatthiesen
jmatthiesen merged commit 15f354c into main Feb 10, 2025
@jmatthiesen
jmatthiesen deleted the jmatthiesen/templateFixes branch February 10, 2025 21:00
@jeffhandley jeffhandley added the area-ai-templates Microsoft.Extensions.AI.Templates label Mar 7, 2025
@rnelson rnelson mentioned this pull request Mar 12, 2025
Merged
@github-actions github-actions Bot locked and limited conversation to collaborators Apr 6, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@MackinnonBuck MackinnonBuck MackinnonBuck left review comments
@SteveSandersonMS SteveSandersonMS SteveSandersonMS approved these changes

Assignees

@jmatthiesen jmatthiesen

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@jmatthiesen @dotnet-comment-bot @SteveSandersonMS @MackinnonBuck @jeffhandley