Files.com 1.6.466__tar.gz → 1.6.468__tar.gz

{files_com-1.6.466/files_com.egg-info → files_com-1.6.468}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: files_com
-Version: 1.6.466
+Version: 1.6.468
 Summary: Python bindings for the Files.com API
 License: MIT
 Requires-Python: >=3.5

files_com-1.6.468/_VERSION

@@ -0,0 +1 @@
+1.6.468

{files_com-1.6.466 → files_com-1.6.468/files_com.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: files_com
-Version: 1.6.466
+Version: 1.6.468
 Summary: Python bindings for the Files.com API
 License: MIT
 Requires-Python: >=3.5

{files_com-1.6.466 → files_com-1.6.468}/files_com.egg-info/SOURCES.txt

@@ -291,6 +291,7 @@ tests/test_snapshot.py
 tests/test_sso_event.py
 tests/test_sso_strategy.py
 tests/test_status.py
+tests/test_stream_download.py
 tests/test_style.py
 tests/test_sync.py
 tests/test_sync_log.py

{files_com-1.6.466 → files_com-1.6.468}/files_sdk/__init__.py

@@ -318,7 +318,7 @@ source_ip = None
 workspace_id = None
 base_url = "https://app.files.com"
 base_path = "api/rest/v1"
-version = "1.6.466"
+version = "1.6.468"
 
 __version__ = version
 

{files_com-1.6.466 → files_com-1.6.468}/files_sdk/api_client.py

@@ -142,15 +142,26 @@ class ApiClient:
 
     def stream_download(self, uri, io, is_string_io=False):
         # NOTE the stream=True parameter below
-        with requests.get(uri, stream=True) as r:
-            r.raise_for_status()  # TODO check this later
-            for chunk in r.iter_content(
-                chunk_size=8192, decode_unicode=is_string_io
-            ):
-                # If you have chunk encoded response uncomment if
-                # and set chunk_size parameter to None.
-                # if chunk:
-                io.write(chunk)
+        try:
+            with requests.get(
+                uri,
+                stream=True,
+                timeout=(files_sdk.open_timeout, files_sdk.read_timeout),
+            ) as r:
+                r.raise_for_status()  # TODO check this later
+                for chunk in r.iter_content(
+                    chunk_size=8192, decode_unicode=is_string_io
+                ):
+                    # If you have chunk encoded response uncomment if
+                    # and set chunk_size parameter to None.
+                    # if chunk:
+                    io.write(chunk)
+        except (
+            requests.exceptions.Timeout,
+            requests.exceptions.ConnectionError,
+            requests.exceptions.ChunkedEncodingError,
+        ) as e:
+            raise self.handle_network_error(e, e.request, 0) from None
 
     def execute_request_with_auto_retry(
         self, request, skip_body_logging=False

{files_com-1.6.466 → files_com-1.6.468}/files_sdk/models/custom_domain.py

@@ -18,6 +18,7 @@ class CustomDomain:
         "ssl_certificate_id": None,  # int64 - Current SSL certificate ID.
         "brick_managed": None,  # boolean - Is this domain's SSL certificate automatically managed and renewed by Files.com?
         "folder_behavior_id": None,  # int64 - Public Hosting behavior ID when this domain routes to a specific Public Hosting behavior.  Preserved as historical context when `destination` becomes `unassigned`.
+        "ip_addresses": None,  # array(string) - Dedicated public IP addresses allocated to this Custom Domain.
         "created_at": None,  # date-time - When this Custom Domain was created.
         "updated_at": None,  # date-time - When this Custom Domain was last updated.
     }
@@ -175,6 +176,34 @@ def get(id, params=None, options=None):
     find(id, params, options)
 
 
+# Parameters:
+#   id (required) - int64 - Custom Domain ID.
+#   count (required) - int64 - Number of dedicated IP addresses to allocate.
+def create_allocate_ip(id, params=None, options=None):
+    if not isinstance(params, dict):
+        params = {}
+    if not isinstance(options, dict):
+        options = {}
+    params["id"] = id
+    if "id" in params and not isinstance(params["id"], int):
+        raise InvalidParameterError("Bad parameter: id must be an int")
+    if "count" in params and not isinstance(params["count"], int):
+        raise InvalidParameterError("Bad parameter: count must be an int")
+    if "id" not in params:
+        raise MissingParameterError("Parameter missing: id")
+    if "count" not in params:
+        raise MissingParameterError("Parameter missing: count")
+    response, options = Api.send_request(
+        "POST",
+        "/custom_domains/{id}/allocate_ips".format(
+            id=quote(str(params["id"]), safe="")
+        ),
+        params,
+        options,
+    )
+    return CustomDomain(response.data, options)
+
+
 # Parameters:
 #   destination - string - Where this custom domain routes. Can be `site_alias`, `public_hosting`, `s3_endpoint`, or `unassigned` (not routing traffic). Set to `unassigned` automatically when a bound `public_hosting` folder behavior is deleted, and can be set manually via the API for any reason.
 #   folder_behavior_id - int64 - Public Hosting behavior ID when this domain routes to a specific Public Hosting behavior.  Preserved as historical context when `destination` becomes `unassigned`.

{files_com-1.6.466 → files_com-1.6.468}/files_sdk/models/sftp_host_key.py

@@ -12,6 +12,7 @@ from files_sdk.error import (  # noqa: F401
 class SftpHostKey:
     default_attributes = {
         "active": None,  # boolean - If true, use this SFTP Host Key.
+        "custom_domain_id": None,  # int64 - Custom Domain ID. If set, this key is used only for that Custom Domain.
         "id": None,  # int64 - SFTP Host Key ID
         "name": None,  # string - The friendly name of this SFTP Host Key.
         "key_type": None,  # string - SSH key type
@@ -43,6 +44,7 @@ class SftpHostKey:
 
     # Parameters:
     #   active - boolean - If true, use this SFTP Host Key.
+    #   custom_domain_id - int64 - Custom Domain ID. If set, this key is used only for that Custom Domain.
     #   name - string - The friendly name of this SFTP Host Key.
     #   private_key - string - The private key data.
     def update(self, params=None):
@@ -57,6 +59,12 @@ class SftpHostKey:
             raise MissingParameterError("Parameter missing: id")
         if "id" in params and not isinstance(params["id"], int):
             raise InvalidParameterError("Bad parameter: id must be an int")
+        if "custom_domain_id" in params and not isinstance(
+            params["custom_domain_id"], int
+        ):
+            raise InvalidParameterError(
+                "Bad parameter: custom_domain_id must be an int"
+            )
         if "name" in params and not isinstance(params["name"], str):
             raise InvalidParameterError("Bad parameter: name must be an str")
         if "private_key" in params and not isinstance(
@@ -156,6 +164,7 @@ def get(id, params=None, options=None):
 
 # Parameters:
 #   active - boolean - If true, use this SFTP Host Key.
+#   custom_domain_id - int64 - Custom Domain ID. If set, this key is used only for that Custom Domain.
 #   name - string - The friendly name of this SFTP Host Key.
 #   private_key - string - The private key data.
 def create(params=None, options=None):
@@ -165,6 +174,12 @@ def create(params=None, options=None):
         options = {}
     if "active" in params and not isinstance(params["active"], bool):
         raise InvalidParameterError("Bad parameter: active must be an bool")
+    if "custom_domain_id" in params and not isinstance(
+        params["custom_domain_id"], int
+    ):
+        raise InvalidParameterError(
+            "Bad parameter: custom_domain_id must be an int"
+        )
     if "name" in params and not isinstance(params["name"], str):
         raise InvalidParameterError("Bad parameter: name must be an str")
     if "private_key" in params and not isinstance(params["private_key"], str):
@@ -179,6 +194,7 @@ def create(params=None, options=None):
 
 # Parameters:
 #   active - boolean - If true, use this SFTP Host Key.
+#   custom_domain_id - int64 - Custom Domain ID. If set, this key is used only for that Custom Domain.
 #   name - string - The friendly name of this SFTP Host Key.
 #   private_key - string - The private key data.
 def update(id, params=None, options=None):
@@ -191,6 +207,12 @@ def update(id, params=None, options=None):
         raise InvalidParameterError("Bad parameter: id must be an int")
     if "active" in params and not isinstance(params["active"], bool):
         raise InvalidParameterError("Bad parameter: active must be an bool")
+    if "custom_domain_id" in params and not isinstance(
+        params["custom_domain_id"], int
+    ):
+        raise InvalidParameterError(
+            "Bad parameter: custom_domain_id must be an int"
+        )
     if "name" in params and not isinstance(params["name"], str):
         raise InvalidParameterError("Bad parameter: name must be an str")
     if "private_key" in params and not isinstance(params["private_key"], str):

{files_com-1.6.466 → files_com-1.6.468}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "files_com"
-version = "1.6.466"
+version = "1.6.468"
 description = "Python bindings for the Files.com API"
 readme = "README.md"
 license = { text = "MIT" }

{files_com-1.6.466 → files_com-1.6.468}/tests/test_custom_domain.py

@@ -41,6 +41,15 @@ class CustomDomainTest(TestBase):
         }
         custom_domain.find(id, params)
 
+    @unittest.skipUnless(TestBase.mock_server_path_exists("POST", "/custom_domains/{id}/allocate_ips"), "Mock path does not exist")
+    def test_create_allocate_ip(self):
+        id = 12345
+        params = {
+            "id" : 12345,
+            "count" : 12345,
+        }
+        custom_domain.create_allocate_ip(id, params)
+
     @unittest.skipUnless(TestBase.mock_server_path_exists("POST", "/custom_domains"), "Mock path does not exist")
     def test_create(self):
         params = {

files_com-1.6.468/tests/test_stream_download.py

@@ -0,0 +1,73 @@
+import io
+import threading
+import unittest
+from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
+from unittest.mock import patch
+
+import files_sdk
+from files_sdk.api_client import ApiClient
+
+
+class DownloadHandler(BaseHTTPRequestHandler):
+    def do_GET(self):
+        chunk = b"\x00\xff" * 4096
+        try:
+            if self.path == "/stall-headers":
+                self.server.release_response.wait(5)
+            self.send_response(200)
+            if self.path == "/incomplete-body":
+                self.send_header("Transfer-Encoding", "chunked")
+            else:
+                self.send_header("Content-Length", str(len(chunk) * 3))
+            self.end_headers()
+            if self.path == "/incomplete-body":
+                self.wfile.write(b"%x\r\n" % len(chunk) + chunk + b"\r\n")
+                self.wfile.flush()
+                return  # Close without the final chunk.
+            if self.path == "/stall-body":
+                self.server.release_response.wait(5)
+            for _ in range(3):
+                self.wfile.write(chunk)
+                self.wfile.flush()
+        except (BrokenPipeError, ConnectionResetError):
+            pass
+
+    def log_message(self, *args):
+        pass
+
+
+class TestStreamDownload(unittest.TestCase):
+    def setUp(self):
+        self.server = ThreadingHTTPServer(("127.0.0.1", 0), DownloadHandler)
+        self.server.release_response = threading.Event()
+        self.thread = threading.Thread(target=self.server.serve_forever)
+        self.thread.start()
+        self.url = "http://127.0.0.1:{}".format(self.server.server_port)
+
+    def tearDown(self):
+        self.server.release_response.set()
+        self.server.shutdown()
+        self.server.server_close()
+        self.thread.join()
+
+    @patch.object(files_sdk, "read_timeout", 0.2)
+    def test_stalled_download_raises_a_network_error(self):
+        for path in ("/stall-headers", "/stall-body"):
+            with self.subTest(path=path):
+                with self.assertRaises(files_sdk.error.APIConnectionError):
+                    ApiClient().stream_download(self.url + path, io.BytesIO())
+
+    def test_download_preserves_binary_content(self):
+        output = io.BytesIO()
+        ApiClient().stream_download(self.url + "/stream", output)
+        self.assertEqual(output.getvalue(), b"\x00\xff" * 4096 * 3)
+
+    def test_interrupted_download_raises_a_network_error(self):
+        output = io.BytesIO()
+        with self.assertRaises(files_sdk.error.APIConnectionError):
+            ApiClient().stream_download(self.url + "/incomplete-body", output)
+        self.assertEqual(output.getvalue(), b"\x00\xff" * 4096)
+
+
+if __name__ == "__main__":
+    unittest.main()

files_com-1.6.466/_VERSION

@@ -1 +0,0 @@
-1.6.466