wassname/Open-Assistant
1
0
Fork 0
mirror of https://github.com/wassname/Open-Assistant.git synced 2026-07-05 17:30:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

exclude banned users from leaderboard

Browse Source
This commit is contained in:
Andreas Köpf
2023-02-08 20:13:49 +01:00
parent 07b58d4021
commit a272ec26c5
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/oasst_backend/user_stats_repository.py
+4 -4
View File
@@ -102,7 +102,7 @@ class UserStatsRepository:
UserStats,
)
.join(UserStats, User.id == UserStats.user_id)
.filter(UserStats.time_frame == time_frame.value, User.show_on_leaderboard)
.filter(UserStats.time_frame == time_frame.value, User.show_on_leaderboard, User.enabled)
.order_by(UserStats.rank)
.limit(limit)
)
@@ -121,7 +121,7 @@ class UserStatsRepository:
window_size: int = 5,
) -> LeaderboardStats | None:
# no window for users who don't show themselves
if not user.show_on_leaderboard:
if not user.show_on_leaderboard or not user.enabled:
return None
qry = self.session.query(UserStats).filter(UserStats.user_id == user.id, UserStats.time_frame == time_frame)
@@ -144,7 +144,7 @@ class UserStatsRepository:
UserStats,
)
.join(UserStats, User.id == UserStats.user_id)
.filter(UserStats.time_frame == time_frame.value, User.show_on_leaderboard)
.filter(UserStats.time_frame == time_frame.value, User.show_on_leaderboard, User.enabled)
.where(UserStats.rank >= min_rank, UserStats.rank <= max_rank)
.order_by(UserStats.rank)
)
@@ -547,7 +547,7 @@ FROM
ORDER BY leader_score DESC, user_id
) AS "rank", user_id, time_frame
FROM user_stats us2
INNER JOIN "user" u ON us2.user_id = u.id AND u.show_on_leaderboard
INNER JOIN "user" u ON us2.user_id = u.id AND u.show_on_leaderboard AND u.enabled
WHERE (:time_frame IS NULL OR time_frame = :time_frame)) AS r
WHERE
us.user_id = r.user_id