Merge pull request #66 from Frameio/develop

0.9.1 Release

Author: jhodges10

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.9.0
+current_version = 0.9.1
 commit = True
 tag = True
 

frameioclient/uploader.py

@@ -1,8 +1,12 @@
+import os
 import math
 import requests
 import threading
 import concurrent.futures
-import os
+
+from requests.adapters import HTTPAdapter
+from requests.packages.urllib3.util.retry import Retry
+
 
 thread_local = threading.local()
 
@@ -11,6 +15,12 @@ def __init__(self, asset, file):
     self.asset = asset
     self.file = file
     self.chunk_size = None
+    self.retry_strategy = Retry(
+        total=3,
+        backoff_factor=1,
+        status_forcelist=[400, 500, 503],
+        method_whitelist=["PUT"]
+    )
 
   def _calculate_chunks(self, total_size, chunk_count):
     self.chunk_size = int(math.ceil(total_size / chunk_count))
@@ -24,8 +34,12 @@ def _calculate_chunks(self, total_size, chunk_count):
     return chunk_offsets
 
   def _get_session(self):
-    if not hasattr(thread_local, "session"):
-        thread_local.session = requests.Session()
+    if not hasattr(thread_local, "session"):        
+        adapter = HTTPAdapter(max_retries=self.retry_strategy)
+        http = requests.Session()
+        http.mount("https", adapter)
+
+        thread_local.session = http
     return thread_local.session
 
   def _smart_read_chunk(self, chunk_offset, is_final_chunk):
@@ -47,7 +61,7 @@ def _upload_chunk(self, task):
 
     if chunk_id+1 == chunks_total:
       is_final_chunk = True
-    
+
     session = self._get_session()
 
     chunk_data = self._smart_read_chunk(chunk_offset, is_final_chunk)

setup.py

@@ -4,7 +4,7 @@
 
 from setuptools.command.install import install
 
-version='0.9.0'
+version='0.9.1'
 
 with open("README.md", "r") as f:
   long_description = f.read()