AI Templates - Fixes for Ollama and OpenAI scenarios #5855
Conversation
| @@ -52,7 +56,7 @@ | |||
| chatSuggestions?.Clear(); | |||
| await chatInput!.FocusAsync(); | |||
|
|
|||
| #if (IsOllama) | |||
| @*#if (IsOllama) | |||
There was a problem hiding this comment.
This looks wrong, but it is the conditional syntax used by the templating engine for .razor files.
There was a problem hiding this comment.
Actually the syntax here isn't quite right because it will break the application if you run it directly from sources here. Note that in VS it's displayed like this:
That is, both branches of the if/else are greyed out, because as far as Razor syntax is concerned, this is all just one big comment block. So if you run the application like this, neither branch will execute and the app won't work. This will block us from being able to work on the application code directly. It's just by luck that it even still compiles.
I think what we need is the following syntax instead:
Now Razor itself sees the Ollama part of the code as being a comment, and the rest as being real code. So the app will still work if we run it directly from sources.
I think at least that the dotnet new templating system will also understand this as an if/else and emit the desired code in both cases. (Update: yes, I verified it does)
| @@ -40,8 +40,11 @@ public async Task IngestDataAsync(IIngestionSource source) | |||
| { | |||
| logger.LogInformation("Processing {file}", modifiedDoc.Id); | |||
|
|
|||
| await vectorCollection.DeleteBatchAsync(modifiedDoc.Records.Select(r => r.Id)); | |||
|
|
|||
| if (modifiedDoc.Records.Count > 0) | |||
There was a problem hiding this comment.
Without this, Azure AI Search integration breaks.
There was a problem hiding this comment.
Great, thanks.
The previous version of this check seemed to have the braces in a different place and was suppressing the CreateRecordsForDocumentAsync call as well, but maybe something weird happened in the Git merge.
In any case this version of the check looks totally safe!
🎉 Good job! The coverage increased 🎉
Full code coverage report: https://dev.azure.com/dnceng-public/public/_build/results?buildId=943766&view=codecoverage-tab |
| Use the search tool to find relevant information. When you do this, end your | ||
| reply with citations in the special XML format: | ||
|
|
||
| <citation filename='string' page_number='number'>exact quote here</citation> | ||
|
|
||
| Always include the citation in your response if there are results. |
There was a problem hiding this comment.
Nbd but something quirky about the indentation. Not sure if it's a tabs/spaces thing:
| Use the search tool to find relevant information. When you do this, end your | |
| reply with citations in the special XML format: | |
| <citation filename='string' page_number='number'>exact quote here</citation> | |
| Always include the citation in your response if there are results. | |
| Use the search tool to find relevant information. When you do this, end your | |
| reply with citations in the special XML format: | |
| <citation filename='string' page_number='number'>exact quote here</citation> | |
| Always include the citation in your response if there are results. |
There was a problem hiding this comment.
In the GitHub UI, the word "Always" looks misaligned (indented one space too much) but in the code diff it's unclear why.
Fixes several issues for the different combinations of environment choices:
using Azurestatement)Microsoft Reviewers: Open in CodeFlow