Skip to content

fix(ranking): remove 100-image hard limit blocking ranking round submission #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ayushshukla1807 wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −6
Open

fix(ranking): remove 100-image hard limit blocking ranking round submission #495

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions montage/juror_endpoints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
import html


MAX_RATINGS_SUBMIT = 100
MAX_RATINGS_SUBMIT = 100 # max ratings per bulk-submit batch (yesno/rating)
MAX_RANKING_TASKS = 2000 # max images in a single ranking round ballot
VALID_RATINGS = (0.0, 0.25, 0.5, 0.75, 1.0)
VALID_YESNO = (0.0, 1.0)

Expand Down Expand Up @@ -132,7 +133,7 @@ def get_tasks_from_round(user_dao, round_id, request):
juror_dao.confirm_active(round_id)
rnd = juror_dao.get_round(round_id)
if rnd.vote_method == 'ranking':
count = MAX_RATINGS_SUBMIT # TODO: better constant
count = MAX_RANKING_TASKS # ranking rounds must load all entries at once
tasks = juror_dao.get_tasks_from_round(round_id,
num=count,
offset=offset)
Expand Down Expand Up @@ -247,10 +248,7 @@ def submit_ratings(user_dao, request_dict):

r_dicts = request_dict['ratings']

if len(r_dicts) > MAX_RATINGS_SUBMIT:
raise InvalidAction('can submit up to 100 ratings at once, not %r'
% len(r_dicts))
elif not r_dicts:
if not r_dicts:
return {} # submitting no ratings = immediate return

review_map = {}
Expand Down Expand Up @@ -284,6 +282,11 @@ def submit_ratings(user_dao, request_dict):
rnd.confirm_active()
style = rnd.vote_method

# Enforce batch limit for rating/yesno — ranking rounds must submit all at once anyway
if style != 'ranking' and len(r_dicts) > MAX_RATINGS_SUBMIT:
raise InvalidAction('can submit up to %s ratings at once, not %r'
% (MAX_RATINGS_SUBMIT, len(r_dicts)))

# validation
if style == 'rating':
invalid = [r for r in id_map.values() if r not in VALID_RATINGS]
Expand Down