From 9c480aaac2ccc0e19ed1344d1172d35168062e93 Mon Sep 17 00:00:00 2001 From: James Barker Date: Mon, 10 Feb 2025 09:13:55 +0000 Subject: [PATCH] add retries to openrouter generation endpoint to prevent failures on slow usage stat updates server side Signed-off-by: James Barker --- src/api/providers/openrouter.ts | 51 +++++++++++++++++---------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/src/api/providers/openrouter.ts b/src/api/providers/openrouter.ts index 0e23c5d35d..633b6baa52 100644 --- a/src/api/providers/openrouter.ts +++ b/src/api/providers/openrouter.ts @@ -183,31 +183,34 @@ export class OpenRouterHandler implements ApiHandler, SingleCompletionHandler { // } } - await delay(500) // FIXME: necessary delay to ensure generation endpoint is ready + // retry fetching generation details + let retries = 0 + while (retries < 3) { + await delay(500) // FIXME: necessary delay to ensure generation endpoint is ready + try { + const response = await axios.get(`https://openrouter.ai/api/v1/generation?id=${genId}`, { + headers: { + Authorization: `Bearer ${this.options.openRouterApiKey}`, + }, + timeout: 5_000, // this request hangs sometimes + }) - try { - const response = await axios.get(`https://openrouter.ai/api/v1/generation?id=${genId}`, { - headers: { - Authorization: `Bearer ${this.options.openRouterApiKey}`, - }, - timeout: 5_000, // this request hangs sometimes - }) - - const generation = response.data?.data - console.log("OpenRouter generation details:", response.data) - yield { - type: "usage", - // cacheWriteTokens: 0, - // cacheReadTokens: 0, - // openrouter generation endpoint fails often - inputTokens: generation?.native_tokens_prompt || 0, - outputTokens: generation?.native_tokens_completion || 0, - totalCost: generation?.total_cost || 0, - fullResponseText, - } as OpenRouterApiStreamUsageChunk - } catch (error) { - // ignore if fails - console.error("Error fetching OpenRouter generation details:", error) + const generation = response.data?.data + console.log("OpenRouter generation details:", response.data) + yield { + type: "usage", + // cacheWriteTokens: 0, + // cacheReadTokens: 0, + // openrouter generation endpoint fails often + inputTokens: generation?.native_tokens_prompt || 0, + outputTokens: generation?.native_tokens_completion || 0, + totalCost: generation?.total_cost || 0, + fullResponseText, + } as OpenRouterApiStreamUsageChunk + } catch (error) { + // ignore if fails + console.error("Error fetching OpenRouter generation details:", error) + } } } getModel(): { id: string; info: ModelInfo } {