From c3962ac6ebd5f695771d461442740d551ccb7fb1 Mon Sep 17 00:00:00 2001 From: j Date: Mon, 5 Feb 2018 14:15:39 +0000 Subject: [PATCH] recommendation state --- recommendation_engine.py | 48 ++++++++++++++++++++++++++++++++++++++-- server.py | 6 ++++- 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/recommendation_engine.py b/recommendation_engine.py index 009c9b1..e7534a3 100644 --- a/recommendation_engine.py +++ b/recommendation_engine.py @@ -27,13 +27,28 @@ class Engine: username=kwargs.get('username', 'dd.re'), password=kwargs.get('password', 'dd.re') ) - filename = os.path.join(self.path, 'playlists.json') + filename = os.path.join(self.path, 'playlists.json') if os.path.exists(filename): with open(filename) as f: - self.playlists = json.loads(f.read()) + self.playlists = json.load(f) else: self.playlists = [] + filename = os.path.join(self.path, 'state.json') + if os.path.exists(filename): + with open(filename) as f: + self.state = json.load(f) + else: + self.state = { + 'channels': { + 'keywords': {'locked': False, 'value': 7}, + 'screenings': {'locked': False, 'value': 7}, + 'random': {'locked': True, 'value': 2} + }, + 'keywords': {}, + } + self.update_keywords() + @property def pandora(self): while not self._pandora: @@ -101,6 +116,20 @@ class Engine: 'name': video['name'] } for video in videos] + def update_state(self, data): + for key in data: + if key in self.state: + self.state[key].update(data[key]) + else: + self.state[key] = data[key] + self.save_state() + return self.state + + def save_state(self): + filename = os.path.join(self.path, 'state.json') + with open(filename, 'w') as f: + json.dump(self.state, f, indent=4, ensure_ascii=False, sort_keys=True) + def update(self): # Get all storylines with tags storylines = [{ @@ -160,6 +189,21 @@ class Engine: } for storyline in storylines] if playlist['clips']] with open(os.path.join(self.path, 'playlists.json'), 'w') as f: f.write(json.dumps(self.playlists, indent=4, sort_keys=True)) + self.update_keywords() + + def update_keywords(self): + changed = False + if 'keywords' not in self.state: + self.state['keywords'] = {} + changed = True + for playlist in self.playlists: + for tag in playlist.get('tags', []): + if tag.islower() and tag not in self.state['keywords']: + self.state['keywords'][tag] = {'value': 0} + changed = True + if changed: + self.save_state() + @run_async def update_async(self): diff --git a/server.py b/server.py index 3e0e9a3..84176f3 100755 --- a/server.py +++ b/server.py @@ -28,6 +28,10 @@ def api_task(request, engine, callback): try: if request['method'] == 'getVideos': result = engine.get_videos(request['params']) + elif request['method'] == 'getRecommendations': + result = engine.state + elif request['method'] == 'setRecommendations': + result = engine.update_state(request['params']) else: result = {} response = { @@ -53,7 +57,7 @@ class RPCHandler(tornado.web.RequestHandler): request = None try: request = json.loads(self.request.body.decode()) - if request['method'] not in ('getVideos', ): + if request['method'] not in ('getVideos', 'getRecommendations', 'setRecommendations'): raise Exception('unknown method') except: error = {'error': {'code': -32700, 'message': 'Parse error'}}