Merge pull request #57 from cp2boston/RCB-482_remove_429_loop

Removed 429 loop

Author: cp2boston

rosette/api.py

@@ -522,7 +522,6 @@ def __init__(
         if (refresh_duration < 0):
             refresh_duration = 0
 
-        self.num_retries = retries
         self.connection_refresh_duration = refresh_duration
         self.options = {}
         self.customHeaders = {}
@@ -538,8 +537,6 @@ def _set_pool_size(self):
 
     def _make_request(self, op, url, data, headers):
         """
-        Handles the actual request, retrying if a 429 is encountered
-
         @param op: POST or GET
         @param url: endpoing URL
         @param data: request data
@@ -556,43 +553,39 @@ def _make_request(self, op, url, data, headers):
         session = requests.Session()
         prepared_request = session.prepare_request(request)
 
-        for i in range(self.num_retries + 1):
-            try:
-                response = session.send(prepared_request)
-                status = response.status_code
-                rdata = response.content
-                dict_headers = dict(response.headers)
-                response_headers = {"responseHeaders": dict_headers}
-                if 'x-rosetteapi-concurrency' in dict_headers:
-                    if dict_headers['x-rosetteapi-concurrency'] != self.maxPoolSize:
-                        self.maxPoolSize = dict_headers['x-rosetteapi-concurrency']
-                        self._set_pool_size()
-
-                if status == 200:
-                    return rdata, status, response_headers
-                if status == 429:
-                    code = status
-                    message = "{0} ({1})".format(rdata, i)
-                    time.sleep(self.connection_refresh_duration)
-                    continue
-                if rdata is not None:
-                    try:
-                        the_json = _my_loads(rdata, response_headers)
-                        if 'message' in the_json:
-                            message = the_json['message']
-                        if "code" in the_json:
-                            code = the_json['code']
-                        else:
-                            code = status
-                        raise RosetteException(code, message, url)
-
-                    except:
-                        raise
-            except requests.exceptions.RequestException as e:
-                raise RosetteException(
-                    e.message,
-                    "Unable to establish connection to the Rosette API server",
-                    url)
+        try:
+            response = session.send(prepared_request)
+            status = response.status_code
+            rdata = response.content
+            dict_headers = dict(response.headers)
+            response_headers = {"responseHeaders": dict_headers}
+            if 'x-rosetteapi-concurrency' in dict_headers:
+                if dict_headers['x-rosetteapi-concurrency'] != self.maxPoolSize:
+                    self.maxPoolSize = dict_headers['x-rosetteapi-concurrency']
+                    self._set_pool_size()
+
+            if status == 200:
+                return rdata, status, response_headers
+            if rdata is not None:
+                try:
+                    the_json = _my_loads(rdata, response_headers)
+                    if 'message' in the_json:
+                        message = the_json['message']
+                    if "code" in the_json:
+                        code = the_json['code']
+                    else:
+                        code = status
+                        if not message:
+                            message = rdata
+                    raise RosetteException(code, message, url)
+
+                except:
+                    raise
+        except requests.exceptions.RequestException as e:
+            raise RosetteException(
+                e.message,
+                "Unable to establish connection to the Rosette API server",
+                url)
 
         raise RosetteException(code, message, url)
 

tests/test_rosette_api.py

@@ -47,12 +47,6 @@ def api():
     return api
 
 
-@pytest.fixture
-def json_429(scope="module"):
-    body = json.dumps({'message': 'too many requests', 'versionChecked': True})
-    return body
-
-
 @pytest.fixture
 def json_409(scope="module"):
     body = json.dumps({'code': 'incompatibleClientVersion', 'message': 'the version of client library used is not compatible with this server', 'versionChecked': True})
@@ -140,22 +134,8 @@ def test_info(api, json_response):
     httpretty.disable()
     httpretty.reset()
 
-# Test for 429
-
-
-def test_for_429(api, json_429):
-    httpretty.enable()
-    httpretty.register_uri(httpretty.GET, "https://api.rosette.com/rest/v1/info",
-                           body=json_429, status=429, content_type="application/json")
-
-    with pytest.raises(RosetteException) as e_rosette:
-        result = api.info()
-
-    assert e_rosette.value.status == 429
-    httpretty.disable()
-    httpretty.reset()
 
-# Test for 429
+# Test for 409
 
 
 def test_for_409(api, json_409):