Merge pull request #117 from QwantResearch/optim-es

Replace post filter with query filter in wiki and reverse ES queries
Qwant · Feb 10, 2020 · e20ae4f · e20ae4f
2 parents 67cb0b9 + 7d80a38
commit e20ae4f
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/idunn/api/utils.py b/idunn/api/utils.py
@@ -99,12 +99,14 @@ def init_wiki_es(cls):
     @classmethod
     def get_wiki_info(cls, wikidata_id, wiki_index):
         cls.init_wiki_es()
-
         try:
             with prometheus.wiki_request_duration("wiki_es", "get_wiki_info"):
                 resp = (
                     cls._wiki_es.search(
-                        index=wiki_index, body={"filter": {"term": {"wikibase_item": wikidata_id}}}
+                        index=wiki_index,
+                        body={
+                            "query": {"bool": {"filter": {"term": {"wikibase_item": wikidata_id}}}}
+                        },
                     )
                     .get("hits", {})
                     .get("hits", [])
@@ -128,7 +130,6 @@ def get_wiki_info(cls, wikidata_id, wiki_index):
             return None
 
         wiki = resp[0]["_source"]
-
         return wiki
 
 
@@ -238,7 +239,17 @@ def fetch_closest(lat, lon, max_distance, es):
         body={
             "query": {
                 "function_score": {
-                    "query": {"match_all": {}},
+                    "query": {
+                        "bool": {
+                            "filter": {
+                                "geo_distance": {
+                                    "distance": "{}m".format(max_distance),
+                                    "coord": {"lat": lat, "lon": lon},
+                                    "distance_type": "plane",
+                                }
+                            }
+                        }
+                    },
                     "boost_mode": "replace",
                     "functions": [
                         {
@@ -252,13 +263,6 @@ def fetch_closest(lat, lon, max_distance, es):
                     ],
                 }
             },
-            "filter": {
-                "geo_distance": {
-                    "distance": "{}m".format(max_distance),
-                    "coord": {"lat": lat, "lon": lon},
-                    "distance_type": "plane",
-                }
-            },
             "from": 0,
             "size": 1,
         },