Merge remote-tracking branch 'origin/master' into bid-ranking

# Conflicts:
#	src/main/java/org/prebid/server/settings/model/AccountAuctionConfig.java

Author: AntoxaAntoxic

docs/application-settings.md

@@ -25,6 +25,11 @@ There are two ways to configure application settings: database and file. This do
 - `auction.bidadjustments.mediatype.*.*.*[].value` - value of the bid adjustment
 - `auction.bidadjustments.mediatype.*.*.*[].currency` - currency of the bid adjustment
 - `auction.events.enabled` - enables events for account if true
+- `auction.bid-rounding` - bid rounding options are:
+  - **down** - rounding down to the lower price bucket
+  - **up** - rounding up to the higher price bucket
+  - **timesplit** - 50% of the time rounding down to the lower PB and 50% of the time rounding up to the higher price bucket
+  - **true** - if the price >= 50% of the range, rounding up to the higher price bucket, otherwise rounding down
 - `auction.price-floors.enabled` - enables price floors for account if true. Defaults to true.
 - `auction.price-floors.fetch.enabled`- enables data fetch for price floors for account if true. Defaults to false.
 - `auction.price-floors.fetch.url` - url to fetch price floors data from.
@@ -50,6 +55,7 @@ Keep in mind following restrictions:
 - `auction.preferredmediatype.<bidder>.<media-type>` - <media-type> that will be left for <bidder> that doesn't support multi-format. Other media types will be removed. Acceptable values: `banner`, `video`, `audio`, `native`.
 - `auction.privacysandbox.cookiedeprecation.enabled` - boolean that turns on setting and reading of the Chrome Privacy Sandbox testing label header. Defaults to false.
 - `auction.privacysandbox.cookiedeprecation.ttlsec` - if the above setting is true, how long to set the receive-cookie-deprecation cookie's expiration
+- `auction.cache.enabled` - enables bids caching for account if true. Defaults to true.
 - `privacy.gdpr.enabled` - enables gdpr verifications if true. Has higher priority than configuration in
   application.yaml.
 - `privacy.gdpr.eea-countries` - overrides the host-level list of 2-letter country codes where TCF processing is applied

extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/OrtbDeviceType.java

@@ -27,7 +27,7 @@ public enum OrtbDeviceType {
             Map.entry("Mobile", OrtbDeviceType.MOBILE_TABLET),
             Map.entry("Router", OrtbDeviceType.CONNECTED_DEVICE),
             Map.entry("SmallScreen", OrtbDeviceType.CONNECTED_DEVICE),
-            Map.entry("SmartPhone", OrtbDeviceType.MOBILE_TABLET),
+            Map.entry("SmartPhone", OrtbDeviceType.PHONE),
             Map.entry("SmartSpeaker", OrtbDeviceType.CONNECTED_DEVICE),
             Map.entry("SmartWatch", OrtbDeviceType.CONNECTED_DEVICE),
             Map.entry("Tablet", OrtbDeviceType.TABLET),

extra/pom.xml

@@ -33,7 +33,7 @@
         <checkstyle.version>10.17.0</checkstyle.version>
 
         <!-- Project production dependency versions -->
-        <spring.boot.version>3.4.4</spring.boot.version>
+        <spring.boot.version>3.4.5</spring.boot.version>
         <vertx.version>4.5.14</vertx.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
         <commons.collections.version>4.4</commons.collections.version>

src/main/java/org/prebid/server/auction/BidResponseCreator.java

@@ -596,6 +596,7 @@ private Future<CategoryMappingResult> createCategoryMapping(AuctionContext aucti
         return categoryMappingService.createCategoryMapping(
                         bidderResponses,
                         auctionContext.getBidRequest(),
+                        auctionContext.getAccount(),
                         auctionContext.getTimeoutContext().getTimeout())
 
                 .map(categoryMappingResult -> addCategoryMappingErrors(categoryMappingResult, auctionContext));
@@ -1571,7 +1572,7 @@ private Bid toBid(BidInfo bidInfo,
             final String categoryDuration = bidInfo.getCategory();
             targetingKeywords = keywordsCreator != null
                     ? keywordsCreator.makeFor(
-                    bid, seat, isWinningBid, cacheId, bidType.getName(), videoCacheId, categoryDuration)
+                    bid, seat, isWinningBid, cacheId, bidType.getName(), videoCacheId, categoryDuration, account)
                     : null;
         } else {
             targetingKeywords = null;

src/main/java/org/prebid/server/auction/CpmRange.java

@@ -3,11 +3,16 @@
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.prebid.server.proto.openrtb.ext.request.ExtGranularityRange;
+import org.prebid.server.settings.model.Account;
+import org.prebid.server.settings.model.AccountAuctionConfig;
+import org.prebid.server.settings.model.AccountAuctionBidRoundingMode;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.NumberFormat;
 import java.util.Locale;
+import java.util.Optional;
+import java.util.concurrent.ThreadLocalRandom;
 
 /**
  * Class for price operating with rules defined in {@link PriceGranularity}
@@ -23,8 +28,8 @@ private CpmRange() {
     /**
      * Rounding price by specified rules defined in {@link PriceGranularity} object and returns it in string format
      */
-    public static String fromCpm(BigDecimal cpm, PriceGranularity priceGranularity) {
-        final BigDecimal value = fromCpmAsNumber(cpm, priceGranularity);
+    public static String fromCpm(BigDecimal cpm, PriceGranularity priceGranularity, Account account) {
+        final BigDecimal value = fromCpmAsNumber(cpm, priceGranularity, account);
         return value != null ? format(value, priceGranularity.getPrecision()) : StringUtils.EMPTY;
     }
 
@@ -47,7 +52,7 @@ private static NumberFormat numberFormat(int precision) {
      * Rounding price by specified rules defined in {@link PriceGranularity} object and returns it in {@link BigDecimal}
      * format
      */
-    public static BigDecimal fromCpmAsNumber(BigDecimal cpm, PriceGranularity priceGranularity) {
+    public static BigDecimal fromCpmAsNumber(BigDecimal cpm, PriceGranularity priceGranularity, Account account) {
         if (cpm.compareTo(BigDecimal.ZERO) <= 0) {
             return null;
         }
@@ -69,14 +74,32 @@ public static BigDecimal fromCpmAsNumber(BigDecimal cpm, PriceGranularity priceG
             min = max;
         }
 
-        return increment != null ? calculate(cpm, min, increment) : null;
+        return increment != null ? calculate(cpm, min, increment, resolveRoundingMode(account)) : null;
     }
 
-    private static BigDecimal calculate(BigDecimal cpm, BigDecimal min, BigDecimal increment) {
+    private static BigDecimal calculate(BigDecimal cpm,
+                                        BigDecimal min,
+                                        BigDecimal increment,
+                                        RoundingMode roundingMode) {
+
         return cpm
                 .subtract(min)
-                .divide(increment, 0, RoundingMode.FLOOR)
+                .divide(increment, 0, roundingMode)
                 .multiply(increment)
                 .add(min);
     }
+
+    private static RoundingMode resolveRoundingMode(Account account) {
+        final AccountAuctionBidRoundingMode accountRoundingMode = Optional.ofNullable(account)
+                .map(Account::getAuction)
+                .map(AccountAuctionConfig::getBidRounding)
+                .orElse(AccountAuctionBidRoundingMode.DOWN);
+
+        return switch (accountRoundingMode) {
+            case DOWN -> RoundingMode.FLOOR;
+            case UP -> RoundingMode.CEILING;
+            case TRUE -> RoundingMode.HALF_UP;
+            case TIMESPLIT -> ThreadLocalRandom.current().nextBoolean() ? RoundingMode.FLOOR : RoundingMode.CEILING;
+        };
+    }
 }

src/main/java/org/prebid/server/auction/ExchangeService.java

@@ -94,6 +94,8 @@
 import org.prebid.server.proto.openrtb.ext.request.ExtUser;
 import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebidMeta;
 import org.prebid.server.settings.model.Account;
+import org.prebid.server.settings.model.AccountAuctionConfig;
+import org.prebid.server.settings.model.AccountCacheConfig;
 import org.prebid.server.util.HttpUtil;
 import org.prebid.server.util.ListUtil;
 import org.prebid.server.util.PbsUtil;
@@ -241,7 +243,7 @@ private Future<AuctionContext> runAuction(AuctionContext receivedContext) {
 
         final List<SeatBid> storedAuctionResponses = new ArrayList<>();
         final BidderAliases aliases = aliases(bidRequest, account);
-        final BidRequestCacheInfo cacheInfo = bidRequestCacheInfo(bidRequest);
+        final BidRequestCacheInfo cacheInfo = bidRequestCacheInfo(bidRequest, account);
         final Map<String, MultiBidConfig> bidderToMultiBid = bidderToMultiBids(bidRequest, debugWarnings);
         receivedContext.getBidRejectionTrackers().putAll(makeBidRejectionTrackers(bidRequest, aliases));
 
@@ -311,12 +313,18 @@ private static ExtRequestTargeting targeting(BidRequest bidRequest) {
         return prebid != null ? prebid.getTargeting() : null;
     }
 
-    private static BidRequestCacheInfo bidRequestCacheInfo(BidRequest bidRequest) {
+    private static BidRequestCacheInfo bidRequestCacheInfo(BidRequest bidRequest, Account account) {
+        final boolean cachingEnabled = Optional.ofNullable(account)
+                .map(Account::getAuction)
+                .map(AccountAuctionConfig::getCache)
+                .map(AccountCacheConfig::getEnabled)
+                .orElse(true);
+
         final ExtRequestTargeting targeting = targeting(bidRequest);
         final ExtRequestPrebid prebid = PbsUtil.extRequestPrebid(bidRequest);
         final ExtRequestPrebidCache cache = prebid != null ? prebid.getCache() : null;
 
-        if (targeting != null && cache != null) {
+        if (cachingEnabled && targeting != null && cache != null) {
             final boolean shouldCacheBids = cache.getBids() != null;
             final boolean shouldCacheVideoBids = cache.getVastxml() != null;
             final boolean shouldCacheWinningBidsOnly = !targeting.getIncludebidderkeys()
@@ -345,6 +353,7 @@ private static BidRequestCacheInfo bidRequestCacheInfo(BidRequest bidRequest) {
                         .build();
             }
         }
+
         return BidRequestCacheInfo.noCache();
     }
 

src/main/java/org/prebid/server/auction/TargetingKeywordsCreator.java

@@ -3,6 +3,7 @@
 import com.iab.openrtb.response.Bid;
 import org.apache.commons.lang3.StringUtils;
 import org.prebid.server.proto.openrtb.ext.request.ExtPriceGranularity;
+import org.prebid.server.settings.model.Account;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -152,7 +153,8 @@ Map<String, String> makeFor(Bid bid,
                                 String cacheId,
                                 String format,
                                 String vastCacheId,
-                                String categoryDuration) {
+                                String categoryDuration,
+                                Account account) {
 
         final Map<String, String> keywords = makeFor(
                 bidder,
@@ -164,7 +166,8 @@ Map<String, String> makeFor(Bid bid,
                 vastCacheId,
                 categoryDuration,
                 format,
-                bid.getDealid());
+                bid.getDealid(),
+                account);
 
         if (resolver == null) {
             return truncateKeys(keywords);
@@ -188,7 +191,8 @@ private Map<String, String> makeFor(String bidder,
                                         String vastCacheId,
                                         String categoryDuration,
                                         String format,
-                                        String dealId) {
+                                        String dealId,
+                                        Account account) {
 
         final boolean includeDealBid = alwaysIncludeDeals && StringUtils.isNotEmpty(dealId);
         final KeywordMap keywordMap = new KeywordMap(
@@ -198,7 +202,10 @@ private Map<String, String> makeFor(String bidder,
                 includeBidderKeys || includeDealBid,
                 Collections.emptySet());
 
-        final String roundedCpm = isPriceGranularityValid() ? CpmRange.fromCpm(price, priceGranularity) : DEFAULT_CPM;
+        final String roundedCpm = isPriceGranularityValid()
+                ? CpmRange.fromCpm(price, priceGranularity, account)
+                : DEFAULT_CPM;
+
         keywordMap.put(this.keyPrefix + PB_KEY, roundedCpm);
 
         keywordMap.put(this.keyPrefix + BIDDER_KEY, bidder);

src/main/java/org/prebid/server/auction/categorymapping/BasicCategoryMappingService.java

@@ -42,6 +42,7 @@
 import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebid;
 import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebidVideo;
 import org.prebid.server.settings.ApplicationSettings;
+import org.prebid.server.settings.model.Account;
 import org.prebid.server.util.ObjectUtil;
 
 import java.math.BigDecimal;
@@ -83,6 +84,7 @@ public BasicCategoryMappingService(ApplicationSettings applicationSettings, Jack
     @Override
     public Future<CategoryMappingResult> createCategoryMapping(List<BidderResponse> bidderResponses,
                                                                BidRequest bidRequest,
+                                                               Account account,
                                                                Timeout timeout) {
 
         final ExtRequestTargeting targeting = targeting(bidRequest);
@@ -110,9 +112,21 @@ public Future<CategoryMappingResult> createCategoryMapping(List<BidderResponse>
         final List<RejectedBid> rejectedBids = new ArrayList<>();
 
         return makeBidderToBidCategory(
-                bidderResponses, withCategory, translateCategories, primaryAdServer, publisher, rejectedBids, timeout)
+                bidderResponses,
+                withCategory,
+                translateCategories,
+                primaryAdServer,
+                publisher,
+                rejectedBids,
+                timeout)
                 .map(categoryBidContexts -> resolveBidsCategoriesDurations(
-                        bidderResponses, categoryBidContexts, bidRequest, targeting, withCategory, rejectedBids));
+                        bidderResponses,
+                        categoryBidContexts,
+                        account,
+                        bidRequest,
+                        targeting,
+                        withCategory,
+                        rejectedBids));
     }
 
     private static ExtRequestTargeting targeting(BidRequest bidRequest) {
@@ -326,6 +340,7 @@ private static void collectCategoryFetchResults(CompositeFuture compositeFuture,
      */
     private CategoryMappingResult resolveBidsCategoriesDurations(List<BidderResponse> bidderResponses,
                                                                  List<CategoryBidContext> categoryBidContexts,
+                                                                 Account account,
                                                                  BidRequest bidRequest,
                                                                  ExtRequestTargeting targeting,
                                                                  boolean withCategory,
@@ -342,8 +357,15 @@ private CategoryMappingResult resolveBidsCategoriesDurations(List<BidderResponse
 
         final boolean appendBidderNames = BooleanUtils.toBooleanDefaultIfNull(targeting.getAppendbiddernames(), false);
         final Map<String, Set<CategoryBidContext>> uniqueCatKeysToCategoryBids = categoryBidContexts.stream()
-                .map(categoryBidContext -> enrichCategoryBidContext(categoryBidContext, durations, priceGranularity,
-                        withCategory, appendBidderNames, impIdToBiddersDealTear, rejectedBids))
+                .map(categoryBidContext -> enrichCategoryBidContext(
+                        categoryBidContext,
+                        account,
+                        durations,
+                        priceGranularity,
+                        withCategory,
+                        appendBidderNames,
+                        impIdToBiddersDealTear,
+                        rejectedBids))
                 .filter(Objects::nonNull)
                 .collect(Collectors.groupingBy(CategoryBidContext::getCategoryUniqueKey,
                         Collectors.mapping(Function.identity(), Collectors.toSet())));
@@ -504,6 +526,7 @@ private static boolean isNotRejected(String bidId, String bidder, List<RejectedB
      * and creates {@link CategoryBidContext} which is holder for bid category related information.
      */
     private CategoryBidContext enrichCategoryBidContext(CategoryBidContext categoryBidContext,
+                                                        Account account,
                                                         List<Integer> durations,
                                                         PriceGranularity priceGranularity,
                                                         boolean withCategory,
@@ -522,7 +545,7 @@ private CategoryBidContext enrichCategoryBidContext(CategoryBidContext categoryB
             return null;
         }
 
-        final BigDecimal price = CpmRange.fromCpmAsNumber(bid.getPrice(), priceGranularity);
+        final BigDecimal price = CpmRange.fromCpmAsNumber(bid.getPrice(), priceGranularity, account);
         final String rowPrice = CpmRange.format(price, priceGranularity.getPrecision());
         final String category = categoryBidContext.getCategory();
         final String categoryUniqueKey = createCategoryUniqueKey(withCategory, category, rowPrice, duration);

src/main/java/org/prebid/server/auction/categorymapping/CategoryMappingService.java

@@ -5,12 +5,14 @@
 import org.prebid.server.auction.model.BidderResponse;
 import org.prebid.server.auction.model.CategoryMappingResult;
 import org.prebid.server.execution.timeout.Timeout;
+import org.prebid.server.settings.model.Account;
 
 import java.util.List;
 
 public interface CategoryMappingService {
 
     Future<CategoryMappingResult> createCategoryMapping(List<BidderResponse> bidderResponses,
                                                         BidRequest bidRequest,
+                                                        Account account,
                                                         Timeout timeout);
 }

src/main/java/org/prebid/server/auction/categorymapping/NoOpCategoryMappingService.java

@@ -5,6 +5,7 @@
 import org.prebid.server.auction.model.BidderResponse;
 import org.prebid.server.auction.model.CategoryMappingResult;
 import org.prebid.server.execution.timeout.Timeout;
+import org.prebid.server.settings.model.Account;
 
 import java.util.List;
 
@@ -13,6 +14,7 @@ public class NoOpCategoryMappingService implements CategoryMappingService {
     @Override
     public Future<CategoryMappingResult> createCategoryMapping(List<BidderResponse> bidderResponses,
                                                                BidRequest bidRequest,
+                                                               Account account,
                                                                Timeout timeout) {
 
         return Future.succeededFuture(CategoryMappingResult.of(bidderResponses));