Skip to content

Resolve merge conflicts on PR #2070 (library: P3 heavy tier download, quality prefs, storage) - #2617

Merged
jaylfc merged 1 commit into
devfrom
exec/tsk-4xcxcm
Aug 29, 2026
Merged

jaylfc merged 1 commit into
devfrom
exec/tsk-4xcxcm

Conversation

@jaylfc

@jaylfc jaylfc commented Aug 29, 2026 •

Copy link
Copy Markdown
Owner

CARD TITLE (intent, not commit subject): Resolve merge conflicts on PR #2070 (library: P3 heavy tier download, quality prefs, storage)

Autonomous build of board card tsk-4xcxcm.

The library feature (P1-P3: LibraryStore, ingest pipeline, processors,
collections handoff, heavy-tier download, quality preferences, storage
accounting, per-source rules) was rebased onto current dev.

Dev already incorporated the library code via prior merges (P1 via #2062,
P2 via #2177, P3 via the original #2070 merge, CivitaiProcessor via
lora-studio). The rebase applied all 7 PR commits on top of dev (617 commits
ahead of the original merge base aed3c95) and resolved the following
conflicts:

  1. tests/test_library.py (5 hunks): all about 'from unittest.mock import
    patch' inside HeavyDownloadProcessor test functions. The PR's commit
    93870c3 ('patch imports') was meant to add these. Dev already had them,
    so the resolution kept dev's version. The subsequent fix commit became a
    no-op.

  2. tinyagentos/library_pipeline.py (2 hunks): HeavyDownloadProcessor
    fallback file search, dev scopes the glob to the item's video_id
    (prevents cross-attribution of concurrent downloads), the PR had a
    blanket glob. Resolution kept dev's scoped version.
    Error handling in run_heavy_pipeline, dev treats heavy download as
    optional (records failure on the heavy_download job state instead of
    flipping item to 'error'), the PR set status='error'. Resolution kept
    dev's optional-download semantics.

  3. tinyagentos/routes/library.py (3 hunks): Error handling in
    _heavy_download_task, same optional-download semantics, resolution kept
    dev's version.
    HTMX rendering in list_rules and storage_usage, the PR added HTMX-aware
    responses, dev already had identical rendering (helper functions
    _render_rules_list/_render_storage_summary/_is_htmx already exist).
    Resolution kept the PR's additions (identical to dev's existing code).

Conflict resolution strategy: dev's more advanced code was preferred in all
cases, incorporating later fixes the PR's commit stack did not account for.
CivitaiProcessor was explicitly KEPT (not removed as the PR's c530df6
're-cut' commit intended) because dev's test_lora_studio.py directly imports
and exercises CivitaiProcessor (54 tests). The PR's removal was valid only
in the PR branch context where test_lora_studio.py did not exist.

Net tree delta vs dev: 0 files changed -- the library feature is already
present in dev. Changelog fragment is the only new file.

PR comment with conflict details was added to the PR via gh pr comment.

All 132 library + lora_studio tests pass (78 + 54).

Docs-Reviewed: routes/library.py is already present in dev from prior
merges and documented in docs/agent-coordination.md (line 834-836 covers
CivitaiProcessor); no doc change needed for the zero-delta rebase.

Files:
changelog.d/tsk-4xcxcm-library-p3-heavy-tier.md | 3 +++
1 file changed, 3 insertions(+)

Summary by CodeRabbit

  • New Features
    • Added support for heavy-tier library media downloads.
    • Added YouTube quality preferences and per-source automatic download rules.
    • Added storage tracking by file size and media type.

The library feature (P1-P3: LibraryStore, ingest pipeline, processors,
collections handoff, heavy-tier download, quality preferences, storage
accounting, per-source rules) was rebased onto current dev.

Dev already incorporated the library code via prior merges (P1 via #2062,
P2 via #2177, P3 via the original #2070 merge, CivitaiProcessor via
lora-studio). The rebase applied all 7 PR commits on top of dev (617 commits
ahead of the original merge base aed3c95) and resolved the following
conflicts:

1. tests/test_library.py (5 hunks): all about 'from unittest.mock import
   patch' inside HeavyDownloadProcessor test functions. The PR's commit
   93870c3 ('patch imports') was meant to add these. Dev already had them,
   so the resolution kept dev's version. The subsequent fix commit became a
   no-op.

2. tinyagentos/library_pipeline.py (2 hunks): HeavyDownloadProcessor
   fallback file search, dev scopes the glob to the item's video_id
   (prevents cross-attribution of concurrent downloads), the PR had a
   blanket glob. Resolution kept dev's scoped version.
   Error handling in run_heavy_pipeline, dev treats heavy download as
   optional (records failure on the heavy_download job state instead of
   flipping item to 'error'), the PR set status='error'. Resolution kept
   dev's optional-download semantics.

3. tinyagentos/routes/library.py (3 hunks): Error handling in
   _heavy_download_task, same optional-download semantics, resolution kept
   dev's version.
   HTMX rendering in list_rules and storage_usage, the PR added HTMX-aware
   responses, dev already had identical rendering (helper functions
   _render_rules_list/_render_storage_summary/_is_htmx already exist).
   Resolution kept the PR's additions (identical to dev's existing code).

Conflict resolution strategy: dev's more advanced code was preferred in all
cases, incorporating later fixes the PR's commit stack did not account for.
CivitaiProcessor was explicitly KEPT (not removed as the PR's c530df6
're-cut' commit intended) because dev's test_lora_studio.py directly imports
and exercises CivitaiProcessor (54 tests). The PR's removal was valid only
in the PR branch context where test_lora_studio.py did not exist.

Net tree delta vs dev: 0 files changed -- the library feature is already
present in dev. Changelog fragment is the only new file.

PR comment with conflict details was added to the PR via gh pr comment.

All 132 library + lora_studio tests pass (78 + 54).

Docs-Reviewed: routes/library.py is already present in dev from prior
merges and documented in docs/agent-coordination.md (line 834-836 covers
CivitaiProcessor); no doc change needed for the zero-delta rebase.
@qodo-code-review

Copy link
Copy Markdown

ⓘ Qodo reviews are paused because your trial has ended. Ask your workspace admin to add credits to resume reviews. Manage billing

@coderabbitai

coderabbitai Bot commented Aug 29, 2026 •

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: 7f6ceb06-6019-4338-9587-95a9fdeadccf

📥 Commits

Reviewing files that changed from the base of the PR and between 3d68188 and ef50828.

📒 Files selected for processing (1)
  • changelog.d/tsk-4xcxcm-library-p3-heavy-tier.md

Included review availability: Your plan provides up to 4 included reviews per hour; 1 remains after this review.


📝 Walkthrough

Walkthrough

The changelog now documents heavy-tier library media downloads through yt-dlp, YouTube quality preferences, source-based auto-download rules, and storage accounting by size and media kind.

Changes

Heavy-tier library media downloads

Layer / File(s) Summary
Document heavy-tier download behavior
changelog.d/tsk-4xcxcm-library-p3-heavy-tier.md
Documents yt-dlp downloads, configurable YouTube quality levels, fnmatch-based source rules, and storage accounting.

Estimated code review effort: 1 (Trivial) | ~2 minutes

Merge Risk: ⚪ Minimal · up to ef508

This PR documents library behavior that is already present without changing executable code, storage behavior, or deployment configuration. No actionable merge-blocking risk remains after normal checks and review.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately identifies the primary change as resolving merge conflicts for PR #2070 and provides the relevant library feature scope.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 0…
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Full details: Docstring Coverage

Explanation

No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 0 files. (1 skipped: 1 unsupported.)

✨ Finishing Touches 💡 1
🛠️ Fix failing CI checks 💡
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch exec/tsk-4xcxcm

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@gitar-bot

gitar-bot Bot commented Aug 29, 2026

Copy link
Copy Markdown

Important

You are using the Gitar free plan. Upgrade to unlock code review, CI analysis, auto-apply, custom automations, and more.

Gitar

@kilo-code-bot

kilo-code-bot Bot commented Aug 29, 2026 •

Copy link
Copy Markdown

Code Review Summary

Status: No Issues Found | Recommendation: Merge

The PR is a zero-tree-delta rebase of PR #2070. Per gh pr diff, the only changed file is changelog.d/tsk-4xcxcm-library-p3-heavy-tier.md (3 added lines). No executable code, tests, or configuration is modified by this PR, so there is no surface for runtime, security, or logic issues to inspect.

The changelog fragment conforms to docs/changelog-fragments.md:

The PR body self-reports that the 132 library + lora_studio tests pass and that routes/library.py is already documented in docs/agent-coordination.md. This is consistent with a documentation-only follow-up after a rebase.

Files Reviewed (1 file)
  • changelog.d/tsk-4xcxcm-library-p3-heavy-tier.md

Reviewed by minimax-m3:free · Input: 23.8K · Output: 2K · Cached: 182.7K

@jaylfc
jaylfc merged commit c1046d2 into dev Aug 29, 2026
34 of 37 checks passed
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