Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<PackageVersion Include="Generator.Equals" Version="3.3.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
<PackageVersion Include="KubernetesClient" Version="18.0.5" />
<PackageVersion Include="Elastic.Aspire.Hosting.Elasticsearch" Version="9.3.0" />
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="9.3.0" />
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="9.3.3" />
<PackageVersion Include="FakeItEasy" Version="9.0.1" />
<PackageVersion Include="Elastic.Ingest.Elasticsearch" Version="0.34.5" />
<PackageVersion Include="Elastic.Mapping" Version="0.40.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,16 @@ public static class SearchQueryBuilder
/// Shared document filter that excludes hidden documents and root URLs.
/// </summary>
public static Query DocumentFilter { get; } =
!(Query)new TermsQuery(
Infer.Field<DocumentationDocument>(f => f.Url.Suffix("keyword")),
new TermsQueryField(["/docs", "/docs/", "/docs/404", "/docs/404/"]))
&& !(Query)new TermQuery { Field = Infer.Field<DocumentationDocument>(f => f.Hidden), Value = true };
new BoolQuery
{
MustNot =
[
new TermsQuery(
Infer.Field<DocumentationDocument>(f => f.Url.Suffix("keyword")),
new TermsQueryField(["/docs", "/docs/", "/docs/404", "/docs/404/"])),
new TermQuery { Field = Infer.Field<DocumentationDocument>(f => f.Hidden), Value = true }
]
};

/// <summary>
/// Builds a diminish terms query to reduce scoring for common/noisy terms.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ private async Task<FullSearchResult> SearchWithHybridRrf(FullSearchRequest reque
if (!response.IsValidResponse)
{
logger.LogWarning("Elasticsearch response is not valid. Reason: {Reason}",
response.ElasticsearchServerError?.Error.Reason ?? "Unknown");
response.ElasticsearchServerError?.Error?.Reason ?? "Unknown");
}

return ProcessSearchResponse(response, request.Query, isSemanticQuery: true, request.IncludeHighlighting);
Expand Down Expand Up @@ -208,7 +208,7 @@ private async Task<FullSearchResult> SearchLexicalOnly(FullSearchRequest request
if (!response.IsValidResponse)
{
logger.LogWarning("Elasticsearch response is not valid. Reason: {Reason}",
response.ElasticsearchServerError?.Error.Reason ?? "Unknown");
response.ElasticsearchServerError?.Error?.Reason ?? "Unknown");
}

return ProcessSearchResponse(response, request.Query, isSemanticQuery: false, request.IncludeHighlighting);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public async Task<NavigationSearchResult> SearchImplementation(string query, int
if (!response.IsValidResponse)
{
logger.LogWarning("Elasticsearch response is not valid. Reason: {Reason}",
response.ElasticsearchServerError?.Error.Reason ?? "Unknown");
response.ElasticsearchServerError?.Error?.Reason ?? "Unknown");
}

return ProcessSearchResponse(response, searchQuery);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public async Task SearchReturnsExpectedFirstResultWithExplain(string query, stri
if (results.Count == 0)
{
var countResponse = await clientAccessor.Client.CountAsync(c => c.Indices(clientAccessor.SearchIndex), TestContext.Current.CancellationToken);
output.WriteLine($"Index document count: {(countResponse.IsValidResponse ? countResponse.Count.ToString(CultureInfo.InvariantCulture) : $"ERROR: {countResponse.ElasticsearchServerError?.Error.Reason}")}");
output.WriteLine($"Index document count: {(countResponse.IsValidResponse ? countResponse.Count.ToString(CultureInfo.InvariantCulture) : $"ERROR: {countResponse.ElasticsearchServerError?.Error?.Reason}")}");
}

results.Should().NotBeEmpty($"Search for '{query}' should return results (index: {clientAccessor.SearchIndex})");
Expand Down
Loading