DeepTutor: Lifelong Personalized Tutoring. https://deeptutor.info/.
Python ai-agentsai-tutorclawbotcli-tooldeepresearchinteractive-learninglearningmulti-agent-systemsrag
Merge PR #1380: transcript-aware reading media stage
Bingxi Zhao (Frank)d99ce81805b4
diff --cc web/components/watching/WatchingBrowser.tsxindex 00e97d997,617e3c327..5d352023c--- a/web/components/watching/WatchingBrowser.tsx+++ b/web/components/watching/WatchingBrowser.tsx@@@ -32,46 -28,52 +32,50 @@@ type BrowserView = 'feed' | 'playlistsexport function WatchingBrowser({onDismiss,canDismiss,+ selectionMode = false,+ onSelectUrl,}: {- onDismiss(): void;- canDismiss: boolean;- selectionMode?: boolean;- onSelectUrl?(url: string): void;+ onDismiss(): void+ canDismiss: boolean++ selectionMode?: boolean++ onSelectUrl?(url: string): void}) {- const { t } = useTranslation();- const router = useRouter();- const auth = useAuthStatus();- const [account, setAccount] = useState<InvidiousAccountStatus | null>(null);- const [view, setView] = useState<BrowserView>("search");- const [input, setInput] = useState("");- const [query, setQuery] = useState("");- const [playlist, setPlaylist] = useState("");- const [page, setPage] = useState(1);- const [items, setItems] = useState<(InvidiousVideo | InvidiousPlaylist)[]>(- [],- );- const [busy, setBusy] = useState(false);- const [accountBusy, setAccountBusy] = useState(false);- const [error, setError] = useState("");- const [reload, setReload] = useState(0);- const scroll = useRef<HTMLDivElement>(null);- const restored = useRef(false);- const key = `watching-browser:${auth.userId ?? "local"}`;+ const { t } = useTranslation()+ const router = useRouter()+ const auth = useAuthStatus()+ const [account, setAccount] = useState<InvidiousAccountStatus | null>(null)+ const [view, setView] = useState<BrowserView>('search')+ const [input, setInput] = useState('')+ const [query, setQuery] = useState('')+ const [playlist, setPlaylist] = useState('')+ const [page, setPage] = useState(1)+ const [items, setItems] = useState<(InvidiousVideo | InvidiousPlaylist)[]>([])+ const [busy, setBusy] = useState(false)+ const [accountBusy, setAccountBusy] = useState(false)+ const [error, setError] = useState('')+ const [reload, setReload] = useState(0)+ const scroll = useRef<HTMLElement>(null)+ const restored = useRef(false)+ const key = `watching-browser:${auth.userId ?? 'local'}`useEffect(() => {- if (auth.loading || !auth.statusAvailable) return;- let alive = true;- setItems([]);- setAccount(null);- void invidiousAccount("status")- .then((status) => {- if (!alive) return;- setAccount(status);+ if (auth.loading || !auth.statusAvailable) return+ let alive = true+ setItems([])+ setAccount(null)+ void invidiousAccount('status')+ .then(status => {+ if (!alive) return+ setAccount(status)let saved: {- view?: BrowserView;- query?: string;- page?: number;- playlist?: string;- scroll?: number;- } = {};+ view?: BrowserView+ query?: string+ page?: number+ playlist?: string+ scroll?: number+ } = {}try {- saved = JSON.parse(browserStorage.readRaw("session", key) || "{}");+ saved = JSON.parse(browserStorage.readRaw('session', key) || '{}')} catch {/* Storage is optional. */}@@@ -172,222 -182,259 +176,223 @@@}}function select(url: string) {- remember(scroll.current?.scrollTop || 0);- if (onSelectUrl) onSelectUrl(url);- else router.push(`/watching?video=${encodeURIComponent(url)}`);- onDismiss();+ remember(scroll.current?.scrollTop || 0)- router.push(scopedUrl(`${WATCHING_HOME}?video=${encodeURIComponent(url)}`))++ if (onSelectUrl) onSelectUrl(url)++ else router.push(scopedUrl(`${WATCHING_HOME}?video=${encodeURIComponent(url)}`))+ onDismiss()}return (- <section className="watching-browser" aria-label={t("Browse videos")}>- <header className="flex flex-wrap items-center justify-between gap-3 border-b border-[var(--border)] p-5">- <div>- <h1 className="text-xl font-semibold">- {selectionMode ? t("Browse Invidious") : t("Immersive Watching")}- </h1>- <p className="mt-1 text-sm text-[var(--muted-foreground)]">- {selectionMode- ? t("Choose a video to add to this collection.")- : t("Your videos, with room to learn.")}- </p>- </div>- <div className="flex items-center gap-2 text-sm">- {canDismiss && (- <button className="watching-browser-button" onClick={onDismiss}>- <ArrowLeft size={16} />- {selectionMode ? t("Close") : t("Back to video")}- </button>- )}- <button- className="watching-browser-button"- disabled={accountBusy || auth.loading}- onClick={() => void (account?.connected ? disconnect() : connect())}- >- {accountBusy ? (- <Loader2 className="animate-spin" size={16} />- ) : (- <Link2 size={16} />- )}- {account?.connected- ? t("Disconnect Invidious")- : account?.needs_reauthorization- ? t("Reconnect Invidious")- : t("Connect Invidious")}- </button>- </div>- </header>- <div className="px-5 pt-5">- {account && !account.connected && (- <p className="mb-4 text-sm text-[var(--muted-foreground)]">- {t(- "Sign in with your Invidious account, then approve read-only access to return here. Your DeepTutor login is separate.",+ <section className="watching-browser" aria-label={t('Browse videos')}>+ <LearningShell+ scrollRef={scroll}+ onScroll={() => remember(scroll.current?.scrollTop || 0)}- title={t('Immersive Watching')}- subtitle={t('Your videos, with room to learn.')}++ title={t(selectionMode ? 'Browse Invidious' : 'Immersive Watching')}++ subtitle={t(selectionMode ? 'Choose a video to add to this collection.' : 'Your videos, with room to learn.')}+ action={+ <div className="flex items-center gap-2 text-sm">+ {canDismiss && (+ <button className="watching-browser-button" onClick={onDismiss}>+ <ArrowLeft size={16} />- {t('Back to video')}++ {t(selectionMode ? 'Close' : 'Back to video')}+ </button>)}- </p>- )}- <form- className="flex gap-2"- onSubmit={(event) => {- event.preventDefault();- if (/^https?:\/\//i.test(input.trim())) {- select(input.trim());- return;- }- setView("search");- setQuery(input.trim());- setPage(1);- }}- >- <input- className="min-w-0 flex-1 rounded-xl border border-[var(--border)] bg-[var(--background)] px-4 py-3"- aria-label={t("Search videos or paste a video link")}- placeholder={t("Search videos or paste a video link")}- value={input}- onChange={(e) => setInput(e.target.value)}- />- <button- className="watching-browser-button"- type="submit"- disabled={!input.trim()}- >- <Search size={18} />- <span className="hidden sm:inline">{t("Search")}</span>- </button>- </form>- <nav className="mt-4 flex gap-2" aria-label={t("Video browsing views")}>- {(- [- ["feed", Rss, t("Subscription feed")],- ["playlists", ListVideo, t("Playlists")],- ["search", Search, t("Search")],- ] as const- ).map(([tab, Icon, label]) => (<button- key={tab}className="watching-browser-button"- aria-pressed={- view === tab || (tab === "playlists" && view === "playlist")- }- onClick={() => {- setView(tab);- setPage(1);- }}- >- <Icon size={16} />- {label}- </button>- ))}- </nav>- </div>- <div- ref={scroll}- className="min-h-0 flex-1 overflow-y-auto p-5"- onScroll={() => remember(scroll.current?.scrollTop || 0)}- >- {error && (- <div- role="alert"- className="mb-4 rounded-xl border border-[var(--border)] p-4"- >- {t(error)}{" "}- <button- className="underline"- onClick={() => {- setReload((n) => n + 1);- if (!account)- void invidiousAccount("status")- .then(setAccount)- .catch(() => undefined);- }}+ disabled={accountBusy || auth.loading}+ onClick={() => void (account?.connected ? disconnect() : connect())}>- {t("Retry")}+ {accountBusy ? <Loader2 className="animate-spin" size={16} /> : <Link2 size={16} />}+ {account?.connected+ ? t('Disconnect Invidious')+ : account?.needs_reauthorization+ ? t('Reconnect Invidious')+ : t('Connect Invidious')}</button></div>- )}- {view !== "search" && account && !account.connected ? (- <div className="watching-browser-empty">- <Link2 size={32} />- <p>+ }+ >+ <div>+ {account && !account.connected && (+ <p className="mb-4 text-sm text-[var(--muted-foreground)]">{t(- "Connect your Invidious account to see subscriptions and playlists.",+ 'Sign in with your Invidious account, then approve read-only access to return here. Your DeepTutor login is separate.')}</p>- <button- className="watching-browser-button"- onClick={() => void connect()}- disabled={accountBusy}- >- {t("Connect Invidious")}+ )}+ <form+ className="flex gap-2"+ onSubmit={event => {+ event.preventDefault()+ if (/^https?:\/\//i.test(input.trim())) {+ select(input.trim())+ return+ }+ setView('search')+ setQuery(input.trim())+ setPage(1)+ }}+ >+ <input+ className="min-w-0 flex-1 rounded-xl border border-[var(--border)] bg-[var(--background)] px-4 py-3"+ aria-label={t('Search videos or paste a video link')}+ placeholder={t('Search videos or paste a video link')}+ value={input}+ onChange={e => setInput(e.target.value)}+ />+ <button className="watching-browser-button" type="submit" disabled={!input.trim()}>+ <Search size={18} />+ <span className="hidden sm:inline">{t('Search')}</span></button>- </div>- ) : busy ? (- <div role="status" className="watching-browser-empty">- <Loader2 className="animate-spin" />- {t("Loading videos…")}- </div>- ) : (- <>- {view === "playlist" && (+ </form>+ <nav className="mt-4 flex gap-2" aria-label={t('Video browsing views')}>+ {(+ [+ ['feed', Rss, t('Subscription feed')],+ ['playlists', ListVideo, t('Playlists')],+ ['search', Search, t('Search')],+ ] as const+ ).map(([tab, Icon, label]) => (<button- className="watching-browser-button mb-4"+ key={tab}+ className="watching-browser-button"+ aria-pressed={view === tab || (tab === 'playlists' && view === 'playlist')}onClick={() => {- setView("playlists");- setPage(1);+ setView(tab)+ setPage(1)}}>- <ArrowLeft size={16} />- {t("Playlists")}+ <Icon size={16} />+ {label}+ </button>+ ))}+ </nav>+ </div>+ <div className="mt-5">+ {error && (+ <LearningErrorState+ message={error}+ onRetry={() => {+ setReload(value => value + 1)+ if (!account)+ void invidiousAccount('status')+ .then(setAccount)+ .catch(() => undefined)+ }}+ />+ )}+ {view !== 'search' && account && !account.connected ? (+ <div className="watching-browser-empty">+ <Link2 size={32} />+ <p>{t('Connect your Invidious account to see subscriptions and playlists.')}</p>+ <button+ className="watching-browser-button"+ onClick={() => void connect()}+ disabled={accountBusy}+ >+ {t('Connect Invidious')}</button>- )}- <div className="watching-video-grid">- {items.map((item) => {- const isPlaylist = "playlistId" in item;- const video = isPlaylist ? item.videos?.[0] : item;- const thumbnail = video?.videoThumbnails?.find((thumb) =>- /^https?:\/\//.test(thumb.url),- )?.url;- return (- <button- key={isPlaylist ? item.playlistId : item.videoId}- className="watching-video-card"- onClick={() => {- if (isPlaylist) {- setPlaylist(item.playlistId);- setView("playlist");- setPage(1);- } else- select(- `https://www.youtube.com/watch?v=${encodeURIComponent(item.videoId)}`,- );- }}- >- <div className="relative flex aspect-video items-center justify-center overflow-hidden rounded-xl bg-[var(--muted)]">- {thumbnail ? (- <img- src={thumbnail}- alt=""- loading="lazy"- referrerPolicy="no-referrer"- className="h-full w-full object-cover"- />- ) : (- <Play size={28} />- )}- {!isPlaylist && (- <span className="absolute bottom-2 right-2 rounded bg-black/75 px-1.5 py-0.5 text-xs text-white">- {Math.floor((item.lengthSeconds || 0) / 60)}:- {String((item.lengthSeconds || 0) % 60).padStart(- 2,- "0",- )}- </span>- )}- </div>- <h2 className="mt-3 line-clamp-2 text-sm font-medium">- {item.title}- </h2>- <p className="mt-1 text-xs text-[var(--muted-foreground)]">- {isPlaylist- ? `${item.videoCount} ${t("videos")}`- : item.author}- </p>- </button>- );- })}</div>- {!items.length && !error && (- <div className="watching-browser-empty">- <Play size={32} />- <p>- {view === "search" && !query- ? t("Find a video to start learning.")- : t("No videos here yet.")}- </p>- </div>- )}- {view !== "playlists" && (items.length > 0 || page > 1) && (- <div className="mt-6 flex justify-center gap-4">+ ) : busy ? (+ <LearningSkeleton />+ ) : (+ <>+ {view === 'playlist' && (<button- className="watching-browser-button"- disabled={page <= 1}- onClick={() => setPage(page - 1)}+ className="watching-browser-button mb-4"+ onClick={() => {+ setView('playlists')+ setPage(1)+ }}>- {t("Previous")}- </button>- <span className="self-center">{page}</span>- <button- className="watching-browser-button"- disabled={!items.length}- onClick={() => setPage(page + 1)}- >- {t("Next")}+ <ArrowLeft size={16} />+ {t('Playlists')}</button>+ )}+ <div className="watching-video-grid">+ {items.map(item => {+ const isPlaylist = 'playlistId' in item+ const video = isPlaylist ? item.videos?.[0] : item+ const thumbnail = video?.videoThumbnails?.find(thumb =>+ /^https?:\/\//.test(thumb.url)+ )?.url+ return (+ <button+ key={isPlaylist ? item.playlistId : item.videoId}+ className="watching-video-card"+ onClick={() => {+ if (isPlaylist) {+ setPlaylist(item.playlistId)+ setView('playlist')+ setPage(1)+ } else+ select(+ `https://www.youtube.com/watch?v=${encodeURIComponent(item.videoId)}`+ )+ }}+ >+ <div className="relative flex aspect-video items-center justify-center overflow-hidden rounded-xl bg-[var(--muted)]">+ {thumbnail ? (+ <img+ src={thumbnail}+ alt=""+ loading="lazy"+ referrerPolicy="no-referrer"+ className="h-full w-full object-cover"+ />+ ) : (+ <Play size={28} />+ )}+ {!isPlaylist && (+ <span className="absolute bottom-2 right-2 rounded bg-black/75 px-1.5 py-0.5 text-xs text-white">+ {Math.floor((item.lengthSeconds || 0) / 60)}:+ {String((item.lengthSeconds || 0) % 60).padStart(2, '0')}+ </span>+ )}+ </div>+ <div className="mt-3 flex items-center gap-3 text-left">+ <LearningCardContent+ title={item.title}+ icon={isPlaylist ? <ListVideo size={18} /> : <Play size={18} />}+ subtitle={isPlaylist ? `${item.videoCount} ${t('videos')}` : item.author}+ />+ </div>+ </button>+ )+ })}</div>- )}- </>- )}- </div>+ {!items.length && !error && (+ <LearningEmptyState+ icon={<Play size={32} />}+ title={+ view === 'search' && !query+ ? t('Find a video to start learning.')+ : t('No videos here yet.')+ }+ />+ )}+ {view !== 'playlists' && (items.length > 0 || page > 1) && (+ <div className="mt-6 flex justify-center gap-4">+ <button+ className="watching-browser-button"+ disabled={page <= 1}+ onClick={() => setPage(page - 1)}+ >+ {t('Previous')}+ </button>+ <span className="self-center">{page}</span>+ <button+ className="watching-browser-button"+ disabled={!items.length}+ onClick={() => setPage(page + 1)}+ >+ {t('Next')}+ </button>+ </div>+ )}+ </>+ )}+ </div>+ </LearningShell></section>- );+ )}