Compare commits

..

No commits in common. "8c618ab9888354ca287ff609ab4b79f6291de112" and "b749d66bac897f815bc4381024c52f44f0b822b8" have entirely different histories.

View file

@ -54,15 +54,14 @@ class Engine:
}
if 'gridChange' not in self.state:
self.state['gridChange'] = {
'nextClip': {'locked': False, 'value': 5},
'nextPlaylist': {'locked': False, 'value': 8},
'staySame': {'locked': True, 'value': 3}
'nextClip': {'locked': True, 'value': 4},
'nextPlaylist': {'locked': False, 'value': 4},
'staySame': {'locked': False, 'value': 8}
}
if 'userKeywordsWeights' not in self.state:
self.state['userKeywordsWeights'] = {
'themeTags': {'locked': False, 'value': 0.3},
'characterTags': {'locked': False, 'value': 0.7},
'random' : {'locked': False, 'value': True}
'characterTags': {'locked': False, 'value': 0.7}
}
self.update_keywords()
@ -102,14 +101,12 @@ class Engine:
# Update self_playlists to reflect user log history
playlists = self.update_user_playlists(user)
# Get the user keyword scores for debug view
user_keywords = copy.deepcopy(user.get('keywords', {}))
theme_tags = {k.lower():v for k,v in user_keywords.items() if not k.isupper()}
character_tags = {k:v for k,v in user_keywords.items() if k.isupper()}
top_user_keywords = sorted([(k,v) for (k,v) in theme_tags.items()], key=lambda kv: kv[1])[-10:]
top_user_characters = sorted([(k,v) for (k,v) in character_tags.items()], key=lambda kv: kv[1])[-10:]
debug_index_output = defaultdict(list)
top_user_keywords = sorted([(k,v) for (k,v) in theme_tags.items()], key=lambda kv: kv[1])[-5:]
top_user_characters = sorted([(k,v) for (k,v) in character_tags.items()], key=lambda kv: kv[1])[-5:]
# If the most recent event is "login," initialize grid videos.
if user.get('events', [{}])[0].get("event")=="login":
@ -203,6 +200,7 @@ class Engine:
else:
playlist_pos = next_unwatched_indx[0]
rec_list.append((i, {
'clips': playlist['clips'],
'position': playlist_pos,
@ -210,8 +208,6 @@ class Engine:
'tags': playlist['tags']
}))
debug_index_output["next_clip"].append((i,playlist['name']))
#staySame pool
for i in stay_same_index:
@ -220,7 +216,6 @@ class Engine:
next_playlist_index.append(i)
else:
rec_list.append((i,{}))
debug_index_output["stay_same"].append(i)
# nextPlaylist pool: randomly select playlists (excluding the playlists from the current grid).
vids_exclude = [e.get("playlist") for e in prev_grid_list]
@ -228,7 +223,6 @@ class Engine:
vids_exclude.remove(None)
rec = self.get_recommendations(playlists, user, vids_exclude)
rec_list += [(i, rec['videos'][i]) for i in next_playlist_index]
debug_index_output["new_playlist"] = [(i, rec['videos'][i]["name"]) for i in next_playlist_index]
rec_list = sorted(rec_list, key=lambda k:k[0])
@ -239,13 +233,10 @@ class Engine:
},
'videos': videos_,
"_debug": {
"top_user_keywords": top_user_keywords, # list of (keyword, score)
"top_user_characters": top_user_characters, # list of (keyword, score)
"top_user_playlists": rec["top_user_playlists"], # list of (playlist name, score)
"top_global_playlists": rec["top_global_playlists"], # list of (playlist name, score)
"stay_same_index": debug_index_output["stay_same"], # list of integers
"next_clip_index": debug_index_output["next_clip"], # list of (integer, playlist name)
"new_playlist_index": debug_index_output["new_playlist"] # list of (integer, playlist name)
"top_user_keywords": top_user_keywords,
"top_user_characters": top_user_characters,
"top_user_playlists": rec["top_user_playlists"],
"top_global_playlists": rec["top_global_playlists"]
}
}
@ -262,14 +253,6 @@ class Engine:
if playlist["name"] in vids_exclude:
playlists.remove(playlist)
# Generate random weights if random option is chosen in the dashboard:
if userKeywordsWeights['random']:
themeWeights = random.random()
charWeights = 1-themeWeights
else:
themeWeights = userKeywordsWeights['themeTags']
charWeights = userKeywordsWeights['characterTags']
# For each playlist, compute user keyword score by theme and character tags
user_keywords = copy.deepcopy(user.get('keywords', {}))
theme_tags = {k.lower():v for k,v in user_keywords.items() if not k.isupper()}
@ -283,24 +266,23 @@ class Engine:
character_tags["VICTORIA OLEGOVNA SKITSKAYA"] = character_tags.get("VIKTORIA OLEGOVNA SKITSKAYA",0)
score = {}
for playlist in playlists:
score[playlist['name']] = random.random() * 0.1
score[playlist['name']] = random.random() * 0.001
for tag in playlist['tags']:
if tag in theme_tags:
score[playlist['name']] += theme_tags[tag] * themeWeights
score[playlist['name']] += theme_tags[tag] * userKeywordsWeights["themeTags"]
elif tag in character_tags:
score[playlist['name']] += character_tags[tag] * charWeights
score[playlist['name']] += character_tags[tag] * userKeywordsWeights["characterTags"]
# Select highest scoring playlists
playlists = sorted(
playlists,
key=lambda playlist: -score[playlist['name']]
)
# Record the following for debug view input
top_user_playlists = [(playlist['name'], score[playlist['name']]) for playlist in playlists[:channels['userKeywords']]]
# top_user_playlists = [{
# 'name': playlist['name'],
# 'tags': playlist['tags'],
# 'score': score[playlist['name']],
# } for playlist in playlists[:channels['userKeywords']]]
top_user_playlists = [{
'name': playlist['name'],
'tags': playlist['tags'],
'score': score[playlist['name']],
} for playlist in playlists[:channels['userKeywords']]]
videos = playlists[:channels['userKeywords']]
playlists = playlists[channels['userKeywords']:]
@ -316,12 +298,11 @@ class Engine:
key=lambda playlist: -score[playlist['name']]
)
# Record the following for debug view input
top_global_playlists = [(playlist['name'], score[playlist['name']]) for playlist in playlists[:channels['globalKeywords']]]
# top_global_playlists = [{
# 'name': playlist['name'],
# 'tags': playlist['tags'],
# 'score': score[playlist['name']],
# } for playlist in playlists[:channels['globalKeywords']]]
top_global_playlists = [{
'name': playlist['name'],
'tags': playlist['tags'],
'score': score[playlist['name']],
} for playlist in playlists[:channels['globalKeywords']]]
videos += playlists[:16 - channels['userKeywords']]
# Shuffle playlists (randomize layout) and shift clips (randomize start)