Files.com 1.4.87__tar.gz → 1.4.90__tar.gz

{Files.com-1.4.87 → Files.com-1.4.90}/Files.com.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: Files.com
-Version: 1.4.87
+Version: 1.4.90
 Summary: Python bindings for the Files.com API
 Home-page: UNKNOWN
 License: MIT

Files.com-1.4.90/Files.com.egg-info/requires.txt

@@ -0,0 +1,3 @@
+python_version>=3.0
+requests-toolbelt>=1.0.0
+requests>=2.20

{Files.com-1.4.87 → Files.com-1.4.90}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: Files.com
-Version: 1.4.87
+Version: 1.4.90
 Summary: Python bindings for the Files.com API
 Home-page: UNKNOWN
 License: MIT

{Files.com-1.4.87 → Files.com-1.4.90}/README.md

@@ -64,6 +64,7 @@ Or use if for all subsequent API calls globally like this:
 
 You can set the following global options directly on the `files_sdk` module:
 
+ * `files_sdk.source_ip` - the source IP from which to send requests from (local bind)
  * `files_sdk.open_timeout` - open timeout in seconds (default: 30)
  * `files_sdk.read_timeout` - read timeout in seconds (default: 80)
  * `files_sdk.initial_network_retry_delay` - initial retry delay in seconds (default: 0.5)

{Files.com-1.4.87 → Files.com-1.4.90}/files_sdk/__init__.py

@@ -192,12 +192,15 @@ from files_sdk.models.user_request import UserRequest
 from files_sdk.models.webhook_test import WebhookTest
 
 import files_sdk.path_util
+import socket
+from urllib.parse import urlparse
 
 the_api_key = ""
 session_id = None
+source_ip = None
 base_url = "https://app.files.com"
 base_path = "api/rest/v1"
-version = "1.4.87"
+version = "1.4.90"
 
 __version__ = version
 
@@ -209,7 +212,7 @@ max_network_retries = 3
 
 console_log_level = "none"
 
-OPTS = ("api_key", "client", "session_id")
+OPTS = ("api_key", "client", "session_id", "source_ip")
 
 
 def set_api_key(_api_key):
@@ -229,6 +232,23 @@ def set_session(_session):
     session_id = _session.id
 
 
+def set_source_ip(_source_ip):
+    global source_ip
+    source_ip = _source_ip
+
+
+def get_source_ip():
+    global source_ip
+    if source_ip is None:
+        parsed_url = urlparse(base_url)
+        addrs = socket.getaddrinfo(parsed_url.hostname, parsed_url.port)
+        ipv4_addrs = [
+            addr[4][0] for addr in addrs if addr[0] == socket.AF_INET
+        ]
+        source_ip = ipv4_addrs[0]
+    return source_ip
+
+
 def open(*args, **kwargs):
     return file.open(*args, **kwargs)
 

{Files.com-1.4.87 → Files.com-1.4.90}/files_sdk/api.py

@@ -5,9 +5,14 @@ from files_sdk.api_client import ApiClient
 
 
 class Api:
+    __singleton_instance = None
+
     @staticmethod
-    def api_client():
-        return ApiClient()
+    def client():
+        if not Api.__singleton_instance:
+            Api.__singleton_instance = ApiClient()
+
+        return Api.__singleton_instance
 
     @staticmethod
     def send_request(verb, path, params, options=None):
@@ -25,9 +30,7 @@ class Api:
                 session.save
             session_id = str(session.id)
 
-        client = ApiClient()
-
-        response = client.send_request(
+        response = Api.client().send_request(
             verb, path, api_key=api_key, session_id=session_id, params=params
         )
 

{Files.com-1.4.87 → Files.com-1.4.90}/files_sdk/api_client.py

@@ -12,6 +12,7 @@ from files_sdk.error import (
     Error,
 )
 import files_sdk.util as util
+from requests_toolbelt.adapters import source
 
 
 class ApiClient:
@@ -19,11 +20,20 @@ class ApiClient:
     The Files.com API Client.
     """
 
-    session = requests.Session()
-
     def __init__(self):
         pass
 
+        self.session = requests.Session()
+
+        if (
+            files_sdk.get_source_ip() is not None
+            and self.session.adapters.get(files_sdk.base_url, None) is None
+        ):
+            self.session.mount(
+                files_sdk.base_url,
+                source.SourceAddressAdapter(files_sdk.get_source_ip()),
+            )
+
     def send_remote_request(self, method, url, headers=None, body=None):
         if headers is None:
             headers = {}
@@ -134,6 +144,7 @@ class ApiClient:
                     timeout=(files_sdk.open_timeout, files_sdk.read_timeout),
                     **settings,
                 )
+
                 self.log_response(
                     request,
                     request_start,

{Files.com-1.4.87 → Files.com-1.4.90}/files_sdk/models/file.py

@@ -199,7 +199,7 @@ class File:
         return self.download_uri
 
     def download_content(self, io, is_string_io=False):
-        Api.api_client().stream_download(
+        Api.client().stream_download(
             self.download_uri_with_load(), io, is_string_io
         )
 
@@ -733,7 +733,7 @@ def upload_chunks(io, path, options, upload=None, etags=None, params=None):
         buf = io.read(upload.partsize)
         if buf is not None:  # None means no data but io still open
             bytes_written += len(buf)
-            response = Api.api_client().send_remote_request(
+            response = Api.client().send_remote_request(
                 upload.http_method,
                 upload.upload_uri,
                 {"Content-Length": str(len(buf))},

{Files.com-1.4.87 → Files.com-1.4.90}/setup.py

@@ -10,7 +10,9 @@ setup(
     description="Python bindings for the Files.com API",
     packages = find_packages(exclude = ('tests', 'tests.*', 'doc')),
     install_requires=[
-        'requests >= 2.20; python_version >= "3.0"',
+        'requests >= 2.20',
+        'python_version >= 3.0',
+        'requests-toolbelt >= 1.0.0',
     ],
     include_package_data=True,
     package_data={

Files.com-1.4.87/Files.com.egg-info/requires.txt

@@ -1,3 +0,0 @@
-
-[:python_version >= "3.0"]
-requests>=2.20