Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3014ee0d60 | ||
|
|
a269d4a200 | ||
|
|
bdbdce7de1 | ||
|
|
748d5eb0bd | ||
|
|
fa57ee0532 |
@@ -162,3 +162,32 @@ allow per-provider when a user connects one.
|
||||
|
||||
_Snapshot date 2026-06-02. Items marked **confirm** were not verified to a pinned source at
|
||||
snapshot time — check brain or the live cluster before depending on them._
|
||||
|
||||
## Stage 1 — multi-user facts (verified 2026-06-03)
|
||||
|
||||
### Postgres RLS (ADR-012)
|
||||
- **The deployed DSN MUST connect as a non-superuser, non-BYPASSRLS role.** The
|
||||
app uses the `tapir` role (table owner, non-superuser). `FORCE ROW LEVEL
|
||||
SECURITY` is applied on all user-owned tables; a superuser DSN silently bypasses
|
||||
FORCE and isolation is dead in prod. Verify: `SELECT rolsuper FROM pg_roles
|
||||
WHERE rolname = 'tapir'` must return `f`.
|
||||
- Scoping is via `set_config('tapir.current_user_id', $userID, true)` (transaction-
|
||||
local, auto-resets on commit — never leaks across a pooled connection).
|
||||
|
||||
### Per-user YouTube token persistence
|
||||
- Stage-1 uses the **file-backed SecretStore** at `TAPIR_SECRETS_FILE=/data/secrets.json`
|
||||
mounted from a **PVC** (`tapir-secrets`, 64Mi, RWO). Tokens survive pod restarts.
|
||||
Upgrading to an ESO-backed per-user SecretStore is backlog (infra#86).
|
||||
- Per-user token ref scheme: `youtube/<userID>/refresh_token` (Worker C, ADR-006).
|
||||
The Stage-0 single ref `youtube/refresh_token` is no longer used by `serve`; it
|
||||
remains valid for the CLI `tapir run` (single-user, host-side).
|
||||
|
||||
### Web YouTube connect
|
||||
- Redirect URI (registered in Google OAuth client, type Web): `https://tapir.d-ma.be/oauth/youtube/callback`.
|
||||
- Config env: `TAPIR_YT_CONNECT_REDIRECT_URL=https://tapir.d-ma.be/oauth/youtube/callback`.
|
||||
`TAPIR_YT_CLIENT_ID` / `TAPIR_YT_CLIENT_SECRET` from the Web client (not the Desktop client used for the CLI).
|
||||
|
||||
### Identity resolution
|
||||
- `user_identities(dex_subject → user_id)` table is **intentionally NOT RLS-enabled**
|
||||
(it's auth plumbing, holds no user data; data isolation is on the user-owned tables).
|
||||
All data access after subject resolution goes through `withUser`.
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
ALTER TABLE videos DROP COLUMN IF EXISTS summarize_requested;
|
||||
ALTER TABLE users DROP COLUMN IF EXISTS auto_summarize;
|
||||
@@ -0,0 +1,17 @@
|
||||
-- Migration 006: summarization mode (per-user auto/manual + per-video queue).
|
||||
--
|
||||
-- auto_summarize is a per-user setting (not a global one): multi-user ready per
|
||||
-- ADR-012. FALSE default makes MANUAL the out-of-the-box behavior — `tapir run`
|
||||
-- discovers new videos but only summarizes the ones the user explicitly queued.
|
||||
--
|
||||
-- summarize_requested is the per-video manual queue flag. The web "Summarize"
|
||||
-- button sets it TRUE; the next `tapir run` picks it up, summarizes, and clears
|
||||
-- it back to FALSE. In auto mode it is unused.
|
||||
--
|
||||
-- No RLS policy changes needed: both columns are added to tables that already
|
||||
-- carry user_id and have ENABLE + FORCE ROW LEVEL SECURITY (migration 003). A new
|
||||
-- column on an RLS-protected table inherits that protection automatically — the
|
||||
-- existing users_isolation / videos_isolation policies gate every row, so these
|
||||
-- columns are only ever readable/writable for the row's own user.
|
||||
ALTER TABLE users ADD COLUMN auto_summarize BOOLEAN NOT NULL DEFAULT FALSE;
|
||||
ALTER TABLE videos ADD COLUMN summarize_requested BOOLEAN NOT NULL DEFAULT FALSE;
|
||||
@@ -39,6 +39,16 @@ type SummaryRow struct {
|
||||
FallbackUsed bool
|
||||
CreatedAt time.Time
|
||||
Actions []string // current active actions for this video; nil when none
|
||||
|
||||
// Summarized reports whether a summary exists for this video. The summary-only
|
||||
// reads (ListSummaries/GetSummaryByVideo) always yield true; the all-videos
|
||||
// read (ListVideos) yields false for a discovered-but-unsummarized video, whose
|
||||
// Summary/Highlights/AIProvider fields are then empty.
|
||||
Summarized bool
|
||||
// SummarizeRequested reflects videos.summarize_requested: the manual queue flag
|
||||
// set by the web "Summarize" button and cleared by the next `tapir run`. Only
|
||||
// populated by ListVideos/GetVideoRow (summary-only reads leave it false).
|
||||
SummarizeRequested bool
|
||||
}
|
||||
|
||||
// selectSummary is the shared projection for both reads. videos is LEFT JOINed
|
||||
@@ -101,6 +111,156 @@ func (s *Store) ListSummaries(ctx context.Context, userID string, limit int) ([]
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// selectVideo is the all-videos projection: it drives from the videos table and
|
||||
// LEFT JOINs the (at most one) summary, so a discovered-but-unsummarized video
|
||||
// still appears with empty summary fields. The column order mirrors selectSummary
|
||||
// for the shared fields, then appends summarized + summarize_requested. created_at
|
||||
// falls back to the video's seen_at when there is no summary, so the read-side row
|
||||
// always carries a sortable timestamp.
|
||||
const selectVideo = `
|
||||
SELECT v.id,
|
||||
v.provider_video_id,
|
||||
COALESCE(v.title, ''),
|
||||
v.provider,
|
||||
COALESCE(v.url, ''),
|
||||
v.published_at,
|
||||
COALESCE(s.summary, ''),
|
||||
s.highlights,
|
||||
s.takeaways,
|
||||
COALESCE(s.ai_provider, ''),
|
||||
COALESCE(s.ai_model, ''),
|
||||
COALESCE(s.fallback_used, FALSE),
|
||||
COALESCE(s.created_at, v.seen_at),
|
||||
(s.id IS NOT NULL) AS summarized,
|
||||
v.summarize_requested
|
||||
FROM videos v
|
||||
LEFT JOIN summaries s ON s.video_id = v.id AND s.user_id = v.user_id`
|
||||
|
||||
// ListVideos returns ALL of the user's videos — summarized and not — most recent
|
||||
// first by seen_at, capped at limit (non-positive defaults to 50). Unsummarized
|
||||
// videos come back with Summarized=false and empty summary fields, so the list
|
||||
// view can render them with a "Summarize" affordance. Scoped by user_id.
|
||||
func (s *Store) ListVideos(ctx context.Context, userID string, limit int) ([]SummaryRow, error) {
|
||||
if limit <= 0 {
|
||||
limit = 50
|
||||
}
|
||||
var out []SummaryRow
|
||||
if err := s.withUser(ctx, userID, func(tx pgx.Tx) error {
|
||||
rows, err := tx.Query(ctx,
|
||||
selectVideo+`
|
||||
WHERE v.user_id = $1
|
||||
ORDER BY v.seen_at DESC
|
||||
LIMIT $2`,
|
||||
userID, limit)
|
||||
if err != nil {
|
||||
return fmt.Errorf("store: list videos: %w", err)
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
for rows.Next() {
|
||||
row, err := scanVideoRow(rows)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
out = append(out, row)
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return fmt.Errorf("store: iterate videos: %w", err)
|
||||
}
|
||||
return nil
|
||||
}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := s.attachActions(ctx, userID, out); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// GetVideoRow returns a single video row (summarized or not) for (userID,
|
||||
// videoID), used to re-render one card after queuing it. Returns ErrNotFound when
|
||||
// the user has no such video. Scoped by user_id.
|
||||
func (s *Store) GetVideoRow(ctx context.Context, userID, videoID string) (*SummaryRow, error) {
|
||||
var (
|
||||
row SummaryRow
|
||||
found bool
|
||||
)
|
||||
if err := s.withUser(ctx, userID, func(tx pgx.Tx) error {
|
||||
rows, err := tx.Query(ctx,
|
||||
selectVideo+`
|
||||
WHERE v.user_id = $1 AND v.id = $2`,
|
||||
userID, videoID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("store: get video: %w", err)
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
if !rows.Next() {
|
||||
if err := rows.Err(); err != nil {
|
||||
return fmt.Errorf("store: get video: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
row, err = scanVideoRow(rows)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
found = true
|
||||
return nil
|
||||
}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if !found {
|
||||
return nil, ErrNotFound
|
||||
}
|
||||
holder := []SummaryRow{row}
|
||||
if err := s.attachActions(ctx, userID, holder); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &holder[0], nil
|
||||
}
|
||||
|
||||
// scanVideoRow reads one row in the selectVideo column order. published_at is
|
||||
// nullable so it scans through a pointer.
|
||||
func scanVideoRow(rows pgx.Row) (SummaryRow, error) {
|
||||
var (
|
||||
row SummaryRow
|
||||
highlights []byte
|
||||
takeaways []byte
|
||||
publishedAt *time.Time
|
||||
)
|
||||
if err := rows.Scan(
|
||||
&row.VideoID,
|
||||
&row.ProviderVideoID,
|
||||
&row.Title,
|
||||
&row.Channel,
|
||||
&row.URL,
|
||||
&publishedAt,
|
||||
&row.Summary,
|
||||
&highlights,
|
||||
&takeaways,
|
||||
&row.AIProvider,
|
||||
&row.AIModel,
|
||||
&row.FallbackUsed,
|
||||
&row.CreatedAt,
|
||||
&row.Summarized,
|
||||
&row.SummarizeRequested,
|
||||
); err != nil {
|
||||
return SummaryRow{}, fmt.Errorf("store: scan video: %w", err)
|
||||
}
|
||||
if publishedAt != nil {
|
||||
row.PublishedAt = *publishedAt
|
||||
}
|
||||
var err error
|
||||
if row.Highlights, err = unmarshalList(highlights); err != nil {
|
||||
return SummaryRow{}, fmt.Errorf("store: unmarshal highlights: %w", err)
|
||||
}
|
||||
if row.Takeaways, err = unmarshalList(takeaways); err != nil {
|
||||
return SummaryRow{}, fmt.Errorf("store: unmarshal takeaways: %w", err)
|
||||
}
|
||||
return row, nil
|
||||
}
|
||||
|
||||
// GetSummaryByVideo returns the full summary for (userID, videoID), including
|
||||
// highlights and takeaways. Returns ErrNotFound when the user has no such
|
||||
// summary. Scoped by user_id.
|
||||
|
||||
@@ -181,6 +181,7 @@ func TestRLSEnforcesPerUserIsolation(t *testing.T) {
|
||||
}{
|
||||
{"update users", `UPDATE users SET display_name = 'hacked' WHERE id = $1`, b.userID},
|
||||
{"update videos", `UPDATE videos SET title = 'hacked' WHERE user_id = $1`, b.userID},
|
||||
{"queue videos summarize", `UPDATE videos SET summarize_requested = TRUE WHERE id = $1`, b.videoID},
|
||||
{"update transcripts", `UPDATE transcripts SET content = 'hacked' WHERE user_id = $1`, b.userID},
|
||||
{"update summaries", `UPDATE summaries SET summary = 'hacked' WHERE user_id = $1`, b.userID},
|
||||
{"update summary_actions", `UPDATE summary_actions SET action = 'skipped' WHERE user_id = $1`, b.userID},
|
||||
@@ -218,5 +219,10 @@ func TestRLSEnforcesPerUserIsolation(t *testing.T) {
|
||||
require.Equal(t, 1, bDeliveries, "A's DELETE must not have removed B's delivery")
|
||||
require.Equal(t, 1, bConnections, "A's writes must not have touched B's connection")
|
||||
|
||||
var bRequested bool
|
||||
require.NoError(t, super.QueryRow(ctx,
|
||||
`SELECT summarize_requested FROM videos WHERE user_id = $1`, b.userID).Scan(&bRequested))
|
||||
require.False(t, bRequested, "A scoped must not have queued B's video for summarization")
|
||||
|
||||
_ = a // a's ids are seeded for the symmetric read assertions above
|
||||
}
|
||||
|
||||
@@ -0,0 +1,112 @@
|
||||
package store
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
|
||||
"github.com/jackc/pgx/v5"
|
||||
)
|
||||
|
||||
// SetAutoSummarize sets the user's auto/manual summarization mode. TRUE =
|
||||
// automatic (every new video is summarized by `tapir run`); FALSE = manual (the
|
||||
// user queues videos individually). Per-user, not global (ADR-012). Scoped via
|
||||
// withUser, so RLS confines the UPDATE to the calling user's own row.
|
||||
func (s *Store) SetAutoSummarize(ctx context.Context, userID string, enabled bool) error {
|
||||
return s.withUser(ctx, userID, func(tx pgx.Tx) error {
|
||||
// Ensure the row exists (FK/identity target) before the UPDATE — mirrors
|
||||
// the Deliver/UpsertVideo paths, so toggling mode works even before the
|
||||
// first summary lands.
|
||||
if _, err := tx.Exec(ctx,
|
||||
`INSERT INTO users (id) VALUES ($1) ON CONFLICT (id) DO NOTHING`,
|
||||
userID); err != nil {
|
||||
return fmt.Errorf("store: upsert user: %w", err)
|
||||
}
|
||||
if _, err := tx.Exec(ctx,
|
||||
`UPDATE users SET auto_summarize = $1 WHERE id = $2`, enabled, userID); err != nil {
|
||||
return fmt.Errorf("store: set auto summarize: %w", err)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
// GetAutoSummarize reports the user's summarization mode (TRUE = automatic). An
|
||||
// absent user row reads as FALSE (manual), the safe default. Scoped via withUser.
|
||||
func (s *Store) GetAutoSummarize(ctx context.Context, userID string) (bool, error) {
|
||||
var enabled bool
|
||||
if err := s.withUser(ctx, userID, func(tx pgx.Tx) error {
|
||||
err := tx.QueryRow(ctx,
|
||||
`SELECT auto_summarize FROM users WHERE id = $1`, userID).Scan(&enabled)
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
enabled = false
|
||||
return nil
|
||||
}
|
||||
return err
|
||||
}); err != nil {
|
||||
return false, fmt.Errorf("store: get auto summarize: %w", err)
|
||||
}
|
||||
return enabled, nil
|
||||
}
|
||||
|
||||
// RequestSummarize queues a single video for manual summarization by setting its
|
||||
// summarize_requested flag. The next `tapir run` picks it up and clears the flag.
|
||||
// Returns ErrNotFound when the video does not exist or is not owned by the user
|
||||
// (RLS hides another user's row, so the UPDATE matches zero rows). Scoped via
|
||||
// withUser.
|
||||
func (s *Store) RequestSummarize(ctx context.Context, userID, videoID string) error {
|
||||
return s.withUser(ctx, userID, func(tx pgx.Tx) error {
|
||||
ct, err := tx.Exec(ctx,
|
||||
`UPDATE videos SET summarize_requested = TRUE WHERE id = $1`, videoID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("store: request summarize: %w", err)
|
||||
}
|
||||
if ct.RowsAffected() == 0 {
|
||||
return ErrNotFound
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
// RequestedVideoIDs returns the set of the user's video ids currently flagged for
|
||||
// manual summarization. The run loop loads it once per pass (mirroring
|
||||
// SeenVideoIDs) to decide which discovered videos to process in manual mode.
|
||||
// Scoped by user_id.
|
||||
func (s *Store) RequestedVideoIDs(ctx context.Context, userID string) (map[string]bool, error) {
|
||||
requested := make(map[string]bool)
|
||||
if err := s.withUser(ctx, userID, func(tx pgx.Tx) error {
|
||||
rows, err := tx.Query(ctx,
|
||||
`SELECT id FROM videos WHERE user_id = $1 AND summarize_requested = TRUE`, userID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("store: requested video ids: %w", err)
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
for rows.Next() {
|
||||
var id string
|
||||
if err := rows.Scan(&id); err != nil {
|
||||
return fmt.Errorf("store: scan requested id: %w", err)
|
||||
}
|
||||
requested[id] = true
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return fmt.Errorf("store: iterate requested ids: %w", err)
|
||||
}
|
||||
return nil
|
||||
}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return requested, nil
|
||||
}
|
||||
|
||||
// ClearSummarizeRequested resets a video's manual queue flag, called by the run
|
||||
// loop after a queued video is successfully summarized so it is not re-processed
|
||||
// and the list view drops the "Queued" chip. Scoped via withUser.
|
||||
func (s *Store) ClearSummarizeRequested(ctx context.Context, userID, videoID string) error {
|
||||
return s.withUser(ctx, userID, func(tx pgx.Tx) error {
|
||||
if _, err := tx.Exec(ctx,
|
||||
`UPDATE videos SET summarize_requested = FALSE WHERE id = $1`, videoID); err != nil {
|
||||
return fmt.Errorf("store: clear summarize requested: %w", err)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,126 @@
|
||||
package store_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"testing"
|
||||
|
||||
"github.com/jackc/pgx/v5/pgxpool"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"gitea.d-ma.be/mathias/tapir/internal/adapters/store"
|
||||
)
|
||||
|
||||
// seedBareVideo inserts a videos row with no summary, so the all-videos read and
|
||||
// the manual-queue flag can be exercised without a delivered summary.
|
||||
func seedBareVideo(t *testing.T, p *pgxpool.Pool, userID, videoID, title string) {
|
||||
t.Helper()
|
||||
_, err := p.Exec(context.Background(),
|
||||
`INSERT INTO users (id) VALUES ($1) ON CONFLICT (id) DO NOTHING`, userID)
|
||||
require.NoError(t, err)
|
||||
_, err = p.Exec(context.Background(),
|
||||
`INSERT INTO videos (id, user_id, provider, provider_video_id, title)
|
||||
VALUES ($1, $2, 'youtube', $3, $4)`,
|
||||
videoID, userID, "pv-"+videoID[:8], title)
|
||||
require.NoError(t, err)
|
||||
}
|
||||
|
||||
func TestAutoSummarizeRoundTripDefaultsFalse(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
s := newStore(t)
|
||||
resetDB(t, rawPool(t))
|
||||
|
||||
// Unknown / fresh user defaults to manual (false).
|
||||
got, err := s.GetAutoSummarize(ctx, userA)
|
||||
require.NoError(t, err)
|
||||
require.False(t, got, "default mode is manual")
|
||||
|
||||
require.NoError(t, s.SetAutoSummarize(ctx, userA, true))
|
||||
got, err = s.GetAutoSummarize(ctx, userA)
|
||||
require.NoError(t, err)
|
||||
require.True(t, got, "set to automatic round-trips")
|
||||
|
||||
require.NoError(t, s.SetAutoSummarize(ctx, userA, false))
|
||||
got, err = s.GetAutoSummarize(ctx, userA)
|
||||
require.NoError(t, err)
|
||||
require.False(t, got, "set back to manual round-trips")
|
||||
}
|
||||
|
||||
func TestRequestSummarizeSetsFlag(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
s := newStore(t)
|
||||
p := rawPool(t)
|
||||
resetDB(t, p)
|
||||
seedBareVideo(t, p, userA, videoX, "X Title")
|
||||
|
||||
require.NoError(t, s.RequestSummarize(ctx, userA, videoX))
|
||||
|
||||
requested, err := s.RequestedVideoIDs(ctx, userA)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, map[string]bool{videoX: true}, requested)
|
||||
|
||||
// Clearing drops it from the requested set.
|
||||
require.NoError(t, s.ClearSummarizeRequested(ctx, userA, videoX))
|
||||
requested, err = s.RequestedVideoIDs(ctx, userA)
|
||||
require.NoError(t, err)
|
||||
require.Empty(t, requested)
|
||||
}
|
||||
|
||||
func TestRequestSummarizeMissingVideo(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
s := newStore(t)
|
||||
resetDB(t, rawPool(t))
|
||||
|
||||
err := s.RequestSummarize(ctx, userA, videoX)
|
||||
require.ErrorIs(t, err, store.ErrNotFound, "queuing a non-existent video reports not found")
|
||||
}
|
||||
|
||||
func TestListVideosReturnsSummarizedAndUnsummarized(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
s := newStore(t)
|
||||
p := rawPool(t)
|
||||
resetDB(t, p)
|
||||
|
||||
// videoX: discovered AND summarized. videoY: discovered, not yet summarized.
|
||||
seedBareVideo(t, p, userA, videoX, "Summarized One")
|
||||
seedBareVideo(t, p, userA, videoY, "Pending One")
|
||||
require.NoError(t, s.Deliver(ctx, summary(userA, videoX, "body x")))
|
||||
require.NoError(t, s.RequestSummarize(ctx, userA, videoY))
|
||||
|
||||
rows, err := s.ListVideos(ctx, userA, 50)
|
||||
require.NoError(t, err)
|
||||
require.Len(t, rows, 2, "both summarized and unsummarized videos are listed")
|
||||
|
||||
byID := map[string]store.SummaryRow{}
|
||||
for _, r := range rows {
|
||||
byID[r.VideoID] = r
|
||||
}
|
||||
|
||||
require.True(t, byID[videoX].Summarized)
|
||||
require.Equal(t, "body x", byID[videoX].Summary)
|
||||
require.False(t, byID[videoX].SummarizeRequested)
|
||||
|
||||
require.False(t, byID[videoY].Summarized, "no summary -> Summarized false")
|
||||
require.Empty(t, byID[videoY].Summary, "unsummarized row has empty summary")
|
||||
require.True(t, byID[videoY].SummarizeRequested, "queued video carries the flag")
|
||||
}
|
||||
|
||||
func TestListVideosIsUserScoped(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
s := newStore(t)
|
||||
p := rawPool(t)
|
||||
resetDB(t, p)
|
||||
seedBareVideo(t, p, userA, videoX, "A only")
|
||||
|
||||
rows, err := s.ListVideos(ctx, userB, 50)
|
||||
require.NoError(t, err)
|
||||
require.Empty(t, rows, "user B must not see user A's videos")
|
||||
}
|
||||
|
||||
func TestGetVideoRowNotFound(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
s := newStore(t)
|
||||
resetDB(t, rawPool(t))
|
||||
|
||||
_, err := s.GetVideoRow(ctx, userA, videoX)
|
||||
require.ErrorIs(t, err, store.ErrNotFound)
|
||||
}
|
||||
@@ -23,10 +23,15 @@ import (
|
||||
)
|
||||
|
||||
// VideoStore is the durable persistence the run loop needs: assign a stable id +
|
||||
// metadata, and read the already-summarized set. *store.Store satisfies it.
|
||||
// metadata, read the already-summarized set, and (for manual summarization mode)
|
||||
// read the user's mode + queued videos and clear a video's queue flag once it has
|
||||
// been summarized. *store.Store satisfies it.
|
||||
type VideoStore interface {
|
||||
UpsertVideo(ctx context.Context, v domain.Video) (string, error)
|
||||
SeenVideoIDs(ctx context.Context, userID string) (map[string]bool, error)
|
||||
GetAutoSummarize(ctx context.Context, userID string) (bool, error)
|
||||
RequestedVideoIDs(ctx context.Context, userID string) (map[string]bool, error)
|
||||
ClearSummarizeRequested(ctx context.Context, userID, videoID string) error
|
||||
}
|
||||
|
||||
// Processor runs the core use case for a single video. *usecase.Engine
|
||||
@@ -59,6 +64,7 @@ type Stats struct {
|
||||
Summarized int
|
||||
SkippedSeen int
|
||||
SkippedNoText int
|
||||
SkippedManual int // discovered but not queued, in manual mode
|
||||
Errors int
|
||||
}
|
||||
|
||||
@@ -82,6 +88,22 @@ func (r *Runner) RunOnce(ctx context.Context) (Stats, error) {
|
||||
return stats, fmt.Errorf("runner: load seen videos: %w", err)
|
||||
}
|
||||
|
||||
// Summarization mode (per-user, ADR-012). Auto = summarize every unseen video
|
||||
// (the original behavior). Manual = still discover/persist videos so the user
|
||||
// sees them, but only summarize the ones explicitly queued via the web UI
|
||||
// (summarize_requested). The queued set is loaded once per pass, like seen.
|
||||
auto, err := r.store.GetAutoSummarize(ctx, r.userID)
|
||||
if err != nil {
|
||||
return stats, fmt.Errorf("runner: load summarize mode: %w", err)
|
||||
}
|
||||
var requested map[string]bool
|
||||
if !auto {
|
||||
requested, err = r.store.RequestedVideoIDs(ctx, r.userID)
|
||||
if err != nil {
|
||||
return stats, fmt.Errorf("runner: load requested videos: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
subs, err := r.src.ListSubscriptions(ctx, r.userID)
|
||||
if err != nil {
|
||||
return stats, fmt.Errorf("runner: list subscriptions: %w", err)
|
||||
@@ -112,6 +134,14 @@ func (r *Runner) RunOnce(ctx context.Context) (Stats, error) {
|
||||
}
|
||||
seen[id] = true // also guard against the same video within this pass
|
||||
|
||||
// Manual mode: skip summarization for videos the user has not queued.
|
||||
// Discovery already happened (UpsertVideo above), so the new video is
|
||||
// visible in the list; it just isn't summarized until requested.
|
||||
if !auto && !requested[id] {
|
||||
stats.SkippedManual++
|
||||
continue
|
||||
}
|
||||
|
||||
if fetchDelay > 0 {
|
||||
time.Sleep(fetchDelay)
|
||||
}
|
||||
@@ -127,6 +157,15 @@ func (r *Runner) RunOnce(ctx context.Context) (Stats, error) {
|
||||
r.log.Info("skipped video (no transcript)", "video", v.ProviderVideoID, "title", v.Title)
|
||||
case res.Summary != nil:
|
||||
stats.Summarized++
|
||||
// In manual mode the video was processed because it was queued;
|
||||
// clear the flag so it is not re-summarized and the UI drops the
|
||||
// "Queued" chip. (Auto mode never sets the flag.)
|
||||
if !auto {
|
||||
if err := r.store.ClearSummarizeRequested(ctx, r.userID, id); err != nil {
|
||||
errs = append(errs, fmt.Errorf("clear summarize flag %q: %w", v.ProviderVideoID, err))
|
||||
stats.Errors++
|
||||
}
|
||||
}
|
||||
r.log.Info("summarized video", "video", v.ProviderVideoID, "title", v.Title,
|
||||
"provider", res.Summary.AIProvider, "model", res.Summary.AIModel)
|
||||
}
|
||||
@@ -145,7 +184,7 @@ func (r *Runner) Loop(ctx context.Context, interval time.Duration) error {
|
||||
r.log.Info("run pass complete",
|
||||
"candidates", stats.Candidates, "summarized", stats.Summarized,
|
||||
"skipped_seen", stats.SkippedSeen, "skipped_no_text", stats.SkippedNoText,
|
||||
"errors", stats.Errors)
|
||||
"skipped_manual", stats.SkippedManual, "errors", stats.Errors)
|
||||
if err != nil {
|
||||
r.log.Warn("run pass had errors", "err", err)
|
||||
}
|
||||
|
||||
@@ -40,9 +40,14 @@ func (f *fakeSource) FetchTranscript(_ context.Context, v domain.Video) (domain.
|
||||
|
||||
// fakeStore assigns deterministic ids ("id-"+provider video id) so a pre-seeded
|
||||
// seen set lines up with UpsertVideo output, modelling cross-restart dedup.
|
||||
// auto controls the summarization mode; requested is the manual-mode queue keyed
|
||||
// by store id; cleared records the ids whose queue flag the runner reset.
|
||||
type fakeStore struct {
|
||||
seen map[string]bool
|
||||
upserted []domain.Video
|
||||
auto bool
|
||||
requested map[string]bool
|
||||
cleared []string
|
||||
}
|
||||
|
||||
func (f *fakeStore) UpsertVideo(_ context.Context, v domain.Video) (string, error) {
|
||||
@@ -58,6 +63,23 @@ func (f *fakeStore) SeenVideoIDs(_ context.Context, _ string) (map[string]bool,
|
||||
return cp, nil
|
||||
}
|
||||
|
||||
func (f *fakeStore) GetAutoSummarize(_ context.Context, _ string) (bool, error) {
|
||||
return f.auto, nil
|
||||
}
|
||||
|
||||
func (f *fakeStore) RequestedVideoIDs(_ context.Context, _ string) (map[string]bool, error) {
|
||||
cp := make(map[string]bool, len(f.requested))
|
||||
for k, v := range f.requested {
|
||||
cp[k] = v
|
||||
}
|
||||
return cp, nil
|
||||
}
|
||||
|
||||
func (f *fakeStore) ClearSummarizeRequested(_ context.Context, _, videoID string) error {
|
||||
f.cleared = append(f.cleared, videoID)
|
||||
return nil
|
||||
}
|
||||
|
||||
type fakeSummarizer struct{}
|
||||
|
||||
func (fakeSummarizer) Summarize(_ context.Context, v domain.Video, _ domain.Transcript) (domain.Summary, error) {
|
||||
@@ -91,7 +113,7 @@ func TestRunOnce_SummarizesNewVideos(t *testing.T) {
|
||||
subs: []domain.Subscription{sub("chan1", "Channel One")},
|
||||
videos: map[string][]domain.Video{"chan1": {vid("v1", "Video 1"), vid("v2", "Video 2")}},
|
||||
}
|
||||
st := &fakeStore{seen: map[string]bool{}}
|
||||
st := &fakeStore{seen: map[string]bool{}, auto: true}
|
||||
sink := &recordingSink{}
|
||||
eng := usecase.NewEngine(src, fakeSummarizer{}, sink)
|
||||
r := runner.New(src, st, eng, testUser, quietLogger())
|
||||
@@ -114,7 +136,7 @@ func TestRunOnce_SkipsAlreadySummarized(t *testing.T) {
|
||||
videos: map[string][]domain.Video{"chan1": {vid("v1", "Video 1"), vid("v2", "Video 2")}},
|
||||
}
|
||||
// v1 was summarized in a prior run (durable seen set).
|
||||
st := &fakeStore{seen: map[string]bool{"id-v1": true}}
|
||||
st := &fakeStore{seen: map[string]bool{"id-v1": true}, auto: true}
|
||||
sink := &recordingSink{}
|
||||
eng := usecase.NewEngine(src, fakeSummarizer{}, sink)
|
||||
r := runner.New(src, st, eng, testUser, quietLogger())
|
||||
@@ -133,7 +155,7 @@ func TestRunOnce_SkipsVideosWithoutTranscript(t *testing.T) {
|
||||
videos: map[string][]domain.Video{"chan1": {vid("v1", "Video 1")}},
|
||||
transcripts: map[string]domain.Transcript{"v1": {Source: domain.SourceNone}},
|
||||
}
|
||||
st := &fakeStore{seen: map[string]bool{}}
|
||||
st := &fakeStore{seen: map[string]bool{}, auto: true}
|
||||
sink := &recordingSink{}
|
||||
eng := usecase.NewEngine(src, fakeSummarizer{}, sink)
|
||||
r := runner.New(src, st, eng, testUser, quietLogger())
|
||||
@@ -145,13 +167,53 @@ func TestRunOnce_SkipsVideosWithoutTranscript(t *testing.T) {
|
||||
require.Empty(t, sink.delivered, "no summary delivered when there is no transcript")
|
||||
}
|
||||
|
||||
func TestRunOnce_ManualMode_SkipsUnrequested(t *testing.T) {
|
||||
src := &fakeSource{
|
||||
subs: []domain.Subscription{sub("chan1", "Channel One")},
|
||||
videos: map[string][]domain.Video{"chan1": {vid("v1", "Video 1"), vid("v2", "Video 2")}},
|
||||
}
|
||||
// Manual mode, nothing queued: discover (upsert) but summarize nothing.
|
||||
st := &fakeStore{seen: map[string]bool{}, auto: false, requested: map[string]bool{}}
|
||||
sink := &recordingSink{}
|
||||
eng := usecase.NewEngine(src, fakeSummarizer{}, sink)
|
||||
r := runner.New(src, st, eng, testUser, quietLogger())
|
||||
|
||||
stats, err := r.RunOnce(context.Background())
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, 2, stats.Candidates)
|
||||
require.Equal(t, 2, stats.SkippedManual, "manual mode skips unqueued videos")
|
||||
require.Equal(t, 0, stats.Summarized)
|
||||
require.Empty(t, sink.delivered, "no summary in manual mode without a request")
|
||||
require.Len(t, st.upserted, 2, "discovery still persists every candidate")
|
||||
}
|
||||
|
||||
func TestRunOnce_ManualMode_ProcessesRequested(t *testing.T) {
|
||||
src := &fakeSource{
|
||||
subs: []domain.Subscription{sub("chan1", "Channel One")},
|
||||
videos: map[string][]domain.Video{"chan1": {vid("v1", "Video 1"), vid("v2", "Video 2")}},
|
||||
}
|
||||
// Manual mode, v1 queued (by store id). Only v1 is summarized; its flag clears.
|
||||
st := &fakeStore{seen: map[string]bool{}, auto: false, requested: map[string]bool{"id-v1": true}}
|
||||
sink := &recordingSink{}
|
||||
eng := usecase.NewEngine(src, fakeSummarizer{}, sink)
|
||||
r := runner.New(src, st, eng, testUser, quietLogger())
|
||||
|
||||
stats, err := r.RunOnce(context.Background())
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, 1, stats.Summarized, "only the queued video is summarized")
|
||||
require.Equal(t, 1, stats.SkippedManual, "the unqueued video is skipped")
|
||||
require.Len(t, sink.delivered, 1)
|
||||
require.Equal(t, "id-v1", sink.delivered[0].VideoID)
|
||||
require.Equal(t, []string{"id-v1"}, st.cleared, "the queue flag is cleared after summarizing")
|
||||
}
|
||||
|
||||
func TestRunOnce_UpsertsEveryCandidate(t *testing.T) {
|
||||
src := &fakeSource{
|
||||
subs: []domain.Subscription{sub("chan1", "Channel One")},
|
||||
videos: map[string][]domain.Video{"chan1": {vid("v1", "Video 1"), vid("v2", "Video 2")}},
|
||||
}
|
||||
// Even an already-seen video gets upserted so its metadata stays fresh.
|
||||
st := &fakeStore{seen: map[string]bool{"id-v1": true}}
|
||||
st := &fakeStore{seen: map[string]bool{"id-v1": true}, auto: true}
|
||||
eng := usecase.NewEngine(src, fakeSummarizer{}, &recordingSink{})
|
||||
r := runner.New(src, st, eng, testUser, quietLogger())
|
||||
|
||||
|
||||
@@ -28,7 +28,12 @@ func (a *App) handleAccount(w http.ResponseWriter, r *http.Request) {
|
||||
if u, ok := a.Auth.CurrentUser(r); ok {
|
||||
email = u.Email
|
||||
}
|
||||
a.render(w, r, AccountPage(name, email, conns, takeFlash(w, r)))
|
||||
auto, err := a.Store.GetAutoSummarize(r.Context(), userID)
|
||||
if err != nil {
|
||||
a.serverError(w, r, "summarize mode", err)
|
||||
return
|
||||
}
|
||||
a.render(w, r, AccountPage(name, email, conns, auto, takeFlash(w, r)))
|
||||
}
|
||||
|
||||
// handleDisconnect removes a provider connection: it deletes the OAuth token from
|
||||
|
||||
@@ -16,12 +16,19 @@ import (
|
||||
// the concrete *store.Store). *store.Store satisfies it; tests can substitute a
|
||||
// fake without a database.
|
||||
type Store interface {
|
||||
ListSummaries(ctx context.Context, userID string, limit int) ([]store.SummaryRow, error)
|
||||
ListVideos(ctx context.Context, userID string, limit int) ([]store.SummaryRow, error)
|
||||
GetSummaryByVideo(ctx context.Context, userID, videoID string) (*store.SummaryRow, error)
|
||||
GetVideoRow(ctx context.Context, userID, videoID string) (*store.SummaryRow, error)
|
||||
ActionsFor(ctx context.Context, userID string, videoIDs []string) (map[string][]string, error)
|
||||
SetAction(ctx context.Context, userID, videoID, action string) error
|
||||
ClearAction(ctx context.Context, userID, videoID, action string) error
|
||||
|
||||
// Summarization mode: the per-user auto/manual toggle and the per-video
|
||||
// manual queue (the "Summarize" button). The runner consumes the queue.
|
||||
GetAutoSummarize(ctx context.Context, userID string) (bool, error)
|
||||
SetAutoSummarize(ctx context.Context, userID string, enabled bool) error
|
||||
RequestSummarize(ctx context.Context, userID, videoID string) error
|
||||
|
||||
// Account management (the /account page, disconnect, delete-account).
|
||||
ConnectionsForUser(ctx context.Context, userID string) ([]store.Connection, error)
|
||||
DeleteConnection(ctx context.Context, userID, provider string) error
|
||||
@@ -76,6 +83,7 @@ func (a *App) Router() http.Handler {
|
||||
app.HandleFunc("GET /{$}", a.handleList)
|
||||
app.HandleFunc("GET /v/{videoId}", a.handleDetail)
|
||||
app.HandleFunc("POST /v/{videoId}/action", a.handleAction)
|
||||
app.HandleFunc("POST /v/{videoId}/summarize", a.handleRequestSummarize)
|
||||
app.HandleFunc("GET /register", a.handleRegisterForm)
|
||||
app.HandleFunc("POST /register", a.handleRegister)
|
||||
|
||||
@@ -84,6 +92,7 @@ func (a *App) Router() http.Handler {
|
||||
app.HandleFunc("GET /account", a.handleAccount)
|
||||
app.HandleFunc("POST /account/disconnect/{provider}", a.handleDisconnect)
|
||||
app.HandleFunc("POST /account/delete", a.handleDeleteAccount)
|
||||
app.HandleFunc("POST /account/summarize-mode", a.handleSummarizeMode)
|
||||
|
||||
// Web-initiated YouTube connect (ADR-006). Gated like every app route, so
|
||||
// CurrentUserID is set and the connection binds to the authenticated user.
|
||||
@@ -121,9 +130,9 @@ func (a *App) handleList(w http.ResponseWriter, r *http.Request) {
|
||||
To: q.Get("to"),
|
||||
}
|
||||
|
||||
rows, err := a.Store.ListSummaries(r.Context(), userID, 0)
|
||||
rows, err := a.Store.ListVideos(r.Context(), userID, 0)
|
||||
if err != nil {
|
||||
a.serverError(w, r, "list summaries", err)
|
||||
a.serverError(w, r, "list videos", err)
|
||||
return
|
||||
}
|
||||
rows = f.apply(rows)
|
||||
@@ -199,6 +208,59 @@ func (a *App) handleAction(w http.ResponseWriter, r *http.Request) {
|
||||
http.Redirect(w, r, "/v/"+videoID, http.StatusSeeOther)
|
||||
}
|
||||
|
||||
// handleRequestSummarize queues a video for manual summarization. It does NOT run
|
||||
// the engine inline — it only flips summarize_requested; the next `tapir run`
|
||||
// picks it up (the single summarization driver). For HTMX it returns the refreshed
|
||||
// card (now showing "Queued"); without JS it redirects back to the list.
|
||||
func (a *App) handleRequestSummarize(w http.ResponseWriter, r *http.Request) {
|
||||
userID, ok := a.currentUserID(w, r)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
videoID := r.PathValue("videoId")
|
||||
|
||||
err := a.Store.RequestSummarize(r.Context(), userID, videoID)
|
||||
if errors.Is(err, store.ErrNotFound) {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
if err != nil {
|
||||
a.serverError(w, r, "request summarize", err)
|
||||
return
|
||||
}
|
||||
|
||||
if !isHTMX(r) {
|
||||
http.Redirect(w, r, "/", http.StatusSeeOther)
|
||||
return
|
||||
}
|
||||
row, err := a.Store.GetVideoRow(r.Context(), userID, videoID)
|
||||
if err != nil {
|
||||
a.serverError(w, r, "get video", err)
|
||||
return
|
||||
}
|
||||
a.render(w, r, VideoCard(*row))
|
||||
}
|
||||
|
||||
// handleSummarizeMode toggles the user's auto/manual summarization mode. The form
|
||||
// submits the desired new value (enabled=true|false). For HTMX it returns the
|
||||
// refreshed mode control; without JS it redirects back to the account page.
|
||||
func (a *App) handleSummarizeMode(w http.ResponseWriter, r *http.Request) {
|
||||
userID, ok := a.currentUserID(w, r)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
enabled := r.FormValue("enabled") == "true"
|
||||
if err := a.Store.SetAutoSummarize(r.Context(), userID, enabled); err != nil {
|
||||
a.serverError(w, r, "set summarize mode", err)
|
||||
return
|
||||
}
|
||||
if !isHTMX(r) {
|
||||
http.Redirect(w, r, "/account", http.StatusSeeOther)
|
||||
return
|
||||
}
|
||||
a.render(w, r, summarizeModeControl(enabled))
|
||||
}
|
||||
|
||||
// currentUserID returns the tapir user_id the registration gate resolved for this
|
||||
// request. Behind the gate it is always present; a miss means a handler was
|
||||
// reached without scoping (a wiring bug), so it answers 500 and reports false.
|
||||
|
||||
@@ -185,8 +185,10 @@ func TestListRendersRowsAndActionState(t *testing.T) {
|
||||
func TestListHTMXReturnsFragment(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
app := newApp(t)
|
||||
resetDB(t, rawPool(t))
|
||||
p := rawPool(t)
|
||||
resetDB(t, p)
|
||||
require.NoError(t, deliver(ctx, app, videoX, "body x"))
|
||||
seedVideo(t, p, videoX, "X Title", "https://x", time.Time{})
|
||||
|
||||
req := httptest.NewRequest(http.MethodGet, "/", nil)
|
||||
req.Header.Set("HX-Request", "true")
|
||||
@@ -290,6 +292,103 @@ func TestActionRejectsUnknownVerb(t *testing.T) {
|
||||
require.Equal(t, http.StatusBadRequest, rec.Code)
|
||||
}
|
||||
|
||||
func TestListShowsSummarizeButtonForUnsummarized(t *testing.T) {
|
||||
app := newApp(t)
|
||||
p := rawPool(t)
|
||||
resetDB(t, p)
|
||||
// A discovered-but-unsummarized video (no summary delivered).
|
||||
seedVideo(t, p, videoX, "Pending Title", "https://x", time.Time{})
|
||||
|
||||
rec := do(t, app, httptest.NewRequest(http.MethodGet, "/", nil))
|
||||
require.Equal(t, http.StatusOK, rec.Code)
|
||||
html := body(t, rec)
|
||||
|
||||
require.Contains(t, html, "Pending Title", "unsummarized videos are listed too")
|
||||
require.Contains(t, html, "Summarize", "a Summarize button is offered")
|
||||
require.Contains(t, html, "/v/"+videoX+"/summarize", "button posts to the queue endpoint")
|
||||
require.Contains(t, html, "card-pending", "muted pending treatment")
|
||||
require.NotContains(t, html, "Queued", "not queued yet")
|
||||
}
|
||||
|
||||
func TestRequestSummarizeQueuesAndRendersCard(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
app := newApp(t)
|
||||
p := rawPool(t)
|
||||
resetDB(t, p)
|
||||
seedVideo(t, p, videoX, "Pending Title", "https://x", time.Time{})
|
||||
|
||||
rec := postSummarize(t, app, videoX, true)
|
||||
require.Equal(t, http.StatusOK, rec.Code)
|
||||
html := body(t, rec)
|
||||
require.Contains(t, html, "Queued", "card now shows the queued state")
|
||||
require.NotContains(t, html, ">Summarize<", "the Summarize button is gone once queued")
|
||||
|
||||
// The flag is persisted, so the next run picks it up.
|
||||
row, err := app.Store.GetVideoRow(ctx, userID, videoX)
|
||||
require.NoError(t, err)
|
||||
require.True(t, row.SummarizeRequested)
|
||||
}
|
||||
|
||||
func TestRequestSummarizeNonHTMXRedirects(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
app := newApp(t)
|
||||
p := rawPool(t)
|
||||
resetDB(t, p)
|
||||
seedVideo(t, p, videoX, "Pending Title", "https://x", time.Time{})
|
||||
|
||||
rec := postSummarize(t, app, videoX, false)
|
||||
require.Equal(t, http.StatusSeeOther, rec.Code)
|
||||
require.Equal(t, "/", rec.Header().Get("Location"))
|
||||
|
||||
row, err := app.Store.GetVideoRow(ctx, userID, videoX)
|
||||
require.NoError(t, err)
|
||||
require.True(t, row.SummarizeRequested, "queued on the no-JS path too")
|
||||
}
|
||||
|
||||
func TestRequestSummarizeNotFound(t *testing.T) {
|
||||
app := newApp(t)
|
||||
resetDB(t, rawPool(t))
|
||||
rec := postSummarize(t, app, videoX, true)
|
||||
require.Equal(t, http.StatusNotFound, rec.Code, "queuing an unknown video is a 404")
|
||||
}
|
||||
|
||||
func TestSummarizeModeToggle(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
app := newApp(t)
|
||||
resetDB(t, rawPool(t))
|
||||
|
||||
// Account page defaults to manual.
|
||||
rec := do(t, app, httptest.NewRequest(http.MethodGet, "/account", nil))
|
||||
require.Equal(t, http.StatusOK, rec.Code)
|
||||
html := body(t, rec)
|
||||
require.Contains(t, html, "Manual", "default mode shown")
|
||||
require.Contains(t, html, "Switch to automatic")
|
||||
|
||||
// Toggle to automatic via HTMX returns the refreshed control.
|
||||
req := httptest.NewRequest(http.MethodPost, "/account/summarize-mode",
|
||||
strings.NewReader("enabled=true"))
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
req.Header.Set("HX-Request", "true")
|
||||
rec = do(t, app, req)
|
||||
require.Equal(t, http.StatusOK, rec.Code)
|
||||
html = body(t, rec)
|
||||
require.Contains(t, html, "Automatic")
|
||||
require.Contains(t, html, "Switch to manual")
|
||||
|
||||
got, err := app.Store.GetAutoSummarize(ctx, userID)
|
||||
require.NoError(t, err)
|
||||
require.True(t, got, "mode persisted")
|
||||
}
|
||||
|
||||
func postSummarize(t *testing.T, app *web.App, videoID string, htmx bool) *httptest.ResponseRecorder {
|
||||
t.Helper()
|
||||
req := httptest.NewRequest(http.MethodPost, "/v/"+videoID+"/summarize", nil)
|
||||
if htmx {
|
||||
req.Header.Set("HX-Request", "true")
|
||||
}
|
||||
return do(t, app, req)
|
||||
}
|
||||
|
||||
// deliver stores a summary through the App's store under test.
|
||||
func deliver(ctx context.Context, app *web.App, videoID, text string) error {
|
||||
return app.Store.(*store.Store).Deliver(ctx, summary(videoID, text))
|
||||
|
||||
@@ -171,6 +171,36 @@ func actionURL(videoID string) templ.SafeURL {
|
||||
return templ.SafeURL("/v/" + videoID + "/action")
|
||||
}
|
||||
|
||||
// summarizeURL builds the manual-queue POST path for a video id.
|
||||
func summarizeURL(videoID string) templ.SafeURL {
|
||||
return templ.SafeURL("/v/" + videoID + "/summarize")
|
||||
}
|
||||
|
||||
// summarizeModeLabel names the current mode for display.
|
||||
func summarizeModeLabel(auto bool) string {
|
||||
if auto {
|
||||
return "Automatic"
|
||||
}
|
||||
return "Manual"
|
||||
}
|
||||
|
||||
// summarizeModeToggleLabel is the caption on the toggle button — it names the mode
|
||||
// the click switches TO (the opposite of the current one).
|
||||
func summarizeModeToggleLabel(auto bool) string {
|
||||
if auto {
|
||||
return "Switch to manual"
|
||||
}
|
||||
return "Switch to automatic"
|
||||
}
|
||||
|
||||
// boolStr renders a bool as the "enabled" form value the toggle submits.
|
||||
func boolStr(b bool) string {
|
||||
if b {
|
||||
return "true"
|
||||
}
|
||||
return "false"
|
||||
}
|
||||
|
||||
// externalURL passes a stored source URL through templ's URL sanitiser.
|
||||
func externalURL(u string) templ.SafeURL {
|
||||
return templ.URL(u)
|
||||
@@ -347,6 +377,15 @@ main { max-width: 60rem; margin: 0 auto; padding: var(--s4) var(--s3); }
|
||||
.card-state { color: var(--muted); font-size: .8rem; }
|
||||
.badge { display: inline-block; padding: .15rem .55rem; border-radius: 999px; background: var(--badge-bg); color: var(--badge-fg); font-size: .72rem; font-weight: 600; }
|
||||
|
||||
/* pending (discovered-but-unsummarized) card: muted until summarized */
|
||||
.card-pending { border-style: dashed; }
|
||||
.card-pending .card-title { color: var(--muted); font-weight: 600; }
|
||||
|
||||
/* summarization mode toggle on the account page */
|
||||
.summarize-mode { display: flex; gap: var(--s3); align-items: center; flex-wrap: wrap; }
|
||||
.summarize-mode p { margin: 0; }
|
||||
.summarize-mode form { margin: 0; }
|
||||
|
||||
/* empty state */
|
||||
.empty { text-align: center; color: var(--muted); padding: var(--s5) var(--s4); border: 1px dashed var(--line); border-radius: var(--radius); background: var(--card); }
|
||||
.empty strong { display: block; color: var(--fg); font-size: 1.05rem; margin-bottom: var(--s2); }
|
||||
|
||||
+69
-11
@@ -73,28 +73,46 @@ templ filterForm(f Filter) {
|
||||
</form>
|
||||
}
|
||||
|
||||
// summaryList is the swappable list fragment: one card per summary (title link,
|
||||
// channel · date meta, provider chip, fallback badge, action state). Cards
|
||||
// reflow to a single column on mobile; an empty list shows a friendly first-run
|
||||
// state instead of a blank table.
|
||||
// summaryList is the swappable list fragment: one card per video (summarized or
|
||||
// not). Cards reflow to a single column on mobile; an empty list shows a friendly
|
||||
// first-run state instead of a blank table.
|
||||
templ summaryList(rows []store.SummaryRow) {
|
||||
if len(rows) == 0 {
|
||||
<div class="empty">
|
||||
<strong>No summaries yet</strong>
|
||||
<span>Summaries appear here as your subscriptions are processed — run <code>tapir run</code> to fetch and summarize new videos.</span>
|
||||
<strong>No videos yet</strong>
|
||||
<span>Videos appear here as your subscriptions are processed — run <code>tapir run</code> to fetch them. In manual mode, use the Summarize button to queue one.</span>
|
||||
</div>
|
||||
} else {
|
||||
<ul class="cards">
|
||||
for _, r := range rows {
|
||||
<li class="card">
|
||||
@VideoCard(r)
|
||||
}
|
||||
</ul>
|
||||
}
|
||||
}
|
||||
|
||||
// VideoCard is one list card, also returned standalone by POST /v/{id}/summarize
|
||||
// (HTMX swaps it in place via outerHTML). A summarized video links to its detail
|
||||
// page and shows its provider chip / fallback badge / action state. An
|
||||
// unsummarized video gets a muted "pending" treatment and either a "Summarize"
|
||||
// button (to queue it) or a "Queued" chip when already requested.
|
||||
templ VideoCard(r store.SummaryRow) {
|
||||
<li class={ "card", templ.KV("card-pending", !r.Summarized) } id={ "video-" + r.VideoID }>
|
||||
if r.Summarized {
|
||||
<div class="card-title"><a href={ videoURL(r.VideoID) }>{ displayTitle(r) }</a></div>
|
||||
} else {
|
||||
<div class="card-title">{ displayTitle(r) }</div>
|
||||
}
|
||||
if cardMeta(r) != "" {
|
||||
<div class="card-meta">{ cardMeta(r) }</div>
|
||||
}
|
||||
if r.Summarized {
|
||||
if p := previewText(r.Summary, 160); p != "" {
|
||||
<div class="card-preview">{ p }</div>
|
||||
}
|
||||
}
|
||||
<div class="card-foot">
|
||||
if r.Summarized {
|
||||
if r.AIProvider != "" {
|
||||
<span class="chip">{ r.AIProvider }</span>
|
||||
}
|
||||
@@ -104,12 +122,23 @@ templ summaryList(rows []store.SummaryRow) {
|
||||
if len(r.Actions) > 0 {
|
||||
<span class="card-state">{ strings.Join(r.Actions, ", ") }</span>
|
||||
}
|
||||
} else if r.SummarizeRequested {
|
||||
<span class="chip">Queued</span>
|
||||
<span class="card-state muted">waiting for the next run</span>
|
||||
} else {
|
||||
<form
|
||||
method="post"
|
||||
action={ summarizeURL(r.VideoID) }
|
||||
hx-post={ string(summarizeURL(r.VideoID)) }
|
||||
hx-target={ "#video-" + r.VideoID }
|
||||
hx-swap="outerHTML"
|
||||
>
|
||||
<button type="submit" class="btn-secondary">Summarize</button>
|
||||
</form>
|
||||
}
|
||||
</div>
|
||||
</li>
|
||||
}
|
||||
</ul>
|
||||
}
|
||||
}
|
||||
|
||||
// DetailPage is the full summary view: text, highlights, takeaways, metadata,
|
||||
// and the action button group.
|
||||
@@ -202,7 +231,7 @@ templ RegisterPage(email, errMsg string) {
|
||||
// signed-in email, the user's connected video accounts (each with a Disconnect
|
||||
// control), a Connect-YouTube link when none is connected, and the delete-account
|
||||
// danger zone. flash surfaces a one-shot notification (disconnect/connect).
|
||||
templ AccountPage(displayName, email string, conns []store.Connection, flash string) {
|
||||
templ AccountPage(displayName, email string, conns []store.Connection, autoSummarize bool, flash string) {
|
||||
@Layout("Tapir — Account") {
|
||||
@flashBanner(flash)
|
||||
<article class="account">
|
||||
@@ -215,6 +244,15 @@ templ AccountPage(displayName, email string, conns []store.Connection, flash str
|
||||
<dd>{ email }</dd>
|
||||
}
|
||||
</dl>
|
||||
<section>
|
||||
<h2>Summarization</h2>
|
||||
<p class="muted">
|
||||
Automatic summarizes every new video as it is discovered. Manual lets you
|
||||
pick which videos to summarize — new videos appear in your list with a
|
||||
Summarize button.
|
||||
</p>
|
||||
@summarizeModeControl(autoSummarize)
|
||||
</section>
|
||||
<section>
|
||||
<h2>Connected accounts</h2>
|
||||
if len(conns) == 0 {
|
||||
@@ -262,6 +300,26 @@ templ AccountPage(displayName, email string, conns []store.Connection, flash str
|
||||
}
|
||||
}
|
||||
|
||||
// summarizeModeControl is the auto/manual toggle, also returned standalone by
|
||||
// POST /account/summarize-mode (HTMX swaps it via outerHTML). The hidden field
|
||||
// submits the desired NEW value, so a single submit flips the mode; without JS the
|
||||
// form posts and the handler redirects back to /account.
|
||||
templ summarizeModeControl(auto bool) {
|
||||
<div id="summarize-mode" class="summarize-mode">
|
||||
<p>Current mode: <strong>{ summarizeModeLabel(auto) }</strong></p>
|
||||
<form
|
||||
method="post"
|
||||
action="/account/summarize-mode"
|
||||
hx-post="/account/summarize-mode"
|
||||
hx-target="#summarize-mode"
|
||||
hx-swap="outerHTML"
|
||||
>
|
||||
<input type="hidden" name="enabled" value={ boolStr(!auto) }/>
|
||||
<button type="submit" class="btn-secondary">{ summarizeModeToggleLabel(auto) }</button>
|
||||
</form>
|
||||
</div>
|
||||
}
|
||||
|
||||
// ActionButtons is the toggle group fragment returned by POST /v/{id}/action.
|
||||
// Each button submits its verb; HTMX swaps this element in place (outerHTML),
|
||||
// and without JS the form POSTs and the handler redirects back to the detail
|
||||
|
||||
+470
-241
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user