liqian 2 years ago
parent
commit
32db9b10c8
3 changed files with 8 additions and 5 deletions
  1. 1 0
      recommend.py
  2. 2 0
      user2new.py
  3. 5 5
      video_recall.py

+ 1 - 0
recommend.py

@@ -542,6 +542,7 @@ def get_recommend_params(recommend_type, ab_exp_info, ab_info_data, page_type=0)
     expire_time = 3600
     rule_key = config_.AB_EXP_CODE['095'].get('rule_key')
     data_key = config_.AB_EXP_CODE['095'].get('data_key')
+    rule_key_30day = None
     no_op_flag = True
 
     # 获取实验配置

+ 2 - 0
user2new.py

@@ -47,6 +47,8 @@ def user2new(app_type, mid, uid):
             config_.RECORD_KEY_NAME_PREFIX_LAST_VIDEO_REGION_DUP1_24H,
             config_.LAST_VIDEO_FROM_REGION_H_PREFIX,
             config_.RECORD_KEY_NAME_PREFIX_LAST_VIDEO_REGION_H,
+            config_.LAST_VIDEO_FROM_30DAY_PREFIX,
+            config_.RECORD_KEY_NAME_PREFIX_LAST_VIDEO_30DAY,
         ]
         for h_key_prefix in h_key_prefix_list:
             h_key_name = f"{h_key_prefix}{app_type_item}:{mid}"

+ 5 - 5
video_recall.py

@@ -1864,13 +1864,13 @@ class PoolRecall(object):
         # 判断当前日期的小时级列表是否更新
         now_date = datetime.today()
         now_dt = datetime.strftime(now_date, '%Y%m%d')
-        now_pool_recall_key = f"{pool_key_prefix}:{self.data_key}:{self.rule_key_30day}:{now_dt}"
+        now_pool_recall_key = f"{pool_key_prefix}{self.data_key}:{self.rule_key_30day}:{now_dt}"
         if self.redis_helper.key_exists(key_name=now_pool_recall_key):
             value = {'date': now_dt}
             self.redis_helper.set_data_to_redis(key_name=record_key, value=str(value), expire_time=expire_time)
         else:
             redis_dt = datetime.strftime(now_date - timedelta(days=1), '%Y%m%d')
-            now_pool_recall_key = f"{pool_key_prefix}:{self.data_key}:{self.rule_key_30day}:{redis_dt}"
+            now_pool_recall_key = f"{pool_key_prefix}{self.data_key}:{self.rule_key_30day}:{redis_dt}"
             value = {'date': redis_dt}
             self.redis_helper.set_data_to_redis(key_name=record_key, value=str(value), expire_time=expire_time)
         return now_pool_recall_key
@@ -1896,11 +1896,11 @@ class PoolRecall(object):
             now_dt = datetime.strftime(now_date, '%Y%m%d')
             if record_dt == now_dt:
                 # 已获取当前日期数据
-                pool_recall_key = f"{pool_key_prefix}:{self.data_key}:{self.rule_key_30day}:{now_dt}"
+                pool_recall_key = f"{pool_key_prefix}{self.data_key}:{self.rule_key_30day}:{now_dt}"
                 idx = self.get_video_idx(pool_recall_key=pool_recall_key, last_video_key=last_video_key)
             elif record_dt == datetime.strftime((now_date - timedelta(days=1)), '%Y%m%d'):
                 # 记录的dt - 当前dt = 1,判断当前h数据是否已更新
-                now_pool_recall_key = f"{pool_key_prefix}:{self.data_key}:{self.rule_key_30day}:{now_dt}"
+                now_pool_recall_key = f"{pool_key_prefix}{self.data_key}:{self.rule_key_30day}:{now_dt}"
                 if self.redis_helper.key_exists(key_name=now_pool_recall_key):
                     new_record = {'date': now_dt}
                     self.redis_helper.set_data_to_redis(key_name=record_key,
@@ -1910,7 +1910,7 @@ class PoolRecall(object):
                     self.redis_helper.del_keys(key_name=last_video_key)
                     pool_recall_key = now_pool_recall_key
                 else:
-                    pool_recall_key = f"{pool_key_prefix}:{self.data_key}:{self.rule_key_30day}:{record_dt}"
+                    pool_recall_key = f"{pool_key_prefix}{self.data_key}:{self.rule_key_30day}:{record_dt}"
                     idx = self.get_video_idx(pool_recall_key=pool_recall_key, last_video_key=last_video_key)
             else:
                 idx = 0