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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fotoware-client
-Version: 0.2.0
+Version: 0.2.2
 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
@@ -157,4 +157,4 @@ Pre-commit hooks: `pip install pre-commit && pre-commit install`.
 
 ## License
 
-MIT, see [LICENSE](LICENSE).
+MIT, see [LICENSE](https://github.com/hoppefamily/python-fotoware-client/blob/main/LICENSE).

{python_fotoware_client-0.2.0 → python_fotoware_client-0.2.2}/README.md

@@ -136,4 +136,4 @@ Pre-commit hooks: `pip install pre-commit && pre-commit install`.
 
 ## License
 
-MIT, see [LICENSE](LICENSE).
+MIT, see [LICENSE](https://github.com/hoppefamily/python-fotoware-client/blob/main/LICENSE).

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-fotoware-client"
-version = "0.2.0"
+version = "0.2.2"
 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.0 → python_fotoware_client-0.2.2}/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.0"
+__version__ = "0.2.2"
 
 __all__ = [
     # Client

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

@@ -161,9 +161,7 @@ class FotoWareClient:
             NotFoundError: If there is no such asset
             APIError: If the request fails
         """
-        response = self._request("GET", self.resolve(asset_href), headers=ACCEPT_ASSET)
-        asset = Asset.from_json(response.json())
-        response.close()
+        asset = Asset.from_json(self._get_json(self.resolve(asset_href), headers=ACCEPT_ASSET))
         return asset
 
     def cost_snapshot(self) -> dict[str, object]:
@@ -194,9 +192,9 @@ class FotoWareClient:
         me_url = urljoin(self.tenant_url + "/", self.settings.api_descriptor_path.lstrip("/"))
 
         try:
-            response = self._request("GET", me_url, headers=ACCEPT_FULL_DESCRIPTOR)
-            response.json()  # Validate response is valid JSON
-            response.close()
+            self._get_json(
+                me_url, headers=ACCEPT_FULL_DESCRIPTOR
+            )  # Validate response is valid JSON
             logger.debug("FotoWare API connection validated successfully")
         except Exception as e:
             logger.error("FotoWare API connection validation failed: %s", e)
@@ -211,6 +209,19 @@ class FotoWareClient:
         token = self._auth.get_access_token()
         return {"Authorization": f"Bearer {token}"}
 
+    def _get_json(self, url: str, **kwargs: Any) -> Any:
+        """GET *url* and return its JSON; the response is closed either way.
+
+        Raises:
+            requests.JSONDecodeError: If the answer is no JSON
+            The errors of _request
+        """
+        response = self._request("GET", url, **kwargs)
+        try:
+            return response.json()
+        finally:
+            response.close()
+
     def _request(
         self,
         method: str,
@@ -324,17 +335,13 @@ class FotoWareClient:
 
         # The API descriptor names the archives list, as a path on the tenant
         me_url = urljoin(self.tenant_url + "/", self.settings.api_descriptor_path.lstrip("/"))
-        response = self._request("GET", me_url, headers=ACCEPT_FULL_DESCRIPTOR)
-        archives_path = response.json().get("archives")
-        response.close()
+        archives_path = self._get_json(me_url, headers=ACCEPT_FULL_DESCRIPTOR).get("archives")
         if not isinstance(archives_path, str) or not archives_path:
             raise APIError("No archives link found in API descriptor")
         archives_href = urljoin(self.tenant_url + "/", archives_path)
 
         # Fetch archives
-        response = self._request("GET", archives_href, headers=ACCEPT_COLLECTIONLIST)
-        archives_data = response.json()
-        response.close()
+        archives_data = self._get_json(archives_href, headers=ACCEPT_COLLECTIONLIST)
 
         # Parse archives
         archives = []
@@ -363,17 +370,13 @@ class FotoWareClient:
                 editor lists no fields
             KeyError: If the editor's answer has another shape
         """
-        response = self._request("GET", self.resolve(archive_href), headers=ACCEPT_COLLECTIONINFO)
-        archive = response.json()
-        response.close()
+        archive = self._get_json(self.resolve(archive_href), headers=ACCEPT_COLLECTIONINFO)
         editor_href = (archive.get("metadataEditor") or {}).get("href")
         if not editor_href:
             raise APIError(f"Archive {archive_href} links no metadata editor")
 
         editor_url = urljoin(self.tenant_url + "/", editor_href.lstrip("/"))
-        response = self._request("GET", editor_url, headers=ACCEPT_JSON)
-        editor = response.json()
-        response.close()
+        editor = self._get_json(editor_url, headers=ACCEPT_JSON)
 
         labels: dict[str, str] = {}
         for region in editor["detailRegions"]:
@@ -428,9 +431,9 @@ class FotoWareClient:
             page = self.next_page(page)
 
     def _search_page(self, url: str, *, params: dict[str, str] | None = None) -> SearchResult:
-        response = self._request("GET", url, params=params, headers=ACCEPT_ASSETLIST)
-        result = SearchResult.from_json(response.json())
-        response.close()
+        result = SearchResult.from_json(
+            self._get_json(url, params=params, headers=ACCEPT_ASSETLIST)
+        )
         self._counters.count_search_page(empty=not result.assets)
         return result
 
@@ -454,9 +457,7 @@ class FotoWareClient:
 
         try:
             # Get asset with download info
-            response = self._request("GET", self.resolve(asset_href), headers=ACCEPT_DOWNLOAD)
-            data = response.json()
-            response.close()
+            data = self._get_json(self.resolve(asset_href), headers=ACCEPT_DOWNLOAD)
 
             # Look for direct URL in attributes
             if "attributes" in data and "downloadUrl" in data["attributes"]:
@@ -469,9 +470,7 @@ class FotoWareClient:
                     download_href = link.get("href")
                     if download_href:
                         # Fetch presigned URL
-                        response = self._request("GET", download_href, headers=ACCEPT_DOWNLOAD)
-                        download_data = response.json()
-                        response.close()
+                        download_data = self._get_json(download_href, headers=ACCEPT_DOWNLOAD)
                         result_url: str | None = download_data.get("url") or download_data.get(
                             "href"
                         )
@@ -548,9 +547,7 @@ class FotoWareClient:
         logger.debug("get_rendition_url: Starting for asset=%s", asset_href)
 
         # Step 1: Get asset metadata with renditions
-        response = self._request("GET", self.resolve(asset_href), headers=ACCEPT_ASSET)
-        asset_data = response.json()
-        response.close()
+        asset_data = self._get_json(self.resolve(asset_href), headers=ACCEPT_ASSET)
 
         # Step 2: Find the rendition asked for, the original unless named
         renditions = asset_data.get("renditions", [])
@@ -588,9 +585,7 @@ class FotoWareClient:
 
         # Step 3: Get rendition service URL
         me_url = urljoin(self.tenant_url + "/", self.settings.api_descriptor_path.lstrip("/"))
-        response = self._request("GET", me_url, headers=ACCEPT_FULL_DESCRIPTOR)
-        me_data = response.json()
-        response.close()
+        me_data = self._get_json(me_url, headers=ACCEPT_FULL_DESCRIPTOR)
 
         rendition_service_url = me_data.get("services", {}).get("rendition_request")
         if not rendition_service_url:
@@ -618,11 +613,10 @@ class FotoWareClient:
         )
 
         # Get polling URL from Location header or response body
-        polling_url = response.headers.get("Location")
-        if not polling_url:
-            response_data = response.json()
+        try:
+            polling_url = response.headers.get("Location") or response.json().get("href")
+        finally:
             response.close()
-            polling_url = response_data.get("href")
 
         if not polling_url:
             raise APIError(
@@ -713,9 +707,7 @@ class FotoWareClient:
         logger.debug("download_original: Starting for asset=%s", asset_href)
 
         # Step 1: Get asset metadata with renditions
-        response = self._request("GET", self.resolve(asset_href), headers=ACCEPT_ASSET)
-        asset_data = response.json()
-        response.close()
+        asset_data = self._get_json(self.resolve(asset_href), headers=ACCEPT_ASSET)
 
         # Step 2: Find the original rendition
         renditions = asset_data.get("renditions", [])
@@ -750,9 +742,7 @@ class FotoWareClient:
 
         # Step 3: Get rendition service URL
         me_url = urljoin(self.tenant_url + "/", self.settings.api_descriptor_path.lstrip("/"))
-        response = self._request("GET", me_url, headers=ACCEPT_FULL_DESCRIPTOR)
-        me_data = response.json()
-        response.close()
+        me_data = self._get_json(me_url, headers=ACCEPT_FULL_DESCRIPTOR)
 
         rendition_service_url = me_data.get("services", {}).get("rendition_request")
         if not rendition_service_url:
@@ -781,11 +771,10 @@ class FotoWareClient:
         )
 
         # Get polling URL from Location header or response body
-        polling_url = response.headers.get("Location")
-        if not polling_url:
-            response_data = response.json()
+        try:
+            polling_url = response.headers.get("Location") or response.json().get("href")
+        finally:
             response.close()
-            polling_url = response_data.get("href")
 
         if not polling_url:
             raise APIError(

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fotoware-client
-Version: 0.2.0
+Version: 0.2.2
 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
@@ -157,4 +157,4 @@ Pre-commit hooks: `pip install pre-commit && pre-commit install`.
 
 ## License
 
-MIT, see [LICENSE](LICENSE).
+MIT, see [LICENSE](https://github.com/hoppefamily/python-fotoware-client/blob/main/LICENSE).

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

@@ -4,6 +4,7 @@ import io
 from unittest.mock import Mock, patch
 
 import pytest
+import requests
 
 from fotoware_client.client import FotoWareClient
 from fotoware_client.exceptions import APIError, ConfigurationError
@@ -508,3 +509,37 @@ class TestFotoWareClientRenditionChoice:
             pytest.raises(APIError, match="No Large rendition"),
         ):
             client.get_rendition_url("https://fotoware.example.com/asset/1.info", rendition="Large")
+
+
+class TestResponsesAreClosed:
+    """Every response goes back to the pool, whatever its body holds."""
+
+    @patch("fotoware_client.client.OAuthAuthenticator")
+    def test_an_unreadable_answer_is_closed(self, mock_auth: Mock) -> None:
+        client = FotoWareClient("https://fotoware.example.com", "id", "secret")
+        response = Mock()
+        response.json.side_effect = requests.JSONDecodeError("invalid json", "", 0)
+
+        with patch.object(client, "_request", return_value=response):
+            with pytest.raises(requests.JSONDecodeError):
+                client.get_asset("/a/1.jpg.info")
+
+        response.close.assert_called_once()
+
+    @patch("fotoware_client.client.OAuthAuthenticator")
+    def test_a_rendition_request_answered_with_a_location_is_closed(self, mock_auth: Mock) -> None:
+        client = FotoWareClient("https://fotoware.example.com", "id", "secret")
+        asset = Mock()
+        asset.json.return_value = {"renditions": [{"original": True, "href": "/r/1"}]}
+        descriptor = Mock()
+        descriptor.json.return_value = {
+            "services": {"rendition_request": "/fotoweb/services/renditions"}
+        }
+        requested = Mock(status_code=202, headers={"Location": "/fotoweb/poll/1"})
+        ready = Mock(status_code=200)
+
+        with patch.object(client, "_request", side_effect=[asset, descriptor, requested, ready]):
+            client.get_rendition_url("/a/1.jpg.info")
+
+        requested.close.assert_called_once()
+        requested.json.assert_not_called()