-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Capture more of OpenRouter's provider specific error details #10073
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.
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
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -256,10 +256,36 @@ export class OpenRouterHandler extends BaseProvider implements SingleCompletionH | |
| try { | ||
| stream = await this.client.chat.completions.create(completionParams, requestOptions) | ||
| } catch (error) { | ||
| const errorMessage = error instanceof Error ? error.message : String(error) | ||
| const apiError = new ApiProviderError(errorMessage, this.providerName, modelId, "createMessage") | ||
| TelemetryService.instance.captureException(apiError) | ||
| throw handleOpenAIError(error, this.providerName) | ||
| // Check if error has OpenRouter-specific metadata.raw property | ||
| const errorObj = error as any | ||
| const hasMetadataRaw = errorObj?.metadata?.raw | ||
|
||
|
|
||
| if (hasMetadataRaw) { | ||
| const openRouterError = error as OpenRouterErrorResponse | ||
| const rawErrorMessage = openRouterError.metadata?.raw || openRouterError.message | ||
|
||
|
|
||
| const apiError = Object.assign( | ||
| new ApiProviderError( | ||
| rawErrorMessage ?? "Unknown error", | ||
| this.providerName, | ||
| modelId, | ||
| "createMessage", | ||
| openRouterError.code, | ||
| ), | ||
| { | ||
| status: openRouterError.code, | ||
| error: { message: openRouterError.message, metadata: openRouterError.metadata }, | ||
| }, | ||
| ) | ||
|
|
||
| TelemetryService.instance.captureException(apiError) | ||
| throw handleOpenAIError(error, this.providerName) | ||
| } else { | ||
| const errorMessage = error instanceof Error ? error.message : String(error) | ||
| const apiError = new ApiProviderError(errorMessage, this.providerName, modelId, "createMessage") | ||
| TelemetryService.instance.captureException(apiError) | ||
| throw handleOpenAIError(error, this.providerName) | ||
| } | ||
| } | ||
|
|
||
| let lastUsage: CompletionUsage | undefined = undefined | ||
|
|
@@ -476,10 +502,36 @@ export class OpenRouterHandler extends BaseProvider implements SingleCompletionH | |
| try { | ||
| response = await this.client.chat.completions.create(completionParams, requestOptions) | ||
| } catch (error) { | ||
| const errorMessage = error instanceof Error ? error.message : String(error) | ||
| const apiError = new ApiProviderError(errorMessage, this.providerName, modelId, "completePrompt") | ||
| TelemetryService.instance.captureException(apiError) | ||
| throw handleOpenAIError(error, this.providerName) | ||
| // Check if error has OpenRouter-specific metadata.raw property | ||
| const errorObj = error as any | ||
| const hasMetadataRaw = errorObj?.metadata?.raw | ||
|
|
||
| if (hasMetadataRaw) { | ||
| const openRouterError = error as OpenRouterErrorResponse | ||
| const rawErrorMessage = openRouterError.metadata?.raw || openRouterError.message | ||
|
|
||
| const apiError = Object.assign( | ||
| new ApiProviderError( | ||
| rawErrorMessage ?? "Unknown error", | ||
| this.providerName, | ||
| modelId, | ||
| "completePrompt", | ||
| openRouterError.code, | ||
| ), | ||
| { | ||
| status: openRouterError.code, | ||
| error: { message: openRouterError.message, metadata: openRouterError.metadata }, | ||
| }, | ||
| ) | ||
|
|
||
| TelemetryService.instance.captureException(apiError) | ||
| throw handleOpenAIError(error, this.providerName) | ||
| } else { | ||
| const errorMessage = error instanceof Error ? error.message : String(error) | ||
| const apiError = new ApiProviderError(errorMessage, this.providerName, modelId, "completePrompt") | ||
| TelemetryService.instance.captureException(apiError) | ||
| throw handleOpenAIError(error, this.providerName) | ||
| } | ||
| } | ||
|
|
||
| if ("error" in response) { | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This error handling logic is nearly identical to the one in
completePrompt. Consider extracting it into a shared helper function to reduce duplication.This comment was generated because it violated a code review rule: irule_tTqpIuNs8DV0QFGj.