update redis expire time

region_rule_rank_h_by24h.py

@@ -171,7 +171,7 @@ def video_rank(df, now_date, now_h, rule_key, param, region, app_type, data_key)
         f"{config_.RECALL_KEY_NAME_PREFIX_REGION_BY_24H}{region}.{app_type}.{data_key}.{rule_key}." \
         f"{datetime.datetime.strftime(now_date, '%Y%m%d')}.{now_h}"
     if len(day_recall_result) > 0:
-        redis_helper.add_data_with_zset(key_name=day_recall_key_name, data=day_recall_result, expire_time=23 * 3600)
+        redis_helper.add_data_with_zset(key_name=day_recall_key_name, data=day_recall_result, expire_time=2 * 3600)
         # 清空线上过滤应用列表
         redis_helper.del_keys(key_name=f"{config_.REGION_H_VIDEO_FILER_24H}{region}.{app_type}.{data_key}.{rule_key}")
 
@@ -406,7 +406,7 @@ def h_rank_bottom(now_date, now_h, rule_params, region_code_list):
                 final_key_name = \
                     f"{key_prefix}{region}.{app_type}.{data_key}.{rule_key}.{datetime.datetime.strftime(now_date, '%Y%m%d')}.{now_h}"
                 if len(final_data) > 0:
-                    redis_helper.add_data_with_zset(key_name=final_key_name, data=final_data, expire_time=23 * 3600)
+                    redis_helper.add_data_with_zset(key_name=final_key_name, data=final_data, expire_time=2 * 3600)
                 # 清空线上过滤应用列表
                 redis_helper.del_keys(key_name=f"{config_.REGION_H_VIDEO_FILER_24H}{region}.{app_type}.{data_key}.{rule_key}")
 

rov_train.py

@@ -253,7 +253,7 @@ def predict():
     # 上传redis
     key_name = config_.RECALL_KEY_NAME_PREFIX + time.strftime('%Y%m%d')
     redis_helper = RedisHelper()
-    redis_helper.add_data_with_zset(key_name=key_name, data=applet_redis_data)
+    redis_helper.add_data_with_zset(key_name=key_name, data=applet_redis_data, expire_time=2*24*3600)
     log_.info('applet data to redis finished!')
 
     # 清空修改ROV的视频数据
@@ -290,7 +290,7 @@ def predict():
     # 上传Redis
     redis_helper = RedisHelper()
     app_key_name = config_.RECALL_KEY_NAME_PREFIX_APP + time.strftime('%Y%m%d')
-    redis_helper.add_data_with_zset(key_name=app_key_name, data=app_redis_data)
+    redis_helper.add_data_with_zset(key_name=app_key_name, data=app_redis_data, expire_time=2*24*3600)
     log_.info('app data to redis finished!')
     # 清空修改ROV的视频数据
     redis_helper.del_keys(key_name=config_.UPDATE_ROV_KEY_NAME_APP)
@@ -323,7 +323,7 @@ def predict_test():
     # 上传Redis
     redis_helper = RedisHelper()
     key_name = config_.RECALL_KEY_NAME_PREFIX + time.strftime('%Y%m%d')
-    redis_helper.add_data_with_zset(key_name=key_name, data=redis_data)
+    redis_helper.add_data_with_zset(key_name=key_name, data=redis_data, expire_time=2*24*3600)
     log_.info('test data to redis finished!')
     # 清空修改ROV的视频数据
     redis_helper.del_keys(key_name=config_.UPDATE_ROV_KEY_NAME)
@@ -356,7 +356,7 @@ def predict_test():
     # 上传Redis
     redis_helper = RedisHelper()
     app_key_name = config_.RECALL_KEY_NAME_PREFIX_APP + time.strftime('%Y%m%d')
-    redis_helper.add_data_with_zset(key_name=app_key_name, data=app_redis_data)
+    redis_helper.add_data_with_zset(key_name=app_key_name, data=app_redis_data, expire_time=2*24*3600)
     log_.info('app test data to redis finished!')
     # 清空修改ROV的视频数据
     redis_helper.del_keys(key_name=config_.UPDATE_ROV_KEY_NAME_APP)
@@ -441,14 +441,14 @@ def predict_18_19():
 
 
 if __name__ == '__main__':
-    # log_.info('rov model train start...')
-    # train_start = time.time()
-    # train_filename = config_.TRAIN_DATA_FILENAME
-    # X, Y, videos, fea = process_data(filename=train_filename)
-    # log_.info('X_shape = {}, Y_sahpe = {}'.format(X.shape, Y.shape))
-    # train(X, Y, features=fea)
-    # train_end = time.time()
-    # log_.info('rov model train end, execute time = {}ms'.format((train_end - train_start)*1000))
+    log_.info('rov model train start...')
+    train_start = time.time()
+    train_filename = config_.TRAIN_DATA_FILENAME
+    X, Y, videos, fea = process_data(filename=train_filename)
+    log_.info('X_shape = {}, Y_sahpe = {}'.format(X.shape, Y.shape))
+    train(X, Y, features=fea)
+    train_end = time.time()
+    log_.info('rov model train end, execute time = {}ms'.format((train_end - train_start)*1000))
 
     log_.info('rov model predict start...')
     predict_start = time.time()

rule_rank_h_by_24h.py

@@ -183,7 +183,7 @@ def video_rank_h(df, now_date, now_h, rule_key, param, app_type, data_key):
         f"{config_.RECALL_KEY_NAME_PREFIX_BY_24H}{app_type}.{data_key}.{rule_key}.{now_dt}.{now_h}"
     if len(day_recall_result) > 0:
         log_.info(f"count = {len(day_recall_result)}")
-        redis_helper.add_data_with_zset(key_name=h_24h_recall_key_name, data=day_recall_result, expire_time=23 * 3600)
+        redis_helper.add_data_with_zset(key_name=h_24h_recall_key_name, data=day_recall_result, expire_time=2 * 3600)
         # 清空线上过滤应用列表
         redis_helper.del_keys(key_name=f"{config_.H_VIDEO_FILER_24H}{app_type}.{data_key}.{rule_key}")
 
@@ -207,7 +207,7 @@ def video_rank_h(df, now_date, now_h, rule_key, param, app_type, data_key):
         if len(other_24h_recall_result) > 0:
             log_.info(f"count = {len(other_24h_recall_result)}")
             redis_helper.add_data_with_zset(key_name=other_h_24h_recall_key_name, data=other_24h_recall_result,
-                                            expire_time=23 * 3600)
+                                            expire_time=2 * 3600)
 
     # 去重更新rov模型结果，并另存为redis中
     # initial_data_dup = {}
@@ -306,7 +306,7 @@ def h_rank_bottom(now_date, now_h, rule_params):
                 final_key_name = \
                     f"{key_prefix}{app_type}.{data_key}.{rule_key}.{datetime.strftime(now_date, '%Y%m%d')}.{now_h}"
                 if len(final_data) > 0:
-                    redis_helper.add_data_with_zset(key_name=final_key_name, data=final_data, expire_time=23 * 3600)
+                    redis_helper.add_data_with_zset(key_name=final_key_name, data=final_data, expire_time=2 * 3600)
                 # 清空线上过滤应用列表
                 redis_helper.del_keys(key_name=f"{config_.H_VIDEO_FILER_24H}{app_type}.{data_key}.{rule_key}")