Skip to content

feat(基质筛选): 分项跳过已锁定/已废弃缩略图#1729

Merged
MistEO merged 7 commits intov2from
fix/essence
Mar 30, 2026
Merged

feat(基质筛选): 分项跳过已锁定/已废弃缩略图#1729
MistEO merged 7 commits intov2from
fix/essence

Conversation

@Joe-Bao
Copy link
Copy Markdown
Contributor

@Joe-Bao Joe-Bao commented Mar 30, 2026 •
edited by sourcery-ai bot
Loading

fix #1721

Summary by Sourcery

在精华过滤行收集管道中支持分别跳过已锁定缩略图和已丢弃缩略图，同时保持对传统选项的向后兼容性。

新功能：

  • 引入单独的配置选项，用于在精华行收集过程中跳过已锁定缩略图和已丢弃缩略图。
  • 允许行收集步骤根据锁定、丢弃或组合缩略图标记来检测并跳过对应条目。

增强：

  • 通过在使用传统 skip-locked-row 选项时，将其映射到新的缩略图跳过选项上来保持向后兼容性。
  • 更新精华过滤的文档、本地化字符串、管道及任务配置以反映新的缩略图跳过行为。

文档：

  • 在精华过滤器的 README 中记录新的缩略图跳过选项及其运行时行为。
Original summary in English

Summary by Sourcery

Support separate skipping of locked and discarded thumbnails in the essence filter row collection pipeline while maintaining backward compatibility with the legacy option.

New Features:

  • Introduce separate configuration options to skip locked thumbnails and discarded thumbnails during essence row collection.
  • Allow the row collection step to detect and skip items based on either lock, discard, or combined thumbnail markers.

Enhancements:

  • Maintain backward compatibility by mapping the legacy skip-locked-row option to the new thumbnail skip options when used.
  • Update essence filter documentation, localization strings, pipelines, and task configuration to reflect the new thumbnail skip behavior.

Documentation:

  • Document the new thumbnail skip options and their runtime behavior in the essence filter README.

新功能：

  • 引入独立的 skip_thumb_lock 和 skip_thumb_discard 选项，用于在本质过滤过程中控制对已锁定和已丢弃缩略图的跳过行为。

增强：

  • 优化行收集行为，改为基于每个缩略图的锁定/丢弃状态进行识别；当新选项缺失时，将传统的 skip_locked_row 视为兼容别名。
  • 更新 essence filter 的 README、本地化条目、流水线以及任务定义，以反映新的缩略图跳过选项。
Original summary in English

Summary by Sourcery

在精华过滤行收集管道中支持分别跳过已锁定缩略图和已丢弃缩略图，同时保持对传统选项的向后兼容性。

新功能：

  • 引入单独的配置选项，用于在精华行收集过程中跳过已锁定缩略图和已丢弃缩略图。
  • 允许行收集步骤根据锁定、丢弃或组合缩略图标记来检测并跳过对应条目。

增强：

  • 通过在使用传统 skip-locked-row 选项时，将其映射到新的缩略图跳过选项上来保持向后兼容性。
  • 更新精华过滤的文档、本地化字符串、管道及任务配置以反映新的缩略图跳过行为。

文档：

  • 在精华过滤器的 README 中记录新的缩略图跳过选项及其运行时行为。
Original summary in English

Summary by Sourcery

Support separate skipping of locked and discarded thumbnails in the essence filter row collection pipeline while maintaining backward compatibility with the legacy option.

New Features:

  • Introduce separate configuration options to skip locked thumbnails and discarded thumbnails during essence row collection.
  • Allow the row collection step to detect and skip items based on either lock, discard, or combined thumbnail markers.

Enhancements:

  • Maintain backward compatibility by mapping the legacy skip-locked-row option to the new thumbnail skip options when used.
  • Update essence filter documentation, localization strings, pipelines, and task configuration to reflect the new thumbnail skip behavior.

Documentation:

  • Document the new thumbnail skip options and their runtime behavior in the essence filter README.

@Joe-Bao Joe-Bao marked this pull request as ready for review March 30, 2026 06:16
Copilot AI review requested due to automatic review settings March 30, 2026 06:16
sourcery-ai[bot]
sourcery-ai bot reviewed Mar 30, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

嗨，我已经审查了你的修改，看起来非常不错！

Sourcery 对开源项目是完全免费的——如果你觉得我们的评审有帮助，欢迎分享 ✨
帮助我变得更有用！请在每条评论上点 👍 或 👎，我会根据你的反馈改进后续的评审。
Original comment in English

Hey - I've reviewed your changes and they look great!

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Copilot AI reviewed Mar 30, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

该 PR 围绕 Issue #1721，对“基质筛选”任务的“跳过缩略图标记”能力做了拆分：将“跳过锁定/废弃”从一个总开关细化为两个独立开关，并在 Go 侧与 pipeline 侧同时打通对应参数与识别节点，以便用户分别控制“已锁定”“已废弃”的跳过策略。

Changes:

  • 将任务选项从 SkipLockedRow 拆分为 SkipThumbLock / SkipThumbDiscard，并更新各语言 UI 文案。
  • Pipeline 新增单模板识别节点 EssenceThumbLock / EssenceThumbDiscard，Go 侧按开关组合选择调用（两者都开则复用 EssenceThumbMarked）。
  • Go 侧 attach/options 解析新增两个字段，并保留对旧字段 skip_locked_row 的兼容映射。

Reviewed changes

Copilot reviewed 12 out of 12 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
assets/tasks/EssenceFilter.json 任务选项列表改为两个独立跳过开关，并通过 pipeline_override 写入新 attach 字段
assets/resource/pipeline/EssenceFilter/LockDiscard.json 新增两个单模板缩略图标记识别节点，供 Go 侧按需调用
assets/resource/pipeline/AutoEssence/EssenceFilterAfterBattle.json after-battle 默认 attach 字段同步为新 skip_thumb_* 字段
assets/locales/interface/zh_tw.json UI 文案改为两个开关对应的 label/description
assets/locales/interface/zh_cn.json UI 文案改为两个开关对应的 label/description，并调整部分 focus 文案措辞
assets/locales/interface/ko_kr.json UI 文案改为两个开关对应的 label/description
assets/locales/interface/ja_jp.json UI 文案改为两个开关对应的 label/description
assets/locales/interface/en_us.json UI 文案改为两个开关对应的 label/description
agent/go-service/essencefilter/types.go Options 结构体新增 SkipThumbLock/SkipThumbDiscard 字段
agent/go-service/essencefilter/options_resolve.go 默认值与 patch 应用逻辑更新，并兼容旧 skip_locked_row 入参
agent/go-service/essencefilter/actions.go RowCollect 中按开关组合调用不同识别节点，支持单独跳过锁定/废弃
agent/go-service/essencefilter/README.md 更新数据流说明，补充新字段与旧字段兼容说明

@MistEO MistEO merged commit a96f75d into v2 Mar 30, 2026
18 checks passed
@MistEO MistEO deleted the fix/essence branch March 30, 2026 11:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sourcery-ai sourcery-ai[bot] sourcery-ai[bot] left review comments

Copilot code review Copilot Copilot left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

希望基质筛选锁定的跳过缩略图已标记格子可以单独设置锁定或者废弃

3 participants

@Joe-Bao @MistEO