Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/terminate-openai-failed-streams.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@effect/ai-openai": patch
---

Terminate OpenAI HTTP and WebSocket response streams when a `response.failed` event arrives.
5 changes: 3 additions & 2 deletions packages/ai/openai/src/OpenAiClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,8 @@ export const make = Effect.fnUntraced(
Stream.pipeThroughChannel(Sse.decodeDataSchema(OpenAiSchema.ResponseStreamEvent)),
Stream.takeUntil((event) =>
event.data.type === "response.completed" ||
event.data.type === "response.incomplete"
event.data.type === "response.incomplete" ||
event.data.type === "response.failed"
),
Stream.map((event) => event.data),
Stream.catchTags({
Expand Down Expand Up @@ -637,7 +638,7 @@ const makeSocket = Effect.gen(function*() {

return Stream.fromQueue(incoming).pipe(
Stream.takeUntil((e) => {
done = e.type === "response.completed" || e.type === "response.incomplete"
done = e.type === "response.completed" || e.type === "response.incomplete" || e.type === "response.failed"
return done
})
)
Expand Down
72 changes: 71 additions & 1 deletion packages/ai/openai/test/OpenAiClient.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import * as HttpClient from "effect/unstable/http/HttpClient"
import * as HttpClientError from "effect/unstable/http/HttpClientError"
import * as HttpClientRequest from "effect/unstable/http/HttpClientRequest"
import * as HttpClientResponse from "effect/unstable/http/HttpClientResponse"
import * as Socket from "effect/unstable/socket/Socket"
import { WS } from "vitest-websocket-mock"

describe("OpenAiClient", () => {
describe("make", () => {
Expand Down Expand Up @@ -448,6 +450,59 @@ describe("OpenAiClient", () => {
})

describe("createResponseStream", () => {
it.live("terminates an SSE stream at response.failed", () =>
Effect.gen(function*() {
const client = yield* OpenAiClient.OpenAiClient
const [, stream] = yield* client.createResponseStream({ model: "gpt-4o", input: "test" })
const result = yield* Stream.runCollect(stream).pipe(Effect.timeoutOption("100 millis"))

assert.strictEqual(result._tag, "Some")
}).pipe(Effect.provide(makeTestLayer(undefined, {
_tag: "Sse",
events: [{
type: "response.failed",
sequence_number: 1,
response: makeResponseBody({ status: "failed" })
}],
keepOpen: true
}))))

it.live("terminates a WebSocket stream at response.failed", () =>
Effect.gen(function*() {
const server = yield* Effect.acquireRelease(
Effect.sync(() => new WS("wss://api.openai.com/v1/responses", { jsonProtocol: true })),
(server) =>
Effect.sync(() => {
server.close()
WS.clean()
})
)
const event = {
type: "response.failed",
sequence_number: 1,
response: makeResponseBody({ status: "failed" })
}
const result = yield* OpenAiClient.withWebSocketMode(
Effect.gen(function*() {
const client = yield* OpenAiClient.OpenAiClient
const [, stream] = yield* client.createResponseStream({ model: "gpt-4o", input: "test" })
const [events] = yield* Effect.all([
Stream.runCollect(stream),
Effect.promise(() => server.nextMessage).pipe(
Effect.tap(() => Effect.sync(() => server.send(event)))
)
], { concurrency: "unbounded" })
return events
})
).pipe(
Effect.provide(makeTestLayer()),
Effect.provideService(Socket.WebSocketConstructor, (url) => new globalThis.WebSocket(url)),
Effect.timeoutOption("1 second")
)

assert.strictEqual(result._tag, "Some")
}))

it.effect("accepts keepalive stream events", () =>
Effect.gen(function*() {
const client = yield* OpenAiClient.OpenAiClient
Expand Down Expand Up @@ -537,6 +592,7 @@ type MockResponse =
| {
readonly _tag: "Sse"
readonly events: ReadonlyArray<typeof OpenAiSchema.ResponseStreamEvent.Encoded>
readonly keepOpen?: boolean | undefined
readonly status?: number | undefined
readonly headers?: Record<string, string> | undefined
}
Expand Down Expand Up @@ -657,7 +713,7 @@ const makeResponse = (
? JSON.stringify(response.body)
: response.events.map((event) => `data: ${JSON.stringify(event)}\n\n`).join("")

return HttpClientResponse.fromWeb(
const httpResponse = HttpClientResponse.fromWeb(
request,
new Response(body, {
status: response.status ?? 200,
Expand All @@ -667,4 +723,18 @@ const makeResponse = (
}
})
)
if (response._tag !== "Sse" || response.keepOpen !== true) return httpResponse

const stream = Stream.concat(
Stream.succeed(new TextEncoder().encode(body)),
Stream.never
)
// `fromWeb` stores the ReadableStream internally, so a proxy is needed to replace it with a non-terminating test stream.
return new Proxy(httpResponse, {
get(target, property) {
if (property === "stream") return stream
const value = Reflect.get(target, property, target)
return typeof value === "function" ? value.bind(target) : value
}
})
}
Loading