Merge branch 'develop' of https://github.com/Labelbox/labelbox-python into ms/validation

Author: Matt Sokoloff

CHANGELOG.md

@@ -6,7 +6,12 @@
 * Comparing a Labelbox object (e.g. Project) to None doesn't raise an exception
 * Adding `order_by` to `Project.labels` doesn't raise an exception
 
-## Version 2.4.10 (2021-01-05)
+## Version 2.4.11 (2021-03-07)
+### Fix
+* Increase query timeout
+* Retry 502s
+
+## Version 2.4.10 (2021-02-05)
 ### Added 
 * SDK version added to request headers
 

labelbox/client.py

@@ -74,7 +74,7 @@ def __init__(self,
     #TODO: Add exponential backoff so we don'tt overwhelm the api
     @retry.Retry(predicate=retry.if_exception_type(
         labelbox.exceptions.InternalServerError))
-    def execute(self, query, params=None, timeout=10.0):
+    def execute(self, query, params=None, timeout=30.0):
         """ Sends a request to the server for the execution of the
         given query.
 

tests/integration/test_client_errors.py

@@ -3,7 +3,7 @@
 import time
 import pytest
 
-from labelbox import Project, Dataset, User, LabelingFrontend
+from labelbox import Project, Dataset, User
 import labelbox.client
 import labelbox.exceptions
 
@@ -112,24 +112,23 @@ def test_invalid_attribute_error(client, rand_gen):
 
 @pytest.mark.skip("timeouts cause failure before rate limit")
 def test_api_limit_error(client):
-    global limited
-    limited = False
 
     def get(arg):
         try:
             return client.get_user()
         except labelbox.exceptions.ApiLimitError as e:
             return e
 
+    #Rate limited at 1500 + buffer
     n = 1600
+    #max of 30 concurrency before the service becomes unavailable
     with Pool(30) as pool:
         start = time.time()
         results = list(pool.imap(get, range(n)), total=n)
         elapsed = time.time() - start
 
     assert elapsed < 60, "Didn't finish fast enough"
     assert labelbox.exceptions.ApiLimitError in {type(r) for r in results}
-    del limited
 
     # Sleep at the end of this test to allow other tests to execute.
-    #time.sleep(60)
+    time.sleep(60)