X-Git-Url: http://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fsimaecho.py;h=147c624578f74de13f44ef54dd20d6d07ce10861;hb=f206f5e50c1cd9e5d3287c00c740277db485761e;hp=f173dd628bbab72f0926181ad951f594ca94b30e;hpb=6811b8c3146c26dbed8cfb900a9d17160a2bc95e;p=mpd-sima.git diff --git a/sima/lib/simaecho.py b/sima/lib/simaecho.py index f173dd6..147c624 100644 --- a/sima/lib/simaecho.py +++ b/sima/lib/simaecho.py @@ -19,163 +19,115 @@ """ Consume EchoNest web service - """ -__version__ = '0.0.1' +__version__ = '0.0.5' __author__ = 'Jack Kaliko' -import urllib.request, urllib.error, urllib.parse - -from datetime import datetime, timedelta -from socket import timeout as SocketTimeOut -from time import sleep - -from requests import get 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: +if len(ECH.get('apikey')) == 23: # simple hack allowing imp.reload getws(ECH) -# Some definitions -WAIT_BETWEEN_REQUESTS = timedelta(0, 0.4) - - -class SimaEchoError(Exception): - 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 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 - def created(self): - return self.requestdate - def get(self): - return self.elem - - -class SimaFM(): - """ +class SimaEch: + """EchoNest http client """ root_url = 'http://{host}/api/{version}'.format(**ECH) - cache = dict({}) - timestamp = datetime.utcnow() - - def __init__(self, cache=True): - self._ressource = None - self._payload = {'api_key': ECH.get('apikey')} - self.current_element = None - self.caching = cache - self.purge_cache() - - def _fetch(self): - """Use cached elements or proceed http request""" - self._req = get(self._ressource, params=self._payload, timeout=5) - if self._req.url in SimaFM.cache: - print('got from SimaFM cache') - self.current_element = SimaFM.cache.get(self._req.url).get() - return - self._fetch_lfm() - - @Throttle(WAIT_BETWEEN_REQUESTS) - def _fetch_lfm(self): - """fetch from web service""" - if self._req.status_code is not 200: - raise SimaEchoError(self._req.status_code) - self.current_element = self._req.json() - self._controls_lfm_answer() - if self.caching: - SimaFM.cache.update({self._req.url: - Cache(self.current_element)}) - - def _controls_lfm_answer(self): - """Controls last.fm answer. + 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 _controls_answer(self, ans): + """Controls answer. """ - status = self.current_element.get('response').get('status') - if status.get('code') is 0: + status = ans.get('response').get('status') + code = status.get('code') + if code is 0: return True - raise SimaEchoError(status.get('message')) + if code is 5: + raise WSNotFound('Artist not found') + raise WSError(status.get('message')) - def _controls_artist(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: - self._payload.update( + payload.update( id='musicbrainz:artist:{0}'.format(artist.mbid)) else: - self._payload.update(name=artist.name) - self._payload.update(bucket='id:musicbrainz') - self._payload.update(results=30) - - def purge_cache(self, age=4): - now = datetime.utcnow() - if now.hour == SimaFM.timestamp.hour: - return - SimaFM.timestamp = datetime.utcnow() - cache = SimaFM.cache - delta = timedelta(hours=age) - for url in list(cache.keys()): - timestamp = cache.get(url).created() - if now - timestamp > delta: - cache.pop(url) + payload.update(name=artist.name) + payload.update(bucket='id:musicbrainz') + payload.update(results=100) + 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 """ - """ - self._controls_artist(artist) + payload = self._forge_payload(artist) # Construct URL - self._ressource = '{0}/artist/similar'.format(SimaFM.root_url) - self._fetch() - 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 run(): - test = SimaFM() - for t, a, m in test.get_similartracks(artist='Nirvana', track='Smells Like Teen Spirit'): - print(a, t, m) - return - -if __name__ == '__main__': - try: - run() - except XmlFMHTTPError as conn_err: - print("error trying to connect: %s" % conn_err) - except XmlFMNotFound as not_found: - print("looks like no artists were found: %s" % not_found) - except XmlFMError as err: - print(err) + 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