update exp code

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/model/RecommendParam.java

@@ -19,14 +19,9 @@ import java.util.Set;
 public class RecommendParam {
     private int topK;
     private double flowPoolP;
-    private String abCode;
     private String ruleKey;
     private String dataKey;
 
-    // hardcode   兼容旧服务的518实验
-    private String hDataKey;
-    private String hRuleKey;
-
     private int flowPoolId;
     private String flowPoolAbtestGroup;
     private String rankKeyPrefix;

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/model/Video.java

@@ -16,7 +16,6 @@ public class Video {
     private double rovScore;
     private double sortScore;
     private String pushFrom;
-    private String abCode;
 
     // 流量池相关 start
     private String flowPool;

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/RecommendService.java

@@ -53,12 +53,6 @@ public class RecommendService {
     @Qualifier("redisTemplate")
     private RedisTemplate<String, String> redisTemplate;
 
-
-    private final Map<Integer, String> ab_initial_config_map = new HashMap<>();
-
-    @ApolloJsonValue("${ab_exp_code:{}}")
-    private Map<String, Map<String, String>> abExpCodeMap;
-
     @ApolloJsonValue("${app_ab_code:{}}")
     private Map<String, Map<String, Map<String, String>>> appAbCodeMap;
 
@@ -156,7 +150,6 @@ public class RecommendService {
             updateCache(request, param, videos);
             long updateCacheTime = stopwatch.elapsed(TimeUnit.MILLISECONDS);
             timerLogMapTL.get().put("updateCacheTime", updateCacheTime);
-            timerLogMapTL.get().put("abCodeFake", param.getAbCode());
             timerLogService.log(timerLogMapTL.get());
             logStatisticsInfo(request, param, videos);
             // 更新position
@@ -174,7 +167,6 @@ public class RecommendService {
                 vps.add(VideoProto.newBuilder()
                         .setPosition(i + 1)
                         .setPushFrom(Strings.nullToEmpty(videos.get(i).getPushFrom()))
-                        .setAbCode(Strings.nullToEmpty(videos.get(i).getAbCode()))
                         .setVideoId(videos.get(i).getVideoId())
                         .setRovScore(videos.get(i).getRovScore())
                         .setSortScore(videos.get(i).getSortScore())
@@ -299,7 +291,6 @@ public class RecommendService {
                 .setResult(Result.newBuilder().setCode(1).setMessage("success"))
                 .addAllVideo(CommonCollectionUtils.toList(videos, v -> VideoProto.newBuilder()
                         .setPushFrom(Strings.nullToEmpty(v.getPushFrom()))
-                        .setAbCode(Strings.nullToEmpty(v.getAbCode()))
                         .setVideoId(v.getVideoId())
                         .setRovScore(v.getRovScore())
                         .build()))
@@ -321,11 +312,8 @@ public class RecommendService {
         param.setCity(request.getCity());
 
 
-        String abInitialConfig = ab_initial_config_map.getOrDefault(request.getAppType(), "095-1");
-        Map<String, String> abExpCode = abExpCodeMap.getOrDefault(abInitialConfig, Collections.emptyMap());
-        param.setAbCode(abExpCode.get("ab_code"));
-        param.setRuleKey(abExpCode.get("rule_key"));
-        param.setDataKey(abExpCode.get("data_key"));
+        param.setRuleKey("data66");
+        param.setDataKey("rule66");
         param.setRankKeyPrefix("rank:score1:");
 
         // 实验配置
@@ -346,22 +334,6 @@ public class RecommendService {
             } else if (abExpCodes.contains("339")) {
                 param.setFlowPoolP(0);
             }
-
-            for (Map.Entry<String, Map<String, String>> entry : abExpCodeMap.entrySet()) {
-                if (abExpCodes.contains(entry.getKey())) {
-                    param.setAbCode(entry.getValue().get("ab_code"));
-                    param.setRuleKey(entry.getValue().get("rule_key"));
-                    param.setDataKey(entry.getValue().get("data_key"));
-
-                    param.setHDataKey(entry.getValue().get("h_data_key"));
-                    param.setHRuleKey(entry.getValue().get("h_rule_key"));
-
-                    param.setRankKeyPrefix(StringUtils.isNotBlank(entry.getValue().get("rank_key_prefix"))
-                            ? entry.getValue().get("rank_key_prefix")
-                            : "rank:score1:");
-                    break;
-                }
-            }
         }
 
         // app实验组
@@ -372,7 +344,6 @@ public class RecommendService {
                 if (StringUtils.isNotBlank(eventId)
                         && appAbCode != null
                         && appAbCode.containsKey(eventId)) {
-                    param.setAbCode(appAbCode.get(eventId).get("ab_code"));
                     param.setRuleKey(appAbCode.get(eventId).get("rule_key"));
                     param.setDataKey(appAbCode.get(eventId).get("data_key"));
                 }
@@ -447,14 +418,6 @@ public class RecommendService {
         if (param.getSize() < rankResult.getVideos().size()) {
             videos = rankResult.getVideos().subList(0, param.getSize());
         }
-
-
-        // mark video in flow pool
-        // TODO 业务上有什么用处
-        // 需要被标记的视频满足什么条件
-        // 逻辑已经废弃
-        // markFlowPoolVideo(param, videos);
-
         return videos;
     }
 
@@ -463,11 +426,8 @@ public class RecommendService {
         recallParam.setAppType(param.getAppType());
         // hard code 算法实验配置化之前，复用abcode做AB验证
         // note 避免非实验产品被覆盖
-        recallParam.setAbCode(param.getAbCode());
         recallParam.setRuleKey(param.getRuleKey());
         recallParam.setDataKey(param.getDataKey());
-        recallParam.setHRuleKey(param.getHRuleKey());
-        recallParam.setHDataKey(param.getHDataKey());
 
         recallParam.setVideoId(param.getVideoId());
         recallParam.setFlowPoolAbtestGroup(param.getFlowPoolAbtestGroup());
@@ -504,9 +464,6 @@ public class RecommendService {
     public RankParam convertToRankParam(RecommendParam param, RecallResult recallResult) {
         RankParam rankParam = new RankParam();
         rankParam.setRecallResult(recallResult);
-        // hard code 算法实验配置化之前，复用abcode做AB验证
-        // note 避免非实验产品被覆盖
-        rankParam.setAbCode(param.getAbCode());
         rankParam.setRankKeyPrefix(param.getRankKeyPrefix());
 
         rankParam.setSize(param.getSize());

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/RankParam.java

@@ -17,7 +17,6 @@ public class RankParam {
     private int topK;
     private String rankKeyPrefix;
     private double flowPoolP;
-    private String abCode;
     private int appType;
     private boolean specialRecommend;
     private String mid;

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/RankRouter.java

@@ -1,49 +1,62 @@
 package com.tzld.piaoquan.recommend.server.service.rank;
 
-import com.aliyun.odps.utils.StringUtils;
+import com.tzld.piaoquan.recommend.server.service.ServiceBeanFactory;
 import com.tzld.piaoquan.recommend.server.service.rank.strategy.*;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.*;
+
 @Service
 @Slf4j
 public class RankRouter {
+
+    private LinkedHashMap<String, RankService> strategyMap;
+
+    private static final Map<String, Class<? extends RankService>> STRATEGY_CLASSES = new HashMap<>();
+
+    static {
+        STRATEGY_CLASSES.put("536", RankStrategy4RegionMergeModelV536.class);
+        STRATEGY_CLASSES.put("562", RankStrategy4RegionMergeModelV562.class);
+        STRATEGY_CLASSES.put("563", RankStrategy4RegionMergeModelV563.class);
+        STRATEGY_CLASSES.put("564", RankStrategy4RegionMergeModelV564.class);
+        STRATEGY_CLASSES.put("567", RankStrategy4RegionMergeModelV567.class);
+        STRATEGY_CLASSES.put("569", RankStrategy4RegionMergeModelV569.class);
+    }
+
     @Autowired
-    private RankStrategy4RegionMergeModelV536 rankStrategy4RegionMergeModelV536;
-    @Autowired
-    private RankStrategy4RegionMergeModelV562 rankStrategy4RegionMergeModelV562;
-    @Autowired
-    private RankStrategy4RegionMergeModelV563 rankStrategy4RegionMergeModelV563;
-    @Autowired
-    private RankStrategy4RegionMergeModelV564 rankStrategy4RegionMergeModelV564;
-    @Autowired
-    private RankStrategy4RegionMergeModelV567 rankStrategy4RegionMergeModelV567;
-    @Autowired
-    private RankStrategy4RegionMergeModelV569 rankStrategy4RegionMergeModelV569;
+    public RankRouter(ServiceBeanFactory serviceBeanFactory) {
+        this.strategyMap = new LinkedHashMap<>();
+        for (Map.Entry<String, Class<? extends RankService>> entry : STRATEGY_CLASSES.entrySet()) {
+            try {
+                this.strategyMap.put(entry.getKey(), serviceBeanFactory.getBean(entry.getValue()));
+            } catch (Exception e) {
+                log.error("Failed to initialize strategy: {}", entry.getKey(), e);
+            }
+        }
+    }
 
     public RankResult rank(RankParam param) {
-        String abCode = param.getAbCode();
-        if (StringUtils.isBlank(abCode)) {
-            return rankStrategy4RegionMergeModelV536.rank(param);
+        Set<String> abExpCodes = param.getAbExpCodes();
+        if (CollectionUtils.isNotEmpty(abExpCodes)) {
+            for (Map.Entry<String, RankService> entry : strategyMap.entrySet()) {
+                if (abExpCodes.contains(entry.getKey())) {
+                    return entry.getValue().rank(param);
+                }
+            }
         }
-        // 536 562 563 564 567 569
-        switch (abCode) {
-
-            case "60112": // 562
-                return rankStrategy4RegionMergeModelV562.rank(param);
-            case "60113": // 563
-                return rankStrategy4RegionMergeModelV563.rank(param); // 60113 CF召回 doing
-            case "60114": // 564
-                return rankStrategy4RegionMergeModelV564.rank(param); // 60114 排序r-cnt实验 doing
-            case "60117": // 567
-                return rankStrategy4RegionMergeModelV567.rank(param); // 60117 cf叠加r-cnt模型 doing
-            case "60119": // 569
-                return rankStrategy4RegionMergeModelV569.rank(param); // rov fm模型 60119 实验关闭
-            case "60121": // 536
-            default: // base 536
-                return rankStrategy4RegionMergeModelV536.rank(param); // vor统计量 doing
+
+        
+        Optional<RankService> defaultStrategy = strategyMap.values().stream().findFirst();
+        if (defaultStrategy.isPresent()) {
+            return defaultStrategy.get().rank(param);
+        } else {
+            log.error("No available rank strategy found.");
+            return null;
         }
     }
+
 }
 

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/RecallParam.java

@@ -19,11 +19,6 @@ public class RecallParam {
     private String ruleKey;
     private String province;
 
-    // hardcode   兼容旧服务的518实验
-    private String hDataKey;
-    private String hRuleKey;
-
-    private String abCode;
     private int size;
     private String flowPoolAbtestGroup;
     private Long videoId;

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/RecallService.java

@@ -7,6 +7,7 @@ import com.tzld.piaoquan.recommend.server.model.Video;
 import com.tzld.piaoquan.recommend.server.service.flowpool.FlowPoolConstants;
 import com.tzld.piaoquan.recommend.server.service.recall.strategy.*;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
@@ -87,7 +88,6 @@ public class RecallService implements ApplicationContextAware {
             return strategies;
         }
 
-        String abCode = param.getAbCode();
         //1：通过“产品”控制“召回子策略”. 票圈美好祝福与内部tab只走祝福召回。APP只走固定列表。特殊配置的app只有固定召回列表。
         if (this.matchSpecialApp(param.getAppType())) {
             strategies.add(strategyMap.get(RegionRealtimeRecallStrategyV5Hand.class.getSimpleName()));
@@ -101,32 +101,20 @@ public class RecallService implements ApplicationContextAware {
             strategies.add(strategyMap.get(AppFallbackRecallStrategy.class.getSimpleName()));
             return strategies;
         }
-        switch (abCode) {
-//            60112  562
-//            60113  563
-//            60114  564
-//            60117  567
-//            60119  569
-//            60121  536
-            case "60121": // 536
-            case "60112": // 562
-            case "60114": // 564
-            case "60119": // 569
-                strategies.add(strategyMap.get(RegionRealtimeRecallStrategyV1.class.getSimpleName()));
-                strategies.addAll(getRegionRecallStrategy(param));
-                strategies.add(strategyMap.get(ReturnVideoRecallStrategy.class.getSimpleName()));
-                break;
-            case "60113": // 563
-            case "60117": // 567
-                strategies.add(strategyMap.get(RegionRealtimeRecallStrategyV1.class.getSimpleName()));
-                strategies.addAll(getRegionRecallStrategy(param));
-                strategies.add(strategyMap.get(ReturnVideoRecallStrategy.class.getSimpleName()));
+
+        strategies.addAll(getRegionRecallStrategy(param));
+        strategies.add(strategyMap.get(RegionRealtimeRecallStrategyV1.class.getSimpleName()));
+        strategies.add(strategyMap.get(ReturnVideoRecallStrategy.class.getSimpleName()));
+
+        Set<String> abExpCodes = param.getAbExpCodes();
+        if(CollectionUtils.isNotEmpty(abExpCodes)) {
+            if (abExpCodes.contains("563")
+                    || abExpCodes.contains("567")) {
                 strategies.add(strategyMap.get(SceneCFRovnRecallStrategy.class.getSimpleName()));
                 strategies.add(strategyMap.get(SceneCFRosnRecallStrategy.class.getSimpleName()));
-                break;
-            default:
-                strategies.addAll(getRegionRecallStrategy(param));
+            }
         }
+
         // 命中用户黑名单不走流量池
         if (!param.isRiskUser()) {
             if (param.getFlowPoolAbtestGroup().equals(FlowPoolConstants.EXPERIMENTAL_FLOW_SET_LEVEL)) {

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/AbstractFlowPoolWithLevelRecallStrategy.java

@@ -53,7 +53,6 @@ public abstract class AbstractFlowPoolWithLevelRecallStrategy implements RecallS
             filterResult.getVideoIds().stream().forEach(vid -> {
                 Video recallData = new Video();
                 recallData.setVideoId(vid);
-                recallData.setAbCode(param.getAbCode());
                 recallData.setRovScore(RandomUtils.nextDouble(0, 100));
                 recallData.setPushFrom(pushFrom());
                 recallData.setFlowPool(videoFlowPoolMap.get(vid));

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/AbstractFlowPoolWithLevelScoreRecallStrategy.java

@@ -54,7 +54,6 @@ public abstract class AbstractFlowPoolWithLevelScoreRecallStrategy implements Re
             filterResult.getVideoIds().stream().forEach(vid -> {
                 Video video = new Video();
                 video.setVideoId(vid);
-                video.setAbCode(param.getAbCode());
                 video.setRovScore(videoScoreMap.get(vid));
                 video.setPushFrom(pushFrom());
                 video.setFlowPool(videoFlowPoolMap.get(vid));

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/AbstractRegionRecallStrategy.java

@@ -141,7 +141,6 @@ public abstract class AbstractRegionRecallStrategy implements RecallStrategy {
                 filterResult.getVideoIds().stream().forEach(vid -> {
                     Video video = new Video();
                     video.setVideoId(vid);
-                    video.setAbCode(param.getAbCode());
                     video.setRovScore(videoMap.get(vid));
                     video.setPushFrom(pushFrom());
                     video.setLastVideoKey(lastVideoKey);

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/AbstractVideoRecallStrategy.java

@@ -62,7 +62,6 @@ public abstract class AbstractVideoRecallStrategy implements RecallStrategy {
             filterResult.getVideoIds().stream().forEach(vid -> {
                 Video recallData = new Video();
                 recallData.setVideoId(vid);
-                recallData.setAbCode(param.getAbCode());
                 recallData.setRovScore(videoScoreMap.get(vid));
                 recallData.setPushFrom(pushFrom());
                 recallData.setFlowPool("");

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/AppFallbackRecallStrategy.java

@@ -62,7 +62,6 @@ public class AppFallbackRecallStrategy implements RecallStrategy {
                     .forEach(vid -> {
                         Video video = new Video();
                         video.setVideoId(vid);
-                        video.setAbCode(param.getAbCode());
                         video.setPushFrom(pushFrom());
                         videosResult.add(video);
                     });

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/BlessRecallStrategy.java

@@ -65,7 +65,6 @@ public class BlessRecallStrategy implements RecallStrategy {
             filterResult.getVideoIds().stream().forEach(vid -> {
                 Video video = new Video();
                 video.setVideoId(vid);
-                video.setAbCode(param.getAbCode());
                 video.setRovScore(videoMap.get(vid));
                 video.setPushFrom(pushFrom());
                 videosResult.add(video);

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/FlowPoolWithLevelRecallStrategyTomson.java

@@ -166,7 +166,6 @@ public class FlowPoolWithLevelRecallStrategyTomson extends AbstractFlowPoolWithL
             filterResult.getVideoIds().forEach(vid -> {
                 Video recallData = new Video();
                 recallData.setVideoId(vid);
-                recallData.setAbCode(param.getAbCode());
                 recallData.setRovScore(finalResultmap.getOrDefault(vid, 0.0));
                 recallData.setPushFrom(pushFrom());
                 recallData.setFlowPool(videoFlowPoolMap_.get(vid));

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/FlowPoolWithLevelScoreRecallStrategy.java

@@ -164,7 +164,6 @@ public class FlowPoolWithLevelScoreRecallStrategy extends AbstractFlowPoolWithLe
             filterResult.getVideoIds().forEach(vid -> {
                 Video recallData = new Video();
                 recallData.setVideoId(vid);
-                recallData.setAbCode(param.getAbCode());
                 recallData.setRovScore(finalResultmap.getOrDefault(vid, 0.0));
                 recallData.setPushFrom(pushFrom());
                 recallData.setFlowPool(videoFlowPoolMap_.get(vid));

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/RegionRealtimeRecallStrategyV1.java

@@ -59,7 +59,6 @@ public class RegionRealtimeRecallStrategyV1 implements RecallStrategy {
             filterResult.getVideoIds().forEach(vid -> {
                 Video video = new Video();
                 video.setVideoId(vid);
-                video.setAbCode(param.getAbCode());
                 video.setRovScore(videoMap.get(vid));
                 video.setPushFrom(pushFrom());
                 videosResult.add(video);

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/RegionRealtimeRecallStrategyV5Hand.java

@@ -42,7 +42,6 @@ public class RegionRealtimeRecallStrategyV5Hand implements RecallStrategy {
         vids.forEach(vid -> {
             Video video = new Video();
             video.setVideoId(vid);
-            video.setAbCode(param.getAbCode());
             video.setRovScore(RandomUtils.nextFloat(0, 1));
             video.setPushFrom(pushFrom());
             videosResult.add(video);

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/SceneCFRosnRecallStrategy.java

@@ -55,7 +55,6 @@ public class SceneCFRosnRecallStrategy implements RecallStrategy {
                 filterResult.getVideoIds().forEach(vid -> {
                     Video video = new Video();
                     video.setVideoId(vid);
-                    video.setAbCode(param.getAbCode());
                     video.setRovScore(vid2Score.getOrDefault(vid, 0.0D));
                     video.setPushFrom(pushFrom());
                     videosResult.add(video);

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/SceneCFRovnRecallStrategy.java

@@ -55,7 +55,6 @@ public class SceneCFRovnRecallStrategy implements RecallStrategy {
                 filterResult.getVideoIds().forEach(vid -> {
                     Video video = new Video();
                     video.setVideoId(vid);
-                    video.setAbCode(param.getAbCode());
                     video.setRovScore(vid2Score.getOrDefault(vid, 0.0D));
                     video.setPushFrom(pushFrom());
                     videosResult.add(video);

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/SpecialRecallStrategy.java

@@ -70,7 +70,6 @@ public class SpecialRecallStrategy implements RecallStrategy {
                 Video video = new Video();
                 video.setVideoId(NumberUtils.toLong(t.getValue(), 0L));
                 video.setRovScore(t.getScore());
-                video.setAbCode("99999");
                 video.setPushFrom(PUSH_FROM);
                 video.setLastVideoKey(lastSpecialRecallKey);
                 results.add(video);