Skip to content

fix: settle async streams on executor rejection #974

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

Open
sylvesterkaczmarek wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: settle async streams on executor rejection #974

Show file tree
Hide file tree
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
11 changes: 10 additions & 1 deletion openai-java-core/src/main/kotlin/com/openai/core/http/AsyncStreamResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,15 @@ internal fun <T> CompletableFuture<StreamResponse<T>>.toAsync(streamHandlerExecu
else "Cannot subscribe after the response is closed"
}

val guardedExecutor = Executor { task ->
try {
executor.execute(task)
} catch (error: Throwable) {
if (onCompleteFuture.completeExceptionally(error)) close()
throw error
}
}

this@toAsync.whenCompleteAsync(
{ streamResponse, futureError ->
if (state.get() == State.CLOSED) {
Expand Down Expand Up @@ -129,7 +138,7 @@ internal fun <T> CompletableFuture<StreamResponse<T>>.toAsync(streamHandlerExecu
}
}
},
executor,
guardedExecutor,
)
}

Expand Down
21 changes: 21 additions & 0 deletions openai-java-core/src/test/kotlin/com/openai/core/http/AsyncStreamResponseTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ package com.openai.core.http

import java.util.*
import java.util.concurrent.CompletableFuture
import java.util.concurrent.ExecutionException
import java.util.concurrent.Executor
import java.util.concurrent.RejectedExecutionException
import java.util.concurrent.TimeUnit
import java.util.stream.Stream
import kotlin.streams.asStream
import org.assertj.core.api.Assertions.assertThat
Expand Down Expand Up @@ -257,6 +260,24 @@ internal class AsyncStreamResponseTest {
verify(streamResponse, times(1)).close()
}

@Test
fun subscribe_whenExecutorRejects_completesAndCloses() {
val future = CompletableFuture.completedFuture(streamResponse)
val asyncStreamResponse = future.toAsync(executor)
val rejected = RejectedExecutionException("executor rejected")
val rejectingExecutor = Executor { throw rejected }

asyncStreamResponse.subscribe(handler, rejectingExecutor)

val completionError = catchThrowable {
asyncStreamResponse.onCompleteFuture().get(100, TimeUnit.MILLISECONDS)
}
assertThat(completionError).isInstanceOf(ExecutionException::class.java).hasCause(rejected)
verify(streamResponse, times(1)).close()
verify(handler, never()).onNext(any())
verify(handler, never()).onComplete(any())
}

@Test
fun close_whenFutureErrors_doesNothing() {
val future = CompletableFuture<StreamResponse<String>>()
Expand Down