tbr-deal-finder 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

tbr_deal_finder/book.py

@@ -55,7 +55,10 @@ class Book:
         self.format = format
 
     def discount(self) -> int:
-        return int((self.list_price/self.current_price - 1) * 100)
+        if not self.current_price:
+            return 100
+
+        return int((1 - self.current_price/self.list_price) * 100)
 
     @staticmethod
     def price_to_string(price: float) -> str:
@@ -127,6 +130,15 @@ class Book:
             "book_id": self.title_id,
         }
 
+    def unknown_book_dict(self):
+        return {
+            "retailer": self.retailer,
+            "title": self.title,
+            "authors": self.authors,
+            "format": self.format.value,
+            "book_id": self.deal_id,
+        }
+
 
 def get_deals_found_at(timepoint: datetime) -> list[Book]:
     db_conn = get_duckdb_conn()

tbr_deal_finder/cli.py

@@ -13,7 +13,7 @@ from tbr_deal_finder.migrations import make_migrations
 from tbr_deal_finder.book import get_deals_found_at, print_books, get_active_deals
 from tbr_deal_finder.retailer import RETAILER_MAP
 from tbr_deal_finder.retailer_deal import get_latest_deals
-from tbr_deal_finder.tracked_books import reprocess_incomplete_tbr_books
+from tbr_deal_finder.tracked_books import reprocess_incomplete_tbr_books, clear_unknown_books
 from tbr_deal_finder.utils import (
     echo_err,
     echo_info,
@@ -183,6 +183,7 @@ def setup():
     # Retailers may have changed causing some books to need reprocessing
     config = Config.load()
     reprocess_incomplete_tbr_books(config)
+    clear_unknown_books()
 
 
 @cli.command()

tbr_deal_finder/config.py

@@ -26,7 +26,7 @@ class Config:
     library_export_paths: list[str]
     tracked_retailers: list[str]
     max_price: float = 8.0
-    min_discount: int = 35
+    min_discount: int = 30
     run_time: datetime = datetime.now()
     
     locale: str = "us"  # This will be set as a class attribute below

tbr_deal_finder/migrations.py

@@ -62,6 +62,32 @@ _MIGRATIONS = [
             );
             """
     ),
+    TableMigration(
+        version=1,
+        table_name="unknown_book",
+        sql="""
+            CREATE TABLE unknown_book
+            (
+                retailer        VARCHAR,
+                title           VARCHAR,
+                authors         VARCHAR,
+                format          VARCHAR,
+                book_id         VARCHAR
+            );
+            """
+    ),
+    TableMigration(
+        version=1,
+        table_name="unknown_book_run_history",
+        sql="""
+            CREATE TABLE unknown_book_run_history
+            (
+                timepoint           TIMESTAMP_NS,
+                ran_successfully    BOOLEAN,
+                details             VARCHAR
+            );
+            """
+    ),
 ]
 
 

tbr_deal_finder/queries/latest_unknown_book_sync.sql

@@ -0,0 +1,5 @@
+SELECT timepoint
+FROM unknown_book_run_history
+WHERE ran_successfully = TRUE
+ORDER BY timepoint DESC
+LIMIT 1

tbr_deal_finder/retailer/amazon.py

@@ -15,7 +15,7 @@ from tbr_deal_finder import TBR_DEALS_PATH
 from tbr_deal_finder.config import Config
 from tbr_deal_finder.retailer.models import Retailer
 
-_AUTH_PATH = TBR_DEALS_PATH.joinpath("audible.json")
+AUTH_PATH = TBR_DEALS_PATH.joinpath("audible.json")
 
 
 def login_url_callback(url: str) -> str:
@@ -71,15 +71,15 @@ class Amazon(Retailer):
     _client: audible.AsyncClient = None
 
     async def set_auth(self):
-        if not os.path.exists(_AUTH_PATH):
+        if not os.path.exists(AUTH_PATH):
             auth = audible.Authenticator.from_login_external(
                 locale=Config.locale,
                 login_url_callback=login_url_callback
             )
 
             # Save credentials to file
-            auth.to_file(_AUTH_PATH)
+            auth.to_file(AUTH_PATH)
 
-        self._auth = audible.Authenticator.from_file(_AUTH_PATH)
+        self._auth = audible.Authenticator.from_file(AUTH_PATH)
         self._client = audible.AsyncClient(auth=self._auth)
 

tbr_deal_finder/retailer/kindle.py

@@ -1,13 +1,17 @@
 import asyncio
+import json
 import readline  # type: ignore
 
 from tbr_deal_finder.config import Config
-from tbr_deal_finder.retailer.amazon import Amazon
+from tbr_deal_finder.retailer.amazon import Amazon, AUTH_PATH
 from tbr_deal_finder.book import Book, BookFormat, get_normalized_title, get_normalized_authors, is_matching_authors
 
 
 class Kindle(Amazon):
 
+    def __init__(self):
+        self._headers = {}
+
     @property
     def name(self) -> str:
         return "Kindle"
@@ -19,6 +23,25 @@ class Kindle(Amazon):
     def _get_base_url(self) -> str:
         return f"https://www.amazon.{self._auth.locale.domain}"
 
+    def _get_read_base_url(self) -> str:
+        return f"https://read.amazon.{self._auth.locale.domain}"
+
+    async def set_auth(self):
+        await super().set_auth()
+
+        with open(AUTH_PATH, "r") as f:
+            auth_info = json.load(f)
+
+            cookies = auth_info["website_cookies"]
+            cookies["x-access-token"] = auth_info["access_token"]
+
+        self._headers = {
+            "User-Agent": "Mozilla/5.0 (Linux; Android 10; Kindle) AppleWebKit/537.3",
+            "Accept": "application/json, */*",
+            "Cookie": "; ".join([f"{k}={v}" for k, v in cookies.items()])
+        }
+
+
     async def get_book_asin(
         self,
         target: Book,
@@ -90,44 +113,28 @@ class Kindle(Amazon):
         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 = []
+        books = []
         pagination_token = 0
-        total_pages = 1
+        url = f"{self._get_read_base_url()}/kindle-library/search"
 
-        while pagination_token < total_pages:
+        while True:
             optional_params = {}
             if pagination_token:
                 optional_params["paginationToken"] = pagination_token
 
             response = await self._client.get(
-                "https://read.amazon.com/kindle-library/search",
+                url,
+                headers=self._headers,
                 query="",
                 libraryType="BOOKS",
                 sortType="recency",
                 resourceType="EBOOK",
-                querySize=5,
+                querySize=50,
                 **optional_params
             )
 
-            if "paginationToken" in response:
-                total_pages = int(response["paginationToken"])
-
             for book in response["itemsList"]:
-                response.append(
+                books.append(
                     Book(
                         retailer=self.name,
                         title = book["title"],
@@ -138,4 +145,9 @@ class Kindle(Amazon):
                     )
                 )
 
-        return response
+            if "paginationToken" in response:
+                pagination_token = int(response["paginationToken"])
+            else:
+                break
+
+        return books

tbr_deal_finder/retailer/librofm.py

@@ -10,7 +10,7 @@ from tbr_deal_finder import TBR_DEALS_PATH
 from tbr_deal_finder.config import Config
 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
+from tbr_deal_finder.utils import currency_to_float, echo_err
 
 
 class LibroFM(AioHttpSession, Retailer):
@@ -77,6 +77,10 @@ class LibroFM(AioHttpSession, Retailer):
                 "password": click.prompt("Libro FM Password", hide_input=True),
             }
         )
+        if "access_token" not in response:
+            echo_err("Login failed. Try again.")
+            await self.set_auth()
+
         self.auth_token = response["access_token"]
         with open(auth_path, "w") as f:
             json.dump(response, f)

tbr_deal_finder/retailer_deal.py

@@ -8,7 +8,7 @@ from tqdm.asyncio import tqdm_asyncio
 
 from tbr_deal_finder.book import Book, get_active_deals, BookFormat
 from tbr_deal_finder.config import Config
-from tbr_deal_finder.tracked_books import get_tbr_books
+from tbr_deal_finder.tracked_books import get_tbr_books, get_unknown_books, set_unknown_books
 from tbr_deal_finder.retailer import RETAILER_MAP
 from tbr_deal_finder.retailer.models import Retailer
 from tbr_deal_finder.utils import get_duckdb_conn, echo_warning, echo_info
@@ -55,7 +55,12 @@ def update_retailer_deal_table(config: Config, new_deals: list[Book]):
         db_conn.unregister("_df")
 
 
-async def _get_books(config, retailer: Retailer, books: list[Book]) -> list[Book]:
+async def _get_books(
+    config, 
+    retailer: Retailer, 
+    books: list[Book],
+    ignored_deal_ids: set[str],
+) -> tuple[list[Book], list[Book]]:
     """Get Books with limited concurrency.
 
     - Creates semaphore to limit concurrent requests.
@@ -72,7 +77,7 @@ async def _get_books(config, retailer: Retailer, books: list[Book]) -> list[Book
     """
     semaphore = asyncio.Semaphore(10)
     response = []
-    unresolved_books = []
+    unknown_books = []
     books = [copy.deepcopy(book) for book in books]
     for book in books:
         book.retailer = retailer.name
@@ -81,19 +86,20 @@ async def _get_books(config, retailer: Retailer, books: list[Book]) -> list[Book
     tasks = [
         retailer.get_book(book, semaphore)
         for book in books
+        if book.deal_id not in ignored_deal_ids
     ]
     results = await tqdm_asyncio.gather(*tasks, desc=f"Getting latest prices from {retailer.name}")
     for book in results:
         if book.exists:
             response.append(book)
         elif not book.exists:
-            unresolved_books.append(book)
+            unknown_books.append(book)
 
     click.echo()
-    for book in unresolved_books:
+    for book in unknown_books:
         echo_info(f"{book.title} by {book.authors} not found")
 
-    return response
+    return response, unknown_books
 
 
 def _apply_proper_list_prices(books: list[Book]):
@@ -169,7 +175,10 @@ async def get_latest_deals(config: Config):
     """
 
     books: list[Book] = []
+    unknown_books: list[Book] = []
     tbr_books = await get_tbr_books(config)
+    ignore_books: list[Book] = get_unknown_books(config)
+    ignored_deal_ids: set[str] = {book.deal_id for book in ignore_books}
 
     for retailer_str in config.tracked_retailers:
         retailer = RETAILER_MAP[retailer_str]()
@@ -182,7 +191,14 @@ async def get_latest_deals(config: Config):
 
         echo_info(f"Getting deals from {retailer.name}")
         click.echo("\n---------------")
-        books.extend(await _get_books(config, retailer, relevant_tbr_books))
+        retailer_books, u_books = await _get_books(
+            config,
+            retailer,
+            relevant_tbr_books,
+            ignored_deal_ids
+        )
+        books.extend(retailer_books)
+        unknown_books.extend(u_books)
         click.echo("---------------\n")
 
     _apply_proper_list_prices(books)
@@ -194,3 +210,4 @@ async def get_latest_deals(config: Config):
     ]
 
     update_retailer_deal_table(config, books)
+    set_unknown_books(config, unknown_books)

tbr_deal_finder/tracked_books.py

@@ -1,7 +1,9 @@
 import asyncio
 import copy
 import csv
+import functools
 from collections import defaultdict
+from datetime import datetime, timedelta
 from typing import Callable, Awaitable, Optional
 
 import pandas as pd
@@ -12,7 +14,7 @@ from tbr_deal_finder.owned_books import get_owned_books
 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
+from tbr_deal_finder.utils import execute_query, get_duckdb_conn, get_query_by_name
 
 
 def _library_export_tbr_books(config: Config, tbr_book_map: dict[str: Book]):
@@ -214,6 +216,66 @@ async def _maybe_set_audiobook_isbn(config: Config, new_tbr_books: list[Book]):
     )
 
 
+@functools.cache
+def unknown_books_requires_sync() -> bool:
+    db_conn = get_duckdb_conn()
+    results = execute_query(
+        db_conn,
+        get_query_by_name("latest_unknown_book_sync.sql")
+    )
+    if not results:
+        return True
+
+    sync_last_ran = results[0]["timepoint"]
+    return datetime.now() - timedelta(days=7) > sync_last_ran
+
+
+def clear_unknown_books():
+    db_conn = get_duckdb_conn()
+    db_conn.execute(
+        "DELETE FROM unknown_book"
+    )
+    db_conn.execute(
+        "DELETE FROM unknown_book_run_history"
+    )
+
+
+def set_unknown_books(config: Config, unknown_books: list[Book]):
+    if not unknown_books_requires_sync():
+        return
+
+    db_conn = get_duckdb_conn()
+    db_conn.execute(
+        "INSERT INTO unknown_book_run_history (timepoint, ran_successfully, details) VALUES (?, ?, ?)",
+        [config.run_time, True, ""]
+    )
+
+    db_conn.execute(
+        "DELETE FROM unknown_book"
+    )
+    if not unknown_books:
+        return
+
+    df = pd.DataFrame([book.unknown_book_dict() for book in unknown_books])
+    db_conn = get_duckdb_conn()
+    db_conn.register("_df", df)
+    db_conn.execute("INSERT INTO unknown_book SELECT * FROM _df;")
+    db_conn.unregister("_df")
+
+
+def get_unknown_books(config: Config) -> list[Book]:
+    if unknown_books_requires_sync():
+        return []
+
+    db_conn = get_duckdb_conn()
+    unknown_book_data = execute_query(
+        db_conn,
+        "SELECT * EXCLUDE(book_id) FROM unknown_book"
+    )
+
+    return [Book(timepoint=config.run_time, **b) for b in unknown_book_data]
+
+
 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
     """

{tbr_deal_finder-0.2.0.dist-info → tbr_deal_finder-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tbr-deal-finder
-Version: 0.2.0
+Version: 0.2.1
 Summary: Track price drops and find deals on books in your TBR list across audiobook and ebook formats.
 License: MIT
 License-File: LICENSE
@@ -23,7 +23,7 @@ Track price drops and find deals on books in your TBR (To Be Read) and wishlist
 ## Features
 - Use your StoryGraph exports, Goodreads exports, and custom csvs (spreadsheet) to track book deals
 - Supports multiple of the library exports above
-- Tracks deals on the wishlist of all your configured retailers like audible 
+- Tracks deals on the wishlist of all your configured retailers like audible (excluding kindle)
 - Supports multiple locales and currencies
 - Find the latest and active deals from supported sellers
 - Simple CLI interface for setup and usage

tbr_deal_finder-0.2.1.dist-info/RECORD

@@ -0,0 +1,25 @@
+tbr_deal_finder/__init__.py,sha256=WCoj0GZrRiCQlrpkLTw1VUeJmX-RtBLdLqnFYn1Es_4,208
+tbr_deal_finder/book.py,sha256=mJzuDgyd5UQqlfubj8e9uhmbUxliYvD1y-oQkfenIAM,6414
+tbr_deal_finder/cli.py,sha256=YnfYyjoeQ0pefPdT-fcz19NQWlEWTHldAR52owoAxd8,7493
+tbr_deal_finder/config.py,sha256=Bpr9C9NClsHrFJuykcITrtRTr2vxAzbcZrMQ85neQ-Y,3978
+tbr_deal_finder/migrations.py,sha256=fO7r2JbWb6YG0CsPqauakwvbKaEFPxqX1PP8c8N03Wc,4951
+tbr_deal_finder/owned_books.py,sha256=Cf1VeiSg7XBi_TXptJfy5sO1mEgMMQWbJ_P6SzAx0nQ,516
+tbr_deal_finder/retailer_deal.py,sha256=_0ZxsTB3frWHKFmfIWZOdsXGe5zOylNh04oamuWd45c,6955
+tbr_deal_finder/tracked_books.py,sha256=1zKv1aRqP9AnyZlzfyAWWUNamrFG6UhWXubZ-1HzBm4,12486
+tbr_deal_finder/utils.py,sha256=_4wdGFDtqCdMyoMnwTDiHgCR4WQLAcQr8LlZZZUcq6E,1357
+tbr_deal_finder/queries/get_active_deals.sql,sha256=nh0F1lRV6YVrUV7gsQpjsgfXmN9R0peBeMHRifjgpUM,212
+tbr_deal_finder/queries/get_deals_found_at.sql,sha256=KqrtQk7FS4Hf74RyL1r-oD2D-RJz1urrxKxkwlvjAro,139
+tbr_deal_finder/queries/latest_deal_last_ran_most_recent_success.sql,sha256=W4cNMAHtcW2DzQyPL8SHHFcbVZQKVK2VfTzazxC3LJU,107
+tbr_deal_finder/queries/latest_unknown_book_sync.sql,sha256=d4ewoYP5otnCj0_TqsXCCLI8BEmHzqTyJrGxTvl2l-I,108
+tbr_deal_finder/retailer/__init__.py,sha256=OD6jUYV8LaURxqHnZq-aiFi7OdWG6qWznRlF_g246lo,316
+tbr_deal_finder/retailer/amazon.py,sha256=sUjNkKEBEOeT_mYPDyi4XKvijM8kM8ZT4hKAe7-j7yI,2468
+tbr_deal_finder/retailer/audible.py,sha256=qwXDKc1W8vGGhqvU2YI7hNfD1rHz2yL-8foXstxb8t8,3991
+tbr_deal_finder/retailer/chirp.py,sha256=f_O-6X9duR_gBT8UWDxDr-KQYSRFOOiYOX9Az2pCi6Y,9183
+tbr_deal_finder/retailer/kindle.py,sha256=ZkOqNu43C5JbngB6lZhdK0373NH-iJKHE1fFIjGuMow,4829
+tbr_deal_finder/retailer/librofm.py,sha256=TRey_38sf3VGpvXxLwhdqwYKP7Izj07c9Qs3n1pu5_Y,6494
+tbr_deal_finder/retailer/models.py,sha256=xm99ngt_Ze7yyEwttddkpwL7xjy0YfcFAduV6Rsx63M,2510
+tbr_deal_finder-0.2.1.dist-info/METADATA,sha256=QKG3ak5XtMq_TLYHF10BFDak_tycxBCJaeNce6qKVLg,4381
+tbr_deal_finder-0.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+tbr_deal_finder-0.2.1.dist-info/entry_points.txt,sha256=y_KG1k8xVCY8gngSZ-na2bkK-tTLUdOc_qZ9Djwldv0,60
+tbr_deal_finder-0.2.1.dist-info/licenses/LICENSE,sha256=rNc0wNPn4d4HHu6ZheJzeUaz_FbJ4rj2Dr2FjAivkNg,1064
+tbr_deal_finder-0.2.1.dist-info/RECORD,,

tbr_deal_finder-0.2.0.dist-info/RECORD

@@ -1,24 +0,0 @@
-tbr_deal_finder/__init__.py,sha256=WCoj0GZrRiCQlrpkLTw1VUeJmX-RtBLdLqnFYn1Es_4,208
-tbr_deal_finder/book.py,sha256=vCvkjU98mI0Z7WW_Z3GppnI4aem9ht-flB8HB4RCujQ,6107
-tbr_deal_finder/cli.py,sha256=C4F2rbPrfYNqlmolx08ZHDCcFJuiPbkc4ECXUO25kmI,7446
-tbr_deal_finder/config.py,sha256=-TtZLv4kVBf56xPkgAdKXeVRV0qw8MZ53XHBQ1HnVX8,3978
-tbr_deal_finder/migrations.py,sha256=_ZxUXzGyEFYlPlpzMvViDVPZJc5BNOiixj150U8HRFc,4224
-tbr_deal_finder/owned_books.py,sha256=Cf1VeiSg7XBi_TXptJfy5sO1mEgMMQWbJ_P6SzAx0nQ,516
-tbr_deal_finder/retailer_deal.py,sha256=jv32WSOtxVxCkxTCLkOqSkcHGHhWfbD4nSxY42Cqk38,6422
-tbr_deal_finder/tracked_books.py,sha256=TdVD5kIgdkDoQNwBIsOikrvFiQiIezmSYf64F5cBN0o,10856
-tbr_deal_finder/utils.py,sha256=_4wdGFDtqCdMyoMnwTDiHgCR4WQLAcQr8LlZZZUcq6E,1357
-tbr_deal_finder/queries/get_active_deals.sql,sha256=nh0F1lRV6YVrUV7gsQpjsgfXmN9R0peBeMHRifjgpUM,212
-tbr_deal_finder/queries/get_deals_found_at.sql,sha256=KqrtQk7FS4Hf74RyL1r-oD2D-RJz1urrxKxkwlvjAro,139
-tbr_deal_finder/queries/latest_deal_last_ran_most_recent_success.sql,sha256=W4cNMAHtcW2DzQyPL8SHHFcbVZQKVK2VfTzazxC3LJU,107
-tbr_deal_finder/retailer/__init__.py,sha256=OD6jUYV8LaURxqHnZq-aiFi7OdWG6qWznRlF_g246lo,316
-tbr_deal_finder/retailer/amazon.py,sha256=rYJlBT4JsOg7QVIhJ8a7xJKUjczP_RMK2m-ddH7FjlQ,2472
-tbr_deal_finder/retailer/audible.py,sha256=qwXDKc1W8vGGhqvU2YI7hNfD1rHz2yL-8foXstxb8t8,3991
-tbr_deal_finder/retailer/chirp.py,sha256=f_O-6X9duR_gBT8UWDxDr-KQYSRFOOiYOX9Az2pCi6Y,9183
-tbr_deal_finder/retailer/kindle.py,sha256=ELdKSzKMCmZWw8TjGHihuyZcgqwVygi94mZFOYQ61qY,4489
-tbr_deal_finder/retailer/librofm.py,sha256=Oi9UlkyCqdI-PSRApGSCv_TWP7yWwvYEADOZleAOSmM,6357
-tbr_deal_finder/retailer/models.py,sha256=xm99ngt_Ze7yyEwttddkpwL7xjy0YfcFAduV6Rsx63M,2510
-tbr_deal_finder-0.2.0.dist-info/METADATA,sha256=ZS-Q4WHHC3Y7BGbSC7j6ClKizcdVMSVfHJ2KpbV7DXk,4363
-tbr_deal_finder-0.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-tbr_deal_finder-0.2.0.dist-info/entry_points.txt,sha256=y_KG1k8xVCY8gngSZ-na2bkK-tTLUdOc_qZ9Djwldv0,60
-tbr_deal_finder-0.2.0.dist-info/licenses/LICENSE,sha256=rNc0wNPn4d4HHu6ZheJzeUaz_FbJ4rj2Dr2FjAivkNg,1064
-tbr_deal_finder-0.2.0.dist-info/RECORD,,