fix(core): make OGXAsLibraryClient thread-safe - #5773
Merged
Conversation
zy1o
requested review from
bbrowning,
cdoern,
franciscojavierarceo,
leseb,
mattf and
raghotham
as code owners
May 10, 2026 06:41
mattf
approved these changes
May 11, 2026
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.
What does this PR do?
Rework the sync-on-async client.
The previous implementation called
loop.run_until_complete()on a shared loop instance inside.request()method. When multiple threads calledrequest()concurrently, this raisedRuntimeError: This event loop is already running.The fix uses a single dedicated daemon thread running
loop.run_forever(), with all coroutines submitted with aasyncio.run_coroutine_threadsafe()call.Known limitations and tradeoffs
OGXAsLibraryClientis not thread-safe #5752, global state in the async client may still cause races under concurrent load. This PR fixes the event loop collision specifically.threading.Queuewith busy-poll fallback (asyncio.sleep(0.01)) when full. My judgement call is: This is good enough for LLM token rates.future.cancel()on the streaming coroutine is best-effort; a coroutine blocked on network I/O won't respond immediately.Closes #5752
Test Plan
Added unit tests covering:
Launch just them with: