Merge branch 'feature/zhangbo_filter' of algorithm/rov-server into master

config.py

@@ -2035,8 +2035,9 @@ class DevelopmentConfig(BaseConfig):
 
     # 用户已观看视频过滤 & 视频审核条件过滤 & 是否进入老年人社区过滤 & 话题状态过滤 接口地址
     # 参数types: 1-已观看 2-视频状态 3-是否进入老年人社区过滤 4-话题状态
-    VIDEO_FILTER_URL = 'http://videotest-internal.yishihui.com/longvideoapi/openapi/recommend/filterVideos'
+    # VIDEO_FILTER_URL = 'http://videotest-internal.yishihui.com/longvideoapi/openapi/recommend/filterVideos'
     # VIDEO_FILTER_URL = 'http://recommend-common-internal.piaoquantv.com/longvideoapi/openapi/recommend/filterVideos'
+    VIDEO_FILTER_URL = 'http://prespeed-internal.piaoquantv.com/longvideoapi/openapi/recommend/filterVideos'
 
     # 获取视频在流量池中的剩余可分发数接口地址
     GET_REMAIN_VIEW_COUNT_URL = 'http://testapi-internal.piaoquantv.com/flowpool/video/remainViewCount'

utils.py

@@ -616,9 +616,11 @@ class FilterVideos(object):
                         "mid": self.mid,
                         "uid": self.uid,
                         "types": list(types),
-                        "videoIds": video_ids}
+                        "videoIds": video_ids,
+                        "recommendStatus": [-6]}
         # print(request_data)
         # 调用http接口
+        url = config_.VIDEO_FILTER_URL
         result = request_post(request_url=config_.VIDEO_FILTER_URL, request_data=request_data, timeout=(0.1, 1))
 
         # print("result:", result)
@@ -947,7 +949,8 @@ class FilterVideos(object):
                         "mid": self.mid,
                         "uid": self.uid,
                         "types": types,
-                        "videoIds": video_ids}
+                        "videoIds": video_ids,
+                        "recommendStatus": [-6]}
         # print(request_data)
         # 调用http接口
         result = request_post(request_url=config_.VIDEO_FILTER_URL, request_data=request_data, timeout=(0.1, 1))
@@ -1061,27 +1064,27 @@ if __name__ == '__main__':
     # tags_rule = {'早上好': {'start': 0, 'end': 9}, '中午好': {'start': 11, 'end': 13}, '冬至': {'start': 0, 'end': 9}, '祝福': {'start': 0, 'end': 23}}
     # f = FilterVideos("request_id", "app_type", video_ids)
     # f.filter_videos_with_tags_rule(video_ids, video_tag_dict, tags_rule)
-    # user = [
-    #     ('weixin_openid_o0w175fDc8pNnywrYN49E341tKfI', ''),
-    #     ('weixin_openid_o0w175YwC3hStzcR5DAQdbgzdMeI', ''),
-    #     ('weixin_openid_o0w175ftZDl6VJVDx9la3WVPh7mU', '15900461'),
-    #     ('weixin_openid_o0w175SPqpCVRcp7x1XvnX4qpIvI', '19659040'),
-    #     ('weixin_openid_o0w175cOnguapyWIrDrHkOWl4oFQ', '31210128'),
-    #     ('weixin_openid_o0w175UXYId-o71e1Q3SOheYNteQ', '33099722'),
-    #     ('weixin_openid_o0w175QQ5b42AtOe50bchrFgcttA', ''),
-    #     ('weixin_openid_o0w175bgaPlfLsp3YLDKWqLWtXX8', '35371534'),
-    #     ('weixin_openid_o0w175eRpvbmV6nOhM1VTyyLICWA', '30488803'),
-    #     ('weixin_openid_o0w175TZYvG47pQkOjyJFoxQuqsw', '')
-    # ]
+    user = [
+        ('weixin_openid_o0w175fDc8pNnywrYN49E341tKfI', ''),
+        ('weixin_openid_o0w175YwC3hStzcR5DAQdbgzdMeI', ''),
+        ('weixin_openid_o0w175ftZDl6VJVDx9la3WVPh7mU', '15900461'),
+        ('weixin_openid_o0w175SPqpCVRcp7x1XvnX4qpIvI', '19659040'),
+        ('weixin_openid_o0w175cOnguapyWIrDrHkOWl4oFQ', '31210128'),
+        ('weixin_openid_o0w175UXYId-o71e1Q3SOheYNteQ', '33099722'),
+        ('weixin_openid_o0w175QQ5b42AtOe50bchrFgcttA', ''),
+        ('weixin_openid_o0w175bgaPlfLsp3YLDKWqLWtXX8', '35371534'),
+        ('weixin_openid_o0w175eRpvbmV6nOhM1VTyyLICWA', '30488803'),
+        ('weixin_openid_o0w175TZYvG47pQkOjyJFoxQuqsw', '')
+    ]
     # video_df = pd.read_csv('./data/videoids.csv')
     # videoid_list = video_df['videoid'].tolist()
-    # for mid, uid in user:
-    #     video_ids = random.sample(videoid_list, 1000)
-    #     start_time = time.time()
-    #     filter_ = FilterVideos(request_id=f'{mid} - {uid}', app_type=0, mid=mid, uid=uid, video_ids=video_ids)
-    #     res = filter_.filter_videos_new()
-    #     print(f"res: {res}\nexecute_time: {(time.time() - start_time) * 1000}")
-    # filter_.filter_video_status(video_ids=[1, 3, 5])
+    videoid_list = [17759493, 17759670, 17759750, 177601111, 688346]
+    for mid, uid in user:
+        video_ids = videoid_list
+        start_time = time.time()
+        filter_ = FilterVideos(request_id=f'{mid} - {uid}', app_type=0, mid=mid, uid=uid, video_ids=video_ids)
+        res = filter_.filter_video_viewed(video_ids)
+        print(res)
 
     # videos = [{'videoId': 9034659, 'flowPool': '3#11#3#1637824188547'}, {'videoId': 9035052, 'flowPool': '3#11#3#1637824172827'}]
     # res = get_videos_remain_view_count(4, videos)