Merge branch 'recall_20230628' of algorithm/rov-server into master

config.py

@@ -488,6 +488,7 @@ class BaseConfig(object):
         'u2i_tag_recall':'u2i_tag_recall', #u2i_tag_recall
         'u2u2i_recall':'u2u2i_recall', #u2u2i_recall,
         'return_video_recall': 'return_video_recall',  # return_video_recall
+        'u2i_tag_play_recall': 'u2i_tag_play_recall', # u2i_tag_recall
     }
 
     # category id mapping

recommend.py

@@ -218,6 +218,7 @@ def video_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type, al
         t = [gevent.spawn(pool_recall.rov_pool_recall_with_region, size, expire_time, ab_code, exp_config)]
         if ab_code==60058:
             t.append(gevent.spawn(pool_recall.get_U2I_reall, mid, exp_config))
+            t.append(gevent.spawn(pool_recall.get_play_reall, mid, exp_config))
         elif  ab_code==60059:
             t.append(gevent.spawn(pool_recall.get_word2vec_item_reall, exp_config))
         elif  ab_code==60061 or ab_code==60063:
@@ -232,6 +233,7 @@ def video_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type, al
              gevent.spawn(pool_recall.flow_pool_recall, size)]
         if ab_code==60058:
             t.append(gevent.spawn(pool_recall.get_U2I_reall, mid, exp_config))
+            t.append(gevent.spawn(pool_recall.get_play_reall, mid, exp_config))
         elif ab_code == 60059:
             t.append(gevent.spawn(pool_recall.get_word2vec_item_reall, exp_config))
         elif ab_code == 60061 or ab_code==60063:
@@ -320,12 +322,15 @@ def video_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type, al
                 'flow_pool_recall': recall_result_list[2]
             }
     data['u2i_recall'] = []
+    data['u2i_play_recall'] = []
     data['w2v_recall'] = []
     data['sim_recall'] = []
     data['u2u2i_recall'] = []
     if ab_code == 60058:
         if len(recall_result_list)>=4:
             data['u2i_recall'] = recall_result_list[3]
+        if len(recall_result_list)>=5:
+            data['u2i_play_recall'] = recall_result_list[4]
     elif ab_code == 60059:
         if len(recall_result_list)>=4:
             data['w2v_recall'] = recall_result_list[3]

video_rank.py

@@ -916,14 +916,21 @@ def video_sank_pos_rank(data, size, top_K, flow_pool_P, ab_Code='', exp_config=N
     rule_24h_dup_recall_rank = sorted(rule_24h_dup_recall, key=lambda k: k.get('rovScore', 0), reverse=True)
     recall_dict['rov_recall_24h_dup'] = rule_24h_dup_recall_rank
     u2i_recall = []
+    u2i_play_recall = []
     w2v_recall =[]
     sim_recall = []
     u2u2i_recall = []
     return_video_recall = []
+    #print("")
     if ab_Code==60058:
         if len(data['u2i_recall'])>0:
-            u2i_recall = sorted(data['u2i_recall'], key=lambda k: k.get('rovScore', 0), reverse=True)
-        recall_dict['u2i_recall'] = u2i_recall
+            recall_dict['u2i_recall'] = data['u2i_recall']
+        else:
+            recall_dict['u2i_recall'] = u2i_recall
+        if len(data['u2i_play_recall']) > 0:
+            recall_dict['u2i_play_recall'] = data['u2i_play_recall']
+        else:
+            recall_dict['u2i_play_recall'] = u2i_play_recall
     elif ab_Code==60059:
         if len(data['w2v_recall'])>0:
             recall_dict['w2v_recall'] = data['w2v_recall']
@@ -961,7 +968,7 @@ def video_sank_pos_rank(data, size, top_K, flow_pool_P, ab_Code='', exp_config=N
         recall_pos2 = exp_config['recall_pos2']
         recall_pos3 = exp_config['recall_pos3']
         recall_pos4 = exp_config['recall_pos4']
-    #print("recall_config:", recall_list)
+    #print("recall_config:", recall_pos1)
     rov_recall_rank = []
     recall_list = []
     recall_list.append(recall_pos1)
@@ -1012,7 +1019,7 @@ def video_sank_pos_rank(data, size, top_K, flow_pool_P, ab_Code='', exp_config=N
                         break
     #print("rov_recall_rank:", rov_recall_rank)
     if len(rov_recall_rank)<4:
-        rov_doudi_rank = region_h_recall_rank + sim_recall + u2i_recall + u2u2i_recall + w2v_recall +return_video_recall+ region_24h_recall_rank + rule_24h_recall_rank + rule_24h_dup_recall_rank
+        rov_doudi_rank = region_h_recall_rank + sim_recall + u2i_recall + u2u2i_recall + w2v_recall +return_video_recall+u2i_play_recall+ region_24h_recall_rank + rule_24h_recall_rank + rule_24h_dup_recall_rank
         for recall_item in rov_doudi_rank:
             vid = recall_item['videoId']
             if vid in select_ids:

video_recall.py

@@ -2386,25 +2386,21 @@ class PoolRecall(object):
 
     def get_3days_hot_item_reall(self, exp_config=None):
         recall_key = "hot_3day:"
-        #print("recall_key:", recall_key)
         data = self.redis_helper.get_data_from_redis(key_name=recall_key)
-
-        #print(data)
         recall_result = []
         recall_dict  = {}
         video_ids = []
-        if data is not None:
-            json_result = json.loads(data)
-            #print("json_result:", json_result)
-            for per_item in json_result:
-                try:
-                    vid = int(per_item[0])
-                    video_ids.append(vid)
-                    recall_dict[vid] = {'videoId': vid, 'flowPool': '',
-                         'rovScore': per_item[1], 'pushFrom': config_.PUSH_FROM['hot_3_day_recall'],
-                         'abCode': self.ab_code}
-                except Exception as e:
-                    continue
+        if data is not None and data!="":
+            try:
+                json_result = json.loads(data)
+                for per_item in json_result:
+                        vid = int(per_item[0])
+                        video_ids.append(vid)
+                        recall_dict[vid] = {'videoId': vid, 'flowPool': '',
+                             'rovScore': per_item[1], 'pushFrom': config_.PUSH_FROM['hot_3_day_recall'],
+                             'abCode': self.ab_code}
+            except Exception as e:
+                return  recall_result
         #print("vid len:", len(video_ids))
         if len(video_ids)<=0:
             return  recall_result
@@ -2434,23 +2430,20 @@ class PoolRecall(object):
         recall_key = "hot_video:"
         #print("recall_key:", recall_key)
         data = self.redis_helper.get_data_from_redis(key_name=recall_key)
-
-        #print(data)
         recall_result = []
         recall_dict  = {}
         video_ids = []
-        if data is not None:
-            json_result = json.loads(data)
-            # print("json_result:", json_result)
-            for per_item in json_result:
-                try:
+        if data is not None and data!="":
+            try:
+                json_result = json.loads(data)
+                for per_item in json_result:
                     vid = int(per_item[0])
                     video_ids.append(vid)
                     recall_dict[vid] = {'videoId': vid, 'flowPool': '',
-                         'rovScore': per_item[1], 'pushFrom': config_.PUSH_FROM['hot_recall'],
-                         'abCode': self.ab_code}
-                except Exception as e:
-                    continue
+                             'rovScore': per_item[1], 'pushFrom': config_.PUSH_FROM['hot_recall'],
+                             'abCode': self.ab_code}
+            except Exception as e:
+                recall_result
         if len(video_ids)<=0:
             return  recall_result
         recall_num = 20
@@ -2485,18 +2478,17 @@ class PoolRecall(object):
         recall_result = []
         recall_dict = {}
         video_ids = []
-        if data is not None:
-            json_result = json.loads(data)
-            # print("json_result:", json_result)
-            for per_item in json_result:
-                try:
-                    vid = int(per_item[0])
-                    video_ids.append(vid)
-                    recall_dict[vid] = {'videoId': vid, 'flowPool': '',
-                                        'rovScore': per_item[1], 'pushFrom': config_.PUSH_FROM['title_i2i_recall'],
-                                        'abCode': self.ab_code}
-                except Exception as e:
-                    continue
+        if data is not None and data!="":
+            try:
+                json_result = json.loads(data)
+                for per_item in json_result:
+                        vid = int(per_item[0])
+                        video_ids.append(vid)
+                        recall_dict[vid] = {'videoId': vid, 'flowPool': '',
+                                            'rovScore': per_item[1], 'pushFrom': config_.PUSH_FROM['title_i2i_recall'],
+                                            'abCode': self.ab_code}
+            except Exception as e:
+                return recall_result
         if len(video_ids) <= 0:
             return recall_result
         video_ids = video_ids[:50]
@@ -2524,17 +2516,16 @@ class PoolRecall(object):
         recall_dict  = {}
         video_ids = []
         if data is not None and data.strip()!="":
-            json_result = data.strip().split(",")
-            # print("json_result:", json_result)
-            for per_item in json_result:
-                try:
-                    vid = int(per_item)
-                    video_ids.append(vid)
-                    recall_dict[vid] = {'videoId': vid, 'flowPool': '',
-                         'rovScore': 0.0, 'pushFrom': config_.PUSH_FROM['w2v_recall'],
-                         'abCode': self.ab_code}
-                except Exception as e:
-                    continue
+            try:
+                json_result = data.strip().split(",")
+                for per_item in json_result:
+                        vid = int(per_item)
+                        video_ids.append(vid)
+                        recall_dict[vid] = {'videoId': vid, 'flowPool': '',
+                             'rovScore': 0.0, 'pushFrom': config_.PUSH_FROM['w2v_recall'],
+                             'abCode': self.ab_code}
+            except Exception as e:
+                return  recall_result
         if len(video_ids)<=0:
             return  recall_result
         recall_num = 20
@@ -2562,7 +2553,7 @@ class PoolRecall(object):
         recall_key = "test_exp_config_pos"
         # print("recall_key:", recall_key)
         data = self.redis_helper.get_data_from_redis(key_name=recall_key)
-        if data is not None:
+        if data is not None and  data!="":
             try:
                 #print(data)
                 json_result = json.loads(data)
@@ -2576,7 +2567,7 @@ class PoolRecall(object):
     def get_w2v_config(self):
         recall_key = "w2v_exp_config_pos_range"
         data = self.redis_helper.get_data_from_redis(key_name=recall_key)
-        if data is not None:
+        if data is not None and data!="":
             try:
                 #print(data)
                 json_result = json.loads(data)
@@ -2606,7 +2597,7 @@ class PoolRecall(object):
         recall_key = "simrecall_exp_config_range"
         #print("recall_key:", recall_key)
         data = self.redis_helper.get_data_from_redis(key_name=recall_key)
-        if data is not None:
+        if data is not None and data!="":
             try:
                 # print(data)
                 json_result = json.loads(data)
@@ -2632,9 +2623,9 @@ class PoolRecall(object):
             return None
 
     def get_U2I_config(self):
-        recall_key = "u2i_exp_config_pos_range"
+        recall_key = "u2i_exp_config_pos_range_new"
         data = self.redis_helper.get_data_from_redis(key_name=recall_key)
-        if data is not None:
+        if data is not None and data!="":
             try:
                 # print(data)
                 json_result = json.loads(data)
@@ -2734,18 +2725,17 @@ class PoolRecall(object):
         recall_result = []
         recall_dict  = {}
         video_ids = []
-        if data is not None:
-            json_result = json.loads(data)
-            #print("json_result:", json_result)
-            for per_item in json_result:
-                try:
+        if data is not None and data!="":
+            try:
+                json_result = json.loads(data)
+                for per_item in json_result:
                     vid = int(per_item[0])
                     video_ids.append(vid)
                     recall_dict[vid] = {'videoId': vid, 'flowPool': '',
                          'rovScore': float(per_item[1]), 'pushFrom': config_.PUSH_FROM['u2i_tag_recall'],
                          'abCode': self.ab_code}
-                except Exception as e:
-                    continue
+            except Exception as e:
+                return  recall_result
         if len(video_ids)<=0:
             return  recall_result
         recall_num = 20
@@ -2819,7 +2809,7 @@ class PoolRecall(object):
     def get_video_recall_config(self):
         recall_key = "vr_exp_pos_config_range"
         data = self.redis_helper.get_data_from_redis(key_name=recall_key)
-        if data is not None:
+        if data is not None and data!="":
             try:
                 # print(data)
                 json_result = json.loads(data)
@@ -2841,18 +2831,63 @@ class PoolRecall(object):
         recall_result = []
         recall_dict  = {}
         video_ids = []
-        if data is not None:
-            json_result = json.loads(data)
-            #print("json_result:", json_result)
-            for per_item in json_result:
-                try:
+        if data is not None and data!="" :
+            try:
+                json_result = json.loads(data)
+                for per_item in json_result:
                     vid = int(per_item[0])
                     video_ids.append(vid)
                     recall_dict[vid] = {'videoId': vid, 'flowPool': '',
                          'rovScore': float(per_item[1]), 'pushFrom': config_.PUSH_FROM['return_video_recall'],
                          'abCode': self.ab_code}
-                except Exception as e:
-                    continue
+            except Exception as e:
+                return recall_result
+        if len(video_ids)<=0:
+            return  recall_result
+        recall_num = 20
+        try:
+            if exp_config and exp_config['recall_get_num']:
+                recall_num = int(exp_config['recall_get_num'])
+        except:
+            recall_num = 20
+        #print("recall_num:", recall_num)
+        video_ids = video_ids[:recall_num]
+        #print(video_ids)
+        filter_ = FilterVideos(request_id=self.request_id,
+                               app_type=self.app_type, mid=self.mid, uid=self.uid, video_ids=video_ids)
+        filtered_viewed_videos = filter_.filter_videos_status(pool_type='normal')
+        if filtered_viewed_videos is None:
+            return recall_result
+        #print("filtered_viewed_videos:", filtered_viewed_videos)
+        for vid in filtered_viewed_videos:
+            if vid in recall_dict:
+                recall_result.append(recall_dict[vid])
+        #print("u2i recall_result:", recall_result)
+        return recall_result
+
+    def get_play_reall(self, mid, exp_config=None):
+        #recall_key = "hot_video:"
+        if not mid:
+            return  []
+        recall_key = "u2i_play:"+mid
+        #print("recall_key:", recall_key)
+        data = self.redis_helper.get_data_from_redis(key_name=recall_key)
+
+        #print(data)
+        recall_result = []
+        recall_dict  = {}
+        video_ids = []
+        if data is not None and data!="":
+            try:
+                json_result = json.loads(data)
+                for per_item in json_result:
+                    vid = int(per_item[0])
+                    video_ids.append(vid)
+                    recall_dict[vid] = {'videoId': vid, 'flowPool': '',
+                         'rovScore': float(per_item[1]), 'pushFrom': config_.PUSH_FROM['u2i_tag_play_recall'],
+                         'abCode': self.ab_code}
+            except Exception as e:
+                return  recall_result
         if len(video_ids)<=0:
             return  recall_result
         recall_num = 20