pin setuptools to 60.10.0 to fix builds 1.4.0
This commit is contained in:
petitminion
parent
7f7f4a1fff
commit
a9d56911ef
8 changed files with 2332 additions and 2191 deletions
|
|
@ -1,148 +1,148 @@
|
|||
import logging
|
||||
import time
|
||||
# import logging
|
||||
# import time
|
||||
|
||||
import troi
|
||||
import troi.core
|
||||
from django.core.cache import cache
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.db.models import Q
|
||||
from requests.exceptions import ConnectTimeout
|
||||
# import troi
|
||||
# import troi.core
|
||||
# from django.core.cache import cache
|
||||
# from django.core.exceptions import ValidationError
|
||||
# from django.db.models import Q
|
||||
# from requests.exceptions import ConnectTimeout
|
||||
|
||||
from funkwhale_api.music import models as music_models
|
||||
from funkwhale_api.typesense import utils
|
||||
# from funkwhale_api.music import models as music_models
|
||||
# from funkwhale_api.typesense import utils
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
# logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
patches = troi.utils.discover_patches()
|
||||
# patches = troi.utils.discover_patches()
|
||||
|
||||
SUPPORTED_PATCHES = patches.keys()
|
||||
# SUPPORTED_PATCHES = patches.keys()
|
||||
|
||||
|
||||
def run(config, **kwargs):
|
||||
"""Validate the received config and run the queryset generation"""
|
||||
candidates = kwargs.pop("candidates", music_models.Track.objects.all())
|
||||
validate(config)
|
||||
return TroiPatch().get_queryset(config, candidates)
|
||||
# def run(config, **kwargs):
|
||||
# """Validate the received config and run the queryset generation"""
|
||||
# candidates = kwargs.pop("candidates", music_models.Track.objects.all())
|
||||
# validate(config)
|
||||
# return TroiPatch().get_queryset(config, candidates)
|
||||
|
||||
|
||||
def validate(config):
|
||||
patch = config.get("patch")
|
||||
if patch not in SUPPORTED_PATCHES:
|
||||
raise ValidationError(
|
||||
'Invalid patch "{}". Supported patches: {}'.format(
|
||||
config["patch"], SUPPORTED_PATCHES
|
||||
)
|
||||
)
|
||||
# def validate(config):
|
||||
# patch = config.get("patch")
|
||||
# if patch not in SUPPORTED_PATCHES:
|
||||
# raise ValidationError(
|
||||
# 'Invalid patch "{}". Supported patches: {}'.format(
|
||||
# config["patch"], SUPPORTED_PATCHES
|
||||
# )
|
||||
# )
|
||||
|
||||
return True
|
||||
# return True
|
||||
|
||||
|
||||
def build_radio_queryset(patch, config, radio_qs):
|
||||
"""Take a troi patch and its arg, match the missing mbid and then build a radio queryset"""
|
||||
# def build_radio_queryset(patch, config, radio_qs):
|
||||
# """Take a troi patch and its arg, match the missing mbid and then build a radio queryset"""
|
||||
|
||||
logger.info("Config used for troi radio generation is " + str(config))
|
||||
# logger.info("Config used for troi radio generation is " + str(config))
|
||||
|
||||
start_time = time.time()
|
||||
try:
|
||||
recommendations = troi.core.generate_playlist(patch, config)
|
||||
except ConnectTimeout:
|
||||
raise ValueError(
|
||||
"Timed out while connecting to ListenBrainz. No candidates could be retrieved for the radio."
|
||||
)
|
||||
end_time_rec = time.time()
|
||||
logger.info("Troi fetch took :" + str(end_time_rec - start_time))
|
||||
# start_time = time.time()
|
||||
# try:
|
||||
# recommendations = troi.core.generate_playlist(patch, config)
|
||||
# except ConnectTimeout:
|
||||
# raise ValueError(
|
||||
# "Timed out while connecting to ListenBrainz. No candidates could be retrieved for the radio."
|
||||
# )
|
||||
# end_time_rec = time.time()
|
||||
# logger.info("Troi fetch took :" + str(end_time_rec - start_time))
|
||||
|
||||
if not recommendations:
|
||||
raise ValueError("No candidates found by troi")
|
||||
# if not recommendations:
|
||||
# raise ValueError("No candidates found by troi")
|
||||
|
||||
recommended_mbids = [
|
||||
recommended_recording.mbid
|
||||
for recommended_recording in recommendations.playlists[0].recordings
|
||||
]
|
||||
# recommended_mbids = [
|
||||
# recommended_recording.mbid
|
||||
# for recommended_recording in recommendations.playlists[0].recordings
|
||||
# ]
|
||||
|
||||
logger.info("Searching for MusicBrainz ID in Funkwhale database")
|
||||
# logger.info("Searching for MusicBrainz ID in Funkwhale database")
|
||||
|
||||
qs_recommended = (
|
||||
music_models.Track.objects.all()
|
||||
.filter(mbid__in=recommended_mbids)
|
||||
.order_by("mbid", "pk")
|
||||
.distinct("mbid")
|
||||
)
|
||||
qs_recommended_mbid = [str(i.mbid) for i in qs_recommended]
|
||||
# qs_recommended = (
|
||||
# music_models.Track.objects.all()
|
||||
# .filter(mbid__in=recommended_mbids)
|
||||
# .order_by("mbid", "pk")
|
||||
# .distinct("mbid")
|
||||
# )
|
||||
# qs_recommended_mbid = [str(i.mbid) for i in qs_recommended]
|
||||
|
||||
recommended_mbids_not_qs = [
|
||||
mbid for mbid in recommended_mbids if mbid not in qs_recommended_mbid
|
||||
]
|
||||
cached_match = cache.get_many(recommended_mbids_not_qs)
|
||||
cached_match_mbid = [str(i) for i in cached_match.keys()]
|
||||
# recommended_mbids_not_qs = [
|
||||
# mbid for mbid in recommended_mbids if mbid not in qs_recommended_mbid
|
||||
# ]
|
||||
# cached_match = cache.get_many(recommended_mbids_not_qs)
|
||||
# cached_match_mbid = [str(i) for i in cached_match.keys()]
|
||||
|
||||
if qs_recommended and cached_match_mbid:
|
||||
logger.info("MusicBrainz IDs found in Funkwhale database and redis")
|
||||
qs_recommended_mbid.extend(cached_match_mbid)
|
||||
mbids_found = qs_recommended_mbid
|
||||
elif qs_recommended and not cached_match_mbid:
|
||||
logger.info("MusicBrainz IDs found in Funkwhale database")
|
||||
mbids_found = qs_recommended_mbid
|
||||
elif not qs_recommended and cached_match_mbid:
|
||||
logger.info("MusicBrainz IDs found in redis cache")
|
||||
mbids_found = cached_match_mbid
|
||||
else:
|
||||
logger.info(
|
||||
"Couldn't find any matches in Funkwhale database. Trying to match all"
|
||||
)
|
||||
mbids_found = []
|
||||
# if qs_recommended and cached_match_mbid:
|
||||
# logger.info("MusicBrainz IDs found in Funkwhale database and redis")
|
||||
# qs_recommended_mbid.extend(cached_match_mbid)
|
||||
# mbids_found = qs_recommended_mbid
|
||||
# elif qs_recommended and not cached_match_mbid:
|
||||
# logger.info("MusicBrainz IDs found in Funkwhale database")
|
||||
# mbids_found = qs_recommended_mbid
|
||||
# elif not qs_recommended and cached_match_mbid:
|
||||
# logger.info("MusicBrainz IDs found in redis cache")
|
||||
# mbids_found = cached_match_mbid
|
||||
# else:
|
||||
# logger.info(
|
||||
# "Couldn't find any matches in Funkwhale database. Trying to match all"
|
||||
# )
|
||||
# mbids_found = []
|
||||
|
||||
recommended_recordings_not_found = [
|
||||
i for i in recommendations.playlists[0].recordings if i.mbid not in mbids_found
|
||||
]
|
||||
# recommended_recordings_not_found = [
|
||||
# i for i in recommendations.playlists[0].recordings if i.mbid not in mbids_found
|
||||
# ]
|
||||
|
||||
logger.info("Matching missing MusicBrainz ID to Funkwhale track")
|
||||
# logger.info("Matching missing MusicBrainz ID to Funkwhale track")
|
||||
|
||||
start_time_resolv = time.time()
|
||||
utils.resolve_recordings_to_fw_track(recommended_recordings_not_found)
|
||||
end_time_resolv = time.time()
|
||||
# start_time_resolv = time.time()
|
||||
# utils.resolve_recordings_to_fw_track(recommended_recordings_not_found)
|
||||
# end_time_resolv = time.time()
|
||||
|
||||
logger.info(
|
||||
"Resolving "
|
||||
+ str(len(recommended_recordings_not_found))
|
||||
+ " tracks in "
|
||||
+ str(end_time_resolv - start_time_resolv)
|
||||
)
|
||||
# logger.info(
|
||||
# "Resolving "
|
||||
# + str(len(recommended_recordings_not_found))
|
||||
# + " tracks in "
|
||||
# + str(end_time_resolv - start_time_resolv)
|
||||
# )
|
||||
|
||||
cached_match = cache.get_many(recommended_mbids)
|
||||
# cached_match = cache.get_many(recommended_mbids)
|
||||
|
||||
if not mbids_found and not cached_match:
|
||||
raise ValueError("No candidates found for troi radio")
|
||||
# if not mbids_found and not cached_match:
|
||||
# raise ValueError("No candidates found for troi radio")
|
||||
|
||||
mbids_found_pks = list(
|
||||
music_models.Track.objects.all()
|
||||
.filter(mbid__in=mbids_found)
|
||||
.order_by("mbid", "pk")
|
||||
.distinct("mbid")
|
||||
.values_list("pk", flat=True)
|
||||
)
|
||||
# mbids_found_pks = list(
|
||||
# music_models.Track.objects.all()
|
||||
# .filter(mbid__in=mbids_found)
|
||||
# .order_by("mbid", "pk")
|
||||
# .distinct("mbid")
|
||||
# .values_list("pk", flat=True)
|
||||
# )
|
||||
|
||||
mbids_found_pks_unique = [
|
||||
i for i in mbids_found_pks if i not in cached_match.keys()
|
||||
]
|
||||
# mbids_found_pks_unique = [
|
||||
# i for i in mbids_found_pks if i not in cached_match.keys()
|
||||
# ]
|
||||
|
||||
if mbids_found and cached_match:
|
||||
return radio_qs.filter(
|
||||
Q(pk__in=mbids_found_pks_unique) | Q(pk__in=cached_match.values())
|
||||
)
|
||||
if mbids_found and not cached_match:
|
||||
return radio_qs.filter(pk__in=mbids_found_pks_unique)
|
||||
# if mbids_found and cached_match:
|
||||
# return radio_qs.filter(
|
||||
# Q(pk__in=mbids_found_pks_unique) | Q(pk__in=cached_match.values())
|
||||
# )
|
||||
# if mbids_found and not cached_match:
|
||||
# return radio_qs.filter(pk__in=mbids_found_pks_unique)
|
||||
|
||||
if not mbids_found and cached_match:
|
||||
return radio_qs.filter(pk__in=cached_match.values())
|
||||
# if not mbids_found and cached_match:
|
||||
# return radio_qs.filter(pk__in=cached_match.values())
|
||||
|
||||
|
||||
class TroiPatch:
|
||||
code = "troi-patch"
|
||||
label = "Troi Patch"
|
||||
# class TroiPatch:
|
||||
# code = "troi-patch"
|
||||
# label = "Troi Patch"
|
||||
|
||||
def get_queryset(self, config, qs):
|
||||
patch_string = config.pop("patch")
|
||||
patch = patches[patch_string]
|
||||
return build_radio_queryset(patch(), config, qs)
|
||||
# def get_queryset(self, config, qs):
|
||||
# patch_string = config.pop("patch")
|
||||
# patch = patches[patch_string]
|
||||
# return build_radio_queryset(patch(), config, qs)
|
||||
|
|
|
|||
|
|
@ -1,111 +1,111 @@
|
|||
from troi import Artist, Element, Playlist, Recording
|
||||
from troi.patch import Patch
|
||||
# from troi import Artist, Element, Playlist, Recording
|
||||
# from troi.patch import Patch
|
||||
|
||||
recording_list = [
|
||||
Recording(
|
||||
name="I Want It That Way",
|
||||
mbid="87dfa566-21c3-45ed-bc42-1d345b8563fa",
|
||||
artist=Artist(name="artist_name"),
|
||||
),
|
||||
Recording(name="Untouchable", artist=Artist(name="Another lol")),
|
||||
Recording(
|
||||
name="The Perfect Kiss",
|
||||
mbid="ec0da94e-fbfe-4eb0-968e-024d4c32d1d0",
|
||||
artist=Artist(name="artist_name2"),
|
||||
),
|
||||
Recording(
|
||||
name="Love Your Voice",
|
||||
mbid="93726547-f8c0-4efd-8e16-d2dee76500f6",
|
||||
artist=Artist(name="artist_name"),
|
||||
),
|
||||
Recording(
|
||||
name="Hall of Fame",
|
||||
mbid="395bd5a1-79cc-4e04-8869-ca9eabc78d09",
|
||||
artist=Artist(name="artist_name_3"),
|
||||
),
|
||||
]
|
||||
# recording_list = [
|
||||
# Recording(
|
||||
# name="I Want It That Way",
|
||||
# mbid="87dfa566-21c3-45ed-bc42-1d345b8563fa",
|
||||
# artist=Artist(name="artist_name"),
|
||||
# ),
|
||||
# Recording(name="Untouchable", artist=Artist(name="Another lol")),
|
||||
# Recording(
|
||||
# name="The Perfect Kiss",
|
||||
# mbid="ec0da94e-fbfe-4eb0-968e-024d4c32d1d0",
|
||||
# artist=Artist(name="artist_name2"),
|
||||
# ),
|
||||
# Recording(
|
||||
# name="Love Your Voice",
|
||||
# mbid="93726547-f8c0-4efd-8e16-d2dee76500f6",
|
||||
# artist=Artist(name="artist_name"),
|
||||
# ),
|
||||
# Recording(
|
||||
# name="Hall of Fame",
|
||||
# mbid="395bd5a1-79cc-4e04-8869-ca9eabc78d09",
|
||||
# artist=Artist(name="artist_name_3"),
|
||||
# ),
|
||||
# ]
|
||||
|
||||
|
||||
class DummyElement(Element):
|
||||
"""Dummy element that returns a fixed playlist for testing"""
|
||||
# class DummyElement(Element):
|
||||
# """Dummy element that returns a fixed playlist for testing"""
|
||||
|
||||
@staticmethod
|
||||
def outputs():
|
||||
return [Playlist]
|
||||
# @staticmethod
|
||||
# def outputs():
|
||||
# return [Playlist]
|
||||
|
||||
def read(self, sources):
|
||||
recordings = recording_list
|
||||
# def read(self, sources):
|
||||
# recordings = recording_list
|
||||
|
||||
return [
|
||||
Playlist(
|
||||
name="Test Export Playlist",
|
||||
description="A playlist to test exporting playlists to spotify",
|
||||
recordings=recordings,
|
||||
)
|
||||
]
|
||||
# return [
|
||||
# Playlist(
|
||||
# name="Test Export Playlist",
|
||||
# description="A playlist to test exporting playlists to spotify",
|
||||
# recordings=recordings,
|
||||
# )
|
||||
# ]
|
||||
|
||||
|
||||
class DummyPatch(Patch):
|
||||
"""Dummy patch that always returns a fixed set of recordings for testing"""
|
||||
# class DummyPatch(Patch):
|
||||
# """Dummy patch that always returns a fixed set of recordings for testing"""
|
||||
|
||||
@staticmethod
|
||||
def slug():
|
||||
return "test-patch"
|
||||
# @staticmethod
|
||||
# def slug():
|
||||
# return "test-patch"
|
||||
|
||||
def create(self, inputs):
|
||||
return DummyElement()
|
||||
# def create(self, inputs):
|
||||
# return DummyElement()
|
||||
|
||||
@staticmethod
|
||||
def outputs():
|
||||
return [Recording]
|
||||
# @staticmethod
|
||||
# def outputs():
|
||||
# return [Recording]
|
||||
|
||||
|
||||
recommended_recording_mbids = [
|
||||
"87dfa566-21c3-45ed-bc42-1d345b8563fa",
|
||||
"ec0da94e-fbfe-4eb0-968e-024d4c32d1d0",
|
||||
"93726547-f8c0-4efd-8e16-d2dee76500f6",
|
||||
"395bd5a1-79cc-4e04-8869-ca9eabc78d09",
|
||||
]
|
||||
# recommended_recording_mbids = [
|
||||
# "87dfa566-21c3-45ed-bc42-1d345b8563fa",
|
||||
# "ec0da94e-fbfe-4eb0-968e-024d4c32d1d0",
|
||||
# "93726547-f8c0-4efd-8e16-d2dee76500f6",
|
||||
# "395bd5a1-79cc-4e04-8869-ca9eabc78d09",
|
||||
# ]
|
||||
|
||||
typesense_search_result = {
|
||||
"facet_counts": [],
|
||||
"found": 1,
|
||||
"out_of": 1,
|
||||
"page": 1,
|
||||
"request_params": {
|
||||
"collection_name": "canonical_fw_data",
|
||||
"per_page": 10,
|
||||
"q": "artist_nameiwantitthatway",
|
||||
},
|
||||
"search_time_ms": 1,
|
||||
"hits": [
|
||||
{
|
||||
"highlights": [
|
||||
{
|
||||
"field": "combined",
|
||||
"snippet": "string",
|
||||
"matched_tokens": ["string"],
|
||||
}
|
||||
],
|
||||
"document": {
|
||||
"pk": "1",
|
||||
"combined": "artist_nameiwantitthatway",
|
||||
},
|
||||
"text_match": 130916,
|
||||
},
|
||||
{
|
||||
"highlights": [
|
||||
{
|
||||
"field": "combined",
|
||||
"snippet": "string",
|
||||
"matched_tokens": ["string"],
|
||||
}
|
||||
],
|
||||
"document": {
|
||||
"pk": "2",
|
||||
"combined": "artist_nameiwantitthatway",
|
||||
},
|
||||
"text_match": 130916,
|
||||
},
|
||||
],
|
||||
}
|
||||
# typesense_search_result = {
|
||||
# "facet_counts": [],
|
||||
# "found": 1,
|
||||
# "out_of": 1,
|
||||
# "page": 1,
|
||||
# "request_params": {
|
||||
# "collection_name": "canonical_fw_data",
|
||||
# "per_page": 10,
|
||||
# "q": "artist_nameiwantitthatway",
|
||||
# },
|
||||
# "search_time_ms": 1,
|
||||
# "hits": [
|
||||
# {
|
||||
# "highlights": [
|
||||
# {
|
||||
# "field": "combined",
|
||||
# "snippet": "string",
|
||||
# "matched_tokens": ["string"],
|
||||
# }
|
||||
# ],
|
||||
# "document": {
|
||||
# "pk": "1",
|
||||
# "combined": "artist_nameiwantitthatway",
|
||||
# },
|
||||
# "text_match": 130916,
|
||||
# },
|
||||
# {
|
||||
# "highlights": [
|
||||
# {
|
||||
# "field": "combined",
|
||||
# "snippet": "string",
|
||||
# "matched_tokens": ["string"],
|
||||
# }
|
||||
# ],
|
||||
# "document": {
|
||||
# "pk": "2",
|
||||
# "combined": "artist_nameiwantitthatway",
|
||||
# },
|
||||
# "text_match": 130916,
|
||||
# },
|
||||
# ],
|
||||
# }
|
||||
|
|
|
|||
|
|
@ -1,92 +1,92 @@
|
|||
import logging
|
||||
import re
|
||||
# import logging
|
||||
# import re
|
||||
|
||||
import unidecode
|
||||
from django.conf import settings
|
||||
from django.core.cache import cache
|
||||
from lb_matching_tools.cleaner import MetadataCleaner
|
||||
# import unidecode
|
||||
# from django.conf import settings
|
||||
# from django.core.cache import cache
|
||||
# from lb_matching_tools.cleaner import MetadataCleaner
|
||||
|
||||
from funkwhale_api.music import models as music_models
|
||||
# from funkwhale_api.music import models as music_models
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
# logger = logging.getLogger(__name__)
|
||||
|
||||
api_key = settings.TYPESENSE_API_KEY
|
||||
host = settings.TYPESENSE_HOST
|
||||
port = settings.TYPESENSE_PORT
|
||||
protocol = settings.TYPESENSE_PROTOCOL
|
||||
TYPESENSE_NUM_TYPO = settings.TYPESENSE_NUM_TYPO
|
||||
# api_key = settings.TYPESENSE_API_KEY
|
||||
# host = settings.TYPESENSE_HOST
|
||||
# port = settings.TYPESENSE_PORT
|
||||
# protocol = settings.TYPESENSE_PROTOCOL
|
||||
# TYPESENSE_NUM_TYPO = settings.TYPESENSE_NUM_TYPO
|
||||
|
||||
|
||||
class TypesenseNotActivate(Exception):
|
||||
pass
|
||||
# class TypesenseNotActivate(Exception):
|
||||
# pass
|
||||
|
||||
|
||||
if not settings.TYPESENSE_API_KEY:
|
||||
logger.info(
|
||||
"Typesense is not activated. You can enable it by setting the TYPESENSE_API_KEY env variable."
|
||||
)
|
||||
else:
|
||||
import typesense
|
||||
# if not settings.TYPESENSE_API_KEY:
|
||||
# logger.info(
|
||||
# "Typesense is not activated. You can enable it by setting the TYPESENSE_API_KEY env variable."
|
||||
# )
|
||||
# else:
|
||||
# import typesense
|
||||
|
||||
|
||||
def delete_non_alnum_characters(text):
|
||||
return unidecode.unidecode(re.sub(r"[^\w]+", "", text).lower())
|
||||
# def delete_non_alnum_characters(text):
|
||||
# return unidecode.unidecode(re.sub(r"[^\w]+", "", text).lower())
|
||||
|
||||
|
||||
def resolve_recordings_to_fw_track(recordings):
|
||||
"""
|
||||
Tries to match a troi recording entity to a fw track using the typesense index.
|
||||
It will save the results in the match_mbid attribute of the Track table.
|
||||
For test purposes : if multiple fw tracks are returned, we log the information
|
||||
but only keep the best result in db to avoid duplicates.
|
||||
"""
|
||||
# def resolve_recordings_to_fw_track(recordings):
|
||||
# """
|
||||
# Tries to match a troi recording entity to a fw track using the typesense index.
|
||||
# It will save the results in the match_mbid attribute of the Track table.
|
||||
# For test purposes : if multiple fw tracks are returned, we log the information
|
||||
# but only keep the best result in db to avoid duplicates.
|
||||
# """
|
||||
|
||||
if not settings.TYPESENSE_API_KEY:
|
||||
raise TypesenseNotActivate(
|
||||
"Typesense is not activated. You can enable it by setting the TYPESENSE_API_KEY env variable."
|
||||
)
|
||||
# if not settings.TYPESENSE_API_KEY:
|
||||
# raise TypesenseNotActivate(
|
||||
# "Typesense is not activated. You can enable it by setting the TYPESENSE_API_KEY env variable."
|
||||
# )
|
||||
|
||||
client = typesense.Client(
|
||||
{
|
||||
"api_key": api_key,
|
||||
"nodes": [{"host": host, "port": port, "protocol": protocol}],
|
||||
"connection_timeout_seconds": 2,
|
||||
}
|
||||
)
|
||||
# client = typesense.Client(
|
||||
# {
|
||||
# "api_key": api_key,
|
||||
# "nodes": [{"host": host, "port": port, "protocol": protocol}],
|
||||
# "connection_timeout_seconds": 2,
|
||||
# }
|
||||
# )
|
||||
|
||||
mc = MetadataCleaner()
|
||||
# mc = MetadataCleaner()
|
||||
|
||||
for recording in recordings:
|
||||
rec = mc.clean_recording(recording.name)
|
||||
artist = mc.clean_artist(recording.artist.name)
|
||||
canonical_name_for_track = delete_non_alnum_characters(artist + rec)
|
||||
# for recording in recordings:
|
||||
# rec = mc.clean_recording(recording.name)
|
||||
# artist = mc.clean_artist(recording.artist.name)
|
||||
# canonical_name_for_track = delete_non_alnum_characters(artist + rec)
|
||||
|
||||
logger.debug(f"Trying to resolve : {canonical_name_for_track}")
|
||||
# logger.debug(f"Trying to resolve : {canonical_name_for_track}")
|
||||
|
||||
search_parameters = {
|
||||
"q": canonical_name_for_track,
|
||||
"query_by": "combined",
|
||||
"num_typos": TYPESENSE_NUM_TYPO,
|
||||
"drop_tokens_threshold": 0,
|
||||
}
|
||||
matches = client.collections["canonical_fw_data"].documents.search(
|
||||
search_parameters
|
||||
)
|
||||
# search_parameters = {
|
||||
# "q": canonical_name_for_track,
|
||||
# "query_by": "combined",
|
||||
# "num_typos": TYPESENSE_NUM_TYPO,
|
||||
# "drop_tokens_threshold": 0,
|
||||
# }
|
||||
# matches = client.collections["canonical_fw_data"].documents.search(
|
||||
# search_parameters
|
||||
# )
|
||||
|
||||
if matches["hits"]:
|
||||
hit = matches["hits"][0]
|
||||
pk = hit["document"]["pk"]
|
||||
logger.debug(f"Saving match for track with primary key {pk}")
|
||||
cache.set(recording.mbid, pk)
|
||||
# if matches["hits"]:
|
||||
# hit = matches["hits"][0]
|
||||
# pk = hit["document"]["pk"]
|
||||
# logger.debug(f"Saving match for track with primary key {pk}")
|
||||
# cache.set(recording.mbid, pk)
|
||||
|
||||
if settings.DEBUG and matches["hits"][1]:
|
||||
for hit in matches["hits"][1:]:
|
||||
pk = hit["document"]["pk"]
|
||||
fw_track = music_models.Track.objects.get(pk=pk)
|
||||
logger.info(
|
||||
f"Duplicate match found for {fw_track.artist.name} {fw_track.title} \
|
||||
and primary key {pk}. Skipping because of better match."
|
||||
)
|
||||
else:
|
||||
logger.debug("No match found in fw db")
|
||||
return cache.get_many([rec.mbid for rec in recordings])
|
||||
# if settings.DEBUG and matches["hits"][1]:
|
||||
# for hit in matches["hits"][1:]:
|
||||
# pk = hit["document"]["pk"]
|
||||
# fw_track = music_models.Track.objects.get(pk=pk)
|
||||
# logger.info(
|
||||
# f"Duplicate match found for {fw_track.artist.name} {fw_track.title} \
|
||||
# and primary key {pk}. Skipping because of better match."
|
||||
# )
|
||||
# else:
|
||||
# logger.debug("No match found in fw db")
|
||||
# return cache.get_many([rec.mbid for rec in recordings])
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue