Skip to content

fix(fcm): Increased FCM batch request limit to 500 #362

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.

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

Merged
merged 1 commit into from
Nov 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions firebase_admin/_messaging_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ class MulticastMessage(object):
def __init__(self, tokens, data=None, notification=None, android=None, webpush=None, apns=None,
fcm_options=None):
_Validators.check_string_list('MulticastMessage.tokens', tokens)
if len(tokens) > 100:
raise ValueError('MulticastMessage.tokens must not contain more than 100 tokens.')
if len(tokens) > 500:
raise ValueError('MulticastMessage.tokens must not contain more than 500 tokens.')
self.tokens = tokens
self.data = data
self.notification = notification
Expand Down
6 changes: 3 additions & 3 deletions firebase_admin/messaging.py
Original file line number Diff line number Diff line change
Expand Up @@ -356,9 +356,9 @@ def send(self, message, dry_run=False):
def send_all(self, messages, dry_run=False):
"""Sends the given messages to FCM via the batch API."""
if not isinstance(messages, list):
raise ValueError('Messages must be an list of messaging.Message instances.')
if len(messages) > 100:
raise ValueError('send_all messages must not contain more than 100 messages.')
raise ValueError('messages must be a list of messaging.Message instances.')
if len(messages) > 500:
raise ValueError('messages must not contain more than 500 elements.')

responses = []

Expand Down
8 changes: 4 additions & 4 deletions integration/test_messaging.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,17 +101,17 @@ def test_send_all():
assert isinstance(response.exception, exceptions.InvalidArgumentError)
assert response.message_id is None

def test_send_one_hundred():
def test_send_all_500():
messages = []
for msg_number in range(100):
for msg_number in range(500):
topic = 'foo-bar-{0}'.format(msg_number % 10)
messages.append(messaging.Message(topic=topic))

batch_response = messaging.send_all(messages, dry_run=True)

assert batch_response.success_count == 100
assert batch_response.success_count == 500
assert batch_response.failure_count == 0
assert len(batch_response.responses) == 100
assert len(batch_response.responses) == 500
for response in batch_response.responses:
assert response.success is True
assert response.exception is None
Expand Down
21 changes: 12 additions & 9 deletions tests/test_messaging.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,18 @@ def test_invalid_tokens_type(self, tokens):
expected = 'MulticastMessage.tokens must be a list of strings.'
assert str(excinfo.value) == expected

def test_tokens_over_one_hundred(self):
def test_tokens_over_500(self):
with pytest.raises(ValueError) as excinfo:
messaging.MulticastMessage(tokens=['token' for _ in range(0, 101)])
expected = 'MulticastMessage.tokens must not contain more than 100 tokens.'
messaging.MulticastMessage(tokens=['token' for _ in range(0, 501)])
expected = 'MulticastMessage.tokens must not contain more than 500 tokens.'
assert str(excinfo.value) == expected

def test_tokens_type(self):
messaging.MulticastMessage(tokens=['token'])
messaging.MulticastMessage(tokens=['token' for _ in range(0, 100)])
message = messaging.MulticastMessage(tokens=['token'])
assert len(message.tokens) == 1

message = messaging.MulticastMessage(tokens=['token' for _ in range(0, 500)])
assert len(message.tokens) == 500


class TestMessageEncoder(object):
Expand Down Expand Up @@ -1598,14 +1601,14 @@ def test_invalid_send_all(self, msg):
expected = 'Message must be an instance of messaging.Message class.'
assert str(excinfo.value) == expected
else:
expected = 'Messages must be an list of messaging.Message instances.'
expected = 'messages must be a list of messaging.Message instances.'
assert str(excinfo.value) == expected

def test_invalid_over_one_hundred(self):
def test_invalid_over_500(self):
msg = messaging.Message(topic='foo')
with pytest.raises(ValueError) as excinfo:
messaging.send_all([msg for _ in range(0, 101)])
expected = 'send_all messages must not contain more than 100 messages.'
messaging.send_all([msg for _ in range(0, 501)])
expected = 'messages must not contain more than 500 elements.'
assert str(excinfo.value) == expected

def test_send_all(self):
Expand Down