MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix linter

This commit is contained in:
Petitminion 2021-10-31 10:04:36 +01:00
parent 5e0af940dd
commit d07dcd98bc
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/funkwhale_api/radios/radios.py
View File

@ -275,7 +275,9 @@ class SimilarAcousticRadio(RelatedObjectRadio):
def filter_queryset(self, queryset): def filter_queryset(self, queryset):
queryset = super().filter_queryset(queryset) queryset = super().filter_queryset(queryset)
mbids_regex = self.get_regex() mbids_regex = self.get_regex()
return queryset.filter(mbid__regex=r'({mbids_regex})'.format(mbids_regex=mbids_regex)) return queryset.filter(
mbid__regex=r'({mbids_regex})'.format(mbids_regex=mbids_regex)
)
@registry.register(name="artist") @registry.register(name="artist")

33
api/funkwhale_api/radios/utils.py
View File

@ -5,8 +5,20 @@ import requests
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
VALID_METRICS = ['mfccs', 'mfccsw', 'gfccs', 'gfccsw', 'key', 'bpm', 'onsetrate', 'moods', VALID_METRICS = [
'instruments', 'dortmund', 'rosamerica', 'tzanetakis'] "mfccs",
"mfccsw",
"gfccs",
"gfccsw",
"key",
"bpm",
"onsetrate",
"moods",
"instruments",
"dortmund",
"rosamerica",
"tzanetakis"
]
class EndpointError(Exception): class EndpointError(Exception):
@ -16,20 +28,25 @@ class EndpointError(Exception):
def get_similar_tracks_mbids_from_mbid(mbid, annoy_similarity): def get_similar_tracks_mbids_from_mbid(mbid, annoy_similarity):
if annoy_similarity not in VALID_METRICS: if annoy_similarity not in VALID_METRICS:
raise AttributeError("Metric %s is not valid. Must be one of : " + print(VALID_METRICS)) raise AttributeError(
"Metric %s is not valid. Must be one of : " + print(VALID_METRICS)
)
headers = {'Content-Type': 'application/json'} headers = {"Content-Type': 'application/json"}
endpoint = "acousticbrainz.org/api/v1/similarity" endpoint = "acousticbrainz.org/api/v1/similarity"
similar_tracks_mbids = [] similar_tracks_mbids = []
similar_tracks = requests.get( similar_tracks = requests.get(
'https://{endpoint}/{annoy_similarity}/?recording_ids={mbid}&remove_dups&n_neighbours=1000' "https://{endpoint}/{annoy_similarity}/?recording_ids={mbid}&remove_dups&n_neighbours=1000"
.format(endpoint=endpoint, annoy_similarity=annoy_similarity, mbid=mbid), headers=headers .format(
endpoint=endpoint, annoy_similarity=annoy_similarity, mbid=mbid
),
headers=headers
) )
if similar_tracks.status_code != 200: if similar_tracks.status_code != 200:
logger.warning("Error while querying {endpoint!r} : {similar_tracks.content!r}") logger.warning("Error while querying {endpoint!r} : {similar_tracks.content!r}")
raise EndpointError raise EndpointError
j = json.loads(similar_tracks.content) j = json.loads(similar_tracks.content)
for tracks in j['{mbid}'.format(mbid=mbid)]['0']: for tracks in j["{mbid}".format(mbid=mbid)]["0"]:
similar_tracks_mbids.append(tracks['recording_mbid']) similar_tracks_mbids.append(tracks["recording_mbid"])
return similar_tracks_mbids return similar_tracks_mbids