Suggestion endpoint; from elasticsearch

emaillenin · Mar 7, 2015 · 6322e0a · 6322e0a
1 parent 742b900
commit 6322e0a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/flaskr.py b/flaskr.py
@@ -37,6 +37,11 @@ def production():
     r.mimetype = 'application/json'
     return r
 
+
+@app.route("/suggestions")
+def suggestions():
+    return json_response(Productions().suggestions(request.args.get('search', '')))
+
 @app.route("/load_index")
 def load_index():
     r = make_response(Productions().load_index(config.exploded_dir))
@@ -58,7 +63,10 @@ def ping():
     return ok()
 
 def ok():
-    r = make_response(json.dumps({'status': 'ok'}))
+    return json_response({'status': 'ok'})
+
+def json_response(dict_response):
+    r = make_response(json.dumps(dict_response))
     r.mimetype = 'application/json'
     return r
 

diff --git a/opencricket/config/es_config.py b/opencricket/config/es_config.py
@@ -1,2 +1,5 @@
 index_settings='{  "settings": {    "index": {      "analysis": {        "filter": {          "stemmer": {            "type": "stemmer",            "language": "english"          },          "autocompleteFilter": {            "max_shingle_size": "5",            "min_shingle_size": "2",            "type": "shingle"          },          "stopwords": {            "type": "stop",            "stopwords": [              "_english_"            ]          }        },        "analyzer": {          "didYouMean": {            "filter": [              "lowercase"            ],            "char_filter": [              "html_strip"            ],            "type": "custom",            "tokenizer": "standard"          },          "autocomplete": {            "filter": [              "lowercase",              "autocompleteFilter"            ],            "char_filter": [              "html_strip"            ],            "type": "custom",            "tokenizer": "standard"          },          "default": {            "filter": [              "lowercase",              "stopwords",              "stemmer"            ],            "char_filter": [              "html_strip"            ],            "type": "custom",            "tokenizer": "standard"          }        }      }    }  }  }'
-mapping='{  "player_stats": {    "properties": {      "autocomplete": {        "type": "string",        "analyzer": "autocomplete"      },      "did_you_mean": {        "type": "string",        "analyzer": "didYouMean"      },      "question": {        "type": "string",        "copy_to": [          "autocomplete",          "did_you_mean"        ]      }    }  }  }'
+mapping='{  "player_stats": {    "properties": {      "autocomplete": {        "type": "string",        "analyzer": "autocomplete"      },      "did_you_mean": {        "type": "string",        "analyzer": "didYouMean"      },      "question": {        "type": "string",        "copy_to": [          "autocomplete",          "did_you_mean"        ]      }    }  }  }'
+
+def es_suggestion(search_string):
+    return '{"suggest":{"didYouMean":{"text":"%s","phrase":{"field":"did_you_mean"}}},"query":{"match":{"question":"%s"}}}' % (search_string, search_string)
diff --git a/opencricket/suggestion/productions.py b/opencricket/suggestion/productions.py
@@ -68,6 +68,9 @@ def explode(self, expansions_dir, exploded_dir):
                         f.write('\n'.join([tmp % a for a in list(product(*final_items))]) + '\n')
 
 
+    def suggestions(self, search_string):
+        return self.es.search(index='opencricket', body=es_config.es_suggestion(search_string))
+
     def create_index(self):
         self.es.indices.create(index='opencricket', body=es_config.index_settings)
         self.es.indices.put_mapping(index='opencricket', doc_type='player_stats', body=es_config.mapping)