Skip to content

Use boolean query DSL #1851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2025
+20 −77
Merged

Use boolean query DSL #1851

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
97 changes: 20 additions & 77 deletions src/api/Elastic.Documentation.Api.Infrastructure/Adapters/Search/ElasticsearchGateway.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,24 @@ public ElasticsearchGateway(ElasticsearchOptions elasticsearchOptions, ILogger<E

var searchQuery = query.Replace("dotnet", "net", StringComparison.InvariantCultureIgnoreCase);

var lexicalSearchRetriever =
((Query)new PrefixQuery(Infer.Field<DocumentDto>(f => f.Title.Suffix("keyword")), searchQuery) { Boost = 10.0f, CaseInsensitive = true }
|| new MatchQuery(Infer.Field<DocumentDto>(f => f.Title), searchQuery) { Operator = Operator.And, Boost = 8.0f }
|| new MatchBoolPrefixQuery(Infer.Field<DocumentDto>(f => f.Title), searchQuery) { Boost = 6.0f }
|| new MatchQuery(Infer.Field<DocumentDto>(f => f.Abstract), searchQuery) { Boost = 4.0f }
|| new MatchQuery(Infer.Field<DocumentDto>(f => f.Parents.First().Title), searchQuery) { Boost = 2.0f }
|| new MatchQuery(Infer.Field<DocumentDto>(f => f.Title), searchQuery) { Fuzziness = 1, Boost = 1.0f }
)
&& !(Query)new TermsQuery(Infer.Field<DocumentDto>(f => f.Url.Suffix("keyword")), new TermsQueryField(["/docs", "/docs/", "/docs/404", "/docs/404/"]))
;
var semanticSearchRetriever =
((Query)new SemanticQuery("title.semantic_text", searchQuery) { Boost = 5.0f }
|| new SemanticQuery("abstract", searchQuery) { Boost = 3.0f }
)
&& !(Query)new TermsQuery(Infer.Field<DocumentDto>(f => f.Url.Suffix("keyword")),
new TermsQueryField(["/docs", "/docs/", "/docs/404", "/docs/404/"]))
;

try
{
var response = await _client.SearchAsync<DocumentDto>(s => s
Expand All @@ -83,84 +101,9 @@ public ElasticsearchGateway(ElasticsearchOptions elasticsearchOptions, ILogger<E
.Rrf(rrf => rrf
.Retrievers(
// Lexical/Traditional search retriever
ret => ret.Standard(std => std
.Query(q => q
.Bool(b => b
.Should(
// Tier 1: Exact/Prefix matches (highest priority)
sh => sh.Prefix(p => p
.Field("title.keyword")
.Value(searchQuery)
.CaseInsensitive(true)
.Boost(10.0f) // Highest importance - exact prefix matches
),
// Tier 2: Title matching with AND operator
sh => sh.Match(m => m
.Field(f => f.Title)
.Query(searchQuery)
.Operator(Operator.And)
.Boost(8.0f) // High importance - all terms must match
),
// Tier 3: Match bool prefix for partial matches
sh => sh.MatchBoolPrefix(m => m
.Field(f => f.Title)
.Query(searchQuery)
.Boost(6.0f) // Medium-high importance - partial matches
),
// Tier 4: Abstract matching
sh => sh.Match(m => m
.Field(f => f.Abstract)
.Query(searchQuery)
.Boost(4.0f) // Medium importance - content matching
),
// Tier 5: Parent matching
sh => sh.Match(m => m
.Field("parents.title")
.Query(searchQuery)
.Boost(2.0f) // Lower importance - parent context
),
// Tier 6: Fuzzy fallback
sh => sh.Match(m => m
.Field(f => f.Title)
.Query(searchQuery)
.Fuzziness(1)
.Boost(1.0f) // Lowest importance - fuzzy fallback
)
)
.MustNot(mn => mn.Terms(t => t
.Field("url.keyword")
.Terms(factory => factory.Value("/docs", "/docs/", "/docs/404", "/docs/404/"))
))
.MinimumShouldMatch(1)
)
)
),
ret => ret.Standard(std => std.Query(lexicalSearchRetriever)),
// Semantic search retriever
ret => ret.Standard(std => std
.Query(q => q
.Bool(b => b
.Should(
// Title semantic search
sh => sh.Semantic(sem => sem
.Field("title.semantic_text")
.Query(searchQuery)
.Boost(5.0f) // Higher importance - title semantic matching
),
// Abstract semantic search
sh => sh.Semantic(sem => sem
.Field("abstract")
.Query(searchQuery)
.Boost(3.0f) // Medium importance - content semantic matching
)
)
.MustNot(mn => mn.Terms(t => t
.Field("url.keyword")
.Terms(factory => factory.Value("/docs", "/docs/", "/docs/404", "/docs/404/"))
))
.MinimumShouldMatch(1)
)
)
)
ret => ret.Standard(std => std.Query(semanticSearchRetriever))
)
.RankConstant(60) // Controls how much weight is given to document ranking
)
Expand Down
Loading