X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fsimaecho.py;h=393d723f62e216d7a6027d02c33a363b5f9a2d40;hb=251934a89e7796fb21bb223c4ae04d757082a89b;hp=716a43eb169094bf7e8d0c67963484f4197a436d;hpb=774f4b39de0b2ad7aa0e6ed3d7cc739a5456e8c5;p=mpd-sima.git diff --git a/sima/lib/simaecho.py b/sima/lib/simaecho.py index 716a43e..393d723 100644 --- a/sima/lib/simaecho.py +++ b/sima/lib/simaecho.py @@ -21,127 +21,120 @@ Consume EchoNest web service """ -__version__ = '0.0.1' +__version__ = '0.0.5' __author__ = 'Jack Kaliko' -import logging - -from datetime import datetime, timedelta -from time import sleep - -from requests import get, Request, Timeout, ConnectionError from sima import ECH from sima.lib.meta import Artist -from sima.utils.utils import getws, Throttle, Cache, purge_cache +from sima.lib.track import Track +from sima.lib.http import HttpClient +from sima.utils.utils import WSError, WSNotFound +from sima.utils.utils import getws if len(ECH.get('apikey')) == 23: # simple hack allowing imp.reload getws(ECH) -# Some definitions -WAIT_BETWEEN_REQUESTS = timedelta(0, 1) -SOCKET_TIMEOUT = 4 +def get_mbid(obj, foreign='foreign_ids'): + if foreign in obj: + for frgnid in obj.get(foreign): + if frgnid.get('catalog') == 'musicbrainz': + return frgnid.get('foreign_id').split(':')[2] + return None -class EchoError(Exception): - pass -class EchoNotFound(EchoError): - pass +class SimaEch: + """EchoNest http client + """ + root_url = 'http://{host}/api/{version}'.format(**ECH) + name = 'EchoNest' + cache = False + """HTTP cache to use, in memory or persitent. -class EchoTimeout(EchoError): - pass + :param BaseCache cache: Set a cache, defaults to `False`. + """ + stats = {'etag':0, + 'ccontrol':0, + 'minrl':120, + 'total':0} -class EchoHTTPError(EchoError): - pass + def __init__(self): + self.http = HttpClient(cache=self.cache, stats=self.stats) -class SimaEch(): - """ - """ - root_url = 'http://{host}/api/{version}'.format(**ECH) - cache = {} - timestamp = datetime.utcnow() - ratelimit = None - - def __init__(self, cache=True): - self.artist = None - self._ressource = None - self.current_element = None - self.caching = cache - purge_cache(self.__class__) - - def _fetch(self, payload): - """Use cached elements or proceed http request""" - url = Request('GET', self._ressource, params=payload,).prepare().url - if url in SimaEch.cache: - self.current_element = SimaEch.cache.get(url).elem - return - try: - self._fetch_ech(payload) - except Timeout: - raise EchoTimeout('Failed to reach server within {0}s'.format( - SOCKET_TIMEOUT)) - except ConnectionError as err: - raise EchoError(err) - - @Throttle(WAIT_BETWEEN_REQUESTS) - def _fetch_ech(self, payload): - """fetch from web service""" - req = get(self._ressource, params=payload, - timeout=SOCKET_TIMEOUT) - self.__class__.ratelimit = req.headers.get('x-ratelimit-remaining', None) - if req.status_code is not 200: - raise EchoHTTPError(req.status_code) - self.current_element = req.json() - self._controls_answer() - if self.caching: - SimaEch.cache.update({req.url: - Cache(self.current_element)}) - - def _controls_answer(self): + def _controls_answer(self, ans): """Controls answer. """ - status = self.current_element.get('response').get('status') + status = ans.get('response').get('status') code = status.get('code') if code is 0: return True if code is 5: - raise EchoNotFound('Artist not found: "{0}"'.format(self.artist)) - raise EchoError(status.get('message')) + raise WSNotFound('Artist not found') + raise WSError(status.get('message')) - def _forge_payload(self, artist): - """ + def _forge_payload(self, artist, top=False): + """Build payload """ payload = {'api_key': ECH.get('apikey')} if not isinstance(artist, Artist): raise TypeError('"{0!r}" not an Artist object'.format(artist)) - self.artist = artist if artist.mbid: - payload.update( - id='musicbrainz:artist:{0}'.format(artist.mbid)) + payload.update(id='musicbrainz:artist:{0}'.format(artist.mbid)) else: - payload.update(name=artist.name) + payload.update(name=artist.name) payload.update(bucket='id:musicbrainz') payload.update(results=100) - return payload - - def get_similar(self, artist=None): - """ + if top: + if artist.mbid: + aid = payload.pop('id') + payload.update(artist_id=aid) + else: + name = payload.pop('name') + payload.update(artist=name) + payload.update(results=100) + payload.update(sort='song_hotttnesss-desc') + # > hashing the URL into a cache key + # return a sorted list of 2-tuple to have consistent cache + return sorted(payload.items(), key=lambda param: param[0]) + + def get_similar(self, artist): + """Fetch similar artists + + :param sima.lib.meta.Artist artist: `Artist` to fetch similar artists from + :returns: generator of :class:`sima.lib.meta.Artist` """ payload = self._forge_payload(artist) # Construct URL - self._ressource = '{0}/artist/similar'.format(SimaEch.root_url) - self._fetch(payload) - for art in self.current_element.get('response').get('artists'): - artist = {} - mbid = None - if 'foreign_ids' in art: - for frgnid in art.get('foreign_ids'): - if frgnid.get('catalog') == 'musicbrainz': - mbid = frgnid.get('foreign_id' - ).lstrip('musicbrainz:artist:') + ressource = '{0}/artist/similar'.format(SimaEch.root_url) + ans = self.http(ressource, payload) + self._controls_answer(ans.json()) # pylint: disable=no-member + for art in ans.json().get('response').get('artists'): # pylint: disable=no-member + mbid = get_mbid(art) yield Artist(mbid=mbid, name=art.get('name')) + def get_toptrack(self, artist): + """Fetch artist top tracks + + :param sima.lib.meta.Artist artist: `Artist` to fetch top tracks from + :returns: generator of :class:`sima.lib.track.Track` + """ + payload = self._forge_payload(artist, top=True) + # Construct URL + ressource = '{0}/song/search'.format(SimaEch.root_url) + ans = self.http(ressource, payload) + self._controls_answer(ans.json()) # pylint: disable=no-member + titles = list() + art = {'artist': artist.name, + 'musicbrainz_artistid': artist.mbid,} + for song in ans.json().get('response').get('songs'): # pylint: disable=no-member + title = song.get('title') + if not art.get('musicbrainz_artistid'): + art['musicbrainz_artistid'] = get_mbid(song, 'artist_foreign_ids') + if title not in titles: + titles.append(title) + yield Track(title=title, **art) + # VIM MODLINE # vim: ai ts=4 sw=4 sts=4 expandtab