__author__ = 'Jack Kaliko'
-from datetime import datetime, timedelta
-
from requests import Session, Request, Timeout, ConnectionError
-from sima import ECH
+from sima import ECH, SOCKET_TIMEOUT, WAIT_BETWEEN_REQUESTS
from sima.lib.meta import Artist
from sima.lib.track import Track
-from sima.lib.httpcli.controller import CacheController
-from sima.lib.httpcli.cache import FileCache
+from sima.lib.http import CacheController
from sima.utils.utils import WSError, WSNotFound, WSTimeout, WSHTTPError
from sima.utils.utils import getws, Throttle
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 SimaEch:
"""EchoNest http client
"""
root_url = 'http://{host}/api/{version}'.format(**ECH)
- timestamp = datetime.utcnow()
ratelimit = None
name = 'EchoNest'
- cache = FileCache('/home/kaliko/.local/share/mpd_sima/http')
+ cache = False
+ stats = {'etag':0,
+ 'ccontrol':0,
+ 'minrl':120,
+ 'total':0}
def __init__(self):
- self._ressource = None
- self.current_element = None
self.controller = CacheController(self.cache)
- def _fetch(self, payload):
- """Use cached elements or proceed http request"""
- req = Request('GET', self._ressource, params=payload,
+ def _fetch(self, ressource, payload):
+ """
+ Prepare http request
+ Use cached elements or proceed http request
+ """
+ req = Request('GET', ressource, params=payload,
).prepare()
+ SimaEch.stats.update(total=SimaEch.stats.get('total')+1)
if self.cache:
cached_response = self.controller.cached_request(req.url, req.headers)
if cached_response:
+ SimaEch.stats.update(ccontrol=SimaEch.stats.get('ccontrol')+1)
return cached_response.json()
-
try:
return self._fetch_ws(req)
except Timeout:
"""fetch from web service"""
sess = Session()
resp = sess.send(prepreq, timeout=SOCKET_TIMEOUT)
- self.__class__.ratelimit = resp.headers.get('x-ratelimit-remaining', None)
- if resp.status_code is not 200:
+ if resp.status_code == 304:
+ SimaEch.stats.update(etag=SimaEch.stats.get('etag')+1)
+ resp = self.controller.update_cached_response(prepreq, resp)
+ elif resp.status_code != 200:
raise WSHTTPError('{0.status_code}: {0.reason}'.format(resp))
ans = resp.json()
self._controls_answer(ans)
+ SimaEch.ratelimit = resp.headers.get('x-ratelimit-remaining', None)
+ minrl = min(int(SimaEch.ratelimit), SimaEch.stats.get('minrl'))
+ SimaEch.stats.update(minrl=minrl)
if self.cache:
self.controller.cache_response(resp.request, resp)
return ans
payload.update(artist=name)
payload.update(results=100)
payload.update(sort='song_hotttnesss-desc')
- return payload
+ # > 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)
- ans = self._fetch(payload)
+ ressource = '{0}/artist/similar'.format(SimaEch.root_url)
+ ans = self._fetch(ressource, payload)
for art in ans.get('response').get('artists'):
- artist = {}
mbid = None
if 'foreign_ids' in art:
for frgnid in art.get('foreign_ids'):
"""
payload = self._forge_payload(artist, top=True)
# Construct URL
- self._ressource = '{0}/song/search'.format(SimaEch.root_url)
- ans = self._fetch(payload)
+ ressource = '{0}/song/search'.format(SimaEch.root_url)
+ ans = self._fetch(ressource, payload)
titles = list()
- artist = {
+ art = {
'artist': artist.name,
'musicbrainz_artistid': artist.mbid,
}
title = song.get('title')
if title not in titles:
titles.append(title)
- yield Track(title=title, **artist)
+ yield Track(title=title, **art)
# VIM MODLINE