Skip to content

hybrid bm25/ELSER search #134

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

Merged
merged 1 commit into from
Dec 12, 2023
Merged

hybrid bm25/ELSER search #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
64 changes: 50 additions & 14 deletions example-apps/search-tutorial/v3/search-tutorial/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,58 @@ def handle_search():
filters, parsed_query = extract_filters(query)
from_ = request.form.get('from_', type=int, default=0)

results = es.search(
query={
'bool': {
'must': [
{
'text_expansion': {
'elser_embedding': {
'model_id': '.elser_model_2',
'model_text': parsed_query,
}
},
if parsed_query:
search_query = {
'sub_searches': [
{
'query': {
'bool': {
'must': {
'multi_match': {
'query': parsed_query,
'fields': ['name', 'summary', 'content'],
}
},
**filters
}
}
],
**filters,
},
{
'query': {
'bool': {
'must': [
{
'text_expansion': {
'elser_embedding': {
'model_id': '.elser_model_2',
'model_text': parsed_query,
}
},
}
],
**filters,
}
},
},
],
'rank': {
'rrf': {}
},
}
else:
search_query = {
'query': {
'bool': {
'must': {
'match_all': {}
},
**filters
}
}
},
}

results = es.search(
**search_query,
size=5,
from_=from_,
)
Expand Down
15 changes: 13 additions & 2 deletions example-apps/search-tutorial/v3/search-tutorial/search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,18 @@ def reindex(self):
return self.insert_documents(documents)

def search(self, **query_args):
return self.es.search(index='my_documents', **query_args)
# sub_searches is not currently supported in the client, so we send
# search requests as raw requests
if 'from_' in query_args:
query_args['from'] = query_args['from_']
del query_args['from_']
return self.es.perform_request(
'GET',
f'/my_documents/_search',
body=json.dumps(query_args),
headers={'Content-Type': 'application/json',
'Accept': 'application/json'},
)

def retrieve_document(self, id):
return self.es.get(index='my_documents', id=id)
Expand All @@ -75,7 +86,7 @@ def deploy_elser(self):
# download ELSER v2
self.es.ml.put_trained_model(model_id='.elser_model_2',
input={'field_names': ['text_field']})

# wait until ready
while True:
status = self.es.ml.get_trained_models(model_id='.elser_model_2',
Expand Down