sanspie/akarpov
1
1
Fork 0
mirror of https://github.com/Alexander-D-Karpov/akarpov synced 2024-11-24 08:53:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
Alexander Karpov 2024-04-22 15:52:33 +03:00
parent f5545ed7d4
commit 4aa1d207aa
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
akarpov/music/services/search.py
View File

@ -12,12 +12,7 @@ def search_song(query):
search_query = ES_Q( search_query = ES_Q(
"bool", "bool",
should=[ should=[
ES_Q("bool", should=[ES_Q("match_phrase", name__exact=query)], boost=5), ES_Q("match", name=query),
ES_Q(
"bool",
should=[ES_Q("match_phrase", name__raw=query.lower())],
boost=2.5,
),
ES_Q("match", name__russian=query), ES_Q("match", name__russian=query),
ES_Q( ES_Q(
"multi_match", "multi_match",
@ -29,6 +24,7 @@ def search_song(query):
"authors.name.raw^3", "authors.name.raw^3",
"album.name^3", "album.name^3",
"album.name.raw^3", "album.name.raw^3",
"name.raw^2",
], ],
type="best_fields", type="best_fields",
fuzziness="AUTO", fuzziness="AUTO",
@ -42,8 +38,9 @@ def search_song(query):
fields=["authors.name", "authors.name.raw"], fields=["authors.name", "authors.name.raw"],
fuzziness="AUTO", fuzziness="AUTO",
), ),
boost=2,
), ),
# Correcting wildcard queries with the proper syntax:
ES_Q("wildcard", **{"name.raw": f"*{query.lower()}*"}),
ES_Q( ES_Q(
"nested", "nested",
path="album", path="album",
@ -53,10 +50,15 @@ def search_song(query):
fields=["album.name", "album.name.raw"], fields=["album.name", "album.name.raw"],
fuzziness="AUTO", fuzziness="AUTO",
), ),
boost=2,
), ),
ES_Q("wildcard", field={"name.raw": f"*{query.lower()}*"}, boost=0.5), # Ensuring the nested wildcard query is properly structured
ES_Q("wildcard", field={"meta.raw": f"*{query.lower()}*"}, boost=0.5), ES_Q(
"nested",
path="album",
query=ES_Q("wildcard", **{"album.name.raw": f"*{query.lower()}*"}),
),
# Correcting the wildcard query for `meta.raw`
ES_Q("wildcard", **{"meta.raw": f"*{query.lower()}*"}),
], ],
minimum_should_match=1, minimum_should_match=1,
) )