Skip to content

fix: _KeyRotator index bounds check #9040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Soulter merged 1 commit into from
Jun 27, 2026
+2 −0
Merged

fix: _KeyRotator index bounds check #9040

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions astrbot/core/tools/web_search_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ async def get(self, provider_settings: dict) -> str:
)

async with self.lock:
if self.index >= len(keys):
self.index = 0
key = keys[self.index]
self.index = (self.index + 1) % len(keys)
return key
Comment on lines 75 to 80

@gemini-code-assist gemini-code-assist Bot Jun 26, 2026

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.

medium

In a single-threaded asyncio event loop, synchronous code blocks (those without any await statements) are executed atomically and will not be interrupted by other coroutines. Therefore, the async with self.lock: block is redundant and can be safely removed to simplify the code and avoid unnecessary locking overhead.

        if self.index >= len(keys):
            self.index = 0
        key = keys[self.index]
        self.index = (self.index + 1) % len(keys)
        return key
References
  1. In a single-threaded asyncio event loop, synchronous functions (code blocks without 'await') are executed atomically and will not be interrupted by other coroutines. Therefore, they are safe from race conditions when modifying shared state within that block.

Expand Down