Page

Matthew Harris · Matthew Harris · commit 4d46ec928ecb · 2024-12-20T18:35:45.000-05:00
diff --git a/src/Azure.AISearch.WebApp/Services/AzureOpenAISearchService.cs b/src/Azure.AISearch.WebApp/Services/AzureOpenAISearchService.cs
@@ -89,11 +89,12 @@ public async Task<SearchResponse> SearchAsync(SearchRequest request)
             var citationIndex = 0;
             foreach (var citation in answerMessage.AzureExtensionsContext.Citations)
             {
-                answerText = answerText.Replace($"[doc{++citationIndex}]", $"<cite>{citation.Title}{citation.DocumentSourceUrl}</cite>", StringComparison.OrdinalIgnoreCase);
+                answerText = answerText.Replace($"[doc{++citationIndex}]", $"<cite>{citation.Title}{citation.Url}</cite>", StringComparison.OrdinalIgnoreCase);
                 searchResponse.SearchResults.Add(new SearchResult
                 {
                     DocumentId = citation.Filepath,
                     DocumentTitle = citation.Title,
+                    SocumentSourceUrl = citation.Url,
                     Captions = string.IsNullOrWhiteSpace(citation.Content) ? Array.Empty<string>() : new[] { citation.Content }
                 });
             }
@@ -120,7 +121,7 @@ private AzureSearchChatExtensionConfiguration GetAzureCognitiveSearchDataSource(
             {
                 ContentFieldNames = { useDocumentsIndex ? nameof(Document.Content) : nameof(DocumentChunk.Content) },
                 TitleFieldName = useDocumentsIndex ? nameof(Document.Title) : nameof(DocumentChunk.SourceDocumentTitle),
-                UrlFieldName = useDocumentsIndex ? nameof(Document.FilePath) : nameof(DocumentChunk.SourceDocumentFilePath),
+                UrlFieldName = useDocumentsIndex ? nameof(Document.SourceUrl) : nameof(DocumentChunk.SourceDocumentSourceUrl),
                 FilepathFieldName = useDocumentsIndex ? nameof(Document.FilePath) : nameof(DocumentChunk.SourceDocumentFilePath),
                 VectorFieldNames = { useDocumentsIndex ? null : nameof(DocumentChunk.ContentVector) }
             },

Original file line number	Diff line number	Diff line change
`@@ -89,11 +89,12 @@ public async Task<SearchResponse> SearchAsync(SearchRequest request)`
`89`	`89`	`var citationIndex = 0;`
`90`	`90`	`foreach (var citation in answerMessage.AzureExtensionsContext.Citations)`
`91`	`91`	`{`
`92`		`- answerText = answerText.Replace($"[doc{++citationIndex}]", $"<cite>{citation.Title}{citation.DocumentSourceUrl}</cite>", StringComparison.OrdinalIgnoreCase);`
	`92`	`+ answerText = answerText.Replace($"[doc{++citationIndex}]", $"<cite>{citation.Title}{citation.Url}</cite>", StringComparison.OrdinalIgnoreCase);`
`93`	`93`	`searchResponse.SearchResults.Add(new SearchResult`
`94`	`94`	`{`
`95`	`95`	`DocumentId = citation.Filepath,`
`96`	`96`	`DocumentTitle = citation.Title,`
	`97`	`+ SocumentSourceUrl = citation.Url,`
`97`	`98`	`Captions = string.IsNullOrWhiteSpace(citation.Content) ? Array.Empty<string>() : new[] { citation.Content }`
`98`	`99`	`});`
`99`	`100`	`}`
`@@ -120,7 +121,7 @@ private AzureSearchChatExtensionConfiguration GetAzureCognitiveSearchDataSource(`
`120`	`121`	`{`
`121`	`122`	`ContentFieldNames = { useDocumentsIndex ? nameof(Document.Content) : nameof(DocumentChunk.Content) },`
`122`	`123`	`TitleFieldName = useDocumentsIndex ? nameof(Document.Title) : nameof(DocumentChunk.SourceDocumentTitle),`
`123`		`- UrlFieldName = useDocumentsIndex ? nameof(Document.FilePath) : nameof(DocumentChunk.SourceDocumentFilePath),`
	`124`	`+ UrlFieldName = useDocumentsIndex ? nameof(Document.SourceUrl) : nameof(DocumentChunk.SourceDocumentSourceUrl),`
`124`	`125`	`FilepathFieldName = useDocumentsIndex ? nameof(Document.FilePath) : nameof(DocumentChunk.SourceDocumentFilePath),`
`125`	`126`	`VectorFieldNames = { useDocumentsIndex ? null : nameof(DocumentChunk.ContentVector) }`
`126`	`127`	`},`