Skip to content

Commit

Permalink
exclude banned users from leaderboard
Browse files Browse the repository at this point in the history
  • Loading branch information
andreaskoepf committed Feb 8, 2023
1 parent 07b58d4 commit a272ec2
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 4 deletions.
8 changes: 4 additions & 4 deletions backend/oasst_backend/user_stats_repository.py
Expand Up @@ -102,7 +102,7 @@ def get_leaderboard(
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)
)
Expand All @@ -121,7 +121,7 @@ def get_leaderboard_user_window(
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)
Expand All @@ -144,7 +144,7 @@ def get_leaderboard_user_window(
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)
)
Expand Down Expand Up @@ -547,7 +547,7 @@ def update_leader_ranks(self, time_frame: UserStatsTimeFrame = None):
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
Expand Down
18 changes: 18 additions & 0 deletions scripts/backend-development/run-local-no-limit.sh
@@ -0,0 +1,18 @@
#!/usr/bin/env bash
parent_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )

# switch to backend directory
pushd "$parent_path/../../backend"

export DEBUG_USE_SEED_DATA=True
export DEBUG_SKIP_TOXICITY_CALCULATION=True
export DEBUG_ALLOW_SELF_LABELING=True
export DEBUG_ALLOW_SELF_RANKING=True
export DEBUG_ALLOW_DUPLICATE_TASKS=True
export DEBUG_SKIP_EMBEDDING_COMPUTATION=True
export RATE_LIMIT=0
export DEBUG_USE_SEED_DATA_PATH=$parent_path/../../backend/test_data/generic/test_generic_data.json

uvicorn main:app --reload --port 8080 --host 0.0.0.0

popd

0 comments on commit a272ec2

Please sign in to comment.