Merge branch 'release/3.5.0'

Author: Bartek Kwiecien

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Filestack-Python Changelog
 
+### 3.5.0 (September 17th, 2021)
+- Broaden pinned requests version from 2.24.0 to >=2.25.1 [#61](https://github.com/filestack/filestack-python/pull/61)
+- Use Client's storage when uploading external urls [#62](https://github.com/filestack/filestack-python/pull/62)
+
 ### 3.4.0 (May 13th, 2021)
 - Store upload response in Filelink object [#59](https://github.com/filestack/filestack-python/pull/59)
 

VERSION

@@ -1 +1 @@
-3.4.0
+3.5.0

docs/requirements.txt

@@ -1,4 +1,4 @@
 Sphinx==2.1.2
 sphinx-rtd-theme==0.4.3
 trafaret==2.0.2
-requests==2.24.0
+requests>=2.25.1

filestack/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '3.4.0'
+__version__ = '3.5.0'
 
 
 class CFG:

filestack/models/client.py

@@ -120,7 +120,7 @@ def upload_url(self, url, store_params=None, security=None):
             :class:`filestack.Filelink`: new Filelink object
         """
         sec = security or self.security
-        upload_response = upload_external_url(url, self.apikey, store_params, security=sec)
+        upload_response = upload_external_url(url, self.apikey, self.storage, store_params, security=sec)
         return filestack.models.Filelink(
             handle=upload_response['handle'],
             apikey=self.apikey,

filestack/uploads/external_url.py

@@ -2,8 +2,10 @@
 from filestack.utils import requests
 
 
-def upload_external_url(url, apikey, store_params=None, security=None):
+def upload_external_url(url, apikey, storage, store_params=None, security=None):
     store_params = store_params or {}
+    if storage and not store_params.get('location'):
+        store_params['location'] = storage
 
     # remove params that are currently not supported in external url upload
     for item in ('mimetype', 'upload_tags'):

setup.py

@@ -23,7 +23,7 @@ def read_version():
     author_email='support@filestack.com',
     packages=find_packages(),
     install_requires=[
-        'requests==2.25.1',
+        'requests>=2.25.1',
         'trafaret==2.0.2'
     ],
     classifiers=[

tests/uploads/test_upload_external_url.py

@@ -10,22 +10,24 @@
 apikey = 'TESTAPIKEY'
 
 
-@pytest.mark.parametrize('store_params, security, expected_store_tasks', [
+@pytest.mark.parametrize('default_storage, store_params, security, expected_store_tasks', [
     (
-        {'location': 's3'},
+        'S3,',
+        {'location': 'gcs'},
         None,
         [
             {
-                'name': 'store', 'params': {'location': 's3'}
+                'name': 'store', 'params': {'location': 'gcs'}
             }
         ]
     ),
     (
+        'gcs',
         {'path': 'new-path/', 'mimetype': 'application/json'},
         type('SecurityMock', (), {'policy_b64': 'abc', 'signature': '123'}),
         [
             {
-                'name': 'store', 'params': {'path': 'new-path/'}
+                'name': 'store', 'params': {'path': 'new-path/', 'location': 'gcs'}
             },
             {
                 'name': 'security', 'params': {'policy': 'abc', 'signature': '123'}
@@ -34,15 +36,17 @@
     )
 ])
 @patch('filestack.uploads.external_url.requests.post')
-def test_upload_with_store_params(post_mock, store_params, security, expected_store_tasks):
+def test_upload_with_store_params(post_mock, default_storage, store_params, security, expected_store_tasks):
     expected_payload = {
         'apikey': 'TESTAPIKEY',
         'sources': ['http://image.url'],
         'tasks': expected_store_tasks
     }
     post_mock.return_value = DummyHttpResponse(json_dict={'handle': 'newHandle'})
 
-    upload_response = upload_external_url(url, apikey, store_params=store_params, security=security)
+    upload_response = upload_external_url(
+        url, apikey, default_storage, store_params=store_params, security=security
+    )
     assert upload_response['handle'] == 'newHandle'
     post_args, _ = post_mock.call_args
     post_mock.assert_called_once_with('{}/process'.format(config.CDN_URL), json=expected_payload)