yujunjun/haystack
1
0
Fork 0
mirror of https://github.com/deepset-ai/haystack.git synced 2026-01-08 13:06:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make filters optional for Elasticsearch query (#80)

Browse Source
This commit is contained in:
Tanay Soni 2020-04-29 11:37:00 +02:00 committed by GitHub
parent 54d32d4f1f
commit e941a7fdf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
haystack/database/elasticsearch.py
View File

@ -105,7 +105,7 @@ class ElasticsearchDocumentStore(BaseDocumentStore):
def query(
self,
query: str,
filters: dict,
filters: dict = None,
top_k: int = 10,
custom_query: str = None,
) -> [Document]:
@ -115,9 +115,10 @@ class ElasticsearchDocumentStore(BaseDocumentStore):
substitutions = {"question": query} # replace all "${question}" placeholder(s) with query
# replace all filter values placeholders with a list of strings(in JSON format) for each filter
for key, values in filters.items():
values_str = json.dumps(values)
substitutions[key] = values_str
if filters:
for key, values in filters.items():
values_str = json.dumps(values)
substitutions[key] = values_str
custom_query_json = template.substitute(**substitutions)
body = json.loads(custom_query_json)
else:
@ -130,14 +131,14 @@ class ElasticsearchDocumentStore(BaseDocumentStore):
},
}
filter_clause = []
for key, values in filters.items():
filter_clause.append(
{
"terms": {key: values}
}
)
if filter_clause:
if filters:
filter_clause = []
for key, values in filters.items():
filter_clause.append(
{
"terms": {key: values}
}
)
body["query"]["bool"]["filter"] = filter_clause
if self.excluded_meta_data: