Skip to content
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

Feature/vocab guided query expansion #1544

Open
wants to merge 14 commits into
base: develop
Choose a base branch
from
Open

Feature/vocab guided query expansion #1544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3097304
Infer type dependent query expansion from vocab rules (less hardcoding)
kwahlin Dec 12, 2024
52e7d3b
Get type dependency for individual groups in nested query
kwahlin Dec 12, 2024
d69a3b2
Bin Property.getAlias()
kwahlin Dec 11, 2024
a16fcb3
Rely on shorthand marker in term definition
kwahlin Dec 12, 2024
037f424
Clean up
kwahlin Dec 12, 2024
4847663
Don't inherit from propertyChainAxiom
kwahlin Dec 12, 2024
c335122
Fix isShorthand method
kwahlin Dec 17, 2024
0c3bc20
Refactor/organize Disambiguate class
kwahlin Dec 17, 2024
950d595
Refine reduceByCondition method and add unit tests
kwahlin Dec 19, 2024
0329c0c
Add unit tests for And.collectRulingTypes
kwahlin Dec 19, 2024
32af60a
Merge branch 'develop' into feature/vocab-guided-query-expansion
kwahlin Dec 19, 2024
8d3fa03
Clean up and make all tests pass
kwahlin Dec 19, 2024
22ec095
Update various for Group
kwahlin Jan 7, 2025
aa8e486
Refactor
kwahlin Jan 8, 2025
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
7 changes: 1 addition & 6 deletions rest/src/main/groovy/whelk/rest/api/SearchUtils2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ Map<String, Object> doSearch(Map<String, String[]> queryParameters) throws Inval
}

qTree.addFilters(queryParams, appParams);
qTree.setOutsetType(disambiguate);

Map<String, Object> esQueryDsl = getEsQueryDsl(qTree, queryParams, appParams.statsRepr);

Expand Down Expand Up @@ -96,7 +95,7 @@ private Map<String, Object> getEsQueryDsl(QueryTree queryTree, QueryParams query
}
}

queryDsl.put("aggs", Aggs.buildAggQuery(statsRepr, disambiguate, queryTree.getOutsetType(), queryUtil::getNestedPath));
queryDsl.put("aggs", Aggs.buildAggQuery(statsRepr, disambiguate, queryTree.collectRulingTypes(disambiguate), queryUtil::getNestedPath));
queryDsl.put("track_total_hits", true);

if (queryParams.debug.contains(QueryParams.Debug.ES_SCORE)) {
Expand All @@ -109,10 +108,6 @@ private Map<String, Object> getEsQueryDsl(QueryTree queryTree, QueryParams query
}

private Map<String, Object> getEsQuery(QueryTree queryTree, List<String> boostFields) {
if (!boostFields.isEmpty()) {
return queryTree.toEs(queryUtil, disambiguate, boostFields);
}
boostFields = queryUtil.esBoost.getBoostFields(queryTree.collectTypes());
return addConstantBoosts(queryTree.toEs(queryUtil, disambiguate, boostFields));
}

Expand Down
5 changes: 3 additions & 2 deletions whelk-core/src/main/groovy/whelk/search2/Aggs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import whelk.search2.querytree.PropertyValue;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
Expand All @@ -34,7 +35,7 @@ public record Bucket(String value, int count) {

public static Map<String, Object> buildAggQuery(AppParams.StatsRepr statsRepr,
Disambiguate disambiguate,
OutsetType outsetType,
Collection<String> types,
Function<String, Optional<String>> getNestedPath) {
if (statsRepr.isEmpty()) {
return Map.of(JsonLd.TYPE_KEY,
Expand All @@ -46,7 +47,7 @@ public static Map<String, Object> buildAggQuery(AppParams.StatsRepr statsRepr,

for (AppParams.Slice slice : statsRepr.sliceList()) {
Property property = slice.property();
Node expanded = property.expand(disambiguate, outsetType);
Node expanded = property.expand(disambiguate, types);
List<Node> altPaths = expanded instanceof Or ? expanded.children() : List.of(expanded);

for (Node n : altPaths) {
Expand Down
Loading
Loading