Skip to content

Fix reading log carousel to check edition-level availability #11417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cdrini merged 9 commits into from
Nov 29, 2025
Merged

Fix reading log carousel to check edition-level availability #11417

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
26e8413
Fix reading log carousel to check edition-level availability
Nov 4, 2025
a58fd15
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 4, 2025
8112abe
Simplify edition availability using safeget helper
Nov 5, 2025
44b63a1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 5, 2025
d80f9e1
Fix edition availability: attach to work docs instead of editions
Nov 13, 2025
3cef49d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 13, 2025
abc3dc0
Fix: Handle editions as both list and dict format
Nov 13, 2025
f79f19e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 13, 2025
e6bd225
Handle ambiguous editions formats for mybooks carousels
cdrini Nov 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 35 additions & 26 deletions openlibrary/plugins/upstream/mybooks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import json
from types import MappingProxyType
from typing import TYPE_CHECKING, Final, Literal, cast
from typing import TYPE_CHECKING, Any, Final, Literal, cast

import web
from web.template import TemplateResult
Expand Down Expand Up @@ -56,9 +56,15 @@ def GET(self, username: str) -> TemplateResult:
template = self.render_template(mb)
return mb.render(header_title=_("Books"), template=template)

def render_template(self, mb):
def render_template(self, mb: 'MyBooksTemplate') -> TemplateResult:
# Marshal loans into homogeneous data that carousel can render
want_to_read, currently_reading, already_read, loans = [], [], [], []

docs: dict[str, Any] = {
'loans': [],
'want-to-read': [],
'currently-reading': [],
'already-read': [],
}

if mb.me:
myloans = get_loans_of_user(mb.me.key)
Expand All @@ -69,30 +75,33 @@ def render_template(self, mb):
if book := web.ctx.site.get(loan['book']):
book.loan = loan
loans.docs.append(book)
docs['loans'] = loans

if mb.me or mb.is_public:
params = {'sort': 'created', 'limit': 6, 'sort_order': 'desc', 'page': 1}
want_to_read = mb.readlog.get_works(key='want-to-read', **params)
currently_reading = mb.readlog.get_works(key='currently-reading', **params)
already_read = mb.readlog.get_works(key='already-read', **params)

# Ideally, do all 3 lookups in one add_availability call
want_to_read.docs = add_availability(
[d for d in want_to_read.docs if d.get('title')]
)[:5]
currently_reading.docs = add_availability(
[d for d in currently_reading.docs if d.get('title')]
)[:5]
already_read.docs = add_availability(
[d for d in already_read.docs if d.get('title')]
)[:5]

docs = {
'loans': loans,
'want-to-read': want_to_read,
'currently-reading': currently_reading,
'already-read': already_read,
}
want_to_read = mb.readlog.get_works('want-to-read', limit=6)
currently_reading = mb.readlog.get_works('currently-reading', limit=6)
already_read = mb.readlog.get_works('already-read', limit=6)
works = want_to_read.docs + currently_reading.docs + already_read.docs

def get_edition(solr_doc: web.Storage | dict) -> dict | None:
editions_raw = cast(dict | list[dict], solr_doc.get('editions'))
if isinstance(editions_raw, dict):
editions = editions_raw.get('docs', [])
else:
editions = editions_raw or []

return editions[0] if editions else None

add_availability(
[get_edition(doc) or doc for doc in works if doc.get('title')]
)

docs |= {
'want-to-read': want_to_read,
'currently-reading': currently_reading,
'already-read': already_read,
}

return render['account/mybooks'](
mb.user,
docs,
Expand Down Expand Up @@ -526,7 +535,7 @@ def get_works(
sort_order: str = 'desc',
q: str = "",
year: int | None = None,
) -> LoggedBooksData:
) -> 'LoggedBooksData':
"""
Get works for want-to-read, currently-reading, and already-read as
determined by {key}.
Expand Down
Loading