python-fotoware-client 0.2.2__tar.gz → 0.2.3__tar.gz

{python_fotoware_client-0.2.2/src/python_fotoware_client.egg-info → python_fotoware_client-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fotoware-client
-Version: 0.2.2
+Version: 0.2.3
 Summary: A thin, honest client for the FotoWare API: one call, one request; refuses queries FotoWare would answer wrongly; counts what each request costs
 Author: Michael Hoppe
 License-Expression: MIT

{python_fotoware_client-0.2.2 → python_fotoware_client-0.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-fotoware-client"
-version = "0.2.2"
+version = "0.2.3"
 description = "A thin, honest client for the FotoWare API: one call, one request; refuses queries FotoWare would answer wrongly; counts what each request costs"
 readme = "README.md"
 requires-python = ">=3.14,<3.15"

{python_fotoware_client-0.2.2 → python_fotoware_client-0.2.3}/src/fotoware_client/__init__.py

@@ -23,7 +23,7 @@ from fotoware_client.models import Archive, Asset, SearchResult
 from fotoware_client.retry import NO_RETRY, STANDARD_RETRY, RetryConfig
 from fotoware_client.settings import ServerSettings
 
-__version__ = "0.2.2"
+__version__ = "0.2.3"
 
 __all__ = [
     # Client

{python_fotoware_client-0.2.2 → python_fotoware_client-0.2.3}/src/fotoware_client/client.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import logging
 import time
-from collections.abc import Iterator
+from collections.abc import Callable, Iterator
 from typing import Any, BinaryIO
 from urllib.parse import urljoin
 
@@ -510,6 +510,57 @@ class FotoWareClient:
         *,
         timeout: int | None = None,
         rendition: str | None = None,
+    ) -> str:
+        """The URL a prepared rendition can be downloaded from, the original's
+        unless *rendition* names another.
+
+        FotoWare prepares the file in a background task and serves it under
+        that task's address for a limited time; download it promptly.
+
+        Raises:
+            APIError: If the asset has no such rendition, or a request fails
+        """
+        return self._renewing_gone_rendition(
+            lambda: self._get_rendition_url_once(asset_href, timeout=timeout, rendition=rendition)
+        )
+
+    def download_original(self, asset_href: str, *, timeout: int | None = None) -> bytes:
+        """The original file of an asset, in memory.
+
+        Raises:
+            APIError: If the request or download fails
+        """
+        return self._renewing_gone_rendition(
+            lambda: self._download_original_once(asset_href, timeout=timeout)
+        )
+
+    def _renewing_gone_rendition[T](self, attempt: Callable[[], T]) -> T:
+        """Run a rendition *attempt*; if FotoWare says its result is gone, once more.
+
+        A rendition is prepared in a background task, and FotoWare answers
+        410 Gone once that task's result has been cleaned up. The address is
+        dead then; asking it again is pointless, but a new rendition request
+        starts a new task. Seen on 2026-10-24 for a few renditions in a hundred
+        while FotoWare was otherwise healthy. The repeat counts as a retry.
+
+        A 410 arrives before any byte is written, so a destination file is
+        still untouched when the attempt is repeated.
+        """
+        try:
+            return attempt()
+        except APIError as exc:
+            if exc.status_code != 410:
+                raise
+            logger.info("Rendition gone (410); requesting it anew: %s", exc)
+            self._counters.count_retry(410, None, 0.0)
+            return attempt()
+
+    def _get_rendition_url_once(
+        self,
+        asset_href: str,
+        *,
+        timeout: int | None = None,
+        rendition: str | None = None,
     ) -> str:
         """Get download URL using FotoWare rendition API.
 
@@ -671,7 +722,7 @@ class FotoWareClient:
                     context={"asset_href": asset_href, "polling_url": polling_url},
                 )
 
-    def download_original(self, asset_href: str, *, timeout: int | None = None) -> bytes:
+    def _download_original_once(self, asset_href: str, *, timeout: int | None = None) -> bytes:
         """Download original file using FotoWare rendition API (atomic operation).
 
         This is the recommended way to download original files. It handles the
@@ -852,11 +903,13 @@ class FotoWareClient:
             APIError: If rendition request or download fails
             NotFoundError: If asset or original rendition not found
         """
-        self._stream_to_file(
-            self.get_rendition_url(asset_href, timeout=timeout),
-            destination,
-            timeout=timeout,
-            chunk_size=chunk_size,
+        self._renewing_gone_rendition(
+            lambda: self._stream_to_file(
+                self._get_rendition_url_once(asset_href, timeout=timeout),
+                destination,
+                timeout=timeout,
+                chunk_size=chunk_size,
+            )
         )
 
     def download_rendition_to_file(
@@ -875,11 +928,13 @@ class FotoWareClient:
             APIError: If the asset has no such rendition, or its request or
                 download fails
         """
-        self._stream_to_file(
-            self.get_rendition_url(asset_href, timeout=timeout, rendition=rendition),
-            destination,
-            timeout=timeout,
-            chunk_size=chunk_size,
+        self._renewing_gone_rendition(
+            lambda: self._stream_to_file(
+                self._get_rendition_url_once(asset_href, timeout=timeout, rendition=rendition),
+                destination,
+                timeout=timeout,
+                chunk_size=chunk_size,
+            )
         )
 
     def _stream_to_file(

{python_fotoware_client-0.2.2 → python_fotoware_client-0.2.3/src/python_fotoware_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fotoware-client
-Version: 0.2.2
+Version: 0.2.3
 Summary: A thin, honest client for the FotoWare API: one call, one request; refuses queries FotoWare would answer wrongly; counts what each request costs
 Author: Michael Hoppe
 License-Expression: MIT

{python_fotoware_client-0.2.2 → python_fotoware_client-0.2.3}/tests/test_client.py

@@ -417,7 +417,7 @@ class TestFotoWareClientDownloadOriginalToFile:
         with (
             patch.object(
                 client,
-                "get_rendition_url",
+                "_get_rendition_url_once",
                 return_value="https://fotoware.example.com/renditions/file.bin",
             ) as mock_get_rendition_url,
             patch.object(
@@ -461,7 +461,7 @@ class TestFotoWareClientDownloadOriginalToFile:
         with (
             patch.object(
                 client,
-                "get_rendition_url",
+                "_get_rendition_url_once",
                 return_value="https://fotoware.example.com/renditions/medium.jpg",
             ) as mock_get_rendition_url,
             patch.object(client, "_request", return_value=response),
@@ -543,3 +543,82 @@ class TestResponsesAreClosed:
 
         requested.close.assert_called_once()
         requested.json.assert_not_called()
+
+
+class TestGoneRenditions:
+    """A rendition whose background task is gone (410) is requested anew, once."""
+
+    @staticmethod
+    def _gone() -> APIError:
+        return APIError("HTTP 410 error", status_code=410)
+
+    @patch("fotoware_client.client.OAuthAuthenticator")
+    def test_a_gone_rendition_is_requested_anew(self, mock_auth: Mock) -> None:
+        client = FotoWareClient("https://fotoware.example.com", "id", "secret")
+        destination = io.BytesIO()
+
+        def stream(url: str, dest: io.BytesIO, **_: object) -> None:
+            if url.endswith("/task-1/file.jpg"):
+                raise self._gone()
+            dest.write(b"jpeg")
+
+        with (
+            patch.object(
+                client,
+                "_get_rendition_url_once",
+                side_effect=["https://f/task-1/file.jpg", "https://f/task-2/file.jpg"],
+            ) as rendition_url,
+            patch.object(client, "_stream_to_file", side_effect=stream),
+        ):
+            client.download_rendition_to_file(
+                "/a/1.jpg.info", destination, rendition="Medium (JPG, 3000px)"
+            )
+
+        assert rendition_url.call_count == 2
+        assert destination.getvalue() == b"jpeg"
+        assert client.cost_snapshot()["retries_by_status"] == {"410": 1}
+
+    @patch("fotoware_client.client.OAuthAuthenticator")
+    def test_a_rendition_gone_twice_is_an_error(self, mock_auth: Mock) -> None:
+        client = FotoWareClient("https://fotoware.example.com", "id", "secret")
+
+        with (
+            patch.object(client, "_get_rendition_url_once", return_value="https://f/t/x.jpg"),
+            patch.object(client, "_stream_to_file", side_effect=self._gone()) as stream,
+        ):
+            with pytest.raises(APIError) as exc_info:
+                client.download_original_to_file("/a/1.jpg.info", io.BytesIO())
+
+        assert exc_info.value.status_code == 410
+        assert stream.call_count == 2
+
+    @patch("fotoware_client.client.OAuthAuthenticator")
+    def test_other_errors_are_not_repeated(self, mock_auth: Mock) -> None:
+        client = FotoWareClient("https://fotoware.example.com", "id", "secret")
+
+        with (
+            patch.object(client, "_get_rendition_url_once", return_value="https://f/t/x.jpg"),
+            patch.object(
+                client,
+                "_stream_to_file",
+                side_effect=APIError("HTTP 403 error", status_code=403),
+            ) as stream,
+        ):
+            with pytest.raises(APIError):
+                client.download_original_to_file("/a/1.jpg.info", io.BytesIO())
+
+        assert stream.call_count == 1
+
+    @patch("fotoware_client.client.OAuthAuthenticator")
+    def test_a_rendition_gone_while_polling_is_requested_anew(self, mock_auth: Mock) -> None:
+        client = FotoWareClient("https://fotoware.example.com", "id", "secret")
+
+        with patch.object(
+            client,
+            "_get_rendition_url_once",
+            side_effect=[self._gone(), "https://f/task-2/file.jpg"],
+        ):
+            assert client.get_rendition_url("/a/1.jpg.info") == "https://f/task-2/file.jpg"
+
+        with patch.object(client, "_download_original_once", side_effect=[self._gone(), b"bytes"]):
+            assert client.download_original("/a/1.jpg.info") == b"bytes"