Expand test coverage.

Author: dbernstein

src/palace/manager/integration/license/overdrive/api.py

@@ -612,11 +612,9 @@ def _get_book_list_page(
         availability_queue = extractor_class.availability_link_list(content_dict)
         return availability_queue, next_link
 
-    def _get_headers(self, auth_token: str | None) -> dict[str, str]:
+    def _get_headers(self, auth_token: str) -> dict[str, str]:
         if auth_token:
             return {"Authorization": f"Bearer {auth_token}", "User-Agent": "Palace"}
-        else:
-            return {}
 
     def book_info_initial_endpoint(
         self,
@@ -787,6 +785,7 @@ def _process_request(
         elif path.endswith("metadata") and path.startswith("/v1/"):
             books[data["id"].lower()]["metadata"] = data
         else:
+            # this should never happen
             raise RuntimeError(f"Unknown URL: {response.url}")
 
     def recently_changed_ids(
@@ -949,6 +948,7 @@ def patron_request(
         permissions.
         """
         patron_credential = self._get_patron_oauth_credential(patron, pin)
+        assert patron_credential.credential
         headers = self._get_headers(patron_credential.credential)
         if extra_headers:
             headers.update(extra_headers)

tests/files/overdrive/bibliographic_information_book_list_test.json

@@ -0,0 +1 @@
+{"subtitle": "Imperial Radch Series, Book 1", "links": {"self": {"href": "http://api.overdrive.com/v1/collections/v1L1BCgAAAA2C/products/2a005d55-a417-4053-b90d-7a38ca6d2065/metadata", "type": "application/vnd.overdrive.api+json"}}, "series": "Imperial Radch", "sortTitle": "Ancillary Justice Imperial Radch Series Book 01", "starRating": 4.3, "isPublicPerformanceAllowed": false, "images": {"cover150Wide": {"href": "http://images.contentreserve.com/ImageType-150/0017-1/C22/288/A0/{2a005d55-a417-4053-b90d-7a38ca6d2065}Img150.jpg", "type": "image/jpeg"}, "cover300Wide": {"href": "http://images.contentreserve.com/ImageType-400/0017-1/C22/288/A0/{2a005d55-a417-4053-b90d-7a38ca6d2065}Img400.jpg", "type": "image/jpeg"}, "cover": {"href": "http://images.contentreserve.com/ImageType-100/0017-1/{2a005d55-a417-4053-b90d-7a38ca6d2065}Img100.jpg", "type": "image/jpeg"}, "thumbnail": {"href": "http://images.contentreserve.com/ImageType-200/0017-1/{2a005d55-a417-4053-b90d-7a38ca6d2065}Img200.jpg", "type": "image/jpeg"}}, "shortDescription": "<p><b>The only novel ever to win the Hugo, Nebula, and Arthur C. Clarke Awards and the first book in Ann Leckie's <i>New York Times</i> bestselling trilogy. </b><p><b><br></b><p>On a remote, icy planet, the soldier known as Breq is drawing closer to completing her quest.<p><br><p>Once, she was the Justice of Toren - a colossal starship with an artificial intelligence linking thousands of soldiers in the service of the Radch, the empire that conquered the galaxy. <p><br><p>Now, an act of treachery has ripped it all away, leaving her with one fragile human body, unanswered questions, and a burning desire for vengeance. <p><br><p><br><p><b>In the Ancillary world: </b><p>1. <i>Ancillary Justice</i><p>2. <i>Ancillary Sword</i><p>3. <i>Ancillary Mercy</i>", "subjects": [{"value": "Fiction"}, {"value": "Science Fiction"}, {"value": "Thriller"}], "title": "Ancillary Justice", "crossRefId": 1223507, "mediaType": "eBook", "id": "2a005d55-a417-4053-b90d-7a38ca6d2065", "languages": [{"code": "en", "name": "English"}], "isOwnedByCollections": true, "publishDate": "2013-10-01T00:00:00-04:00", "awards": [{"source": "Science Fiction and Fantasy Writers of America", "value": "Nebula Award"}, {"source": "World Science Fiction Society", "value": "Hugo Award"}], "publishDateText": "10/01/2013", "isPublicDomain": false, "publisher": "Orbit", "popularity": 4874, "fullDescription": "<p><b>The only novel ever to win the Hugo, Nebula, and Arthur C. Clarke Awards and the first book in Ann Leckie's <i>New York Times</i> bestselling trilogy. </b><p><b><br></b><p>On a remote, icy planet, the soldier known as Breq is drawing closer to completing her quest.<p><br><p>Once, she was the Justice of Toren - a colossal starship with an artificial intelligence linking thousands of soldiers in the service of the Radch, the empire that conquered the galaxy. <p><br><p>Now, an act of treachery has ripped it all away, leaving her with one fragile human body, unanswered questions, and a burning desire for vengeance. <p><br><p><br><p><b>In the Ancillary world: </b><p>1. <i>Ancillary Justice</i><p>2. <i>Ancillary Sword</i><p>3. <i>Ancillary Mercy</i>", "reviews": [{"content": "\"If you don't know the <i>Ancillary </i>series by now, you probably should. Ann Leckie's sociopolitical space opera almost singlehandedly breathed new cool into the stereotype of spaceships trundling through far-off systems amid laser battles. ... [<i>Ancillary Mercy</i>] earns the credit it's received: As a capstone to a series that shook genre expectations, as our closing installment of an immersively realized world, and as the poignant story of a ship that learned to sing.\"&#8212;<b><i><i>NPR Books </i>on<i> Ancillary Mercy</i></b></i>", "source": "John Scalzi", "premium": false}, {"content": "\"Powerful.\"&#8212;<b><i><i>The New York Times </i>on<i> Ancillary Sword</i></b></i>", "source": "i09.com (included in 'This Fall's Must-Read Science Fiction and Fantasy Books')", "premium": false}, {"content": "\"Unexpected, compelling and very cool. Ann Leckie nails it...I've never met a heroine like Breq before. I consider this a very good thing indeed.\"&#8212;<b><i>John Scalzi</b></i>", "source": "Liz Bourke, Tor.com", "premium": false}, {"content": "\"<i>Ancillary Justice </i>is the mind-blowing space opera you've been needing...This is a novel that will thrill you like the page-turner it is, but stick with you for a long time afterward.\"&#8212;<b><i><i>i09.com </i><i>(included in 'This Fall's Must-Read Science Fiction and Fantasy Books')</i></b></i>", "source": "Elizabeth Bear", "premium": false}, {"content": "\"It's not every day a debut novel by an author you'd never heard of before derails your entire afternoon with its brilliance. But when my review copy of <i>Ancillary Justice</i> arrived, that's exactly what it did. In fact, it arrowed upward to reach a pretty high position on my list of best space opera novels ever.\"&#8212;<b><i>Liz Bourke, <i>Tor.com</i></b></i>", "source": "Publishers Weekly", "premium": false}, {"content": "\"Establishes Leckie as an heir to Banks and Cherryh.\"&#8212;<b><i>Elizabeth Bear</b></i>", "source": "The Guardian", "premium": false}, {"content": "\"By turns thrilling, moving and awe-inspiring.\"&#8212;<b><i><i>The Guardian</i></b></i>", "source": "Library Journal", "premium": false}, {"content": "\"Leckie does a very good job of setting this complex equation up... This is an altogether promising debut.\"&#8212;<b><i><i>Kirkus</i></b></i>", "source": "RT Book Reviews", "premium": false}, {"content": "\"Leckie's debut gives casual and hardcore sci-fi fans alike a wonderful read.\"&#8212;<b><i><i>RT Book Reviews</i></b></i>", "source": "Justin Landon Staffer's Book Review", "premium": false}, {"content": "\"A sharply written space opera with a richly imagined sense of detail and place, this debut novel from Ann Leckie works as both an evocative science fiction tale and an involving character study...it's also a strongly female-driven piece, tackling ideas about politics and gender in a way that's both engaging and provocative...<i>Ancillary Justice </i>is a gripping read that's well worth a look.\"&#8212;<b><i><i>SFX </i>(UK)</b></i>", "source": "Paul Graham Raven", "premium": false}, {"content": "\"It engages, it excites, and it challenges the way the reader views our \nworld. Leckie may be a former Secretary of the Science Fiction Writers \nof America, but she's the President of this year's crop of debut \nnovelists. Ancillary Justice might be the best science fiction novel of \nthis very young decade.\"&#8212;<b><i>Justin Landon <i>Staffer's Book Review</i></b></i>", "source": "Jared Shurin Pornokitsch", "premium": false}], "formats": [{"partCount": 0, "rights": [{"type": "Copying", "value": 0}, {"type": "Printing", "value": 0}, {"type": "Lending", "value": 0}, {"type": "ReadAloud", "value": 0}, {"type": "ExpirationRights", "value": 0}], "identifiers": [{"audience": "library", "type": "ISBN", "value": "9780316327695"}], "fileName": "AncillaryJustice9780316246637", "fileSize": 931145, "samples": [{"url": "https://samples.overdrive.com/ancillary-justice-c22288?.epub-sample.overdrive.com", "source": "From the book", "formatType": "ebook-overdrive"}], "onSaleDate": "10/01/2013", "id": "ebook-epub-adobe", "name": "Adobe EPUB eBook"}, {"partCount": 0, "identifiers": [{"audience": "retailer", "type": "ASIN", "value": "B00BAXFDLM"}, {"audience": "library", "type": "ISBN", "value": "9780316327695"}], "fileName": "AncillaryJustice9780316246637", "fileSize": 0, "samples": [{"url": "https://samples.overdrive.com/ancillary-justice-c22288?.epub-sample.overdrive.com", "source": "From the book", "formatType": "ebook-overdrive"}], "onSaleDate": "10/01/2013", "id": "ebook-kindle", "name": "Kindle Book"}, {"partCount": 0, "identifiers": [{"audience": "library", "type": "ISBN", "value": "9780316327695"}], "fileName": "AncillaryJustice9780316246637", "fileSize": 0, "samples": [{"url": "https://samples.overdrive.com/ancillary-justice-c22288?.epub-sample.overdrive.com", "source": "From the book", "formatType": "ebook-overdrive"}], "onSaleDate": "10/01/2013", "id": "ebook-overdrive", "name": "OverDrive Read"}], "creators": [{"fileAs": "Leckie, Ann", "bioText": "<p>Ann Leckie has worked as a waitress, a receptionist, a rodman on a land-surveying crew, a lunch lady, and a recording engineer.  The author of many published short stories, and secretary of the Science Fiction Writers of America, she lives in St. Louis, Missouri, with her husband, children, and cats.", "role": "Author", "name": "Ann Leckie"}]}

tests/manager/integration/license/overdrive/test_api.py

@@ -5,6 +5,7 @@
 from unittest.mock import MagicMock, create_autospec, patch
 
 import pytest
+from httpx import HTTPStatusError
 
 from palace.manager.api.circulation.data import HoldInfo, LoanInfo
 from palace.manager.api.circulation.exceptions import (
@@ -2763,6 +2764,9 @@ async def test_fetch_book_info_list(
         availability_data, availability_json = overdrive_api_fixture.sample_json(
             "overdrive_availability_information.json"
         )
+        metadata_data, metadata_json = overdrive_api_fixture.sample_json(
+            "bibliographic_information_book_list_test.json"
+        )
         (
             overdrive_book_list_with_next_link_data,
             overdrive_book_list_with_next_link_json,
@@ -2775,12 +2779,47 @@ async def test_fetch_book_info_list(
             200, content=overdrive_book_list_with_next_link_data
         )
         mock_async_client.queue_response(200, content=availability_data)
+        mock_async_client.queue_response(200, content=metadata_data)
 
         initial_endpoint = api.book_info_initial_endpoint(start=None, page_size=1)
 
         book_info_list, next_endpoint = await api.fetch_book_info_list(
-            initial_endpoint, fetch_metadata=False, fetch_availability=True
+            initial_endpoint, fetch_metadata=True, fetch_availability=True
         )
         assert next_endpoint
         assert book_info_list
         assert len(book_info_list) == 1
+        assert book_info_list[0]["metadata"]
+        assert book_info_list[0]["availabilityV2"]
+
+    async def test_fetch_book_info_list_retry_and_error(
+        self,
+        overdrive_api_fixture: OverdriveAPIFixture,
+    ):
+        (
+            overdrive_book_list_with_next_link_data,
+            overdrive_book_list_with_next_link_json,
+        ) = overdrive_api_fixture.sample_json("overdrive_book_list_with_next_link.json")
+        api = overdrive_api_fixture.api
+        mock_async_client = overdrive_api_fixture.mock_async_client
+
+        # test recovery after failure with book list page
+        mock_async_client.queue_response(
+            502,
+            content="error",
+        )
+
+        mock_async_client.queue_response(
+            200, content=overdrive_book_list_with_next_link_data
+        )
+
+        # test retry and failure with metadata and availabililty
+        for x in range(8):
+            # error for 4 attempts for availability and metadata
+            mock_async_client.queue_response(500, content="500 Internal Server Error")
+
+        with pytest.raises(HTTPStatusError, match="500 Internal Server Error") as e:
+            initial_endpoint = api.book_info_initial_endpoint(start=None, page_size=1)
+            await api.fetch_book_info_list(
+                initial_endpoint, fetch_metadata=True, fetch_availability=True
+            )