Skip to content

fix: Remove Sentry metrics which were deprecated #59

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 2 commits into from
Nov 19, 2024
Merged

fix: Remove Sentry metrics which were deprecated #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e15c89
fix: Remove Sentry metrics which were deprecated
kaspermarstal Nov 17, 2024
79ebd10
Merge branch 'main' into sentry-metrics
kaspermarstal Nov 19, 2024
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
24 changes: 0 additions & 24 deletions src/Cellm/Models/Anthropic/AnthropicRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,30 +76,6 @@ public AnthropicResponse Deserialize(AnthropicRequest request, string response)
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
});

var tags = new Dictionary<string, string> {
{ nameof(request.Provider), request.Provider?.ToLower() ?? _cellmConfiguration.DefaultProvider },
{ nameof(request.Prompt.Model), request.Prompt.Model ?.ToLower() ?? _anthropicConfiguration.DefaultModel },
{ nameof(_httpClient.BaseAddress), _httpClient.BaseAddress?.ToString() ?? string.Empty }
};

var inputTokens = responseBody?.Usage?.InputTokens ?? -1;
if (inputTokens > 0)
{
SentrySdk.Metrics.Distribution("InputTokens",
inputTokens,
unit: MeasurementUnit.Custom("token"),
tags);
}

var outputTokens = responseBody?.Usage?.OutputTokens ?? -1;
if (outputTokens > 0)
{
SentrySdk.Metrics.Distribution("OutputTokens",
outputTokens,
unit: MeasurementUnit.Custom("token"),
tags);
}

var assistantMessage = responseBody?.Content?.Last()?.Text ?? throw new CellmException("#EMPTY_RESPONSE?");

var prompt = new PromptBuilder(request.Prompt)
Expand Down
24 changes: 0 additions & 24 deletions src/Cellm/Models/GoogleAi/GoogleAiRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,30 +81,6 @@ public GoogleAiResponse Deserialize(GoogleAiRequest request, string response)
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
});

var tags = new Dictionary<string, string> {
{ nameof(request.Provider), request.Provider?.ToLower() ?? _cellmConfiguration.DefaultProvider },
{ nameof(request.Prompt.Model), request.Prompt.Model?.ToLower() ?? _googleAiConfiguration.DefaultModel },
{ nameof(_httpClient.BaseAddress), _httpClient.BaseAddress?.ToString() ?? string.Empty }
};

var inputTokens = responseBody?.UsageMetadata?.PromptTokenCount ?? -1;
if (inputTokens > 0)
{
SentrySdk.Metrics.Distribution("InputTokens",
inputTokens,
unit: MeasurementUnit.Custom("token"),
tags);
}

var outputTokens = responseBody?.UsageMetadata?.CandidatesTokenCount ?? -1;
if (outputTokens > 0)
{
SentrySdk.Metrics.Distribution("OutputTokens",
outputTokens,
unit: MeasurementUnit.Custom("token"),
tags);
}

var assistantMessage = responseBody?.Candidates?.SingleOrDefault()?.Content?.Parts?.SingleOrDefault()?.Text ?? throw new CellmException("#EMPTY_RESPONSE?");

var assistantPrompt = new PromptBuilder(request.Prompt)
Expand Down
24 changes: 0 additions & 24 deletions src/Cellm/Models/OpenAi/OpenAiRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,30 +83,6 @@ public OpenAiResponse Deserialize(OpenAiRequest request, string responseBodyAsSt
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
});

var tags = new Dictionary<string, string> {
{ nameof(request.Provider), request.Provider?.ToLower() ?? _cellmConfiguration.DefaultProvider },
{ nameof(request.Prompt.Model), request.Prompt.Model ?.ToLower() ?? _openAiConfiguration.DefaultModel },
{ nameof(_httpClient.BaseAddress), _httpClient.BaseAddress?.ToString() ?? string.Empty }
};

var inputTokens = responseBody?.Usage?.PromptTokens ?? -1;
if (inputTokens > 0)
{
SentrySdk.Metrics.Distribution("InputTokens",
inputTokens,
unit: MeasurementUnit.Custom("token"),
tags);
}

var outputTokens = responseBody?.Usage?.CompletionTokens ?? -1;
if (outputTokens > 0)
{
SentrySdk.Metrics.Distribution("OutputTokens",
outputTokens,
unit: MeasurementUnit.Custom("token"),
tags);
}

var choice = responseBody?.Choices?.FirstOrDefault() ?? throw new CellmException("Empty response from OpenAI API");
var toolCalls = choice.Message.ToolCalls?
.Select(x => new ToolCall(x.Id, x.Function.Name, x.Function.Arguments, null))
Expand Down