X-Git-Url: http://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fsimaecho.py;h=1ee17fd6e2dbdd60decbf1c4a95c36dc8eaa952d;hb=e9ed5c171c9251ef6ae7765b1406e2f5b2cb1c0d;hp=fbb60b07fb973305beec2aa2a5a168ca7db8f0ca;hpb=4240fefd9d393365932ff04c063cb31fc5dce85c;p=mpd-sima.git diff --git a/sima/lib/simaecho.py b/sima/lib/simaecho.py index fbb60b0..1ee17fd 100644 --- a/sima/lib/simaecho.py +++ b/sima/lib/simaecho.py @@ -21,169 +21,114 @@ 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.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 - - -class EchoError(Exception): - pass - -class EchoNotFound(EchoError): - pass - -class EchoTimeout(EchoError): - pass - -class EchoHTTPError(EchoError): - pass - -class Throttle(): - def __init__(self, wait): - self.wait = wait - self.last_called = datetime.now() - - def __call__(self, func): - def wrapper(*args, **kwargs): - while self.last_called + self.wait > datetime.now(): - sleep(0.1) - result = func(*args, **kwargs) - self.last_called = datetime.now() - return result - return wrapper - - -class Cache(): - def __init__(self, elem, last=None): - self.elem = elem - self.requestdate = last - if not last: - self.requestdate = datetime.utcnow() - def created(self): - return self.requestdate +def get_mbid(obj, foreign='foreign_ids'): + if foreign in obj: + for frgnid in obj.get(foreign): + if frgnid.get('catalog') == 'musicbrainz': + mbid = frgnid.get('foreign_id').split(':')[2] + return None - def get(self): - return self.elem - -def purge_cache(age=4): - now = datetime.utcnow() - if now.hour == SimaEch.timestamp.hour: - return - SimaEch.timestamp = datetime.utcnow() - cache = SimaEch.cache - delta = timedelta(hours=age) - for url in list(cache.keys()): - timestamp = cache.get(url).created() - if now - timestamp > delta: - cache.pop(url) - - -class SimaEch(): - """ +class SimaEch: + """EchoNest http client """ root_url = 'http://{host}/api/{version}'.format(**ECH) - cache = {} - timestamp = datetime.utcnow() ratelimit = None + name = 'EchoNest' + cache = False + stats = {'etag':0, + 'ccontrol':0, + 'minrl':120, + 'total':0} + + def __init__(self): + self.http = HttpClient(cache=self.cache, stats=self.stats) - def __init__(self, cache=True): - self.artist = None - self._ressource = None - self.current_element = None - self.caching = cache - purge_cache() - - 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)) else: - payload.update(name=artist.name) + payload.update(name=artist.name) payload.update(bucket='id:musicbrainz') payload.update(results=100) - return payload + 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=None): - """ + """Fetch similar artists """ 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()) + for art in ans.json().get('response').get('artists'): + mbid = get_mbid(art) yield Artist(mbid=mbid, name=art.get('name')) + def get_toptrack(self, artist=None): + """Fetch artist top tracks + """ + 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()) + titles = list() + art = { + 'artist': artist.name, + 'musicbrainz_artistid': artist.mbid, + } + for song in ans.json().get('response').get('songs'): + 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