fix: remove stale platform instance on reload#7188
Open
Clhikari wants to merge 2 commits intoAstrBotDevs:masterfrom
Open
fix: remove stale platform instance on reload#7188Clhikari wants to merge 2 commits intoAstrBotDevs:masterfrom
Clhikari wants to merge 2 commits intoAstrBotDevs:masterfrom
Conversation
Contributor
There was a problem hiding this comment.
Code Review
This pull request simplifies the platform termination process in PlatformManager by directly removing the adapter instance from the tracking list, ensuring the operation remains safe even if the client ID changes. A new unit test has been added to verify this fix. The reviewer suggested improving the robustness of the error handling by catching a specific ValueError instead of a broad Exception when removing the instance.
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
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
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.
修复了平台热重载时,旧适配器实例可能未被正确移除的问题。
在现有实现里,
PlatformManager.terminate_platform()会通过client_self_id从platform_insts中查找并移除实例。这个字段在 Discord 适配器运行过程中可能发生变化,导致热重载时旧实例未能被正确摘除。后续主动发送消息时,就有机会继续命中已经关闭的旧实例,并触发Session is closed一类错误。Modifications / 改动点
修改了
astrbot/core/platform/manager.py在
terminate_platform()中,改为直接移除_inst_map中记录的实例对象info["inst"]保留原有终止和任务清理流程,未扩展到通用发送链路或 Discord 发送实现
新增回归测试
tests/unit/test_platform_manager.py测试覆盖了
client_self_id变化后,旧实例仍能被正确移除的场景This is NOT a breaking change. / 这不是一个破坏性变更。
Screenshots or Test Results / 运行截图或测试结果
本地已执行以下验证步骤:
测试结果:
本次回归测试验证了以下内容:
Fixes #7187
Checklist / 检查清单
😊 If there are new features added in the PR, I have discussed it with the authors through issues/emails, etc.
/ 如果 PR 中有新加入的功能,已经通过 Issue / 邮件等方式和作者讨论过。
👀 My changes have been well-tested, and "Verification Steps" and "Screenshots" have been provided above.
/ 我的更改经过了良好的测试,并已在上方提供了“验证步骤”和“运行截图”。
🤓 I have ensured that no new dependencies are introduced, OR if new dependencies are introduced, they have been added to the appropriate locations in
requirements.txtandpyproject.toml./ 我确保没有引入新依赖库,或者引入了新依赖库的同时将其添加到
requirements.txt和pyproject.toml文件相应位置。😮 My changes do not introduce malicious code.
/ 我的更改没有引入恶意代码。