Skip to content

fix: Surface third-party API errors to users instead of showing unhandled exception (Fixes CLIENT-GJ) #335

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
kaspermarstal merged 1 commit into from
Apr 13, 2026
Merged

fix: Surface third-party API errors to users instead of showing unhandled exception (Fixes CLIENT-GJ) #335

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
63 changes: 42 additions & 21 deletions src/Cellm/Models/Providers/ProviderRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using System.Text;
using System.ClientModel;
using System.Net.Http;
using System.Text;
using Cellm.AddIn;
using Cellm.AddIn.Exceptions;
using Cellm.Models.Prompts;
Expand All @@ -12,28 +14,47 @@ internal class ProviderRequestHandler(IChatClientFactory chatClientFactory) : IR
public async Task<ProviderResponse> Handle(ProviderRequest request, CancellationToken cancellationToken)
{
var chatClient = chatClientFactory.GetClient(request.Provider);
ChatResponse chatResponse;

var chatResponse = request.Prompt.OutputShape switch
// Third-party provider SDK exceptions bubble up as unhandled exceptions, giving users
// no useful feedback. We capture them to Sentry for visibility and rethrow as CellmException
// so the user sees the API's error message in their Excel cell.
try
{
StructuredOutputShape.None =>
await chatClient.GetResponseAsync(
request.Prompt.Messages,
request.Prompt.Options,
cancellationToken).ConfigureAwait(false),
StructuredOutputShape.Row or StructuredOutputShape.Column =>
await chatClient.GetResponseAsync<string[]>(
AppendOutputShapeInstructions(request.Prompt.Messages, SystemMessages.RowOrColumn),
request.Prompt.Options,
UseJsonSchemaResponseFormat(request.Provider, request.Prompt),
cancellationToken).ConfigureAwait(false),
StructuredOutputShape.Range =>
await chatClient.GetResponseAsync<string[][]>(
AppendOutputShapeInstructions(request.Prompt.Messages, SystemMessages.Range),
request.Prompt.Options,
UseJsonSchemaResponseFormat(request.Provider, request.Prompt),
cancellationToken).ConfigureAwait(false),
_ => throw new CellmException($"Internal error: Unknown output shape ({request.Prompt.OutputShape})")
};
chatResponse = request.Prompt.OutputShape switch
{
StructuredOutputShape.None =>
await chatClient.GetResponseAsync(
request.Prompt.Messages,
request.Prompt.Options,
cancellationToken).ConfigureAwait(false),
StructuredOutputShape.Row or StructuredOutputShape.Column =>
await chatClient.GetResponseAsync<string[]>(
AppendOutputShapeInstructions(request.Prompt.Messages, SystemMessages.RowOrColumn),
request.Prompt.Options,
UseJsonSchemaResponseFormat(request.Provider, request.Prompt),
cancellationToken).ConfigureAwait(false),
StructuredOutputShape.Range =>
await chatClient.GetResponseAsync<string[][]>(
AppendOutputShapeInstructions(request.Prompt.Messages, SystemMessages.Range),
request.Prompt.Options,
UseJsonSchemaResponseFormat(request.Provider, request.Prompt),
cancellationToken).ConfigureAwait(false),
_ => throw new CellmException($"Internal error: Unknown output shape ({request.Prompt.OutputShape})")
};
}
// OpenAI, OpenAI-compatible, Azure, DeepSeek, Mistral, OpenRouter, Cellm
catch (ClientResultException ex)
{
SentrySdk.CaptureException(ex);
throw new CellmException(ex.Message, ex);
}
// Ollama, Anthropic, AWS, Gemini, and general HTTP failures
catch (HttpRequestException ex)
{
SentrySdk.CaptureException(ex);
throw new CellmException(ex.Message, ex);
}

var prompt = new PromptBuilder(request.Prompt)
.AddMessages(chatResponse.Messages)
Expand Down
Loading