Merge pull request #6014 from internetarchive/trending

Adding trending view

Author: jimchamp

openlibrary/core/bookshelves.py

@@ -1,8 +1,11 @@
 from typing import Literal
 from openlibrary.utils.dateutil import DATE_ONE_MONTH_AGO, DATE_ONE_WEEK_AGO
 
+import logging
 from . import db
 
+logger = logging.getLogger(__name__)
+
 
 class Bookshelves:
 
@@ -70,22 +73,26 @@ def total_unique_users(cls, since=None):
         return results[0] if results else None
 
     @classmethod
-    def most_logged_books(cls, shelf_id, limit=10, since=False):
+    def most_logged_books(cls, shelf_id=None, limit=10, since=False):
         """Returns a ranked list of work OLIDs (in the form of an integer --
         i.e. OL123W would be 123) which have been most logged by
         users. This query is limited to a specific shelf_id (e.g. 1
         for "Want to Read").
         """
         oldb = db.get_db()
-        query = 'select work_id, count(*) as cnt from bookshelves_books WHERE bookshelf_id=$shelf_id '
+        where = 'WHERE bookshelf_id' + ('=$shelf_id' if shelf_id else ' IS NOT NULL ')
         if since:
-            query += " AND created >= $since"
+            where += 'AND created >= $since'
+        query = f'select work_id, count(*) as cnt from bookshelves_books {where}'
         query += ' group by work_id order by cnt desc limit $limit'
-        return list(
+        logger.info("Query: %s", query)
+        logged_books = list(
             oldb.query(
                 query, vars={'shelf_id': shelf_id, 'limit': limit, 'since': since}
             )
         )
+        logger.info("Results: %s", logged_books)
+        return logged_books
 
     @classmethod
     def count_total_books_logged_by_user(cls, username, bookshelf_ids=None):
@@ -167,12 +174,30 @@ def get_users_logged_books(
                 "LIMIT $limit OFFSET $offset"
             )
         if bookshelf_id is None:
-            query = "SELECT * from bookshelves_books WHERE " "username=$username"
+            query = "SELECT * from bookshelves_books WHERE username=$username"
             # XXX Removing limit, offset, etc from data looks like a bug
             # unrelated / not fixing in this PR.
             data = {'username': username}
         return list(oldb.query(query, vars=data))
 
+
+    @classmethod
+    def get_recently_logged_books(cls, bookshelf_id=None, limit=50, page=1):
+        oldb = db.get_db()
+        page = int(page) if page else 1
+        data = {
+            'bookshelf_id': bookshelf_id,
+            'limit': limit,
+            'offset': limit * (page - 1),
+        }
+        where = "WHERE bookshelf_id=$bookshelf_id " if bookshelf_id else ""
+        query = (
+            f"SELECT * from bookshelves_books {where} "
+            "ORDER BY created DESC LIMIT $limit OFFSET $offset"
+        )
+        return list(oldb.query(query, vars=data))
+
+
     @classmethod
     def get_users_read_status_of_work(cls, username, work_id):
         """A user can mark a book as (1) want to read, (2) currently reading,

openlibrary/templates/stats/readinglog.html

@@ -59,18 +59,19 @@ <h2>$_('# Books Starred')</h2>
   </div>
 
   <div class="admin-section">
-    <h3>$_('Most Wanted Books (All Time)')</h3>
+
+    <h3>$_('Most Wanted Books (This Month)')</h3>
     <div class="mybooks-list">
-      <ul class="list-books">
-        $for book in stats['leaderboard']['most_wanted_all']:
+     <ul class="list-books">
+        $for book in stats['leaderboard']['most_wanted_month']:
             $:macros.SearchResultsWork(book['work'], decorations=ungettext("Added 1 time", "Added %(count)d times", book['cnt'], count=book['cnt']), availability=book.get('availability'))
       </ul>
     </div>
 
-    <h3>$_('Most Wanted Books (This Month)')</h3>
+    <h3>$_('Most Wanted Books (All Time)')</h3>
     <div class="mybooks-list">
       <ul class="list-books">
-        $for book in stats['leaderboard']['most_wanted_month']:
+        $for book in stats['leaderboard']['most_wanted_all']:
             $:macros.SearchResultsWork(book['work'], decorations=ungettext("Added 1 time", "Added %(count)d times", book['cnt'], count=book['cnt']), availability=book.get('availability'))
       </ul>
     </div>

openlibrary/templates/trending.html

@@ -0,0 +1,25 @@
+$def with (logged_books=None, mode='now')
+
+<div id="contentBody">
+  $ pages = {'now': 'Now', 'daily': 'Today', 'weekly': 'This Week', 'monthly': 'This Month', 'yearly': 'This Year', 'forever': 'All Time'}
+  <h1>$_('Trending Books'): $_(pages[mode])</h1>
+  <p>$_("See what readers from the community are adding to their bookshelves")</p>
+  <p>
+    $for p in pages:
+      <a style="$('font-weight: bold;' if p==mode else '')" href="/trending/$(p)">$pages[p]</a>
+  </p>
+
+  <div class="mybooks-list">
+    <ul class="list-books">
+      $if logged_books:
+        $for entry in logged_books:
+          $if 'bookshelf_id' in entry:
+            $ shelf = {1: "Want to Read", 2: "Currently Reading", 3: "Read"}[entry['bookshelf_id']]
+            $ extra = "Someone marked as " + shelf + ", " + entry['created'].strftime("%m/%d/%Y at %H:%M:%S")
+          $else:
+            $ extra = 'Logged %i times %s' % (entry['cnt'], pages[mode])
+          $if entry.get('work'):
+            $:macros.SearchResultsWork(entry['work'], extra=extra, availability=entry['work'].get('availability'))
+    </ul>
+  </div>
+</div>

openlibrary/utils/dateutil.py

@@ -30,8 +30,10 @@ def date_n_days_ago(n=None, start=None):
     return (_start - datetime.timedelta(days=n)) if n else None
 
 
+DATE_ONE_YEAR_AGO = date_n_days_ago(n=365)
 DATE_ONE_MONTH_AGO = date_n_days_ago(n=days_in_current_month())
 DATE_ONE_WEEK_AGO = date_n_days_ago(n=7)
+DATE_ONE_DAY_AGO = date_n_days_ago(n=1)
 
 
 def parse_date(datestr):

openlibrary/views/loanstats.py

@@ -32,6 +32,27 @@ def reading_log_summary():
     reading_log_summary, 'stats.readling_log_summary', timeout=dateutil.HOUR_SECS
 )
 
+def cached_get_most_logged_books(shelf_id=None, since_days=1, limit=20):
+    return cache.memcache_memoize(
+        get_most_logged_books, 'stats.trending', timeout=dateutil.HOUR_SECS
+    )(shelf_id=shelf_id, since_days=since_days, limit=limit)
+
+def get_most_logged_books(shelf_id=None, since_days=1, limit=20):
+    """
+    shelf_id: Bookshelves.PRESET_BOOKSHELVES['Want to Read'|'Already Read'|'Currently Reading']
+    since: DATE_ONE_YEAR_AGO, DATE_ONE_MONTH_AGO, DATE_ONE_WEEK_AGO, DATE_ONE_DAY_AGO
+    """
+    # enable to work w/ cached
+    if 'env' not in web.ctx:
+        delegate.fakeload()
+
+    # Return as dict to enable cache serialization
+    return [dict(book) for book in
+            Bookshelves.most_logged_books(
+                shelf_id=shelf_id,
+                since=dateutil.date_n_days_ago(since_days),
+                limit=limit)]
+
 
 def reading_log_leaderboard(limit=None):
     # enable to work w/ cached
@@ -72,7 +93,6 @@ def get_cached_reading_log_stats(limit):
     stats.update(cached_reading_log_leaderboard(limit))
     return stats
 
-
 class stats(app.view):
     path = "/stats"
 
@@ -88,14 +108,57 @@ class lending_stats(app.view):
     def GET(self, key, value):
         raise web.seeother("/")
 
+def get_activity_stream(limit=None):
+    # enable to work w/ cached
+    if 'env' not in web.ctx:
+        delegate.fakeload()
+    return Bookshelves.get_recently_logged_books(limit=limit)
+
+def get_cached_activity_stream(limit):
+    return cache.memcache_memoize(
+        get_activity_stream,
+        'stats.activity_stream',
+        timeout=dateutil.HOUR_SECS,
+    )(limit)
+
+class activity_stream(app.view):
+    path = "/trending(/?.*)"
+
+    def GET(self, page=''):
+        if not page:
+            raise web.seeother("/trending/now")
+        page = page[1:]
+        limit = 20
+        if page == "now":
+            logged_books = get_activity_stream(limit=limit)
+        else:
+            shelf_id = None  # optional; get from web.input()?
+            logged_books = cached_get_most_logged_books(since_days={
+                'daily': 1,
+                'weekly': 7,
+                'monthly': 30,
+                'yearly': 365,
+                'forever': None,
+            }[page], limit=limit)
+
+        work_index = get_solr_works(f"/works/OL{book['work_id']}W" for book in logged_books)
+        availability_index = get_availabilities(work_index.values())
+        for work_key in availability_index:
+            work_index[work_key]['availability'] = availability_index[work_key]
+        for i, logged_book in enumerate(logged_books):
+            key = f"/works/OL{logged_book['work_id']}W"
+            if key in work_index:
+                logged_books[i]['work'] = work_index[key]
+        return app.render_template("trending", logged_books=logged_books, mode=page)
+
 
 class readinglog_stats(app.view):
     path = "/stats/readinglog"
 
     def GET(self):
         MAX_LEADERBOARD_SIZE = 50
-        i = web.input(limit="10")
-        limit = int(i.limit) if int(i.limit) < 51 else 50
+        i = web.input(limit="10", mode="all")
+        limit = min(int(i.limit), 50)
 
         stats = get_cached_reading_log_stats(limit=limit)
 

static/css/base/common.less

@@ -28,7 +28,7 @@ td {
   padding: 0;
 }
 h1 {
-  margin: 20px;
+  margin: 20px 0;
 }
 button {
   outline: none;