Merge pull request #14 from paul-nameless/while-loop-ddos

While loop runs without any interval and potentially can raise a rate limit

Author: kvz

transloadit/assembly.py

@@ -108,13 +108,14 @@ def create(self, wait=False, resumable=True, retries=3):
 
         if wait:
             while not self._assembly_finished(response):
+                sleep(response.data.get("info", {}).get("retryIn", 1))
                 response = self.transloadit.get_assembly(
                     assembly_url=response.data.get("assembly_ssl_url")
                 )
 
         if self._rate_limit_reached(response) and retries:
             # wait till rate limit is expired
-            sleep(response.data.get("info", {}).get("retryIn", 0))
+            sleep(response.data.get("info", {}).get("retryIn", 1))
             self.create(wait, resumable, retries - 1)
 
         return response

transloadit/request.py

@@ -10,6 +10,8 @@
 from .response import as_response
 from . import __version__
 
+TIMEOUT = 30
+
 
 class Request:
     """
@@ -43,6 +45,7 @@ def get(self, path, params=None):
             self._get_full_url(path),
             params=self._to_payload(params),
             headers=self.HEADERS,
+            timeout=TIMEOUT,
         )
 
     @as_response
@@ -64,7 +67,11 @@ def post(self, path, data=None, extra_data=None, files=None):
         if extra_data:
             data.update(extra_data)
         return requests.post(
-            self._get_full_url(path), data=data, files=files, headers=self.HEADERS
+            self._get_full_url(path),
+            data=data,
+            files=files,
+            headers=self.HEADERS,
+            timeout=TIMEOUT,
         )
 
     @as_response
@@ -79,7 +86,12 @@ def put(self, path, data=None):
         Return an instance of <transloadit.response.Response>
         """
         data = self._to_payload(data)
-        return requests.put(self._get_full_url(path), data=data, headers=self.HEADERS)
+        return requests.put(
+            self._get_full_url(path),
+            data=data,
+            headers=self.HEADERS,
+            timeout=TIMEOUT,
+        )
 
     @as_response
     def delete(self, path, data=None):
@@ -94,7 +106,10 @@ def delete(self, path, data=None):
         """
         data = self._to_payload(data)
         return requests.delete(
-            self._get_full_url(path), data=data, headers=self.HEADERS
+            self._get_full_url(path),
+            data=data,
+            headers=self.HEADERS,
+            timeout=TIMEOUT,
         )
 
     def _to_payload(self, data):