From: kaliko Date: Sat, 8 Feb 2014 13:10:01 +0000 (+0100) Subject: Use requests in lastfm module X-Git-Tag: mpd-sima/0.12.0pr3~9 X-Git-Url: http://git.kaliko.me/?a=commitdiff_plain;h=67bcabe7439d4830cb3ae8c61fa269eb9232ac59;p=mpd-sima.git Use requests in lastfm module Also add Artist type --- diff --git a/doc/examples/all_settings.cfg b/doc/examples/all_settings.cfg index c0581a0..7eb0f24 100644 --- a/doc/examples/all_settings.cfg +++ b/doc/examples/all_settings.cfg @@ -6,7 +6,7 @@ # # Pay Attention: # * Inline comment are not possible -# +# # WRONG: # host = localhost # My host # diff --git a/sima/lib/simafm.py b/sima/lib/simafm.py index 170488b..95a4fee 100644 --- a/sima/lib/simafm.py +++ b/sima/lib/simafm.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009, 2010, 2011, 2012, 2013 Jack Kaliko -# Copyright (c) 2010 Eric Casteleijn (Throttle decorator) +# Copyright (c) 2014 Jack Kaliko # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,293 +18,129 @@ # """ -Consume last.fm web service - +Consume EchoNest web service """ -__version__ = '0.4.0' +__version__ = '0.0.1' __author__ = 'Jack Kaliko' -import urllib.request, urllib.error, urllib.parse - from datetime import datetime, timedelta -from http.client import BadStatusLine -from socket import timeout as SocketTimeOut -from xml.etree.cElementTree import ElementTree -from request import get +from requests import get, Request, Timeout, ConnectionError from sima import LFM -from sima.utils.utils import getws, Throttle, Cache +from sima.lib.meta import Artist +from sima.utils.utils import getws, Throttle, Cache, purge_cache if len(LFM.get('apikey')) == 43: # simple hack allowing imp.reload getws(LFM) # Some definitions -WAIT_BETWEEN_REQUESTS = timedelta(0, 0.4) - - -class XmlFMError(Exception): # Errors - """ - Exception raised for errors in the input. - """ - - def __init__(self, expression): - self.expression = expression +WAIT_BETWEEN_REQUESTS = timedelta(0, 1) +SOCKET_TIMEOUT = 4 - def __str__(self): - return repr(self.expression) - -class EncodingError(XmlFMError): - """Raised when string is not unicode""" +class WSError(Exception): pass +class WSNotFound(WSError): + pass -class XmlFMHTTPError(XmlFMError): - """Raised when failed to connect server""" - - def __init__(self, expression): - if hasattr(expression, 'code'): - self.expression = 'error %d: %s' % (expression.code, - expression.msg) - else: - self.expression = 'error: %s' % expression - - -class XmlFMNotFound(XmlFMError): - """Raised when no artist is found""" - - def __init__(self, message=None): - if not message: - message = 'Artist probably not found (http error 400)' - self.expression = (message) - - -class XmlFMMissingArtist(XmlFMError): - """Raised when no artist name provided""" - - def __init__(self, message=None): - if not message: - message = 'Missing artist name.' - self.expression = (message) - +class WSTimeout(WSError): + pass -class XmlFMTimeOut(XmlFMError): - """Raised when urlopen times out""" +class WSHTTPError(WSError): + pass - def __init__(self, message=None): - if not message: - message = 'Connection to last.fm web services times out!' - self.expression = (message) class SimaFM(): """ """ root_url = 'http://{host}/{version}/'.format(**LFM) - request = dict({'similar': '?method=artist.getsimilar&artist=%s&' +\ - 'api_key={apikey}'.format(**LFM), - 'top': '?method=artist.gettoptracks&artist=%s&' +\ - 'api_key={apikey}'.format(**LFM), - 'track': '?method=track.getsimilar&artist=%s' +\ - '&track=%s' + 'api_key={apikey}'.format(**LFM), - 'info': '?method=artist.getinfo&artist=%s' +\ - 'api_key={apikey}'.format(**LFM), - }) - payloads = dict({'similar': {'method':'artist.getsimilar', - 'artist':None, 'api_key':LFM.get('apikey'),}, - 'top': {'method':'artist.gettoptracks', - 'artist':None, 'api_key':LFM.get('apikey'),}, - 'track': {'method':'track.getsimilar', - 'artist':None, 'track':None, - 'api_key':LFM.get('apikey'),}, - 'info': {'method':'artist.getinfo', 'artist':None, - 'api_key':LFM.get('apikey'),}, - }) - cache = dict({}) + cache = {} timestamp = datetime.utcnow() - count = 0 + #ratelimit = None - def __init__(self, artist=None, cache=True): - self._url = None - #SimaFM.count += 1 + def __init__(self, cache=True): + self.artist = None + self._url = self.__class__.root_url self.current_element = None self.caching = cache - self.purge_cache() - - def _is_in_cache(self): - """Controls presence of url in cache. - """ - if self._url in SimaFM.cache: - #print('already fetch {0}'.format(self.artist)) - return True - return False + purge_cache(self.__class__) - def _fetch(self): + def _fetch(self, payload): """Use cached elements or proceed http request""" - if self._is_in_cache(): - self.current_element = SimaFM.cache.get(self._url).gettree() + url = Request('GET', self._url, params=payload,).prepare().url + if url in SimaFM.cache: + self.current_element = SimaFM.cache.get(url).elem + print('is cached') return - self._fetch_lfm() - - @Throttle(WAIT_BETWEEN_REQUESTS) - def _fetch_ws(self): - pass + try: + self._fetch_ech(payload) + except Timeout: + raise WSTimeout('Failed to reach server within {0}s'.format( + SOCKET_TIMEOUT)) + except ConnectionError as err: + raise WSError(err) @Throttle(WAIT_BETWEEN_REQUESTS) - def _fetch_lfm(self): - """Get artists, fetch xml from last.fm""" - try: - fd = urllib.request.urlopen(url=self._url, - timeout=15) - except SocketTimeOut: - raise XmlFMTimeOut() - except BadStatusLine as err: - raise XmlFMHTTPError(err) - except urllib.error.URLError as err: - if hasattr(err, 'reason'): - # URLError, failed to reach server - raise XmlFMError(repr(err.reason)) - if hasattr(err, 'code'): - # HTTPError, the server couldn't fulfill the request - if err.code == 400: - raise XmlFMNotFound() - raise XmlFMHTTPError(err) - raise XmlFMError(err) - headers = dict(fd.getheaders()) - content_type = headers.get('Content-Type').split(';') - if content_type[0] != "text/xml": - raise XmlFMError('None XML returned from the server') - if content_type[1].strip() != "charset=utf-8": - raise XmlFMError('XML not UTF-8 encoded!') - try: - self.current_element = ElementTree(file=fd) - except SocketTimeOut: - raise XmlFMTimeOut() - finally: - fd.close() - self._controls_lfm_answer() + def _fetch_ech(self, payload): + """fetch from web service""" + req = get(self._url, params=payload, + timeout=SOCKET_TIMEOUT) + #self.__class__.ratelimit = req.headers.get('x-ratelimit-remaining', None) + if req.status_code is not 200: + raise WSHTTPError(req.status_code) + self.current_element = req.json() + self._controls_answer() if self.caching: - SimaFM.cache[self._url] = Cache(self.current_element) + SimaFM.cache.update({req.url: + Cache(self.current_element)}) - def _controls_lfm_answer(self): - """Controls last.fm answer. + def _controls_answer(self): + """Controls answer. """ - status = self.current_element.getroot().attrib.get('status') - if status == 'ok': - return True - if status == 'failed': - error = self.current_element.find('error').attrib.get('code') - errormsg = self.current_element.findtext('error') - raise XmlFMNotFound(errormsg) - - def _controls_artist(self, artist): + if 'error' in self.current_element: + code = self.current_element.get('error') + mess = self.current_element.get('message') + if code == 6: + raise WSNotFound('{0}: "{1}"'.format(mess, self.artist)) + raise WSError(mess) + return True + + def _forge_payload(self, artist, method='similar', track=None): """ """ + payloads = dict({'similar': {'method':'artist.getsimilar',}, + 'top': {'method':'artist.gettoptracks',}, + 'track': {'method':'track.getsimilar',}, + 'info': {'method':'artist.getinfo',}, + }) + payload = payloads.get(method) + payload.update(api_key=LFM.get('apikey'), format='json') + if not isinstance(artist, Artist): + raise TypeError('"{0!r}" not an Artist object'.format(artist)) self.artist = artist - if not self.artist: - raise XmlFMMissingArtist('Missing artist name calling SimaFM.get_()') - if not isinstance(self.artist, str): - raise EncodingError('"%s" not unicode object' % self.artist) - # last.fm is UTF-8 encoded URL - self.artist_utf8 = self.artist.encode('UTF-8') - - 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) - - def get_similar_ng(self, artist=None): - """ - """ - self._controls_artist(artist) - # Construct URL - self._req = get(SimaFM.root_url, params=None, timeout=5) - self._url = req.url - if self._is_in_cache(): - self.current_element = SimaFM.cache.get(self._url).gettree() + if artist.mbid: + payload.update(mbid='{0}'.format(artist.mbid)) else: - self._fetch_ws() - elem = self.current_element - for art in elem.getiterator(tag='artist'): - yield str(art.findtext('name')), 100 * float(art.findtext('match')) + payload.update(artist=artist.name) + payload.update(results=100) + if method == 'track': + payload.update(track=track) + return payload def get_similar(self, artist=None): """ """ - self._controls_artist(artist) - # Construct URL - url = SimaFM.root_url + SimaFM.request.get('similar') - self._url = url % (urllib.parse.quote(self.artist_utf8, safe='')) - self._fetch() - # TODO: controls name encoding - elem = self.current_element - for art in elem.getiterator(tag='artist'): - yield str(art.findtext('name')), 100 * float(art.findtext('match')) - - def get_toptracks(self, artist=None): - """ - """ - self._controls_artist(artist) - # Construct URL - url = SimaFM.root_url + SimaFM.request.get('top') - self._url = url % (urllib.parse.quote(self.artist_utf8, safe='')) - self._fetch() - # TODO: controls name encoding - elem = self.current_element - for track in elem.getiterator(tag='track'): - yield str(track.findtext('name')), int(track.attrib.get('rank')) - - def get_similartracks(self, track=None, artist=None): - """ - """ - # Construct URL - url = SimaFM.root_url + SimaFM.request.get('track') - self._url = url % (urllib.parse.quote(artist.encode('UTF-8'), safe=''), - urllib.parse.quote(track.encode('UTF-8'), safe='')) - self._fetch() - elem = self.current_element - for trk in elem.getiterator(tag='track'): - yield (str(trk.findtext('artist/name')), - str(trk.findtext('name')), - 100 * float(trk.findtext('match'))) - - def get_mbid(self, artist=None): - """ - """ - self._controls_artist(artist) + payload = self._forge_payload(artist) # Construct URL - url = SimaFM.root_url + SimaFM.request.get('info') - self._url = url % (urllib.parse.quote(self.artist_utf8, safe='')) - self._fetch() - # TODO: controls name encoding - elem = self.current_element - return str(elem.find('artist').findtext('mbid')) - - -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) + self._fetch(payload) + for art in self.current_element.get('similarartists').get('artist'): + match = 100 * float(art.get('match')) + yield Artist(mbid=art.get('mbid', None), + name=art.get('name')), match # VIM MODLINE diff --git a/sima/plugins/internal/lastfm.py b/sima/plugins/internal/lastfm.py index 28bb3a4..3bae05e 100644 --- a/sima/plugins/internal/lastfm.py +++ b/sima/plugins/internal/lastfm.py @@ -13,8 +13,9 @@ from hashlib import md5 # local import from ...lib.plugin import Plugin -from ...lib.simafm import SimaFM, XmlFMHTTPError, XmlFMNotFound, XmlFMError +from ...lib.simafm import SimaFM, WSHTTPError, WSNotFound, WSError from ...lib.track import Track +from ...lib.meta import Artist def cache(func): @@ -22,7 +23,7 @@ def cache(func): def wrapper(*args, **kwargs): #pylint: disable=W0212,C0111 cls = args[0] - similarities = [art + str(match) for art, match in args[1]] + similarities = [art for art, _ in args[1]] hashedlst = md5(''.join(similarities).encode('utf-8')).hexdigest() if hashedlst in cls._cache.get('asearch'): cls.log.debug('cached request') @@ -60,10 +61,11 @@ class Lastfm(Plugin): """ Both flushes and instanciates _cache """ + name = self.__class__.__name__ if isinstance(self._cache, dict): - self.log.info('Lastfm: Flushing cache!') + self.log.info('{0}: Flushing cache!'.format(name)) else: - self.log.info('Lastfm: Initialising cache!') + self.log.info('{0}: Initialising cache!'.format(name)) self._cache = { 'asearch': dict(), 'tsearch': dict(), @@ -170,21 +172,25 @@ class Lastfm(Plugin): Retrieve similar artists on last.fm server. """ if artist is None: - current = self.player.current + curr = self.player.current.__dict__ + name = curr.get('artist') + mbid = curr.get('musicbrainz_artistid', None) + current = Artist(name=name, mbid=mbid) else: current = artist simafm = SimaFM() # initialize artists deque list to construct from DB as_art = deque() - as_artists = simafm.get_similar(artist=current.artist) - self.log.debug('Requesting last.fm for "{0.artist}"'.format(current)) + as_artists = simafm.get_similar(artist=current) + self.log.debug('Requesting last.fm for "{0}"'.format(current)) try: - [as_art.append((a, m)) for a, m in as_artists] - except XmlFMHTTPError as err: + # TODO: let's propagate Artist type + [as_art.append((str(a), m)) for a, m in as_artists] + except WSHTTPError as err: self.log.warning('last.fm http error: %s' % err) - except XmlFMNotFound as err: + except WSNotFound as err: self.log.warning("last.fm: %s" % err) - except XmlFMError as err: + except WSError as err: self.log.warning('last.fm module error: %s' % err) if as_art: self.log.debug('Fetched %d artist(s) from last.fm' % len(as_art)) @@ -230,7 +236,7 @@ class Lastfm(Plugin): return [] similar = sorted(similar, key=lambda sim: sim[1], reverse=True) self.log.info('First five similar artist(s): {}...'.format( - ' / '.join([a for a, m in similar[0:5]]))) + ' / '.join([a for a, _ in similar[0:5]]))) self.log.info('Looking availability in music library') ret = self.get_artists_from_player(similar) ret_extra = None @@ -319,7 +325,7 @@ class Lastfm(Plugin): 'history getting too large?') return None for track in self.to_add: - self.log.info('last.fm candidate: {0!s}'.format(track)) + self.log.info('last.fm candidates: {0!s}'.format(track)) def _album(self): """Get albums for album queue mode diff --git a/sima/utils/utils.py b/sima/utils/utils.py index c3bc6c0..93bac25 100644 --- a/sima/utils/utils.py +++ b/sima/utils/utils.py @@ -27,9 +27,10 @@ import sys from argparse import ArgumentError, Action from base64 import b64decode as push from codecs import getencoder -from datetime import datetime +from datetime import datetime, timedelta from os import environ, access, getcwd, W_OK, R_OK from os.path import dirname, isabs, join, normpath, exists, isdir, isfile +from time import sleep def getws(dic): @@ -77,6 +78,19 @@ def exception_log(): log.info('Quiting now!') sys.exit(1) +def purge_cache(obj, age=4): + now = datetime.utcnow() + if now.hour == obj.timestamp.hour: + return + obj.timestamp = datetime.utcnow() + cache = obj.cache + delta = timedelta(hours=age) + for url in list(cache.keys()): + timestamp = cache.get(url).created() + if now - timestamp > delta: + cache.pop(url) + + class SigHup(Exception): pass