Fix mypy.

Author: dbernstein

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

@@ -118,7 +118,6 @@
 from palace.manager.sqlalchemy.util import get_one
 from palace.manager.util import base64
 from palace.manager.util.datetime_helpers import utc_now
-from palace.manager.util.http.async_http import AsyncClient
 from palace.manager.util.http.exception import BadResponseException
 from palace.manager.util.http.http import HTTP, RequestKwargs
 
@@ -613,8 +612,11 @@ 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) -> dict[str, str]:
-        return {"Authorization": f"Bearer {auth_token}", "User-Agent": "Palace"}
+    def _get_headers(self, auth_token: str | None) -> dict[str, str]:
+        if auth_token:
+            return {"Authorization": f"Bearer {auth_token}", "User-Agent": "Palace"}
+        else:
+            return {}
 
     def book_info_initial_endpoint(
         self,
@@ -640,7 +642,7 @@ def book_info_initial_endpoint(
             limit=str(min(page_size, self.PAGE_SIZE_LIMIT)),
             collection_token=self.collection_token,
         )
-        endpoint: str | None = _make_link_safe(book_info_initial_endpoint)
+        endpoint: str = _make_link_safe(book_info_initial_endpoint)
 
         return BookInfoEndpoint(endpoint)
 
@@ -663,12 +665,11 @@ async def fetch_book_info_list(
         """
 
         async with self.create_async_client(connections) as client:
-
             base_url = self.endpoint(self.HOST_ENDPOINT_BASE)
             client.headers.update(self._get_headers(self._client_oauth_token))
             client.base_url = URL(base_url)
             urls: deque[str] = deque()
-            pending_requests: list[asyncio.Task[Response]] = []
+            pending_requests: list[asyncio.Task[httpx._models.Response]] = []
             books: dict[str, Any] = {}
             retried_requests: defaultdict[str, int] = defaultdict(int)
             extractor_class = extractor_class or OverdriveRepresentationExtractor
@@ -689,12 +690,13 @@ async def fetch_book_info_list(
                 for req in done:
                     try:
                         response = await req
+                        response.raise_for_status()
 
                         if not next:
                             next_url = extractor_class.link(
-                                response.raise_for_status().json(), rel_to_follow
+                                response.json(), rel_to_follow
                             )
-                            next = BookInfoEndpoint(next_url)
+                            next = BookInfoEndpoint(next_url) if next_url else None
 
                         self._process_request(
                             response,
@@ -728,7 +730,7 @@ async def fetch_book_info_list(
 
             return list(books.values()), next
 
-    def create_async_client(self, connections):
+    def create_async_client(self, connections: int = 5) -> httpx.AsyncClient:
         return httpx.AsyncClient(
             timeout=Timeout(20.0, pool=None),
             limits=Limits(
@@ -740,9 +742,9 @@ def create_async_client(self, connections):
 
     def _make_request(
         self,
-        client: AsyncClient,
+        client: httpx.AsyncClient,
         urls: deque[str] | str,
-        pending_requests: list[asyncio.Task[Response]],
+        pending_requests: list[asyncio.Task[httpx._models.Response]],
     ) -> None:
         if isinstance(urls, str):
             url = urls
@@ -754,7 +756,7 @@ def _make_request(
 
     def _process_request(
         self,
-        response: Response,
+        response: httpx._models.Response,
         request_metadata: bool,
         request_availability: bool,
         base_url: str,

tests/fixtures/overdrive.py

@@ -5,7 +5,6 @@
 from typing import Any
 
 import pytest
-from fixtures.http import MockAsyncClientFixture
 
 from palace.manager.api.circulation.dispatcher import CirculationApiDispatcher
 from palace.manager.api.config import Configuration
@@ -20,7 +19,7 @@
 from palace.manager.sqlalchemy.model.patron import Patron
 from tests.fixtures.database import DatabaseTransactionFixture
 from tests.fixtures.files import OverdriveFilesFixture
-from tests.fixtures.http import MockHttpClientFixture
+from tests.fixtures.http import MockAsyncClientFixture, MockHttpClientFixture
 from tests.fixtures.work import (
     WorkIdPolicyQueuePresentationRecalculationFixture,
 )