Repository navigation
Conversation
Release reserved slots in finally blocks and keep asynchronous capacity waiting cancellable. Signed-off-by: YMuskrat <101849520+YMuskrat@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.
Fixes #760.
PooledChatModel reserves a slot before constructing ChatOpenAI, but construction currently happens outside cleanup. Repeated construction errors can exhaust the pool even though no request is running. Cancelled async calls also skip cleanup, and cancellation while waiting on a threaded blocking acquire can leave an orphaned waiter that reserves capacity later.
Put client construction and invocation inside a try/finally release in both retry loops. For async capacity waiting, retry the existing non-blocking acquire after a cancellable 50 ms sleep, avoiding a background acquiring thread. This adds up to one polling interval of capacity-wakeup latency when the pool is full. Existing rate-limit backoff, retries and callback forwarding are retained.
This is per-call cleanup, complementary to the owner/process cleanup proposed in #743.
Validation:
make lint,make format, andmake format-checkpass; all 9,965 unit tests and 124 integration tests pass. Seven new cases cover construction failures, in-flight cancellation, waiting cancellation, capacity recovery and sync/async rate-limit retries. Four fail on the original implementation. The focused run including the existing contrib pool tests passes all 36 tests; no live provider calls were made.