Skip to content

Improve error handling for Mistral, Moonshot #3566

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

Merged
merged 1 commit into from
Nov 7, 2025
+5 −2
Merged

Improve error handling for Mistral, Moonshot #3566

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
7 changes: 5 additions & 2 deletions src/api/providers/openrouter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,10 +512,13 @@ export class OpenRouterHandler extends BaseProvider implements SingleCompletionH
function makeOpenRouterErrorReadable(error: any) {
const metadata = error?.error?.metadata as { raw?: string; provider_name?: string } | undefined
const parsedJson = safeJsonParse(metadata?.raw)
const rawError = parsedJson as { error?: string & { message?: string }; detail?: string } | undefined
const rawError = parsedJson as
| { error?: string & { message?: string }; detail?: string; message?: string }
Copy link
Contributor

@EamonNerbonne EamonNerbonne Nov 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
| { error?: string & { message?: string }; detail?: string; message?: string }
| { error?: string | { message?: string }; detail?: string; message?: string }

Presumably this is more correct but less convenient down below?

Copy link
Collaborator Author

@chrarnoldus chrarnoldus Nov 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep

| undefined

if (error?.code !== 429 && error?.code !== 418) {
const errorMessage = rawError?.error?.message ?? rawError?.error ?? rawError?.detail ?? error?.message
const errorMessage =
rawError?.error?.message ?? rawError?.error ?? rawError?.detail ?? rawError?.message ?? error?.message
Copy link
Contributor

@EamonNerbonne EamonNerbonne Nov 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the horror!

hzw ;-)

throw new Error(`${metadata?.provider_name ?? "Provider"} error: ${errorMessage ?? "unknown error"}`)
}

Expand Down
Loading