Refactor logging statements to use f-strings for improved readability and consistency across the codebase. This change enhances the clarity of log messages by directly embedding variable values, making it easier to trace and debug application behavior.

2026-07-24 11:38:51 -04:00
parent 5210f00587
commit 8f1a69529c
23 changed files with 142 additions and 368 deletions
@@ -68,12 +68,8 @@ async def generate_candidate_phrases_for_books(
        source_ids = (await session.scalars(source_query)).all()
    books_seen = len(source_ids)
    logger.info(
-        "ebook_candidate_phrase_generation_start books_seen=%s min_tokens=%s max_tokens=%s "
-        "max_candidates_per_book=%s",
-        books_seen,
-        config.phrase_min_tokens,
-        config.phrase_max_tokens,
-        config.protected_phrase_max_candidates_per_book,
+        f"ebook_candidate_phrase_generation_start {books_seen=} {config.phrase_min_tokens=} {config.phrase_max_tokens=} "
+        f"{config.protected_phrase_max_candidates_per_book=}"
    )

    pool = get_extraction_pool(config.protected_phrase_extraction_workers)
@@ -89,19 +85,11 @@ async def generate_candidate_phrases_for_books(
        await asyncio.wait([wrapped_future])
        exception = wrapped_future.exception()
        if exception is not None:
-            logger.error(
-                "ebook_candidate_phrase_generation_book_failed source_id=%s",
-                source_id,
-                exc_info=exception,
-            )
+            logger.error(f"ebook_candidate_phrase_generation_book_failed {source_id=}")
            outcomes.append(BookCandidateResult())
            continue
        saved_count = wrapped_future.result()
-        logger.info(
-            "ebook_candidate_phrase_generation_book_committed source_id=%s candidates=%s",
-            source_id,
-            saved_count,
-        )
+        logger.info(f"ebook_candidate_phrase_generation_book_committed {source_id=} {saved_count=}")
        outcomes.append(BookCandidateResult(candidates=saved_count, built=True))

    result = PhraseCandidateGenerationResult(
@@ -110,10 +98,8 @@ async def generate_candidate_phrases_for_books(
        candidate_phrases=sum(outcome.candidates for outcome in outcomes),
    )
    logger.info(
-        "ebook_candidate_phrase_generation_complete books_seen=%s books_built=%s candidate_total=%s",
-        result.books_seen,
-        result.books_built,
-        result.candidate_phrases,
+        f"ebook_candidate_phrase_generation_complete {result.books_seen=} {result.books_built=} "
+        f"{result.candidate_phrases=}"
    )
    return result

@@ -141,11 +127,7 @@ async def recalculate_candidate_phrases_for_book(
    regeneration failure rolls the deletion back.
    """
    started_at = perf_counter()
-    logger.info(
-        "ebook_candidate_phrase_recalculation_start source_id=%s title=%r",
-        source.id,
-        source.title,
-    )
+    logger.info(f"ebook_candidate_phrase_recalculation_start {source.id=} {source.title=}")
    deleted = await delete_phrase_data_for_book(session, source.id)
    candidate_count = await generate_candidate_phrases_for_book(
        session,
@@ -164,15 +146,9 @@ async def recalculate_candidate_phrases_for_book(
        candidate_phrases=candidate_count,
    )
    logger.info(
-        "ebook_candidate_phrase_recalculation_complete source_id=%s deleted_candidates=%s "
-        "deleted_protected=%s deleted_aliases=%s deleted_mentions=%s candidates=%s duration_ms=%.1f",
-        source.id,
-        result.deleted_candidates,
-        result.deleted_protected_phrases,
-        result.deleted_aliases,
-        result.deleted_mentions,
-        result.candidate_phrases,
-        (perf_counter() - started_at) * 1000,
+        f"ebook_candidate_phrase_recalculation_complete {source.id=} {result.deleted_candidates=} "
+        f"{result.deleted_protected_phrases=} {result.deleted_aliases=} {result.deleted_mentions=} "
+        f"{result.candidate_phrases=} duration_ms={(perf_counter() - started_at) * 1000:.1f}"
    )
    return result

@@ -268,10 +244,8 @@ async def generate_candidate_phrases_for_book(
        await session.rollback()
        raise
    logger.info(
-        "ebook_candidate_phrase_generation_book_duration book_id=%s candidates=%s duration_ms=%.1f",
-        book_id,
-        saved_count,
-        (perf_counter() - started_at) * 1000,
+        f"ebook_candidate_phrase_generation_book_duration {book_id=} {saved_count=} duration_ms={(perf_counter() - "
+        f"started_at) * 1000:.1f}"
    )
    return saved_count

@@ -306,23 +280,16 @@ async def store_candidate_phrases_for_book(
        await session.flush()
        saved_count = len(rows)
        logger.info(
-            "ebook_candidate_phrase_save_start book_id=%s candidates=%s mode=bulk_insert",
-            book_id,
-            len(limited_candidates),
+            f"ebook_candidate_phrase_save_start {book_id=} candidates={len(limited_candidates)} mode=bulk_insert"
        )
    else:
        pruned_count = await prune_unstorable_unjudged_candidate_phrases(session, book_id, config)
        logger.info(
-            "ebook_candidate_phrase_save_start book_id=%s candidates=%s pruned_unstorable=%s",
-            book_id,
-            len(limited_candidates),
-            pruned_count,
+            f"ebook_candidate_phrase_save_start {book_id=} candidates={len(limited_candidates)} {pruned_count=}"
        )
        saved_count = await bulk_upsert_unjudged_candidates(session, book_id, series_id, limited_candidates)
    logger.info(
-        "ebook_candidate_phrase_save_complete book_id=%s candidates=%s save_ms=%.1f",
-        book_id,
-        saved_count,
-        (perf_counter() - save_started_at) * 1000,
+        f"ebook_candidate_phrase_save_complete {book_id=} {saved_count=} save_ms={(perf_counter() - save_started_at) * "
+        f"1000:.1f}"
    )
    return saved_count