chore(sync): absorb upstream through 34743f4ad - #5
Merged
Conversation
…strBotDevs#9873) Keep the current skill editor card structure and scrollable dialog. Enable fullscreen on mdAndDown, lift the 88vh cap on compact viewports, and stack the file tree above the editor so save/cancel stay reachable. Upstream-Commit: 0298ddd Upstream-Author: 一张白纸 <202384594+mantoujun12@users.noreply.github.com> Upstream-PR: AstrBotDevs#9873 Sync-Disposition: adapt Fork-Adaptation: Apply fullscreen and compact overflow rules to the existing composition-based SkillsSection dialog instead of the upstream template. Keep scrollable and the current header/body/actions card layout. Tested: cd dashboard && pnpm exec vitest run --config vitest.config.ts tests/skillsSection.vitest.ts AI-Generated: true Generated-At: 2026-08-31T23:44:50Z
…9872) Skip a leading self mention in the Lark text projection used for wake and command matching. Keep Comp.At on the message chain, and do not pass bot identity into quoted-message reconstruction. Upstream-Commit: b0f2f90 Upstream-Author: Ars1027 <118655114+Ars1027@users.noreply.github.com> Upstream-PR: AstrBotDevs#9872 Sync-Disposition: adapt Fork-Adaptation: Apply the skip onto the current helper that already serializes image/file/audio/video components. Keep tests under tests/unit/platform/test_lark_adapter.py. Tested: uv run pytest tests/unit/platform/test_lark_adapter.py -q AI-Generated: true Generated-At: 2026-08-31T23:46:42Z
Copy non-empty buffered text elements before clearing them when an image is inserted, and avoid emitting empty blocks for image-first messages. Co-authored-by: liruihan <liruihan@example.com> (cherry picked from commit e17f568)
Resolve local and non-data-URL image references in Gemini history through the current media helper instead of assuming a data URL. Upstream-Commit: 5aca0c9 Upstream-Author: AnegasakiNene <990126341@qq.com> Upstream-PR: AstrBotDevs#9874 Sync-Disposition: adapt Fork-Adaptation: Make the existing _prepare_conversation helper async and place tests under tests/unit/provider/. Convert remaining prepare-conversation tests and query-path mocks to await/AsyncMock. Tested: uv run pytest tests/unit/provider/test_gemini_source.py -q AI-Generated: true Generated-At: 2026-08-31T23:50:00Z
…9767) Add AnySearch as a seventh web search provider, including anonymous daily-quota mode when no API key is configured. Upstream-Commit: f845a8d Upstream-Author: WangPan59 <79305027+WangPan59@users.noreply.github.com> Upstream-PR: AstrBotDevs#9767 Sync-Disposition: adapt Fork-Adaptation: Use _client_session/_post and runtime _get_key_rotator instead of ClientSession(trust_env=True) and a module-level rotator. Empty keys issue one anonymous request. Update zh/en docs and metadata only; omit ru-RU and the bundled plugin-guide formatting rewrite. Tested: uv run pytest tests/unit/test_web_search_tools.py tests/unit/test_astr_main_agent.py::TestBuiltinToolInjection -q AI-Generated: true Generated-At: 2026-08-31T23:52:37Z
Rebuild the configuration workspace with a profile menu, collapsible search, dedicated AI panel, and shared provider selection menu. Upstream-Commit: 34743f4 Upstream-Author: Soulter <37870767+Soulter@users.noreply.github.com> Upstream-PR: AstrBotDevs#9883 Sync-Disposition: adapt Fork-Adaptation: Keep the composition ConfigPage unsaved banner, step-up, and FloatingActionStack. Point docs at in-app /help via configDocsHref. Omit ru-RU and docs.astrbot.app. Replace ChatUILogo with the local plugin icon. Regenerate the MDI subset from current sources. Tested: cd dashboard && pnpm exec vue-tsc --noEmit && pnpm exec vitest run --config vitest.config.ts tests/configDocs.vitest.ts tests/dialogScrollLayouts.vitest.ts tests/remainingCoverage.vitest.ts tests/pageSmokes.vitest.ts tests/chatComponentSmokes.vitest.ts tests/configItemFragments.vitest.ts tests/configEditorDialogs.vitest.ts && pnpm run i18n:check AI-Generated: true Generated-At: 2026-09-01T00:06:09Z
Advance the upstream cursor to 34743f4 after reviewing eight commits. Record adapt, cherry-pick, and skip decisions plus the absorbed 4.27.5 changelog entries. AI-Generated: true Generated-At: 2026-09-01T00:08:38Z
Align section ordering and search behavior with the productized configuration design. Keep provider menus compatible with chat model labels and custom selector text, and lazy-load provider management views to avoid eager Monaco imports. AI-Generated: true Generated-At: 2026-09-01T01:08:34Z
Member
|
@xero-team-bot review |
|
🔄 Reviewing (exploring the project + incremental diff), one moment… |
![xero-team-bot[bot]](https://avatars.githubusercontent.com/in/4768775?s=60&v=4){kind=small}
There was a problem hiding this comment.
🤖 AI Code Review
The synchronization introduces a Python syntax error in the new AnySearch tool, preventing the web-search module (and likely application startup) from being imported.
Risk breakdown
| Level | Count |
|---|---|
| 🔴 critical | 1 |
| 🟠 high | 0 |
| 🟡 medium | 0 |
| 🔵 low | 0 |
| ⚪ info | 0 |
engine: agent (10 turns)
🔴 critical (1)
astrbot/core/tools/web_search_tools.py:1432— Invalid multiple-exception syntax prevents module import
The newAnySearchWebSearchTool.callmethod usesexcept TypeError, ValueError:, which is invalid Python 3 syntax and raises a SyntaxError when this module is parsed. Since the module contains the built-in web-search tools and is imported by the agent, this can prevent AstrBot from starting or loading web-search functionality at all.
💡 Change the handler toexcept (TypeError, ValueError):.
| _, provider_settings, _ = _get_runtime(context) | ||
|
|
||
| try: | ||
| max_results = int(kwargs.get("max_results", 10)) |
There was a problem hiding this comment.
🔴 Invalid multiple-exception syntax prevents module import
The new AnySearchWebSearchTool.call method uses except TypeError, ValueError:, which is invalid Python 3 syntax and raises a SyntaxError when this module is parsed. Since the module contains the built-in web-search tools and is imported by the agent, this can prevent AstrBot from starting or loading web-search functionality at all.
💡 Change the handler to except (TypeError, ValueError):.
Collaborator
Author
There was a problem hiding this comment.
It's the python 3.14 syntax. Exceptions can be used without parentheses.
Member
|
@xero-team-bot author |
|
Status updated: waiting on the author ( |
Collaborator
Author
Please manually comfirm that all commits are valid and work properly. This pr is created by LLMs |
Align schema initialization with the empty-database cutover. Record missing 4.27.5 user-visible changes in the bilingual changelog. AI-Generated: true Generated-At: 2026-09-01T08:42:29Z
Point waking-check and agent-request tests at command_prefixes and llm_access so they match the 4.27.5 routing config. AI-Generated: true Generated-At: 2026-09-01T13:37:30Z
Date the notes, drop the WIP marker, and record occupancy as Dashboard rename plus the command-update takeover API. AI-Generated: true Generated-At: 2026-09-01T13:37:41Z
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Absorb upstream
fe3d77568b88ea3be83b2190d515da0a039da399..34743f4adfe666e52422426e792b8ff7c88b92ec(8 commits) into this fork. Cursor is now34743f4adfe666e52422426e792b8ff7c88b92ec.Adapted AstrBotDevs#9873, AstrBotDevs#9872, AstrBotDevs#9874, AstrBotDevs#9767, and AstrBotDevs#9883. Cherry-picked AstrBotDevs#9841. Skipped AstrBotDevs#9856 (already equivalent via
4e909eca1) and AstrBotDevs#9879 (dashboard deferral already present; omittedmigra_webchat_session.py; kept fork 404 pointing atmake run). Follow-up commit aligns the productized config workspace with the current composition UI.Related issue
None. Upstream synchronization.
Implementation notes
_prepare_conversationis async./helpdocs. MDI subset regenerated.changelogs/v4.27.5.md.Validation
Focused checks recorded on the integration commits:
Did not re-run
make check,make test, ordocs:buildfor this PR.Compatibility and risk
No fork-owned publish/docs URLs restored. Residual risk is Dashboard config workspace layout on small screens and AnySearch anonymous quota behavior.
Checklist
docs/zh/anddocs/en/when needed.docs/public/openapi.json, and tests change together when routes or schemas change.pyproject.toml,requirements.txt, anduv.locktogether.!and aBREAKING CHANGE:footer.Agent note
Goal: publish
sync/upstream-34743f4adand open a PR againstmaster, with BegoniaHe as reviewer.Paths: Lark adapter/event, Gemini source, web search tools, Dashboard config/skills/provider menus, bilingual websearch docs,
changelogs/v4.27.5.md,upstream-sync.yaml,upstream-decisions.jsonl.Checks run: focused pytest and Dashboard vitest/vue-tsc/i18n recorded on the integration commits. Residual risk: full
make check/make testnot re-run here.Tools: grok-4.6 in opencode.