#10 fix leaderboards

Author: racacax

requirements.txt

@@ -12,4 +12,5 @@ pytest-order==1.3.0
 flake8==7.1.1
 black==24.10.0
 pytest-timeout==2.3.1
-pytest-xdist==3.6.1
+pytest-xdist==3.6.1
+numpy==2.2.2

src/threads/get_matches.py

@@ -13,6 +13,8 @@
 
 logger = create_logger("get_matches")
 
+MAX_RETRIES = 5
+
 
 class GetMatchesThread(AbstractThread):
     def __init__(self):
@@ -138,7 +140,8 @@ def run_insert_matches_loop(self):
 
     def handle(self):
         while True:
-            if self.tries > 5:
+            if self.tries > MAX_RETRIES:
+                logger.info(f"Exceeding {MAX_RETRIES} tries. Skipping to next id.")
                 self.tries = 0
                 self.match_id += 1
             self.run_insert_matches_loop()

src/threads/update_big_queries.py

@@ -9,14 +9,15 @@
 
 from models import Player, PlayerGame, Game, Season, Zone, PlayerSeason, Map
 from src.log_utils import create_logger
-from src.utils import CustomJSONEncoder, RANKS, calculate_points
+from src.utils import CustomJSONEncoder, RANKS, distribute_points
 from src.threads.abstract_thread import AbstractThread
 
 logger = create_logger("update_big_queries")
 
 
 def get_countries_leaderboard(season_id):
     total_players = 1000
+    points_repartition = distribute_points(max_points=10000, num_people=total_players)
     player_seasons = (
         PlayerSeason.select(
             Player.uuid,
@@ -37,7 +38,10 @@ def get_countries_leaderboard(season_id):
     objs = [o for o in player_seasons]
     countries = {}
     for o in objs:
-        computed_points = calculate_points(o["rank"], total_players=total_players)
+        if o["rank"] > len(points_repartition):
+            computed_points = 0
+        else:
+            computed_points = int(points_repartition[o["rank"] - 1])
         if not o["country"] in countries:
             countries[o["country"]] = {
                 "name": o["name"],
@@ -62,6 +66,7 @@ def get_countries_leaderboard(season_id):
 
 def get_clubs_leaderboard(season_id):
     total_players = 1000
+    points_repartition = distribute_points(max_points=10000, num_people=total_players)
     player_seasons = (
         PlayerSeason.select(
             Player.uuid,
@@ -78,7 +83,10 @@ def get_clubs_leaderboard(season_id):
     objs = [o for o in player_seasons]
     club_tags = {}
     for o in objs:
-        computed_points = calculate_points(o["rank"], total_players=total_players)
+        if o["rank"] > len(points_repartition):
+            computed_points = 0
+        else:
+            computed_points = int(points_repartition[o["rank"] - 1])
         if not o["club_tag"] in club_tags:
             club_tags[o["club_tag"]] = {"name": o["club_tag"], "points": 0, "count": 0}
         if club_tags[o["club_tag"]]["count"] < 10:

src/utils.py

@@ -2,7 +2,7 @@
 import decimal
 import inspect
 import json
-import math
+import numpy as np
 from datetime import datetime
 from http.server import BaseHTTPRequestHandler
 from inspect import Parameter
@@ -235,11 +235,13 @@ def routes(cls):
         return formatted_routes
 
 
-def calculate_points(rank, max_points=10000, min_points=1000, total_players=5000):
-    scale_factor = (max_points - min_points) / (math.log(2) - math.log(total_players + 1))
-    points = int(max_points - scale_factor * (math.log(rank + 1) - math.log(2)))
-
-    return max(min_points, points)
+def distribute_points(num_people=1000, max_points=10000):
+    log_values = np.log2(np.arange(1, num_people + 1))
+    scaled_points = (log_values - log_values.min()) / (log_values.max() - log_values.min())
+    scaled_points = scaled_points * max_points
+    rounded_points = np.round(scaled_points, 0)
+    rounded_points = map(lambda x: max_points - x, rounded_points)
+    return list(rounded_points)
 
 
 def get_trackmaster_limit():