feat(scheduler): report progress from every job + parallelize RSS polling

Every background job now reports progress, so the dashboard can show a live
bar for any run (not only enrich/backfill/shorts/maintenance): rss_poll and
subscriptions (runner), autotag, and playlist_sync gained progress.report
calls over their loops.

RSS polling now fetches the channel feeds concurrently (16 workers) instead
of one-at-a-time — a slow/unreachable feed no longer blocks the rest, cutting
a full poll of the catalogue from minutes to seconds. Feed fetches are
network-bound and run in the pool; DB inserts stay on the session's thread
(SQLAlchemy sessions aren't thread-safe), applied as each fetch completes.
Split the DB-write half of poll_rss_channel into apply_rss_feed so the fetch
and apply phases compose cleanly.
This commit is contained in:
npeter83 2026-06-19 02:43:37 +02:00
parent b5141ab112
commit e0971a23ec
4 changed files with 46 additions and 13 deletions

View file

@ -13,6 +13,7 @@ from sqlalchemy.orm import Session
log = logging.getLogger("subfeed.autotag") log = logging.getLogger("subfeed.autotag")
from app import progress
from app.config import settings from app.config import settings
from app.models import Channel, ChannelTag, Tag, Video from app.models import Channel, ChannelTag, Tag, Video
@ -270,13 +271,14 @@ def run_autotag_all(db: Session, only_missing: bool = False) -> dict:
) )
channels = db.execute(query).scalars().all() channels = db.execute(query).scalars().all()
tagged = 0 tagged = 0
for channel in channels: for i, channel in enumerate(channels, 1):
try: try:
apply_channel_autotags(db, channel) apply_channel_autotags(db, channel)
tagged += 1 tagged += 1
except Exception: except Exception:
db.rollback() db.rollback()
log.exception("Auto-tagging failed for channel %s", channel.id) log.exception("Auto-tagging failed for channel %s", channel.id)
progress.report(i, len(channels), "autotag")
removed = _cleanup_orphan_system_tags(db) removed = _cleanup_orphan_system_tags(db)
return {"channels_tagged": tagged, "orphan_tags_removed": removed} return {"channels_tagged": tagged, "orphan_tags_removed": removed}

View file

@ -12,7 +12,7 @@ from datetime import datetime, timezone
from sqlalchemy import delete, select from sqlalchemy import delete, select
from sqlalchemy.orm import Session from sqlalchemy.orm import Session
from app import quota from app import progress, quota
from app.auth import has_read_scope, has_write_scope from app.auth import has_read_scope, has_write_scope
from app.models import Channel, OAuthToken, Playlist, PlaylistItem, User, Video from app.models import Channel, OAuthToken, Playlist, PlaylistItem, User, Video
from app.sync.videos import apply_video_details, parse_dt from app.sync.videos import apply_video_details, parse_dt
@ -382,8 +382,9 @@ def sync_all_playlists(db: Session) -> dict:
.all() .all()
) )
total = 0 total = 0
for user in users: for i, user in enumerate(users, 1):
if not has_read_scope(user): if not has_read_scope(user):
progress.report(i, len(users), "playlist_sync")
continue continue
try: try:
with quota.attribute(user.id, "playlist_sync"): with quota.attribute(user.id, "playlist_sync"):
@ -394,4 +395,5 @@ def sync_all_playlists(db: Session) -> dict:
except Exception: except Exception:
db.rollback() db.rollback()
log.exception("Playlist sync crashed for user %s", user.id) log.exception("Playlist sync crashed for user %s", user.id)
progress.report(i, len(users), "playlist_sync")
return {"users": len(users), "playlists_synced": total} return {"users": len(users), "playlists_synced": total}

View file

@ -5,6 +5,7 @@ user" (any user with a stored refresh token) unless a YOUTUBE_API_KEY is configu
public reads. public reads.
""" """
import logging import logging
from concurrent.futures import ThreadPoolExecutor, as_completed
from sqlalchemy import select from sqlalchemy import select
from sqlalchemy.orm import Session from sqlalchemy.orm import Session
@ -16,15 +17,19 @@ log = logging.getLogger("subfeed.sync")
from app.models import Channel, OAuthToken, Subscription, User from app.models import Channel, OAuthToken, Subscription, User
from app.sync.subscriptions import import_subscriptions from app.sync.subscriptions import import_subscriptions
from app.sync.videos import ( from app.sync.videos import (
apply_rss_feed,
backfill_channel_deep, backfill_channel_deep,
backfill_channel_recent, backfill_channel_recent,
enrich_pending, enrich_pending,
poll_rss_channel,
reconcile_full_history, reconcile_full_history,
refresh_live, refresh_live,
run_shorts_classification, run_shorts_classification,
) )
from app.youtube.client import YouTubeClient from app.youtube.client import YouTubeClient
from app.youtube.rss import fetch_channel_feed
# RSS feeds are free and network-bound, so fetch many at once; DB writes stay single-threaded.
RSS_POLL_WORKERS = 16
def get_service_user(db: Session) -> User | None: def get_service_user(db: Session) -> User | None:
@ -43,13 +48,30 @@ def get_service_user(db: Session) -> User | None:
def run_rss_poll(db: Session, channels: list[Channel] | None = None) -> int: def run_rss_poll(db: Session, channels: list[Channel] | None = None) -> int:
if channels is None: if channels is None:
channels = db.execute(select(Channel)).scalars().all() channels = db.execute(select(Channel)).scalars().all()
total = len(channels)
new = 0 new = 0
for channel in channels: done = 0
try: # Fetch feeds concurrently (network-bound, no DB), then apply inserts on this thread as
new += poll_rss_channel(db, channel) # each fetch returns — a SQLAlchemy session isn't thread-safe. Pass the channel id (a
except Exception: # plain str) to the workers; the ORM instance is touched only here on the main thread.
db.rollback() futures = {}
log.exception("RSS poll failed for channel %s", channel.id) with ThreadPoolExecutor(max_workers=RSS_POLL_WORKERS) as pool:
for channel in channels:
futures[pool.submit(fetch_channel_feed, channel.id)] = channel
for fut in as_completed(futures):
channel = futures[fut]
try:
entries = fut.result()
except Exception:
log.exception("RSS fetch failed for channel %s", channel.id)
entries = []
try:
new += apply_rss_feed(db, channel, entries)
except Exception:
db.rollback()
log.exception("RSS apply failed for channel %s", channel.id)
done += 1
progress.report(done, total, "rss_poll")
return new return new
@ -90,12 +112,13 @@ def run_subscription_resync(db: Session) -> dict:
.scalars() .scalars()
.all() .all()
) )
for user in users: for i, user in enumerate(users, 1):
try: try:
import_subscriptions(db, user) import_subscriptions(db, user)
except Exception: except Exception:
db.rollback() db.rollback()
log.exception("Subscription resync failed for user %s", user.id) log.exception("Subscription resync failed for user %s", user.id)
progress.report(i, len(users), "subscriptions")
return {"users": len(users)} return {"users": len(users)}

View file

@ -67,8 +67,10 @@ def _insert_stubs(db: Session, rows: list[dict]) -> int:
# --- RSS (free) --- # --- RSS (free) ---
def poll_rss_channel(db: Session, channel: Channel) -> int: def apply_rss_feed(db: Session, channel: Channel, entries: list[dict]) -> int:
entries = fetch_channel_feed(channel.id) """Insert new video stubs from an already-fetched feed and stamp the channel's last RSS
time. DB-only must run on the session's own thread; the network fetch
(fetch_channel_feed) is kept separate so callers like run_rss_poll can parallelise it."""
inserted = _insert_stubs(db, entries) inserted = _insert_stubs(db, entries)
channel.last_rss_at = _now() channel.last_rss_at = _now()
db.add(channel) db.add(channel)
@ -76,6 +78,10 @@ def poll_rss_channel(db: Session, channel: Channel) -> int:
return inserted return inserted
def poll_rss_channel(db: Session, channel: Channel) -> int:
return apply_rss_feed(db, channel, fetch_channel_feed(channel.id))
# --- Backfill (uploads playlist; costs quota) --- # --- Backfill (uploads playlist; costs quota) ---
def _stub_from_playlist_item(item: dict, channel_id: str) -> dict | None: def _stub_from_playlist_item(item: dict, channel_id: str) -> dict | None:
content = item.get("contentDetails", {}) content = item.get("contentDetails", {})