Skip to content

fix: include JSON cards in group context - #9655

Merged
Soulter merged 2 commits into
AstrBotDevs:masterfrom
PeiPei233:fix/group-context-json-card
Aug 13, 2026
Merged

fix: include JSON cards in group context#9655
Soulter merged 2 commits into
AstrBotDevs:masterfrom
PeiPei233:fix/group-context-json-card

Conversation

@PeiPei233

@PeiPei233 PeiPei233 commented Aug 13, 2026

Copy link
Copy Markdown
Contributor

Closes #9654

Summary

  • allow Json-only group messages to enter the built-in group context buffer
  • let JSON cards participate in the existing active-reply decision, like text and images
  • summarize common QQ share-card metadata from meta.detail_1 and meta.news
  • support both direct dictionaries and OneBot JSON-string wrappers
  • keep an explicit [Shared Card] placeholder for unknown card formats
  • normalize whitespace and cap each extracted field at 200 characters

Rationale

The aiocqhttp adapter already preserves OneBot json segments, but group context previously accepted only Plain and Image components. Passing the entire raw payload to the LLM would add noisy platform metadata, so this change extracts only the fields needed to understand and respond to shared cards and later reactions.

Validation

  • pytest tests/unit/test_group_chat_context_wiring.py -q (10 passed)
  • ruff check astrbot/builtin_stars/astrbot/main.py tests/unit/test_group_chat_context_wiring.py
  • ruff format --check astrbot/builtin_stars/astrbot/main.py tests/unit/test_group_chat_context_wiring.py

Copilot AI lite review requested due to automatic review settings August 13, 2026 05:05
@dosubot dosubot Bot added size:M This PR changes 30-99 lines, ignoring generated files. area:core The bug / feature is about astrbot's core, backend labels Aug 13, 2026

@sourcery-ai sourcery-ai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This pull request fixes group context gaps for OneBot/aiocqhttp group chats by allowing JSON-only share-card messages to be recorded (instead of being dropped), while ensuring “active reply” behavior is still only driven by text/images.

Changes:

  • Treat Json components as eligible content for GroupChatContext recording in Main.on_message(), while gating active-reply triggering to Plain/Image presence.
  • Add JSON share-card summarization in GroupChatContext._format_message() by extracting common QQ card fields (meta.detail_1 / meta.news) and normalizing/truncating them.
  • Add unit tests covering JSON card recording, formatting (including wrapped JSON), and truncation behavior.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File Description
astrbot/builtin_stars/astrbot/main.py Allows JSON-only messages to be persisted into group context while preventing JSON-only cards from triggering active replies.
astrbot/builtin_stars/astrbot/group_chat_context.py Formats Json components into a compact [Shared Card ...] representation with whitespace normalization and 200-char truncation.
tests/unit/test_group_chat_context_wiring.py Adds tests to ensure JSON cards are recorded and summarized correctly and do not trigger active reply when card-only.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

@dosubot dosubot Bot added the lgtm This PR has been approved by a maintainer label Aug 13, 2026
@Soulter
Soulter merged commit de33730 into AstrBotDevs:master Aug 13, 2026
20 checks passed
BegoniaHe pushed a commit to Xero-Team/AstrBot that referenced this pull request Aug 14, 2026
Upstream-Commit: de33730
Upstream-Author: PeiPei233 <49641967+PeiPei233@users.noreply.github.com>
Upstream-PR: AstrBotDevs#9655
Sync-Disposition: adapt
Fork-Adaptation: Add JSON card summaries to the current GroupChatContext and include Json components in the existing group-context and active-reply eligibility path.
Tested: uv run pytest tests/unit/test_group_chat_context_wiring.py -q
LIghtJUNction added a commit that referenced this pull request Aug 14, 2026
* chore: update readme

* feat: support PowerShell 7 for Windows local shell (#9622)

* feat(config): add Windows PowerShell version option

* feat(computer): honor Windows PowerShell version in local runtime

* fix(computer): correct stale shell comment for configurable PowerShell

* refactor(computer): inline windows shell resolution per AGENTS.md

* test(computer): assert windows_shell in exec_managed call

* test: make shell tests cross-platform

Co-authored-by: Donoym <prober13c14@gmail.com>

* refactor(computer): auto-detect Windows shell instead of config

* fix(computer): drop stale cmd.exe references after shell auto-detect

* style: apply ruff format and import order

* Update astrbot/core/astr_main_agent.py

Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>

---------

Co-authored-by: Donoym <prober13c14@gmail.com>
Co-authored-by: Soulter <37870767+Soulter@users.noreply.github.com>
Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>

* feat: add download-count sorting to plugin marketplace (#9570)

* feat: 插件市场支持按下载量排序

为插件市场现有的前端本地排序补充下载量选项,复用已规范化的 download_count,不改变默认推荐顺序、后端接口和 OpenAPI。

新增稳定且不修改输入的下载量排序工具:支持升降序、未知值双向置底、非法值兜底及相同值原始顺序保留;接入市场排序控件并补齐中、英、俄三语文案。

新增 9 项专项单元测试,覆盖正常排序、零值、缺失与非法值、负数、数字字符串、小数、稳定性和输入不可变。验证通过 45 项 Dashboard Node 测试、额外性质检查、三语 JSON 校验、Vue 类型检查和生产构建。

* Delete dashboard/tests/marketPluginSort.test.mjs

* refactor: 内联插件市场下载量排序

删除独立的市场下载量排序工具,将下载量比较逻辑直接放在现有市场排序分支。

缺失下载量使用默认值 0,保持前端本地排序与现有排序行为一致。

验证:vue-tsc --noEmit;pnpm run build;node --test dashboard/tests/*.test.mjs;git diff --check。

---------

Co-authored-by: C₂₂H₂₅NO₆ <Sisyphbaous-DT-Project@users.noreply.github.com>
Co-authored-by: Soulter <37870767+Soulter@users.noreply.github.com>

* fix: improve dark theme text contrast (#9643)

* fix: propagate QQ media upload failures (#9644)

* feat(qqofficial): add chunked file uploads (#9646)

Add a dedicated chunked uploader for large local QQ Official media. Keep C2C and group endpoints explicit, support server-provided part index bases, and retry transient upload operations.

Co-authored-by: Fuyan Yuan <33221728+TheRainstorm@users.noreply.github.com>

* fix(kb): support UUID fallback in get_kb_by_name and warn on missing KBs (#9636)

Fixes #9529.

When kb_names contains UUIDs instead of names, get_kb_by_name() would
return None and check_all_kb() would silently skip retrieval with only
a DEBUG-level log.

Modifications:
- get_kb_by_name() now falls back to UUID lookup when name match fails
- check_all_kb() distinguishes None (not found) from empty KBs and logs
  a WARNING with the count of missing KBs
- Add regression tests covering UUID lookup, name preference, and logging

* fix: prevent SharedPreferences deadlocks (#9649)

* fix: avoid blocking shared preference access

* docs: clarify shared preference cache roles

* docs: explain shared preference cache purpose

* docs: link cache rationale to pull request

* chore: bump version to 4.27.3 (#9650)

* chore: bump version to 4.27.3

* Update changelog for version 4.27.3

Updated changelog for version 4.27.3 with new features, maintenance updates, and bug fixes.

* Refactor: stat service deprecated stats (#9658)

* refactor(dashboard): migrate get_stat off deprecated stats methods

Rewrite StatService.get_stat to query PlatformStat directly via
db_helper.get_db(), following the existing get_provider_token_stats
pattern in the same file, instead of the deprecated
get_base_stats/get_grouped_base_stats/get_total_message_count.

- Windowed rows are fetched once with an explicit ORDER BY timestamp
  (the old get_base_stats relied on insertion order)
- Per-platform sums and hourly time-series buckets are aggregated in
  Python; total message count uses func.coalesce(func.sum(...), 0)
- Response shape is unchanged: platform entries keep the
  {name, count, timestamp} keys, now built as plain dicts so no
  deprecated po.Platform/Stats classes are instantiated
- Verified semantically identical against the old methods with an A/B
  comparison over a seeded database (time series, per-platform sums,
  total count, and empty-window case all match)

* test(dashboard): cover StatService.get_stat aggregation semantics

The existing test_get_stat route test only asserts the HTTP status and
the presence of the platform key, so an aggregation regression would
pass unnoticed. Add focused unit tests that seed PlatformStat rows and
assert the windowed per-platform sums, the global message total, the
hourly time-series bucket shape, the response key set, and the
empty-window behavior.

* feat(provider): add SSYCloud chat completion provider (#9659)

* fix: include JSON cards in group context (#9655)

* fix: include JSON cards in group context

* fix: allow JSON cards to trigger active replies

* docs: add ShengSuanYun provider guide

* fix: detect audio format from file content (#9612)

* feat: log effective Windows local runtime shell (#9648)

* feat: log effective Windows local runtime shell

* chore: remove Windows shell logging tests

---------

Co-authored-by: Soulter <905617992@qq.com>

* refactor(misskey): migrate off deprecated visibility resolver alias (#9674)

---------

Co-authored-by: Soulter <905617992@qq.com>
Co-authored-by: Wei Chengqian <wcqqq1214@gmail.com>
Co-authored-by: Donoym <prober13c14@gmail.com>
Co-authored-by: Soulter <37870767+Soulter@users.noreply.github.com>
Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
Co-authored-by: C₂₂H₂₅NO₆ <96930391+Sisyphbaous-DT-Project@users.noreply.github.com>
Co-authored-by: C₂₂H₂₅NO₆ <Sisyphbaous-DT-Project@users.noreply.github.com>
Co-authored-by: Fuyan Yuan <33221728+TheRainstorm@users.noreply.github.com>
Co-authored-by: lxfight <1686540385@qq.com>
Co-authored-by: Ruochen Pan <badbatch0x01@gmail.com>
Co-authored-by: xxshu26 <15197757832@163.com>
Co-authored-by: PeiPei233 <49641967+PeiPei233@users.noreply.github.com>
Co-authored-by: xiaoxuan010 <2592053474@qq.com>
Co-authored-by: C10H14N2O5 <100066858+C10H14N2O5@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:core The bug / feature is about astrbot's core, backend lgtm This PR has been approved by a maintainer size:M This PR changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Group context ignores JSON share cards

3 participants