Skip to content

refactor(token-estimation): use nullish checks #862

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

refactor(token-estimation): use nullish checks #862

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
18 changes: 15 additions & 3 deletions apps/gateway/src/chat/tools/estimate-tokens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,18 @@ export function estimateTokens(
let calculatedCompletionTokens = completionTokens;

// Always estimate missing tokens for any provider
if (!promptTokens || !completionTokens) {
if (
promptTokens === null ||
promptTokens === undefined ||
completionTokens === null ||
completionTokens === undefined
) {
// Estimate prompt tokens using encodeChat for better accuracy
if (!promptTokens && messages && messages.length > 0) {
if (
(promptTokens === null || promptTokens === undefined) &&
messages &&
messages.length > 0
) {
try {
// Convert messages to the format expected by gpt-tokenizer
const chatMessages: ChatMessage[] = messages.map((m) => ({
Expand All @@ -49,7 +58,10 @@ export function estimateTokens(
}

// Estimate completion tokens using encode for better accuracy
if (!completionTokens && content) {
if (
(completionTokens === null || completionTokens === undefined) &&
content
) {
try {
calculatedCompletionTokens = encode(content).length;
} catch (error) {
Expand Down
Loading