Skip to content

Queue clips with drawings and caption them like drawings - #301

Merged
iamwavecut merged 2 commits into
mainfrom
feat/video-shared-image-queue
Nov 19, 2026
Merged

iamwavecut merged 2 commits into
mainfrom
feat/video-shared-image-queue

Conversation

@iamwavecut

Copy link
Copy Markdown
Owner

Why

  • Clips had their own video queue and worker. They rendered on GPU1 at the same time as drawings, and VIP users got no priority for clips.
  • Clip captions were a bare title, unlike drawing captions.

Shared queue

  • make_video uses the drawing queue plan. VIP users go to image-vip with IMAGE_VIP_PRIORITY; everyone else goes to image-regular with the default priority.
  • The VIP and regular image generation workers dequeue ImageGen and VideoGen tickets in queue order. They hand a clip to a VideoJobRunner (the FastFrames pipeline). The standalone video worker and the video queue are removed. On prod the video queue has no pending or processing tickets.
  • Taskman accelerator arbitration now includes VideoGen, and VIP clips get the VIP priority floor. A clip and a drawing therefore never render side by side, and a waiting VIP clip holds back regular work in the same way as a VIP drawing.
  • Clips follow the drawing rules:
    • one per-user active limit for drawings and clips together (VIP 10, others 5);
    • the drawing frequency limit, including its VIP text;
    • the enqueue rate limit;
    • the "N orders ahead" queue notice.

Captions

  • A clip caption is built by build_image_generation_caption, the same as a drawing caption: title in <code> or an expandable quote, "за авторством" with the VIP badge, #nsfw 18+ for adult clips, and the support link. It is sent with HTML parse mode.
  • A short !видео … request (10 words or fewer) keeps the user's words as the title, the same as !нарисуй.
  • An empty dialog caption returns video_caption_required for a retry, the same as image_caption_required. The tool argument and the system prompt rule now name make_video.

Tests

  • cargo fmt --all; cargo clippy --workspace --all-targets -- -D warnings.
  • cargo test: openplotva-taskman 69 passed, openplotva-dialog 110 passed, openplotva-prompts 10 passed, openplotva-llm 236 passed, openplotva-app 1465 passed.
  • New tests:
    • taskman: clips share arbitration with images (a VIP clip blocks regular work; a clip and an image leave the queue in arrival order and do not run together);
    • image worker: renders clips from both queues with the right VIP flag, and leaves them in the queue without a runner;
    • scheduler: VIP queue and priority, one active limit with drawings, the frequency limit;
    • captions: drawing-style caption with VIP and #nsfw, brief fallback, HTML parse mode;
    • dispatch: video_caption_required and the verbatim shortcut title.

Clips used their own video queue and worker, so they rendered on GPU1
next to drawings and VIP users had no priority for them. Clips now join
the drawing queues: VIP clips go to image-vip with the VIP priority, the
rest to image-regular, and the image generation workers render them in
queue order through a video runner. Taskman arbitration treats VideoGen
as accelerator work, so a clip and a drawing never run side by side.
Scheduling uses the drawing plan: the per-user active limit counts
drawings and clips together, and the drawing frequency limit, enqueue
limit and queue-position notice apply to clips.

The clip caption now uses the drawing caption: title, author with the
VIP badge, #nsfw for adult clips and the support link, sent as HTML.
A short `!видео ...` request keeps the user's words as the title, and an
empty dialog caption is sent back for a retry, as for drawings.
@github-actions

github-actions Bot commented Nov 19, 2026 •

Copy link
Copy Markdown
Warnings
⚠️ Prompt files are cache-sensitive contracts; confirm prompt shape and role markers were preserved intentionally.
Messages
📖 Danger checked 9 changed file(s).

Generated by 🚫 dangerJS against 1953158

A VideoGen ticket is accelerator work. Left pending after video
generation is switched off, it would hold back every drawing ranked
below it. Image generation workers now always take clips and fail
them when no video runner is configured.
@iamwavecut

Copy link
Copy Markdown
Owner Author

Danger warning about prompts/aifarm/system.prompt: the change is intended and does not change the prompt's shape. One sentence in the existing caption rule now also names make_video (Для draw_image, draw_api и make_video всегда передавай caption …, plus video_caption_required next to image_caption_required). Role markers, partials and the template data shape are unchanged. The system text changes once, so prefix caches warm up again after the deploy.

@iamwavecut
iamwavecut merged commit a316110 into main Nov 19, 2026
12 checks passed
@iamwavecut
iamwavecut deleted the feat/video-shared-image-queue branch November 19, 2026 10:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant