tbr-deal-finder 0.1.8__tar.gz → 0.2.0__tar.gz

{tbr_deal_finder-0.1.8 → tbr_deal_finder-0.2.0}/CHANGELOG.md

@@ -3,6 +3,22 @@
 
 ---
 
+## 0.2.0 (August 15, 2025)
+
+Notes: 
+* Added foundational Kindle support
+  * Library support is undecided right now
+    * Unable to find the endpoint
+  * Wishlist support is undecided right now
+    * Unable to find the endpoint 
+* Improvements to title matching for Audible & Chirp 
+* Improved request performance for Chirp & Libro
+
+BUG FIXES:
+* Fixed breaking import on Windows systems
+
+---
+
 ## 0.1.8 (August 13, 2025)
 
 Notes: 

{tbr_deal_finder-0.1.8 → tbr_deal_finder-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tbr-deal-finder
-Version: 0.1.8
+Version: 0.2.0
 Summary: Track price drops and find deals on books in your TBR list across audiobook and ebook formats.
 License: MIT
 License-File: LICENSE
@@ -37,6 +37,9 @@ Track price drops and find deals on books in your TBR (To Be Read) and wishlist
 * Chirp
 * Libro.fm
 
+### EBooks
+* Kindle
+
 ### Locales
 * US
 * CA

{tbr_deal_finder-0.1.8 → tbr_deal_finder-0.2.0}/README.md

@@ -19,6 +19,9 @@ Track price drops and find deals on books in your TBR (To Be Read) and wishlist
 * Chirp
 * Libro.fm
 
+### EBooks
+* Kindle
+
 ### Locales
 * US
 * CA

{tbr_deal_finder-0.1.8 → tbr_deal_finder-0.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tbr-deal-finder"
-version = "0.1.8"
+version = "0.2.0"
 description = "Track price drops and find deals on books in your TBR list across audiobook and ebook formats."
 readme = "README.md"
 requires-python = ">=3.13"

{tbr_deal_finder-0.1.8 → tbr_deal_finder-0.2.0}/tbr_deal_finder/book.py

@@ -8,7 +8,7 @@ from Levenshtein import ratio
 from unidecode import unidecode
 
 from tbr_deal_finder.config import Config
-from tbr_deal_finder.utils import get_duckdb_conn, execute_query, get_query_by_name
+from tbr_deal_finder.utils import get_duckdb_conn, execute_query, get_query_by_name, echo_info
 
 _AUTHOR_RE = re.compile(r'[^a-zA-Z0-9]')
 
@@ -36,7 +36,7 @@ class Book:
         exists: bool = True,
     ):
         self.retailer = retailer
-        self.title = title.split(":")[0].split("(")[0].strip()
+        self.title = get_normalized_title(title)
         self.authors = authors
         self.timepoint = timepoint
 
@@ -148,13 +148,26 @@ def get_active_deals() -> list[Book]:
 
 
 def print_books(books: list[Book]):
-    prior_title_id = books[0].title_id
-    for book in books:
-        if prior_title_id != book.title_id:
-            prior_title_id = book.title_id
-            click.echo()
+    audiobooks = [book for book in books if book.format == BookFormat.AUDIOBOOK]
+    audiobooks = sorted(audiobooks, key=lambda book: book.deal_id)
 
-        click.echo(str(book))
+    ebooks = [book for book in books if book.format == BookFormat.EBOOK]
+    ebooks = sorted(ebooks, key=lambda book: book.deal_id)
+
+    for books_in_format in [audiobooks, ebooks]:
+        if not books_in_format:
+            continue
+
+        init_book = books_in_format[0]
+        echo_info(f"\n\n{init_book.format.value} Deals:")
+
+        prior_title_id = init_book.title_id
+        for book in books_in_format:
+            if prior_title_id != book.title_id:
+                prior_title_id = book.title_id
+                click.echo()
+
+            click.echo(str(book))
 
 
 def get_full_title_str(title: str, authors: Union[list, str]) -> str:
@@ -165,6 +178,10 @@ def get_title_id(title: str, authors: Union[list, str], book_format: BookFormat)
     return f"{title}__{get_normalized_authors(authors)}__{book_format.value}"
 
 
+def get_normalized_title(title: str) -> str:
+    return title.split(":")[0].split("(")[0].strip()
+
+
 def get_normalized_authors(authors: Union[str, list[str]]) -> list[str]:
     if isinstance(authors, str):
         authors = [i for i in authors.split(",")]

{tbr_deal_finder-0.1.8 → tbr_deal_finder-0.2.0}/tbr_deal_finder/retailer/__init__.py

@@ -1,9 +1,11 @@
 from tbr_deal_finder.retailer.audible import Audible
 from tbr_deal_finder.retailer.chirp import Chirp
+from tbr_deal_finder.retailer.kindle import Kindle
 from tbr_deal_finder.retailer.librofm import LibroFM
 
 RETAILER_MAP = {
     "Audible": Audible,
     "Chirp": Chirp,
     "Libro.FM": LibroFM,
+    "Kindle": Kindle,
 }

{tbr_deal_finder-0.1.8 → tbr_deal_finder-0.2.0}/tbr_deal_finder/retailer/amazon.py

@@ -1,3 +1,4 @@
+import sys
 import os.path
 
 import audible
@@ -5,6 +6,11 @@ import click
 from audible.login import build_init_cookies
 from textwrap import dedent
 
+if sys.platform != 'win32':
+    # Breaks Windows support but required for Mac
+    # Untested on Linux
+    import readline  # type: ignore
+
 from tbr_deal_finder import TBR_DEALS_PATH
 from tbr_deal_finder.config import Config
 from tbr_deal_finder.retailer.models import Retailer

{tbr_deal_finder-0.1.8 → tbr_deal_finder-0.2.0}/tbr_deal_finder/retailer/audible.py

@@ -1,10 +1,9 @@
 import asyncio
 import math
-import readline  # type: ignore
 
 from tbr_deal_finder.config import Config
 from tbr_deal_finder.retailer.amazon import Amazon
-from tbr_deal_finder.book import Book, BookFormat
+from tbr_deal_finder.book import Book, BookFormat, get_normalized_title
 
 
 class Audible(Amazon):
@@ -37,7 +36,7 @@ class Audible(Amazon):
             )
 
             for product in match.get("products", []):
-                if product["title"] != title:
+                if get_normalized_title(product["title"]) != title:
                     continue
                 try:
                     target.list_price = product["price"]["list_price"]["base"]

{tbr_deal_finder-0.1.8 → tbr_deal_finder-0.2.0}/tbr_deal_finder/retailer/chirp.py

@@ -9,17 +9,19 @@ import click
 
 from tbr_deal_finder import TBR_DEALS_PATH
 from tbr_deal_finder.config import Config
-from tbr_deal_finder.retailer.models import Retailer
+from tbr_deal_finder.retailer.models import AioHttpSession, Retailer
 from tbr_deal_finder.book import Book, BookFormat, get_normalized_authors, is_matching_authors
 from tbr_deal_finder.utils import currency_to_float, echo_err
 
 
-class Chirp(Retailer):
+class Chirp(AioHttpSession, Retailer):
     # Static because url for other locales just redirects to .com
     _url: str = "https://api.chirpbooks.com/api/graphql"
     USER_AGENT = "ChirpBooks/5.13.9 (Android)"
 
     def __init__(self):
+        super().__init__()
+
         self.auth_token = None
 
     @property
@@ -38,17 +40,17 @@ class Chirp(Retailer):
         if self.auth_token:
             headers["authorization"] = f"Bearer {self.auth_token}"
 
-        async with aiohttp.ClientSession() as http_client:
-            response = await http_client.request(
-                request_type.upper(),
-                self._url,
-                headers=headers,
-                **kwargs
-            )
-            if response.ok:
-                return await response.json()
-            else:
-                return {}
+        session = await self._get_session()
+        response = await session.request(
+            request_type.upper(),
+            self._url,
+            headers=headers,
+            **kwargs
+        )
+        if response.ok:
+            return await response.json()
+        else:
+            return {}
 
     async def set_auth(self):
         auth_path = TBR_DEALS_PATH.joinpath("chirp.json")
@@ -88,17 +90,17 @@ class Chirp(Retailer):
     ) -> Book:
         title = target.title
         async with semaphore:
-            async with aiohttp.ClientSession() as http_client:
-                response = await http_client.request(
-                    "POST",
-                    self._url,
-                    json={
-                        "query": "fragment audiobookFields on Audiobook{id averageRating coverUrl displayAuthors displayTitle ratingsCount url allAuthors{name slug url}} fragment audiobookWithShoppingCartAndUserAudiobookFields on Audiobook{...audiobookFields currentUserShoppingCartItem{id}currentUserWishlistItem{id}currentUserUserAudiobook{id}currentUserHasAuthorFollow{id}} fragment productFields on Product{discountPrice id isFreeListing listingPrice purchaseUrl savingsPercent showListingPrice timeLeft bannerType} query AudiobookSearch($query:String!,$promotionFilter:String,$filter:String,$page:Int,$pageSize:Int){audiobooks(query:$query,promotionFilter:$promotionFilter,filter:$filter,page:$page,pageSize:$pageSize){totalCount objects(page:$page,pageSize:$pageSize){... on Audiobook{...audiobookWithShoppingCartAndUserAudiobookFields futureSaleDate currentProduct{...productFields}}}}}",
-                        "variables": {"query": title, "filter": "all", "page": 1, "promotionFilter": "default"},
-                        "operationName": "AudiobookSearch"
-                    }
-                )
-                response_body = await response.json()
+            session = await self._get_session()
+            response = await session.request(
+                "POST",
+                self._url,
+                json={
+                    "query": "fragment audiobookFields on Audiobook{id averageRating coverUrl displayAuthors displayTitle ratingsCount url allAuthors{name slug url}} fragment audiobookWithShoppingCartAndUserAudiobookFields on Audiobook{...audiobookFields currentUserShoppingCartItem{id}currentUserWishlistItem{id}currentUserUserAudiobook{id}currentUserHasAuthorFollow{id}} fragment productFields on Product{discountPrice id isFreeListing listingPrice purchaseUrl savingsPercent showListingPrice timeLeft bannerType} query AudiobookSearch($query:String!,$promotionFilter:String,$filter:String,$page:Int,$pageSize:Int){audiobooks(query:$query,promotionFilter:$promotionFilter,filter:$filter,page:$page,pageSize:$pageSize){totalCount objects(page:$page,pageSize:$pageSize){... on Audiobook{...audiobookWithShoppingCartAndUserAudiobookFields futureSaleDate currentProduct{...productFields}}}}}",
+                    "variables": {"query": title, "filter": "all", "page": 1, "promotionFilter": "default"},
+                    "operationName": "AudiobookSearch"
+                }
+            )
+            response_body = await response.json()
 
             audiobooks = response_body["data"]["audiobooks"]["objects"]
             if not audiobooks:

tbr_deal_finder-0.2.0/tbr_deal_finder/retailer/kindle.py

@@ -0,0 +1,141 @@
+import asyncio
+import readline  # type: ignore
+
+from tbr_deal_finder.config import Config
+from tbr_deal_finder.retailer.amazon import Amazon
+from tbr_deal_finder.book import Book, BookFormat, get_normalized_title, get_normalized_authors, is_matching_authors
+
+
+class Kindle(Amazon):
+
+    @property
+    def name(self) -> str:
+        return "Kindle"
+
+    @property
+    def format(self) -> BookFormat:
+        return BookFormat.EBOOK
+
+    def _get_base_url(self) -> str:
+        return f"https://www.amazon.{self._auth.locale.domain}"
+
+    async def get_book_asin(
+        self,
+        target: Book,
+        semaphore: asyncio.Semaphore
+    ) -> Book:
+        title = target.title
+        async with semaphore:
+            match = await self._client.get(
+                f"{self._get_base_url()}/kindle-dbs/kws?userCode=AndroidKin&deviceType=A3VNNDO1I14V03&node=2671536011&excludedNodes=&page=1&size=20&autoSpellCheck=1&rank=r",
+                query=title,
+            )
+
+            for product in match.get("items", []):
+                normalized_authors = get_normalized_authors(product["authors"])
+                if (
+                    get_normalized_title(product["title"]) != title
+                    or not is_matching_authors(target.normalized_authors, normalized_authors)
+                ):
+                    continue
+                try:
+                    target.ebook_asin = product["asin"]
+                    break
+                except KeyError:
+                    continue
+
+            return target
+
+    async def get_book(
+        self,
+        target: Book,
+        semaphore: asyncio.Semaphore
+    ) -> Book:
+        target.exists = False
+
+        if not target.ebook_asin:
+            return target
+
+        asin = target.ebook_asin
+        async with semaphore:
+            match = await self._client.get(
+                f"{self._get_base_url()}/api/bifrost/offers/batch/v1/{asin}?ref_=KindleDeepLinkOffers",
+                headers={"x-client-id": "kindle-android-deeplink"},
+            )
+            products = match.get("resources", [])
+            if not products:
+                return target
+
+            actions = products[0].get("personalizedActionOutput", {}).get("personalizedActions", [])
+            if not actions:
+                return target
+
+            for action in actions:
+                if "printListPrice" in action["offer"]:
+                    target.list_price = action["offer"]["printListPrice"]["value"]
+                    target.current_price = action["offer"]["digitalPrice"]["value"]
+                    target.exists = True
+                    break
+
+            return target
+
+    async def get_wishlist(self, config: Config) -> list[Book]:
+        """Not currently supported
+
+        Getting this info is proving to be a nightmare
+
+        :param config:
+        :return:
+        """
+        return []
+
+    async def get_library(self, config: Config) -> list[Book]:
+        """Not currently supported
+
+        Getting this info is proving to be a nightmare
+
+        :param config:
+        :return:
+        """
+        return []
+
+    async def _get_library_attempt(self, config: Config) -> list[Book]:
+        """This should work, but it's returning a redirect
+
+        The user is already authenticated at this point, so I'm not sure what's happening
+        """
+        response = []
+        pagination_token = 0
+        total_pages = 1
+
+        while pagination_token < total_pages:
+            optional_params = {}
+            if pagination_token:
+                optional_params["paginationToken"] = pagination_token
+
+            response = await self._client.get(
+                "https://read.amazon.com/kindle-library/search",
+                query="",
+                libraryType="BOOKS",
+                sortType="recency",
+                resourceType="EBOOK",
+                querySize=5,
+                **optional_params
+            )
+
+            if "paginationToken" in response:
+                total_pages = int(response["paginationToken"])
+
+            for book in response["itemsList"]:
+                response.append(
+                    Book(
+                        retailer=self.name,
+                        title = book["title"],
+                        authors = book["authors"][0],
+                        format=self.format,
+                        timepoint=config.run_time,
+                        ebook_asin=book["asin"],
+                    )
+                )
+
+        return response

{tbr_deal_finder-0.1.8 → tbr_deal_finder-0.2.0}/tbr_deal_finder/retailer/librofm.py

@@ -4,17 +4,16 @@ import os
 import urllib.parse
 from datetime import datetime, timedelta
 
-import aiohttp
 import click
 
 from tbr_deal_finder import TBR_DEALS_PATH
 from tbr_deal_finder.config import Config
-from tbr_deal_finder.retailer.models import Retailer
-from tbr_deal_finder.book import Book, BookFormat, get_normalized_authors, is_matching_authors
+from tbr_deal_finder.retailer.models import AioHttpSession, Retailer
+from tbr_deal_finder.book import Book, BookFormat, get_normalized_authors, is_matching_authors, get_normalized_title
 from tbr_deal_finder.utils import currency_to_float
 
 
-class LibroFM(Retailer):
+class LibroFM(AioHttpSession, Retailer):
     BASE_URL = "https://libro.fm"
     USER_AGENT = "okhttp/3.14.9"
     USER_AGENT_DOWNLOAD = (
@@ -27,6 +26,8 @@ class LibroFM(Retailer):
     )
 
     def __init__(self):
+        super().__init__()
+
         self.auth_token = None
 
     @property
@@ -44,17 +45,17 @@ class LibroFM(Retailer):
         if self.auth_token:
             headers["authorization"] = f"Bearer {self.auth_token}"
 
-        async with aiohttp.ClientSession() as http_client:
-            response = await http_client.request(
-                request_type.upper(),
-                url,
-                headers=headers,
-                **kwargs
-            )
-            if response.ok:
-                return await response.json()
-            else:
-                return {}
+        session = await self._get_session()
+        response = await session.request(
+            request_type.upper(),
+            url,
+            headers=headers,
+            **kwargs
+        )
+        if response.ok:
+            return await response.json()
+        else:
+            return {}
 
     async def set_auth(self):
         auth_path = TBR_DEALS_PATH.joinpath("libro_fm.json")
@@ -100,7 +101,7 @@ class LibroFM(Retailer):
             normalized_authors = get_normalized_authors(b["authors"])
 
             if (
-                title == b["title"]
+                title == get_normalized_title(b["title"])
                 and is_matching_authors(book.normalized_authors, normalized_authors)
             ):
                 book.audiobook_isbn = b["isbn"]

{tbr_deal_finder-0.1.8 → tbr_deal_finder-0.2.0}/tbr_deal_finder/retailer/models.py

@@ -1,6 +1,8 @@
 import abc
 import asyncio
 
+import aiohttp
+
 from tbr_deal_finder.book import Book, BookFormat
 from tbr_deal_finder.config import Config
 
@@ -52,3 +54,37 @@ class Retailer(abc.ABC):
     async def get_library(self, config: Config) -> list[Book]:
         raise NotImplementedError
 
+
+class AioHttpSession:
+
+    def __init__(self):
+        self._session = None
+
+    async def _get_session(self) -> aiohttp.ClientSession:
+        """Get or create the session."""
+        if self._session is None or self._session.closed:
+            self._session = aiohttp.ClientSession()
+        return self._session
+
+    async def close(self):
+        """Close the session when done."""
+        if self._session and not self._session.closed:
+            await self._session.close()
+
+    async def __aenter__(self):
+        """Support async context manager."""
+        return self
+
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        """Cleanup on context manager exit."""
+        await self.close()
+
+    def __del__(self):
+        """Attempt to close session on garbage collection."""
+        if self._session and not self._session.closed:
+            try:
+                asyncio.create_task(self._session.close())
+            except RuntimeError:
+                # Event loop might be closed
+                pass
+

{tbr_deal_finder-0.1.8 → tbr_deal_finder-0.2.0}/tbr_deal_finder/tracked_books.py

@@ -9,7 +9,7 @@ from tqdm.asyncio import tqdm_asyncio
 
 from tbr_deal_finder.book import Book, BookFormat, get_title_id
 from tbr_deal_finder.owned_books import get_owned_books
-from tbr_deal_finder.retailer import Chirp, RETAILER_MAP, LibroFM
+from tbr_deal_finder.retailer import Chirp, RETAILER_MAP, LibroFM, Kindle
 from tbr_deal_finder.config import Config
 from tbr_deal_finder.retailer.models import Retailer
 from tbr_deal_finder.utils import execute_query, get_duckdb_conn
@@ -194,10 +194,6 @@ async def _maybe_set_audiobook_list_price(config: Config, new_tbr_books: list[Bo
 
 async def _maybe_set_audiobook_isbn(config: Config, new_tbr_books: list[Book]):
     """To get the price from Libro.fm for a book, you need its ISBN
-
-    As opposed to trying to get that every time latest-deals is run
-        we're just updating the export csv once to include the ISBN.
-
     """
     if "Libro.FM" not in config.tracked_retailers:
         return
@@ -218,6 +214,28 @@ async def _maybe_set_audiobook_isbn(config: Config, new_tbr_books: list[Book]):
     )
 
 
+async def _maybe_set_ebook_asin(config: Config, new_tbr_books: list[Book]):
+    """To get the price from kindle for a book, you need its asin
+    """
+    if "Kindle" not in config.tracked_retailers:
+        return
+
+    kindle = Kindle()
+    await kindle.set_auth()
+
+    relevant_tbr_books = [
+        book
+        for book in new_tbr_books
+        if book.format in [BookFormat.EBOOK, BookFormat.NA]
+    ]
+
+    await _set_tbr_book_attr(
+        relevant_tbr_books,
+        "ebook_asin",
+        kindle.get_book_asin,
+    )
+
+
 def get_book_authors(book: dict) -> str:
     if authors := book.get('Authors'):
         return authors
@@ -301,6 +319,7 @@ async def sync_tbr_books(config: Config):
 
     await _maybe_set_audiobook_list_price(config, new_tbr_books)
     await _maybe_set_audiobook_isbn(config, new_tbr_books)
+    await _maybe_set_ebook_asin(config, new_tbr_books)
 
     df = pd.DataFrame([book.tbr_dict() for book in new_tbr_books])
     db_conn.register("_df", df)

{tbr_deal_finder-0.1.8 → tbr_deal_finder-0.2.0}/uv.lock

@@ -612,7 +612,7 @@ wheels = [
 
 [[package]]
 name = "tbr-deal-finder"
-version = "0.1.8"
+version = "0.2.0"
 source = { editable = "." }
 dependencies = [
     { name = "aiohttp" },