Replace StreamingHTTPAdapter by requests-toolbelt's MultipartEncoder

requirements/requirements-development.txt

@@ -1,3 +1,4 @@
 django>=1.7
 djangorestframework>=3.1.0
-requests>=1.1.0
+requests>=1.1.0
+requests-toolbelt>=0.6.2

rest_framework_proxy/views.py

@@ -5,6 +5,7 @@
 from django.utils import six
 from django.utils.six import BytesIO as StringIO
 from requests.exceptions import ConnectionError, SSLError, Timeout
+from requests_toolbelt.multipart.encoder import MultipartEncoder
 from requests import sessions
 from django.http import HttpResponse
 from rest_framework.response import Response
@@ -13,8 +14,6 @@
 from rest_framework.exceptions import UnsupportedMediaType
 
 from rest_framework_proxy.settings import api_proxy_settings
-from rest_framework_proxy.adapters import StreamingHTTPAdapter
-from rest_framework_proxy.utils import StreamingMultipart, generate_boundary
 
 
 class BaseProxyView(APIView):
@@ -158,40 +157,22 @@ def proxy(self, request, *args, **kwargs):
         cookies = self.get_cookies(request)
 
         try:
-            if files:
-                """
-                By default requests library uses chunked upload for files
-                but it is much more easier for servers to handle streamed
-                uploads.
-
-                This new implementation is also lightweight as files are not
-                read entirely into memory.
-                """
-                boundary = generate_boundary()
-                headers['Content-Type'] = 'multipart/form-data; boundary=%s' % boundary
-
-                body = StreamingMultipart(data, files, boundary)
-
-                session = sessions.Session()
-                session.mount('http://', StreamingHTTPAdapter())
-                session.mount('https://', StreamingHTTPAdapter())
-
-                response = session.request(request.method, url,
-                        params=params,
-                        data=body,
-                        headers=headers,
-                        timeout=self.proxy_settings.TIMEOUT,
-                        verify=verify_ssl,
-                        cookies=cookies)
-            else:
-                response = requests.request(request.method, url,
-                        params=params,
-                        data=data,
-                        files=files,
-                        headers=headers,
-                        timeout=self.proxy_settings.TIMEOUT,
-                        verify=verify_ssl,
-                        cookies=cookies)
+            if not type(data) is str and bool(data):
+                # django rest framework request data attribute contains file and non file inputs
+                # need to process file differently to add their names
+                data={k: v for k, v in data.items() if k not in files.keys()}
+                for k, v in files.items():
+                    data[k] = (v.name, v)
+                data = MultipartEncoder(fields=data)
+                headers['Content-Type'] = data.content_type
+
+            response = requests.request(request.method, url,
+                    params=params,
+                    data=data,
+                    headers=headers,
+                    timeout=self.proxy_settings.TIMEOUT,
+                    verify=verify_ssl,
+                    cookies=cookies)
         except (ConnectionError, SSLError):
             status = requests.status_codes.codes.bad_gateway
             return self.create_error_response({

setup.py

@@ -17,7 +17,8 @@
 install_requires = [
     'django>=1.7',
     'djangorestframework>=3.1.0',
-    'requests>=1.1.0'
+    'requests>=1.1.0',
+    'requests-toolbelt>=0.6.2'
 ]
 classifiers = [
     'Environment :: Web Environment',