区域屏蔽需求

parameter_dir/parameter_update.py

@@ -4,20 +4,20 @@ from config import set_config
 config_ = set_config()
 
 RISK_SHIELD_FILTER_RULE_V1_JSON = "RISK_SHIELD_FILTER_RULE_V1_JSON"
+RISK_SHIELD_FILTER_VIDEO_V1_STR = "RISK_SHIELD_FILTER_VIDEO_V1_STR"
 
-def param_update_risk_rule():
+def param_update_risk():
     """
     定时更新风险过滤的规则
     key=RISK_SHIELD_FILTER_RULE_V1_JSON
     value= "{\"VLOG\": [\"北京\"]}"
     """
     redis_helper = RedisHelper()
-    global RISK_SHIELD_FILTER_RULE_V1_JSON
-    level_weight_initial = redis_helper.get_data_from_redis(key_name=config_.FLOWPOOL_LEVEL_WEIGHT_KEY_NAME)
-    if level_weight_initial is not None:
-        RISK_SHIELD_FILTER_RULE_V1_JSON = json.loads(level_weight_initial)
-
-    global flow_pool_abtest_config
-    flow_pool_abtest_config = redis_helper.get_data_from_redis(key_name=config_.FLOWPOOL_ABTEST_KEY_NAME)
-    if flow_pool_abtest_config is not None:
-        flow_pool_abtest_config = json.loads(flow_pool_abtest_config)
+    tmp = redis_helper.get_data_from_redis(key_name=RISK_SHIELD_FILTER_RULE_V1_JSON)
+    if tmp is not None:
+        v1 = json.loads(tmp)
+    global RISK_SHIELD_FILTER_VIDEO_V1_STR
+    tmp = redis_helper.get_data_from_redis(key_name=RISK_SHIELD_FILTER_VIDEO_V1_STR)
+    if tmp is not None:
+        v2 = json.loads(tmp)
+    return v1, v2

utils.py

@@ -820,14 +820,14 @@ class FilterVideos(object):
         return filtered_videos
 
     def filter_videos_with_risk_video(self, video_ids, app_type, region_code):
-        # 1 判断是否过滤,不展示的app+区域列表
+        # 1 判断是否过滤,不展示的app+区域列表 RISK_SHIELD_FILTER_V1_JSON
         app_region_filtered = {
             0: [110000]
         }
         # 初始化为：展示，不过滤。todo 测试时使用 True
         if_filtered = False
         if_filtered = True
-        if app_type in app_region_filtered.keys() and region_code in app_region_filtered[app_type]:
+        if str(app_type) in app_region_filtered.keys() and region_code in app_region_filtered[app_type]:
             if_filtered = True
         if not if_filtered:
             return copy.deepcopy(video_ids[0: min(20, len(video_ids))])

utils_dir/my_utils.py

@@ -0,0 +1,4 @@
+import json
+
+def parse_json_for_risk_rule(s: str):
+    pass

video_recall.py

@@ -2805,7 +2805,7 @@ class PoolRecall(object):
         pool_recall_result = []
         # 每次获取的视频数
         # get_size = size * 5
-        get_size = size * 15
+        get_size = size * 10
         # 记录获取频次
         freq = 0
         while len(pool_recall_result) < size: