diff options
Diffstat (limited to 'container-search-gui')
5 files changed, 132 insertions, 15 deletions
diff --git a/container-search-gui/pom.xml b/container-search-gui/pom.xml index f598758e1de..e15c9b2e026 100644 --- a/container-search-gui/pom.xml +++ b/container-search-gui/pom.xml @@ -44,6 +44,12 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>container-search-and-docproc</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> </dependencies> <build> <plugins> diff --git a/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java b/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java index 95adbbea3fc..45a616ce473 100644 --- a/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java +++ b/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java @@ -2,18 +2,39 @@ package com.yahoo.search.query.gui; import com.google.inject.Inject; + +import com.yahoo.container.QrSearchersConfig; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.prelude.IndexModel; +import com.yahoo.prelude.fastsearch.CacheControl; +import com.yahoo.prelude.querytransform.RecallSearcher; +import com.yahoo.search.Query; +import com.yahoo.search.query.Model; +import com.yahoo.search.query.Presentation; +import com.yahoo.search.query.Ranking; +import com.yahoo.search.query.ranking.Diversity; +import com.yahoo.search.query.ranking.MatchPhase; import com.yahoo.search.query.restapi.ErrorResponse; +import com.yahoo.search.yql.MinimalQueryInserter; +import com.yahoo.vespa.config.search.RankProfilesConfig; +import com.yahoo.search.config.IndexInfoConfig; import com.yahoo.yolean.Exceptions; - +import org.json.JSONException; +import org.json.JSONObject; +import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; import java.util.logging.Level; + /** * Takes requests on /querybuilder * @@ -22,9 +43,15 @@ import java.util.logging.Level; public class GUIHandler extends LoggingRequestHandler { + private final IndexModel indexModel; + private final RankProfilesConfig rankProfilesConfig; + @Inject - public GUIHandler(Context parentCtx) { - super(parentCtx); + public GUIHandler(Context parentContext, IndexInfoConfig indexInfo, QrSearchersConfig clusters, RankProfilesConfig rankProfilesConfig) { + super(parentContext); + this.indexModel = new IndexModel(indexInfo, clusters); + this.rankProfilesConfig = rankProfilesConfig; + } @Override @@ -45,16 +72,16 @@ public class GUIHandler extends LoggingRequestHandler { private HttpResponse handleGET(HttpRequest request) { com.yahoo.restapi.Path path = new com.yahoo.restapi.Path(request.getUri().getPath()); if (path.matches("/querybuilder/")) { - return new FileResponse("_includes/index.html"); + return new FileResponse("_includes/index.html", null, null); } if (!path.matches("/querybuilder/{*}") ) { return ErrorResponse.notFoundError("Nothing at path:" + path); } String filepath = path.getRest(); - if (!isValidPath(filepath)){ + if (!isValidPath(filepath) && !filepath.equals("config.json")){ return ErrorResponse.notFoundError("Nothing at path:" + filepath); } - return new FileResponse(filepath); + return new FileResponse(filepath, indexModel, rankProfilesConfig); } private static boolean isValidPath(String path) { @@ -70,15 +97,27 @@ public class GUIHandler extends LoggingRequestHandler { private static class FileResponse extends HttpResponse { private final String path; + private final IndexModel indexModel; + private final RankProfilesConfig rankProfilesConfig; - public FileResponse(String relativePath) { + public FileResponse(String relativePath, IndexModel indexModel, RankProfilesConfig rankProfilesConfig) { super(200); this.path = relativePath; + this.indexModel = indexModel; + this.rankProfilesConfig = rankProfilesConfig; + } @Override public void render(OutputStream out) throws IOException { - InputStream is = GUIHandler.class.getClassLoader().getResourceAsStream("gui/"+this.path); + InputStream is; + if (this.path.equals("config.json")){ + String json = "{}"; + try { json = getGUIConfig(); } catch (JSONException e) { /*Something happened while parsing JSON */ } + is = new ByteArrayInputStream(json.getBytes()); + } else{ + is = GUIHandler.class.getClassLoader().getResourceAsStream("gui/"+this.path); + } byte[] buf = new byte[1024]; int numRead; while ( (numRead = is.read(buf) ) >= 0) { @@ -121,5 +160,51 @@ public class GUIHandler extends LoggingRequestHandler { } return "text/html"; } + + private String getGUIConfig() throws JSONException { + JSONObject json = new JSONObject(); + json.put("ranking_properties", Arrays.asList("propertyname")); + json.put("ranking_features", Arrays.asList("featurename")); + + List<String> sources = new ArrayList<>(); + + try { + sources = new ArrayList<>(indexModel.getMasterClusters().keySet()); + } catch (NullPointerException ex){ /* clusters are not set */ } + json.put("model_sources", sources); + + List<String> rankProfiles = new ArrayList<>(); + try { + rankProfilesConfig.rankprofile().forEach(rankProfile -> rankProfiles.add(rankProfile.name())); + } catch (NullPointerException ex){ /* rankprofiles are not set*/ } + json.put("ranking_profile", rankProfiles); + + + // Creating map from parent to children for GUI: parameter --> child-parameters + HashMap<String, List<String>> childMap = new HashMap<>(); + childMap.put(Model.MODEL, Arrays.asList(Model.DEFAULT_INDEX, Model.ENCODING, Model.LANGUAGE, Model.QUERY_STRING, Model.RESTRICT, Model.SEARCH_PATH, Model.SOURCES, Model.TYPE)); + childMap.put(Ranking.RANKING, Arrays.asList(Ranking.LOCATION, Ranking.FEATURES, Ranking.LIST_FEATURES, Ranking.PROFILE, Ranking.PROPERTIES, Ranking.SORTING, Ranking.FRESHNESS, Ranking.QUERYCACHE, Ranking.MATCH_PHASE)); + childMap.put(Ranking.RANKING +"."+ Ranking.MATCH_PHASE, Arrays.asList(MatchPhase.MAX_HITS, MatchPhase.ATTRIBUTE, MatchPhase.ASCENDING, Ranking.DIVERSITY)); + childMap.put(Ranking.RANKING +"."+ Ranking.MATCH_PHASE +"."+Ranking.DIVERSITY, Arrays.asList(Diversity.ATTRIBUTE, Diversity.MINGROUPS)); + childMap.put(Presentation.PRESENTATION, Arrays.asList(Presentation.BOLDING, Presentation.FORMAT, Presentation.SUMMARY, "template", Presentation.TIMING )); + childMap.put("trace", Arrays.asList("timestamps")); + childMap.put("tracelevel", Arrays.asList("rules")); + childMap.put("metrics", Arrays.asList("ignore")); + childMap.put("collapse", Arrays.asList("summary")); + childMap.put("pos", Arrays.asList("ll", "radius", "bb", "attribute")); + childMap.put("streaming", Arrays.asList("userid", "groupname", "selection", "priority", "maxbucketspervisitor")); + childMap.put("rules", Arrays.asList("off", "rulebase")); + json.put("childMap", childMap); + + List<String> levelZeroParameters = Arrays.asList(MinimalQueryInserter.YQL.toString(), Query.HITS.toString(), Query.OFFSET.toString(), + "queryProfile", Query.NO_CACHE.toString(), Query.GROUPING_SESSION_CACHE.toString(), + Query.SEARCH_CHAIN.toString(), Query.TIMEOUT.toString(), "trace", "tracelevel", + Query.TRACE_LEVEL.toString(), Model.MODEL, Ranking.RANKING, "collapse", "collapsesize","collapsefield", + Presentation.PRESENTATION, "pos", "streaming", "rules", RecallSearcher.recallName.toString(), "user", + CacheControl.nocachewrite.toString(), "metrics", ""); + json.put("levelZeroParameters", levelZeroParameters); + + return json.toString(); + } } }
\ No newline at end of file diff --git a/container-search-gui/src/main/resources/gui/editarea/edit_area/plugins/autocompletion/autocompletion.js b/container-search-gui/src/main/resources/gui/editarea/edit_area/plugins/autocompletion/autocompletion.js index d6984f59899..5531a2a4f69 100644 --- a/container-search-gui/src/main/resources/gui/editarea/edit_area/plugins/autocompletion/autocompletion.js +++ b/container-search-gui/src/main/resources/gui/editarea/edit_area/plugins/autocompletion/autocompletion.js @@ -480,7 +480,10 @@ var EditArea_autocompletion= { {
var line= "<li><a href=\"#\" class=\"entry\" onmousedown=\"EditArea_autocompletion._select('"+ results[i][1]['replace_with'].replace(new RegExp('"', "g"), """) +"');return false;\">"+ results[i][1]['comment'];
if(results[i][0]['prefix_name'].length>0)
- line+='<span class="prefix">'+ results[i][0]['prefix_name'] +'</span>';
+ var value = results[i][0]['prefix_name'];
+ value = (value == undefined) ? "" : value;
+ if (value == 'SOURCES' || value == ','){value = 'Source'}
+ line+='<span class="prefix">'+ value +'</span>';
line+='</a></li>';
lines[lines.length]=line;
}
diff --git a/container-search-gui/src/main/resources/gui/editarea/edit_area/reg_syntax/yql.js b/container-search-gui/src/main/resources/gui/editarea/edit_area/reg_syntax/yql.js index e4e9cd3b32d..0a7dae862f3 100755 --- a/container-search-gui/src/main/resources/gui/editarea/edit_area/reg_syntax/yql.js +++ b/container-search-gui/src/main/resources/gui/editarea/edit_area/reg_syntax/yql.js @@ -1,6 +1,19 @@ /**
* Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
*/
+function getSources(bool){
+ var options = [];
+ if (window.CONFIG.hasOwnProperty("model_sources")){
+ var sources = window.CONFIG.model_sources;
+ for (i in sources){
+ option = [sources[i]];
+ options.push(option);
+ }
+ if (bool == true){options.push(["*"])}
+ }
+ return options;
+}
+
editAreaLoader.load_syntax["yql"] = {
'DISPLAY_NAME' : 'YQL'
,'QUOTEMARKS' : {1: "'", 2: '"', 3: '`'}
@@ -74,9 +87,23 @@ editAreaLoader.load_syntax["yql"] = { ['DESC','DESC'],['ASC','ASC'],['ALL','ALL'], ['GROUP','GROUP'],
['RANGE','RANGE'],['EACH','EACH'],['OUTPUT','OUTPUT'],
['SUM','SUM'],['LIMIT','LIMIT'],['OFFSET','OFFSET'],
- ['TIMEOUT','TIMEOUT'],
- ]
+ ['TIMEOUT','TIMEOUT']
+ ]
+ }
+ },
+ "sources": { // the name of this definition group. It's posisble to have different rules inside the same definition file
+ "REGEXP": { "before_word": "[^a-zA-Z0-9_]|^" // \\s|\\.|
+ ,"possible_words_letters": "[a-zA-Z0-9_]+"
+ ,"letter_after_word_must_match": "[^a-zA-Z0-9_]|$"
+ ,"prefix_separator": " "
+ }
+ ,"CASE_SENSITIVE": false
+ ,"MAX_TEXT_LENGTH": 50 // the maximum length of the text being analyzed before the cursor position
+ ,"KEYWORDS": {
+ 'SOURCES' : getSources(true) ,
+ ',' : getSources(false)
}
}
+
}
};
diff --git a/container-search-gui/src/main/resources/gui/gui_variables.json b/container-search-gui/src/main/resources/gui/gui_variables.json deleted file mode 100644 index 1b5f411611a..00000000000 --- a/container-search-gui/src/main/resources/gui/gui_variables.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "propertyname" : ["propertyname"], - "featurename" : ["featurename"] -} |