feat:完善打分策略

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/RankService.java

@@ -13,19 +13,11 @@ public interface RankService {
 
     AdRankItem adItemRank(RankRecommendRequestParam request);
 
-    default AdRankItem adItemRankWithVideoAdThompson(RankRecommendRequestParam request) {
-        return null;
-    }
+    AdRankItem adItemRankWithVideoAdThompson(RankRecommendRequestParam request);
 
-    default AdPlatformCreativeDTO adBidRank(BidRankRecommendRequestParam request) {
-        return null;
-    }
+    AdPlatformCreativeDTO adBidRank(BidRankRecommendRequestParam request);
 
-    default AdPlatformCreativeDTO adBidRankNewPid(BidRankRecommendRequestParam request) {
-        return null;
-    }
+    AdPlatformCreativeDTO adBidRankNewPid(BidRankRecommendRequestParam request);
 
-    default List<AdRankItem> rank(ScoreParam param, UserAdFeature userAdFeature, List<AdRankItem> rankItems, String configFile) {
-        return null;
-    }
+    List<AdRankItem> rank(ScoreParam param, UserAdFeature userAdFeature, List<AdRankItem> rankItems, String configFile);
 }

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/impl/RankService680.java → ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/RankService680.java

@@ -1,11 +1,10 @@
-package com.tzld.piaoquan.ad.engine.service.score.impl;
+package com.tzld.piaoquan.ad.engine.service.score;
 
 import com.tzld.piaoquan.ad.engine.commons.score.ScoreParam;
 import com.tzld.piaoquan.ad.engine.commons.util.ExtractorUtils;
 import com.tzld.piaoquan.ad.engine.commons.util.NumUtil;
 import com.tzld.piaoquan.ad.engine.service.feature.Feature;
 import com.tzld.piaoquan.ad.engine.service.feature.FeatureService;
-import com.tzld.piaoquan.ad.engine.service.score.RankService;
 import com.tzld.piaoquan.ad.engine.service.score.convert.RequestConvert;
 import com.tzld.piaoquan.ad.engine.service.score.dto.AdPlatformCreativeDTO;
 import com.tzld.piaoquan.ad.engine.service.score.param.RankRecommendRequestParam;
@@ -16,6 +15,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.*;
@@ -23,13 +26,16 @@ import java.util.stream.Collectors;
 
 @Slf4j
 @Service
-public class RankService680 implements RankService {
+public class RankService680 {
 
     @Autowired
     private FeatureService featureService;
 
-    @Override
-    public AdRankItem adItemRank(RankRecommendRequestParam request) {
+    private Map<String, double[]> bucketsMap = new HashMap<>();
+
+    private Map<String, Double> bucketsLen = new HashMap<>();
+
+    public List<AdRankItem> adItemRank(RankRecommendRequestParam request) {
 
         long ts = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) / 1000;
 
@@ -55,7 +61,14 @@ public class RankService680 implements RankService {
 
         Map<String, String> d2Feature = videoFeature.getOrDefault("alg_cid_feature_vid_cf_rank", new HashMap<>());
 
+        List<AdRankItem> adRankItems = new ArrayList<>(request.getAdIdList().size());
         for (AdPlatformCreativeDTO dto : request.getAdIdList()) {
+            AdRankItem adRankItem = new AdRankItem();
+            adRankItem.setAdId(dto.getCreativeId());
+            adRankItem.setCreativeCode(dto.getCreativeCode());
+            adRankItem.setAdVerId(dto.getAdVerId());
+            adRankItem.setVideoId(request.getVideoId());
+
             String cidStr = dto.getCreativeId().toString();
             Map<String, String> cidFeatureMap = new HashMap<>();
             Map<String, Map<String, String>> cidFeature = allCidFeature.getOrDefault(cidStr, new HashMap<>());
@@ -75,8 +88,22 @@ public class RankService680 implements RankService {
 
             String title = b1Feature.getOrDefault("cidtitle", "");
             this.handleE1AndE2Feature(e1Feature, e2Feature, title, cidFeatureMap);
+
+            adRankItem.setFeatureMap(cidFeatureMap);
+
+            adRankItems.add(adRankItem);
+
         }
 
+        // 分桶
+        this.readBucketFile();
+        userFeatureMap = this.featureBucket(userFeatureMap);
+        for (AdRankItem adRankItem : adRankItems) {
+            Map<String, String> featureMap = adRankItem.getFeatureMap();
+            adRankItem.setFeatureMap(this.featureBucket(featureMap));
+        }
+
+
 
         return null;
     }
@@ -371,6 +398,57 @@ public class RankService680 implements RankService {
         return midActionStaticsMap;
     }
 
+    private void readBucketFile() {
+        InputStream resourceStream = RankService680.class.getClassLoader().getResourceAsStream("20240609_bucket_274.txt");
+        if (resourceStream != null) {
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(resourceStream))) {
+                Map<String, double[]> bucketsMap = new HashMap<>();
+                Map<String, Double> bucketsLen = new HashMap<>();
+                String line;
+                while ((line = reader.readLine()) != null) {
+                    // 替换空格和换行符，过滤空行
+                    line = line.replace(" ", "").replaceAll("\n", "");
+                    if (!line.isEmpty()) {
+                        String[] rList = line.split("\t");
+                        if (rList.length == 3) {
+                            String key = rList[0];
+                            double value1 = Double.parseDouble(rList[1]);
+                            bucketsLen.put(key, value1);
+                            double[] value2 = Arrays.stream(rList[2].split(","))
+                                    .mapToDouble(Double::valueOf)
+                                    .toArray();
+                            bucketsMap.put(key, value2);
+                        }
+                    }
+                }
+                this.bucketsMap = bucketsMap;
+                this.bucketsLen = bucketsLen;
+            } catch (IOException e) {
+                log.error("something is wrong in parse bucket file:" + e);
+            }
+        } else {
+            log.error("no bucket file");
+        }
+
+    }
+
+    private Map<String, String> featureBucket(Map<String, String> featureMap) {
+        Map<String, String> newFeatureMap = new HashMap<>(featureMap.size());
+        for (Map.Entry<String, String> entry : featureMap.entrySet()) {
+            String name = entry.getKey();
+            double score = Double.parseDouble(entry.getValue());
+            // 注意：0值、不在分桶文件中的特征，会被过滤掉。
+            if (score > 1E-8 && this.bucketsMap.containsKey(name)) {
+                double[] buckets = this.bucketsMap.get(name);
+                int bucketNum = buckets.length + 1;
+                Double scoreNew = 1.0 / bucketNum * (ExtractorUtils.findInsertPosition(buckets, score) + 1.0);
+                newFeatureMap.put(name, String.valueOf(scoreNew));
+            }
+        }
+
+        return newFeatureMap;
+    }
+
     public static class Tuple5 {
         public String f1;
         public String f2;

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/VideoAdThompsonScorerV2.java

@@ -89,7 +89,7 @@ public class VideoAdThompsonScorerV2 {
             item.setCpa(cpa);
             item.setAdId(dto.getCreativeId());
             item.setScore(score);
-            item.setFeature(ext);
+            item.setExt(ext);
             item.setVideoId(param.getVideoId());
             item.setScore_type(663);
             item.setWeight(dto.getWeight());
@@ -138,7 +138,7 @@ public class VideoAdThompsonScorerV2 {
                 ext.put("s1", s1);
                 item.setCreativeCode(dto.getCreativeCode());
                 item.setWeight(dto.getWeight());
-                item.setFeature(ext);
+                item.setExt(ext);
                 item.setScore_type(664);
             } catch (Exception e) {
                 log.error("svc=thompsonScorerByExp664 {}", gson.toJson(e.getStackTrace()));
@@ -187,7 +187,7 @@ public class VideoAdThompsonScorerV2 {
                         exp665Param.getOrDefault("alpha", 1d), exp665Param.getOrDefault("beta", 10000d), null);
                 ext.put("s1", s1);
                 item.setCreativeCode(dto.getCreativeCode());
-                item.setFeature(ext);
+                item.setExt(ext);
             } catch (Exception e) {
                 log.error("svc=thompsonScorerByExp665 {}", gson.toJson(e.getStackTrace()));
             }
@@ -255,7 +255,7 @@ public class VideoAdThompsonScorerV2 {
             item.setCpa(cpa);
             item.setAdId(dto.getCreativeId());
             item.setScore(score);
-            item.setFeature(ext);
+            item.setExt(ext);
             item.setVideoId(param.getVideoId());
             item.setScore_type(666);
             item.setWeight(dto.getWeight());
@@ -350,7 +350,7 @@ public class VideoAdThompsonScorerV2 {
             item.setAdId(dto.getCreativeId());
             item.setWeight(dto.getWeight());
             item.setScore(score);
-            item.setFeature(ext);
+            item.setExt(ext);
             item.setBid1(dto.getBid1());
             item.setBid2(dto.getBid2());
             item.setCreativeCode(dto.getCreativeCode());
@@ -413,7 +413,7 @@ public class VideoAdThompsonScorerV2 {
             item.setAdId(dto.getCreativeId());
             item.setWeight(dto.getWeight());
             item.setScore(score);
-            item.setFeature(ext);
+            item.setExt(ext);
             item.setBid1(dto.getBid1());
             item.setBid2(dto.getBid2());
             item.setCreativeCode(dto.getCreativeCode());
@@ -567,7 +567,7 @@ public class VideoAdThompsonScorerV2 {
             item.setCpa(cpa);
             item.setAdId(dto.getCreativeId());
             item.setScore(score);
-            item.setFeature(ext);
+            item.setExt(ext);
             item.setVideoId(param.getVideoId());
             item.setScore_type(scoreType);
             item.setWeight(dto.getWeight());

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/impl/RankServiceImpl.java

@@ -10,6 +10,7 @@ import com.tzld.piaoquan.ad.engine.service.predict.helper.NewExpInfoHelper;
 import com.tzld.piaoquan.ad.engine.service.predict.param.ThresholdPredictModelParam;
 import com.tzld.piaoquan.ad.engine.service.remote.FeatureRemoteService;
 import com.tzld.piaoquan.ad.engine.service.score.RankService;
+import com.tzld.piaoquan.ad.engine.service.score.RankService680;
 import com.tzld.piaoquan.ad.engine.service.score.VideoAdThompsonScorerV2;
 import com.tzld.piaoquan.ad.engine.service.score.container.AdCreativeFeatureContainer;
 import com.tzld.piaoquan.ad.engine.service.score.container.PidLambdaContainer;
@@ -80,9 +81,9 @@ public class RankServiceImpl implements RankService {
         Long appType = requestParam.getAppType();
         Integer newExpGroup = requestParam.getNewExpGroup();
         if (AbUtil.isInAbExp(expCodeSet, appType, newExpGroup, fmModelScoreExpCode)) {
-            return fmRankService.adItemRank(requestParam);
+            return fmRankService.adItemRank(requestParam).get(0);
         }else if (AbUtil.isInAbExp(expCodeSet, appType, newExpGroup, tacticsAndFmModelScoreExpCode)){
-            return tacticsAndFmModelScoreRankService.adItemRank(requestParam);
+            // return tacticsAndFmModelScoreRankService.adItemRank(requestParam).get;
         }
         return adItemRankOld(requestParam);
     }
@@ -207,7 +208,7 @@ public class RankServiceImpl implements RankService {
             }
 
             for (AdRankItem adRankItem : rankResult) {
-                adRankItem.getFeature().put("userAdFeature", JSON.toJSONString(userAdFeature));
+                adRankItem.getExt().put("userAdFeature", JSON.toJSONString(userAdFeature));
             }
             // 日志上报
             logHubService.scoreLogUpload(param, request.getAdIdList(), rankResult, request,

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/impl/TacticsAndFmModelScoreRankService.java

@@ -1,16 +1,9 @@
 package com.tzld.piaoquan.ad.engine.service.score.impl;
 
-import com.tzld.piaoquan.ad.engine.service.score.RankService;
-import com.tzld.piaoquan.ad.engine.service.score.param.RankRecommendRequestParam;
-import com.tzld.piaoquan.recommend.feature.domain.ad.base.AdRankItem;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 @Slf4j
 @Service
-public class TacticsAndFmModelScoreRankService implements RankService {
-    @Override
-    public AdRankItem adItemRank(RankRecommendRequestParam request) {
-        return null;
-    }
+public class TacticsAndFmModelScoreRankService {
 }