Skip to content
Snippets Groups Projects
Commit d07dcd98 authored by petitminion's avatar petitminion
Browse files

fix linter

parent 5e0af940
No related branches found
No related tags found
No related merge requests found
...@@ -275,7 +275,9 @@ class SimilarAcousticRadio(RelatedObjectRadio): ...@@ -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")
......
...@@ -5,8 +5,20 @@ import requests ...@@ -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): ...@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment