add bottom_strategy_last && add send_msg_to_feishu

config.py

@@ -41,6 +41,13 @@ class BaseConfig(object):
     # 从ROV召回池获取视频的最大频次，限制每次请求的获取次数
     MAX_FREQ_FROM_ROV_POOL = 3
 
+    # 兜底视频redis存储key
+    BOTTOM_KEY_NAME = 'com.weiqu.video.bottom'
+
+    # rov召回池更新时间
+    ROV_UPDATE_H = 6
+    ROV_UPDATE_MINUTE = 30
+
 
 class DevelopmentConfig(BaseConfig):
     """测试环境配置"""
@@ -160,6 +167,6 @@ class ProductionConfig(BaseConfig):
 
 def set_config():
     # return DevelopmentConfig()
-    # return TestConfig()
+    return TestConfig()
     # return PreProductionConfig()
-    return ProductionConfig()
+    # return ProductionConfig()

db_helper.py

@@ -272,5 +272,7 @@ if __name__ == '__main__':
     redis_helper = RedisHelper()
     key = 'flow.video.12345.123#112'
     # redis_helper.decr_key(key_name=key)
-    res = redis_helper.get_data_from_redis(key_name=key)
-    print(int(res), type(int(res)))
+    # res = redis_helper.get_data_from_redis(key_name=key)
+    # print(int(res), type(int(res)))
+    data = redis_helper.get_data_zset_with_index(key_name=config_.BOTTOM_KEY_NAME, start=0, end=-1)
+    print(len(data))

utils.py

@@ -13,6 +13,23 @@ config_ = set_config()
 log_ = Log()
 
 
+def send_msg_to_feishu(msg_text):
+    """发送消息到飞书"""
+    # webhook地址
+    webhook = 'https://open.feishu.cn/open-apis/bot/v2/hook/251c9690-f7e0-4ae8-9206-20d4942ae6f0'
+    # 自定义关键词key_word
+    key_word = '服务报警'
+    headers = {'Content-Type': 'application/json'}
+    payload_message = {
+        "msg_type": "text",
+        "content": {
+            "text": '{}: {}'.format(key_word, msg_text)
+        }
+    }
+    response = requests.request('POST', url=webhook, headers=headers, data=json.dumps(payload_message))
+    print(response.text)
+
+
 def request_post(request_url, request_data, timeout):
     """
     post 请求 HTTP接口
@@ -212,6 +229,9 @@ if __name__ == '__main__':
     # filter_.filter_videos()
     # filter_.filter_video_status(video_ids=[1, 3, 5])
 
-    videos = [{'videoId': 9034659, 'flowPool': '3#11#3#1637824188547'}, {'videoId': 9035052, 'flowPool': '3#11#3#1637824172827'}]
-    res = get_videos_remain_view_count(4, videos)
-    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)
+    # print(res)
+
+    text = '测试 @李倩'
+    send_msg_to_feishu(text)

video_rank.py

@@ -5,7 +5,7 @@ from log import Log
 from config import set_config
 from video_recall import PoolRecall
 from db_helper import RedisHelper
-from utils import FilterVideos
+from utils import FilterVideos, send_msg_to_feishu
 
 log_ = Log()
 config_ = set_config()
@@ -99,20 +99,18 @@ def bottom_strategy(size, app_type, ab_code):
     :param size: 需要获取的视频数
     :param app_type: 产品标识 type-int
     :param ab_code: abCode
-    :param mid:
-    :param uid:
     :return:
     """
     pool_recall = PoolRecall(app_type=app_type, ab_code=ab_code)
     key_name, _ = pool_recall.get_pool_redis_key(pool_type='rov')
-    if not key_name:
-        log_.info('bottom strategy no data!')
-        return []
     redis_helper = RedisHelper()
     data = redis_helper.get_data_zset_with_index(key_name=key_name, start=0, end=1000)
     if not data:
-        log_.info('bottom strategy no data!')
-        return []
+        send_msg_to_feishu('ROV推荐进入了二次兜底，请查看是否有数据更新失败问题。')
+        # 二次兜底
+        bottom_data = bottom_strategy_last(size=size, app_type=app_type, ab_code=ab_code)
+        return bottom_data
+
     # 状态过滤
     filter_videos = FilterVideos(app_type=app_type, video_ids=data)
     filtered_data = filter_videos.filter_video_status(video_ids=data)
@@ -124,6 +122,25 @@ def bottom_strategy(size, app_type, ab_code):
     return bottom_data
 
 
+def bottom_strategy_last(size, app_type, ab_code):
+    """
+    兜底策略: 从兜底视频中随机获取视频，进行状态过滤后的视频
+    :param size: 需要获取的视频数
+    :param app_type: 产品标识 type-int
+    :param ab_code: abCode
+    :return:
+    """
+    redis_helper = RedisHelper()
+    bottom_data = redis_helper.get_data_zset_with_index(key_name=config_.BOTTOM_KEY_NAME, start=0, end=-1)
+    random_data = numpy.random.choice(bottom_data, size * 30, False)
+    # 状态过滤
+    filter_videos = FilterVideos(app_type=app_type, video_ids=random_data)
+    filtered_data = filter_videos.filter_video_status(video_ids=data)
+    bottom_data = [{'videoId': video_id, 'pushFrom': 'bottom_strategy_last', 'abCode': ab_code}
+                   for video_id in filtered_data[:size]]
+    return bottom_data
+
+
 if __name__ == '__main__':
     d_test = [[{'videoId': 3674236, 'rovScore': 99.24105262298141, 'pushFrom': 'recall_pool', 'abCode': 10000}, {'videoId': 1915009, 'rovScore': 99.248872388032, 'pushFrom': 'recall_pool', 'abCode': 10000}, {'videoId': 9033859, 'rovScore': 99.21956695197761, 'pushFrom': 'recall_pool', 'abCode': 10000}, {'videoId': 4258137, 'rovScore': 99.24737622823497, 'pushFrom': 'recall_pool', 'abCode': 10000}, {'videoId': 9034962, 'rovScore': 99.18993382219318, 'pushFrom': 'recall_pool', 'abCode': 10000}, {'videoId': 1922051, 'rovScore': 99.2351969813565, 'pushFrom': 'recall_pool', 'abCode': 10000}, {'videoId': 7829308, 'rovScore': 99.25465474490638, 'pushFrom': 'recall_pool', 'abCode': 10000}, {'videoId': 3247671, 'rovScore': 99.24601245746983, 'pushFrom': 'recall_pool', 'abCode': 10000}, {'videoId': 5831941, 'rovScore': 99.16776814766304, 'pushFrom': 'recall_pool', 'abCode': 10000}, {'videoId': 7837973, 'rovScore': 99.253749334822, 'pushFrom': 'recall_pool', 'abCode': 10000}], [{'videoId': 9035245, 'flowPool': '1#1#1#1636085384424', 'rovScore': 1.0, 'pushFrom': 'flow_pool', 'abCode': 10000}, {'videoId': 9034828, 'flowPool': '1#1#1#1636090368461', 'rovScore': 1.0, 'pushFrom': 'flow_pool', 'abCode': 10000}, {'videoId': 9035244, 'flowPool': '1#1#1#1636085467105', 'rovScore': 1.0, 'pushFrom': 'flow_pool', 'abCode': 10000}, {'videoId': 9035237, 'flowPool': '1#1#1#1636086478074', 'rovScore': 1.0, 'pushFrom': 'flow_pool', 'abCode': 10000}]]
     data = {

video_recall.py

@@ -5,7 +5,7 @@ from datetime import date, timedelta, datetime
 from log import Log
 from db_helper import RedisHelper
 from config import set_config
-from utils import FilterVideos, get_videos_remain_view_count, get_videos_local_distribute_count
+from utils import FilterVideos, get_videos_remain_view_count, get_videos_local_distribute_count, send_msg_to_feishu
 import gevent
 
 log_ = Log()
@@ -262,6 +262,16 @@ class PoolRecall(object):
                     key_name = config_.RECALL_KEY_NAME_PREFIX + redis_date
                     # if not self.redis_helper.key_exists(key_name):
                     #     return None, None
+
+                    # 判断当前时间是否晚于rov召回池更新时间 + 1h，发送消息到飞书
+                    now_h = datetime.now().hour
+                    now_m = datetime.now().minute
+                    feishu_text = '今日ROV召回池数据未按时更新，请及时查看解决。'
+                    if now_h == config_.ROV_UPDATE_H + 1 and now_m > config_.ROV_UPDATE_MINUTE:
+                        send_msg_to_feishu(feishu_text)
+                    elif now_h > config_.ROV_UPDATE_H + 1:
+                        send_msg_to_feishu(feishu_text)
+
                 return key_name, redis_date
 
         elif pool_type == 'flow':