Skip to content

Commit 9429632

Browse files
committed
feat(api): abort signal support for opencode-go, unbound, vercel-ai-gateway, zoo-gateway
1 parent 38d5ee0 commit 9429632

8 files changed

Lines changed: 702 additions & 31 deletions

File tree

‎src/api/providers/__tests__/opencode-go.spec.ts‎

Lines changed: 193 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import { getModels } from "../fetchers/modelCache"
1919
import { ApiHandlerOptions } from "../../../shared/api"
2020
import { asyncStreamFrom, collectStream } from "../../../test-utils/stream"
2121
import { clearAllMocks } from "../../../test-utils/reset"
22+
import { makeCreateMessageMetadata } from "../../../test-utils/api"
2223

2324
vitest.mock("openai")
2425
vitest.mock("delay", () => ({
@@ -188,6 +189,7 @@ describe("OpencodeGoHandler", () => {
188189
max_completion_tokens: 40_960,
189190
temperature: expect.any(Number),
190191
}),
192+
expect.objectContaining({ signal: expect.any(AbortSignal) }),
191193
)
192194
})
193195

@@ -202,6 +204,7 @@ describe("OpencodeGoHandler", () => {
202204
model: "glm-5.1",
203205
reasoning_effort: "medium",
204206
}),
207+
expect.objectContaining({ signal: expect.any(AbortSignal) }),
205208
)
206209
})
207210

@@ -352,10 +355,67 @@ describe("OpencodeGoHandler", () => {
352355

353356
await collectStream(handler.createMessage("sys", messages))
354357

355-
expect(mockCreate).toHaveBeenCalledWith(expect.objectContaining({ max_completion_tokens: 999 }))
358+
expect(mockCreate).toHaveBeenCalledWith(
359+
expect.objectContaining({ max_completion_tokens: 999 }),
360+
expect.objectContaining({ signal: expect.any(AbortSignal) }),
361+
)
356362
})
357363
})
358364

365+
describe("createMessage abort signal bridging", () => {
366+
it("rejects with an AbortError when the external signal is already aborted", async () => {
367+
mockCreate.mockImplementation(async () => {
368+
throw new DOMException("The operation was aborted.", "AbortError")
369+
})
370+
371+
const handler = new OpencodeGoHandler(mockOptions)
372+
const controller = new AbortController()
373+
controller.abort()
374+
375+
const stream = handler.createMessage(
376+
"sys",
377+
[{ role: "user", content: "hi" }],
378+
makeCreateMessageMetadata({ abortSignal: controller.signal }),
379+
)
380+
381+
await expect(collectStream(stream)).rejects.toMatchObject({ name: "AbortError" })
382+
})
383+
384+
it("aborts the in-flight request when the external signal fires mid-stream", async () => {
385+
let capturedSignal: AbortSignal | undefined
386+
mockCreate.mockImplementation(async (_params: unknown, options: { signal?: AbortSignal }) => {
387+
capturedSignal = options?.signal
388+
return (async function* () {
389+
yield {
390+
choices: [{ delta: { content: "partial" }, index: 0 }],
391+
index: 0,
392+
}
393+
await new Promise((_resolve, reject) => {
394+
const onAbort = () => reject(new DOMException("The operation was aborted.", "AbortError"))
395+
options?.signal?.addEventListener("abort", onAbort, { once: true })
396+
})
397+
})()
398+
})
399+
400+
const handler = new OpencodeGoHandler(mockOptions)
401+
const controller = new AbortController()
402+
403+
const consumed = collectStream(
404+
handler.createMessage(
405+
"sys",
406+
[{ role: "user", content: "hi" }],
407+
makeCreateMessageMetadata({ abortSignal: controller.signal }),
408+
),
409+
)
410+
411+
// Let the request start and the first chunk be yielded before aborting.
412+
await new Promise((resolve) => setTimeout(resolve, 25))
413+
controller.abort()
414+
415+
await expect(consumed).rejects.toMatchObject({ name: "AbortError" })
416+
expect(capturedSignal?.aborted).toBe(true)
417+
})
418+
})
359419
describe("completePrompt", () => {
360420
it("returns the message content for a non-streaming completion", async () => {
361421
mockCreate.mockResolvedValue({ choices: [{ message: { content: "the answer" } }] })
@@ -369,6 +429,7 @@ describe("OpencodeGoHandler", () => {
369429
max_completion_tokens: 40_960,
370430
reasoning_effort: "medium",
371431
}),
432+
{},
372433
)
373434
})
374435

@@ -394,7 +455,7 @@ describe("OpencodeGoHandler", () => {
394455
mockCreate.mockResolvedValue({ choices: [{ message: { content: "ok" } }] })
395456
const handler = new OpencodeGoHandler({ ...mockOptions, includeMaxTokens: true, modelMaxTokens: 4321 })
396457
await handler.completePrompt("ping")
397-
expect(mockCreate).toHaveBeenCalledWith(expect.objectContaining({ max_completion_tokens: 4321 }))
458+
expect(mockCreate).toHaveBeenCalledWith(expect.objectContaining({ max_completion_tokens: 4321 }), {})
398459
})
399460
})
400461

@@ -456,6 +517,7 @@ describe("OpencodeGoHandler", () => {
456517
stream: true,
457518
system: expect.arrayContaining([expect.objectContaining({ type: "text", text: "sys" })]),
458519
}),
520+
expect.objectContaining({ signal: expect.any(AbortSignal) }),
459521
)
460522
// The OpenAI chat completions endpoint must NOT be used for this model.
461523
expect(mockCreate).not.toHaveBeenCalled()
@@ -537,6 +599,7 @@ describe("OpencodeGoHandler", () => {
537599
// so the model default is used.
538600
max_tokens: 65_536,
539601
}),
602+
undefined,
540603
)
541604
expect(mockCreate).not.toHaveBeenCalled()
542605
})
@@ -552,7 +615,7 @@ describe("OpencodeGoHandler", () => {
552615
modelMaxTokens: 2048,
553616
})
554617
await handler.completePrompt("ping")
555-
expect(mockAnthropicCreate).toHaveBeenCalledWith(expect.objectContaining({ max_tokens: 2048 }))
618+
expect(mockAnthropicCreate).toHaveBeenCalledWith(expect.objectContaining({ max_tokens: 2048 }), undefined)
556619
})
557620

558621
it("completePrompt rethrows non-Error values unchanged from the Anthropic path", async () => {
@@ -567,6 +630,125 @@ describe("OpencodeGoHandler", () => {
567630
expect(await handler.completePrompt("ping")).toBe("")
568631
})
569632

633+
it("completePrompt passes abort signal through to Anthropic client", async () => {
634+
mockAnthropicCreate.mockResolvedValue({ content: [{ type: "text", text: "response" }] })
635+
const controller = new AbortController()
636+
const handler = new OpencodeGoHandler(anthropicOptions)
637+
await handler.completePrompt("ping", { abortSignal: controller.signal })
638+
expect(mockAnthropicCreate).toHaveBeenCalledWith(expect.objectContaining({ model: expect.any(String) }), {
639+
signal: controller.signal,
640+
})
641+
})
642+
643+
it("completePrompt passes both signal and timeoutMs through to Anthropic client", async () => {
644+
mockAnthropicCreate.mockResolvedValue({ content: [{ type: "text", text: "response" }] })
645+
const controller = new AbortController()
646+
const handler = new OpencodeGoHandler(anthropicOptions)
647+
await handler.completePrompt("ping", { abortSignal: controller.signal, timeoutMs: 10000 })
648+
expect(mockAnthropicCreate).toHaveBeenCalledWith(expect.objectContaining({ model: expect.any(String) }), {
649+
signal: controller.signal,
650+
timeout: 10000,
651+
})
652+
})
653+
654+
it("completePrompt passes only timeoutMs when no signal is provided", async () => {
655+
mockAnthropicCreate.mockResolvedValue({ content: [{ type: "text", text: "response" }] })
656+
const handler = new OpencodeGoHandler(anthropicOptions)
657+
await handler.completePrompt("ping", { timeoutMs: 5000 })
658+
expect(mockAnthropicCreate).toHaveBeenCalledWith(expect.objectContaining({ model: expect.any(String) }), {
659+
timeout: 5000,
660+
})
661+
})
662+
663+
it("completePrompt works without options (backward compatible, Anthropic path)", async () => {
664+
mockAnthropicCreate.mockResolvedValue({ content: [{ type: "text", text: "response" }] })
665+
const handler = new OpencodeGoHandler(anthropicOptions)
666+
const result = await handler.completePrompt("ping")
667+
expect(result).toBe("response")
668+
expect(mockAnthropicCreate).toHaveBeenCalledWith(
669+
expect.objectContaining({ model: expect.any(String) }),
670+
undefined,
671+
)
672+
})
673+
674+
describe("completePrompt (OpenAI path)", () => {
675+
const openaiOptions: ApiHandlerOptions = {
676+
opencodeGoApiKey: "test-key",
677+
apiModelId: "glm-5.1", // OpenAI-format model
678+
}
679+
680+
beforeEach(() => {
681+
vitest.clearAllMocks()
682+
})
683+
684+
it("completePrompt returns text for OpenAI path", async () => {
685+
mockCreate.mockResolvedValueOnce({
686+
choices: [{ message: { content: "response" } }],
687+
})
688+
689+
const handler = new OpencodeGoHandler(openaiOptions)
690+
expect(await handler.completePrompt("ping")).toBe("response")
691+
expect(mockCreate).toHaveBeenCalledWith(
692+
expect.objectContaining({ model: expect.any(String), stream: false }),
693+
{}, // empty object when no options
694+
)
695+
})
696+
697+
it("completePrompt passes abort signal through to OpenAI client", async () => {
698+
mockCreate.mockResolvedValueOnce({
699+
choices: [{ message: { content: "response" } }],
700+
})
701+
const controller = new AbortController()
702+
const handler = new OpencodeGoHandler(openaiOptions)
703+
704+
await handler.completePrompt("ping", { abortSignal: controller.signal })
705+
expect(mockCreate).toHaveBeenCalledWith(
706+
expect.objectContaining({ model: expect.any(String), stream: false }),
707+
{ signal: controller.signal },
708+
)
709+
})
710+
711+
it("completePrompt passes both signal and timeoutMs through to OpenAI client", async () => {
712+
mockCreate.mockResolvedValueOnce({
713+
choices: [{ message: { content: "response" } }],
714+
})
715+
const controller = new AbortController()
716+
const handler = new OpencodeGoHandler(openaiOptions)
717+
718+
await handler.completePrompt("ping", { abortSignal: controller.signal, timeoutMs: 10000 })
719+
expect(mockCreate).toHaveBeenCalledWith(
720+
expect.objectContaining({ model: expect.any(String), stream: false }),
721+
{ signal: controller.signal, timeout: 10000 },
722+
)
723+
})
724+
725+
it("completePrompt passes only timeoutMs when no signal is provided", async () => {
726+
mockCreate.mockResolvedValueOnce({
727+
choices: [{ message: { content: "response" } }],
728+
})
729+
const handler = new OpencodeGoHandler(openaiOptions)
730+
731+
await handler.completePrompt("ping", { timeoutMs: 5000 })
732+
expect(mockCreate).toHaveBeenCalledWith(
733+
expect.objectContaining({ model: expect.any(String), stream: false }),
734+
{ timeout: 5000 },
735+
)
736+
})
737+
738+
it("completePrompt works without options (backward compatible, OpenAI path)", async () => {
739+
mockCreate.mockResolvedValueOnce({
740+
choices: [{ message: { content: "response" } }],
741+
})
742+
const handler = new OpencodeGoHandler(openaiOptions)
743+
744+
const result = await handler.completePrompt("ping")
745+
expect(result).toBe("response")
746+
expect(mockCreate).toHaveBeenCalledWith(
747+
expect.objectContaining({ model: expect.any(String), stream: false }),
748+
{}, // empty object when no options
749+
)
750+
})
751+
})
570752
it("omits tools and tool_choice from the Anthropic request when no tools are provided", async () => {
571753
const handler = new OpencodeGoHandler(anthropicOptions)
572754
const messages: Anthropic.Messages.MessageParam[] = [{ role: "user", content: "Hi" }]
@@ -712,7 +894,10 @@ describe("OpencodeGoHandler", () => {
712894

713895
await collectStream(handler.createMessage("sys", messages))
714896

715-
expect(mockAnthropicCreate).toHaveBeenCalledWith(expect.objectContaining({ max_tokens: 8192 }))
897+
expect(mockAnthropicCreate).toHaveBeenCalledWith(
898+
expect.objectContaining({ max_tokens: 8192 }),
899+
expect.objectContaining({ signal: expect.any(AbortSignal) }),
900+
)
716901
})
717902

718903
it("falls back to the model max_tokens when includeMaxTokens is on but modelMaxTokens is unset", async () => {
@@ -722,7 +907,10 @@ describe("OpencodeGoHandler", () => {
722907
await collectStream(handler.createMessage("sys", messages))
723908

724909
// qwen3.7-max maxTokens (65_536) clamped to 20% of 1M context => 65_536.
725-
expect(mockAnthropicCreate).toHaveBeenCalledWith(expect.objectContaining({ max_tokens: 65_536 }))
910+
expect(mockAnthropicCreate).toHaveBeenCalledWith(
911+
expect.objectContaining({ max_tokens: 65_536 }),
912+
expect.objectContaining({ signal: expect.any(AbortSignal) }),
913+
)
726914
})
727915

728916
it("accumulates output tokens across message_delta events into the final cost", async () => {

0 commit comments

Comments
 (0)