-
Notifications
You must be signed in to change notification settings - Fork 504
Use threading for sandbox client #638
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.
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
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import asyncio | ||
| import threading | ||
| from typing import Any, Callable | ||
|
|
||
| THREAD_LOCAL_STORAGE = threading.local() | ||
|
|
||
|
|
||
| def get_thread_local_storage() -> threading.local: | ||
| """Get the thread-local storage for the current thread.""" | ||
| return THREAD_LOCAL_STORAGE | ||
|
|
||
|
|
||
| def get_or_create_thread_attr( | ||
| key: str, factory: Callable[..., Any], *args, **kwargs | ||
| ) -> Any: | ||
| """Get value from thread-local storage, creating it if it doesn't exist.""" | ||
| thread_local = get_thread_local_storage() | ||
| value = getattr(thread_local, key, None) | ||
| if value is None: | ||
| value = factory(*args, **kwargs) | ||
| setattr(thread_local, key, value) | ||
| return value | ||
|
|
||
|
|
||
| def get_or_create_thread_loop() -> asyncio.AbstractEventLoop: | ||
| """Get or create event loop for current thread. Reuses loop to avoid closing it.""" | ||
| thread_local_loop = get_or_create_thread_attr("loop", asyncio.new_event_loop) | ||
| asyncio.set_event_loop(thread_local_loop) | ||
| return thread_local_loop |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bug: Thread-local storage key collision ignores different client configurations
The hardcoded key
"sandbox_client"inget_or_create_thread_attrcauses allThreadedAsyncSandboxClientinstances to share the same thread-localAsyncSandboxClient. When multiple instances are created with differentclient_kwargs(e.g., differentmax_connectionsvalues), the first instance to make a call on a thread creates the client with its config, and subsequent instances silently reuse that same client, ignoring their own configurations. The factory kwargs are only used on creation, not on retrieval.Additional Locations (1)
verifiers/utils/thread_utils.py#L17-L21