tbr-deal-finder 0.1.6__py3-none-any.whl → 0.1.8__py3-none-any.whl

tbr_deal_finder/book.py

@@ -1,10 +1,10 @@
-import dataclasses
 import re
 from datetime import datetime
 from enum import Enum
-from typing import Optional, Union
+from typing import Union
 
 import click
+from Levenshtein import ratio
 from unidecode import unidecode
 
 from tbr_deal_finder.config import Config
@@ -14,40 +14,45 @@ _AUTHOR_RE = re.compile(r'[^a-zA-Z0-9]')
 
 class BookFormat(Enum):
     AUDIOBOOK = "Audiobook"
-    NA = "N/A"  # When format does not matter
-
-
-@dataclasses.dataclass
-class Book:    
-    retailer: str
-    title: str
-    authors: str
-    list_price: float
-    current_price: float
-    timepoint: datetime
-    format: Union[BookFormat, str]
-
-    # Metadata really only used for tracked books.
-    # See get_tbr_books for more context
-    audiobook_isbn: str = None
-    audiobook_list_price: float = 0
-
-    deleted: bool = False
-
-    deal_id: Optional[str] = None
-    exists: bool = True
-    normalized_authors: list[str] = None
-
-    def __post_init__(self):
-        self.current_price = round(self.current_price, 2)
-        self.list_price = round(self.list_price, 2)
-        self.normalized_authors = get_normalized_authors(self.authors)
-
-        if not self.deal_id:
-            self.deal_id = f"{self.title}__{self.normalized_authors}__{self.format}__{self.retailer}"
-
-        if isinstance(self.format, str):
-            self.format = BookFormat(self.format)
+    EBOOK = "E-Book"
+    NA = "N/A"  # When the format doesn't matter
+
+
+class Book:
+
+    def __init__(
+        self,
+        retailer: str,
+        title: str,
+        authors: str,
+        timepoint: datetime,
+        format: Union[BookFormat, str],
+        list_price: float = 0,
+        current_price: float = 0,
+        ebook_asin: str = None,
+        audiobook_isbn: str = None,
+        audiobook_list_price: float = 0,
+        deleted: bool = False,
+        exists: bool = True,
+    ):
+        self.retailer = retailer
+        self.title = title.split(":")[0].split("(")[0].strip()
+        self.authors = authors
+        self.timepoint = timepoint
+
+        self.ebook_asin = ebook_asin
+        self.audiobook_isbn = audiobook_isbn
+        self.audiobook_list_price = audiobook_list_price
+        self.deleted = deleted
+        self.exists = exists
+
+        self.list_price = list_price
+        self.current_price = current_price
+        self.normalized_authors = get_normalized_authors(authors)
+
+        if isinstance(format, str):
+            format = BookFormat(format)
+        self.format = format
 
     def discount(self) -> int:
         return int((self.list_price/self.current_price - 1) * 100)
@@ -56,6 +61,10 @@ class Book:
     def price_to_string(price: float) -> str:
         return f"{Config.currency_symbol()}{price:.2f}"
 
+    @property
+    def deal_id(self) -> str:
+        return f"{self.title}__{self.normalized_authors}__{self.format}__{self.retailer}"
+
     @property
     def title_id(self) -> str:
         return f"{self.title}__{self.normalized_authors}__{self.format}"
@@ -64,6 +73,22 @@ class Book:
     def full_title_str(self) -> str:
         return f"{self.title}__{self.normalized_authors}"
 
+    @property
+    def current_price(self) -> float:
+        return self._current_price
+
+    @current_price.setter
+    def current_price(self, price: float):
+        self._current_price = round(price, 2)
+
+    @property
+    def list_price(self) -> float:
+        return self._list_price
+
+    @list_price.setter
+    def list_price(self, price: float):
+        self._list_price = round(price, 2)
+
     def list_price_string(self):
         return self.price_to_string(self.list_price)
 
@@ -76,17 +101,31 @@ class Book:
         title = self.title
         if len(self.title) > 75:
             title = f"{title[:75]}..."
-        return f"{title} by {self.authors} - {price} - {self.discount()}% Off at {self.retailer} - {book_format}"
+        return f"{title} by {self.authors} - {price} - {self.discount()}% Off at {self.retailer}"
 
     def dict(self):
-        response = dataclasses.asdict(self)
-        response["format"] = self.format.value
-        del response["audiobook_isbn"]
-        del response["audiobook_list_price"]
-        del response["exists"]
-        del response["normalized_authors"]
-
-        return response
+        return {
+            "retailer": self.retailer,
+            "title": self.title,
+            "authors": self.authors,
+            "list_price": self.list_price,
+            "current_price": self.current_price,
+            "timepoint": self.timepoint,
+            "format": self.format.value,
+            "deleted": self.deleted,
+            "deal_id": self.deal_id,
+        }
+
+    def tbr_dict(self):
+        return {
+            "title": self.title,
+            "authors": self.authors,
+            "format": self.format.value,
+            "ebook_asin": self.ebook_asin,
+            "audiobook_isbn": self.audiobook_isbn,
+            "audiobook_list_price": self.audiobook_list_price,
+            "book_id": self.title_id,
+        }
 
 
 def get_deals_found_at(timepoint: datetime) -> list[Book]:
@@ -118,6 +157,14 @@ def print_books(books: list[Book]):
         click.echo(str(book))
 
 
+def get_full_title_str(title: str, authors: Union[list, str]) -> str:
+    return f"{title}__{get_normalized_authors(authors)}"
+
+
+def get_title_id(title: str, authors: Union[list, str], book_format: BookFormat) -> str:
+    return f"{title}__{get_normalized_authors(authors)}__{book_format.value}"
+
+
 def get_normalized_authors(authors: Union[str, list[str]]) -> list[str]:
     if isinstance(authors, str):
         authors = [i for i in authors.split(",")]
@@ -125,5 +172,18 @@ def get_normalized_authors(authors: Union[str, list[str]]) -> list[str]:
     return sorted([_AUTHOR_RE.sub('', unidecode(author)).lower() for author in authors])
 
 
-def get_title_id(title: str, authors: Union[list, str], book_format: BookFormat) -> str:
-    return f"{title}__{get_normalized_authors(authors)}__{book_format.value}"
+def is_matching_authors(a1: list[str], a2: list[str]) -> bool:
+    """Checks if two normalized authors are matching.
+    Matching here means that they are at least 80% similar using levenshtein distance.
+
+    Score is calculated as follows:
+        1 - (distance / (len1 + len2))
+
+    :param a1:
+    :param a2:
+    :return:
+    """
+    return any(
+        any(ratio(author1, author2, score_cutoff=.8) for author2 in a2)
+        for author1 in a1
+    )

tbr_deal_finder/cli.py

@@ -9,11 +9,11 @@ import click
 import questionary
 
 from tbr_deal_finder.config import Config
-from tbr_deal_finder.library_exports import maybe_enrich_library_exports
 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.utils import (
     echo_err,
     echo_info,
@@ -28,12 +28,6 @@ from tbr_deal_finder.utils import (
 def cli():
     make_migrations()
 
-    # Check that the config exists for all commands ran
-    try:
-        Config.load()
-    except FileNotFoundError:
-        _set_config()
-
 
 def _add_path(existing_paths: list[str]) -> Union[str, None]:
     try:
@@ -68,24 +62,26 @@ def _set_library_export_paths(config: Config):
     Ensures that only valid, unique paths are added. Updates the config in-place.
     """
     while True:
-        if config.library_export_paths:
-            if len(config.library_export_paths) > 1:
-                choices = ["Add new path", "Remove path", "Done"]
-            else:
-                choices = ["Add new path", "Done"]
-
-            try:
-                user_selection = questionary.select(
-                    "What change would you like to make to your library export paths",
-                    choices=choices,
-                ).ask()
-            except (KeyError, KeyboardInterrupt, TypeError):
-                return
+        if len(config.library_export_paths) > 0:
+            choices = ["Add new path", "Remove path", "Done"]
         else:
-            click.echo("Add your library export path.")
-            user_selection = "Add new path"
+            choices = ["Add new path", "Done"]
+
+        try:
+            user_selection = questionary.select(
+                "What change would you like to make to your library export paths",
+                choices=choices,
+            ).ask()
+        except (KeyError, KeyboardInterrupt, TypeError):
+            return
 
         if user_selection == "Done":
+            if not config.library_export_paths:
+                if not click.confirm(
+                    "Don't add a GoodReads or StoryGraph export and use wishlist entirely? "
+                    "Note: Wishlist checks will still work even if you add your StoryGraph/GoodReads export."
+                ):
+                    continue
             return
         elif user_selection == "Add new path":
             if new_path := _add_path(config.library_export_paths):
@@ -184,13 +180,18 @@ def _set_config() -> Config:
 def setup():
     _set_config()
 
+    # Retailers may have changed causing some books to need reprocessing
+    config = Config.load()
+    reprocess_incomplete_tbr_books(config)
+
 
 @cli.command()
 def latest_deals():
     """Find book deals from your Library export."""
-    config = Config.load()
-
-    asyncio.run(maybe_enrich_library_exports(config))
+    try:
+        config = Config.load()
+    except FileNotFoundError:
+        config = _set_config()
 
     db_conn = get_duckdb_conn()
     results = execute_query(

tbr_deal_finder/config.py

@@ -62,10 +62,16 @@ class Config:
         tracked_retailers_str = parser.get('DEFAULT', 'tracked_retailers')
         locale = parser.get('DEFAULT', 'locale', fallback="us")
         cls.set_locale(locale)
+
+        if export_paths_str:
+            library_export_paths = [i.strip() for i in export_paths_str.split(",")]
+        else:
+            library_export_paths = []
+
         return cls(
             max_price=parser.getfloat('DEFAULT', 'max_price', fallback=8.0),  
             min_discount=parser.getint('DEFAULT', 'min_discount', fallback=35),
-            library_export_paths=[i.strip() for i in export_paths_str.split(",")],
+            library_export_paths=library_export_paths,
             tracked_retailers=[i.strip() for i in tracked_retailers_str.split(",")]
         )
 
@@ -77,8 +83,20 @@ class Config:
     def tracked_retailers_str(self) -> str:
         return ", ".join(self.tracked_retailers)
 
+    def is_tracking_format(self, book_format) -> bool:
+        from tbr_deal_finder.retailer import RETAILER_MAP
+
+        for retailer_str in self.tracked_retailers:
+            retailer = RETAILER_MAP[retailer_str]()
+            if retailer.format == book_format:
+                return True
+
+        return False
+
     def set_library_export_paths(self, library_export_paths: Union[str, list[str]]):
-        if isinstance(library_export_paths, str):
+        if not library_export_paths:
+            self.library_export_paths = []
+        elif isinstance(library_export_paths, str):
             self.library_export_paths = [i.strip() for i in library_export_paths.split(",")]
         else:
             self.library_export_paths = library_export_paths

tbr_deal_finder/migrations.py

@@ -46,6 +46,22 @@ _MIGRATIONS = [
             );
             """
     ),
+    TableMigration(
+        version=1,
+        table_name="tbr_book",
+        sql="""
+            CREATE TABLE tbr_book
+            (
+                title                VARCHAR,
+                authors              VARCHAR,
+                format               VARCHAR,
+                ebook_asin           VARCHAR,
+                audiobook_isbn       VARCHAR,
+                audiobook_list_price FLOAT,
+                book_id              VARCHAR
+            );
+            """
+    ),
 ]
 
 

tbr_deal_finder/owned_books.py

@@ -0,0 +1,18 @@
+from tbr_deal_finder.book import Book
+from tbr_deal_finder.config import Config
+from tbr_deal_finder.retailer import RETAILER_MAP
+from tbr_deal_finder.retailer.models import Retailer
+
+
+async def get_owned_books(config: Config) -> list[Book]:
+    owned_books = []
+
+    for retailer_str in config.tracked_retailers:
+        retailer: Retailer = RETAILER_MAP[retailer_str]()
+        await retailer.set_auth()
+
+        owned_books.extend(
+            await retailer.get_library(config)
+        )
+
+    return owned_books

tbr_deal_finder/queries/get_active_deals.sql

@@ -1,4 +1,4 @@
-SELECT *
+SELECT * exclude(deal_id)
 FROM retailer_deal
 QUALIFY	ROW_NUMBER() OVER (PARTITION BY title, authors, retailer, format ORDER BY timepoint DESC) = 1 AND deleted IS NOT TRUE
 ORDER BY title, authors, retailer, format

tbr_deal_finder/queries/get_deals_found_at.sql

@@ -1,4 +1,4 @@
-SELECT *
+SELECT * exclude(deal_id)
 FROM retailer_deal
 WHERE timepoint = $timepoint AND deleted IS NOT TRUE
 ORDER BY title, authors, retailer, format

tbr_deal_finder/retailer/amazon.py

@@ -0,0 +1,79 @@
+import os.path
+
+import audible
+import click
+from audible.login import build_init_cookies
+from textwrap import dedent
+
+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")
+
+
+def login_url_callback(url: str) -> str:
+    """Helper function for login with external browsers."""
+
+    try:
+        from playwright.sync_api import sync_playwright  # type: ignore
+    except ImportError:
+        pass
+    else:
+        with sync_playwright() as p:
+            iphone = p.devices["iPhone 12 Pro"]
+            browser = p.webkit.launch(headless=False)
+            context = browser.new_context(
+                **iphone
+            )
+            cookies = []
+            for name, value in build_init_cookies().items():
+                cookies.append(
+                    {
+                        "name": name,
+                        "value": value,
+                        "url": url
+                    }
+                )
+            context.add_cookies(cookies)
+            page = browser.new_page()
+            page.goto(url)
+
+            while True:
+                page.wait_for_timeout(600)
+                if "/ap/maplanding" in page.url:
+                    response_url = page.url
+                    break
+
+            browser.close()
+        return response_url
+
+    message = f"""\
+        Please copy the following url and insert it into a web browser of your choice to log into Amazon.
+        Note: your browser will show you an error page (Page not found). This is expected.
+        
+        {url}
+
+        Once you have logged in, please insert the copied url.
+    """
+    click.echo(dedent(message))
+    return input()
+
+
+class Amazon(Retailer):
+    _auth: audible.Authenticator = None
+    _client: audible.AsyncClient = None
+
+    async def set_auth(self):
+        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)
+
+        self._auth = audible.Authenticator.from_file(_AUTH_PATH)
+        self._client = audible.AsyncClient(auth=self._auth)
+

tbr_deal_finder/retailer/audible.py

@@ -1,74 +1,13 @@
 import asyncio
 import math
-import os.path
-from datetime import datetime
-from textwrap import dedent
 import readline  # type: ignore
 
-
-import audible
-import click
-from audible.login import build_init_cookies
-
-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.amazon import Amazon
 from tbr_deal_finder.book import Book, BookFormat
 
-_AUTH_PATH = TBR_DEALS_PATH.joinpath("audible.json")
-
-
-def login_url_callback(url: str) -> str:
-    """Helper function for login with external browsers."""
-
-    try:
-        from playwright.sync_api import sync_playwright  # type: ignore
-    except ImportError:
-        pass
-    else:
-        with sync_playwright() as p:
-            iphone = p.devices["iPhone 12 Pro"]
-            browser = p.webkit.launch(headless=False)
-            context = browser.new_context(
-                **iphone
-            )
-            cookies = []
-            for name, value in build_init_cookies().items():
-                cookies.append(
-                    {
-                        "name": name,
-                        "value": value,
-                        "url": url
-                    }
-                )
-            context.add_cookies(cookies)
-            page = browser.new_page()
-            page.goto(url)
-
-            while True:
-                page.wait_for_timeout(600)
-                if "/ap/maplanding" in page.url:
-                    response_url = page.url
-                    break
-
-            browser.close()
-        return response_url
-
-    message = f"""\
-        Please copy the following url and insert it into a web browser of your choice to log into Amazon.
-        Note: your browser will show you an error page (Page not found). This is expected.
-        
-        {url}
-
-        Once you have logged in, please insert the copied url.
-    """
-    click.echo(dedent(message))
-    return input()
-
 
-class Audible(Retailer):
-    _auth: audible.Authenticator = None
-    _client: audible.AsyncClient = None
+class Audible(Amazon):
 
     @property
     def name(self) -> str:
@@ -78,23 +17,9 @@ class Audible(Retailer):
     def format(self) -> BookFormat:
         return BookFormat.AUDIOBOOK
 
-    async def set_auth(self):
-        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)
-
-        self._auth = audible.Authenticator.from_file(_AUTH_PATH)
-        self._client = audible.AsyncClient(auth=self._auth)
-
     async def get_book(
         self,
         target: Book,
-        runtime: datetime,
         semaphore: asyncio.Semaphore
     ) -> Book:
         title = target.title
@@ -114,27 +39,16 @@ class Audible(Retailer):
             for product in match.get("products", []):
                 if product["title"] != title:
                     continue
+                try:
+                    target.list_price = product["price"]["list_price"]["base"]
+                    target.current_price = product["price"]["lowest_price"]["base"]
+                    target.exists = True
+                    return target
+                except KeyError:
+                    continue
 
-                return Book(
-                    retailer=self.name,
-                    title=title,
-                    authors=authors,
-                    list_price=product["price"]["list_price"]["base"],
-                    current_price=product["price"]["lowest_price"]["base"],
-                    timepoint=runtime,
-                    format=BookFormat.AUDIOBOOK
-                )
-
-            return Book(
-                retailer=self.name,
-                title=title,
-                authors=authors,
-                list_price=0,
-                current_price=0,
-                timepoint=runtime,
-                format=BookFormat.AUDIOBOOK,
-                exists=False,
-            )
+            target.exists = False
+            return target
 
     async def get_wishlist(self, config: Config) -> list[Book]:
         wishlist_books = []
@@ -171,3 +85,39 @@ class Audible(Retailer):
             total_pages = math.ceil(int(response.get("total_results", 1))/page_size)
 
         return wishlist_books
+
+    async def get_library(self, config: Config) -> list[Book]:
+        library_books = []
+
+        page = 1
+        total_pages = 1
+        page_size = 1000
+        while page <= total_pages:
+            response = await self._client.get(
+                "1.0/library",
+                num_results=page_size,
+                page=page,
+                response_groups=[
+                    "contributors, product_attrs, product_desc, product_extended_attrs"
+                ]
+            )
+
+            for audiobook in response.get("items", []):
+                authors = [author["name"] for author in audiobook["authors"]]
+                library_books.append(
+                    Book(
+                        retailer=self.name,
+                        title=audiobook["title"],
+                        authors=", ".join(authors),
+                        list_price=1,
+                        current_price=1,
+                        timepoint=config.run_time,
+                        format=self.format,
+                        audiobook_isbn=audiobook["isbn"],
+                    )
+                )
+
+            page += 1
+            total_pages = math.ceil(int(response.get("total_results", 1))/page_size)
+
+        return library_books