Page

Author: Matthew Harris

src/Azure.AISearch.WebApp/Models/SearchAnswer.cs

@@ -6,6 +6,7 @@ public class SearchAnswer
     public string? SearchIndexKey { get; set; }
     public string? DocumentId { get; set; }
     public string? DocumentTitle { get; set; }
+    public string? DocumentPage { get; set; }
     public double? Score { get; set; }
     public string? Text { get; set; }
 }

src/Azure.AISearch.WebApp/Models/SearchResult.cs

@@ -6,6 +6,7 @@ public class SearchResult
     public string? SearchIndexKey { get; set; }
     public string? DocumentId { get; set; }
     public string? DocumentTitle { get; set; }
+    public string? DocumentPage { get; set; }
     public double? Score { get; set; }
     public IDictionary<string, IList<string>> Highlights { get; set; } = new Dictionary<string, IList<string>>();
     public IList<string> Captions { get; set; } = new List<string>();

src/Azure.AISearch.WebApp/Pages/Shared/_SearchResponse.cshtml

@@ -55,6 +55,7 @@
                         <div class="ms-2 me-auto mb-2">
                             <div>
                                 <code>@searchResult.DocumentTitle</code>
+                                <code>@searchResult.DocumentPage</code>
                             </div>
                             @if (searchResult.Captions.Any())
                             {

src/Azure.AISearch.WebApp/Services/AzureCognitiveSearchService.cs

@@ -127,6 +127,7 @@ private SearchResult GetSearchResultForDocumentsIndex(SearchResult<SearchDocumen
         searchResult.SearchIndexKey = result.Document.GetString(nameof(Document.Id));
         searchResult.DocumentId = result.Document.GetString(nameof(Document.Id));
         searchResult.DocumentTitle = result.Document.GetString(nameof(Document.Title));
+        searchResult.DocumentPage = result.Document.GetString(nameof(Document.Page));
 
         return searchResult;
     }
@@ -136,6 +137,8 @@ private void SetSearchOptionsForChunksIndex(SearchOptions searchOptions, QueryTy
         searchOptions.Select.Add(nameof(DocumentChunk.Id));
         searchOptions.Select.Add(nameof(DocumentChunk.SourceDocumentId));
         searchOptions.Select.Add(nameof(DocumentChunk.SourceDocumentTitle));
+        searchOptions.Select.Add(nameof(DocumentChunk.SourceDocumentPage));
+
         searchOptions.Select.Add(nameof(DocumentChunk.Content));
         if (queryType != QueryType.Vector)
         {
@@ -175,7 +178,7 @@ private SearchResult GetSearchResultForChunksIndex(SearchResult<SearchDocument>
         //searchResult.Author = result.Document.GetString(nameof(DocumentChunk.SourceDocumentAuthor));
         //searchResult.Type = result.Document.GetString(nameof(DocumentChunk.SourceDocumentType));
         //searchResult.PublishDate = result.Document.GetDateTimeOffset(nameof(DocumentChunk.SourceDocumentPublishDate));
-        //searchResult.Page = result.Document.GetString(nameof(DocumentChunk.SourceDocumentPage));
+        searchResult.Page = result.Document.GetString(nameof(DocumentChunk.SourceDocumentPage));
 
         return searchResult;
     }

src/Azure.AISearch.WebApp/Services/AzureOpenAISearchService.cs

@@ -94,6 +94,7 @@ public async Task<SearchResponse> SearchAsync(SearchRequest request)
                 {
                     DocumentId = citation.Filepath,
                     DocumentTitle = citation.Title,
+                    DocumentPage = citation.Page,
                     Captions = string.IsNullOrWhiteSpace(citation.Content) ? Array.Empty<string>() : new[] { citation.Content }
                 });
             }
@@ -122,6 +123,7 @@ private AzureSearchChatExtensionConfiguration GetAzureCognitiveSearchDataSource(
                 TitleFieldName = useDocumentsIndex ? nameof(Document.Title) : nameof(DocumentChunk.SourceDocumentTitle),
                 UrlFieldName = useDocumentsIndex ? nameof(Document.FilePath) : nameof(DocumentChunk.SourceDocumentFilePath),
                 FilepathFieldName = useDocumentsIndex ? nameof(Document.FilePath) : nameof(DocumentChunk.SourceDocumentFilePath),
+                PageFieldName = useDocumentsIndex ? nameof(Document.Page) : nameof(DocumentChunk.SourceDocumentPage),
                 VectorFieldNames = { useDocumentsIndex ? null : nameof(DocumentChunk.ContentVector) }
             },
             ShouldRestrictResultScope = request.LimitToDataSource, // Limit responses to data from the data source only