Skip to content

Sanitize token usage, charge remaining credits, and add DB/accounting error handling in generateAnswer #56

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
Abdulmuiz44 merged 2 commits into from
Apr 6, 2026
Merged

Sanitize token usage, charge remaining credits, and add DB/accounting error handling in generateAnswer #56

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
446c77c
Stabilize credit charging and handle chat save failures gracefully
Abdulmuiz44 Apr 6, 2026
c28dfee
Merge branch 'codex/ui-redesign' into codex/fix-upgrade-modal-for-cre…
Abdulmuiz44 Apr 6, 2026
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
25 changes: 22 additions & 3 deletions app/actions/generate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,11 @@ export async function generateAnswer({ prompt, tool, authorId, authorEmail, atta
// Generate the AI response
const generationResult = await generateTeacherResponse({ prompt, tool, attachments, history, userId: authorId, enableWebSearch, researchMode })
const answer = generationResult.text
const rawTokenCost = Number(generationResult.usage.totalTokens ?? 0)
const tokenCost = Number.isFinite(rawTokenCost)
? Math.max(1, Math.min(Math.round(rawTokenCost), 2_147_483_647))
: 1
const creditsToCharge = Math.max(1, Math.min(tokenCost, creditsRemaining))
const tokenCost = Math.max(1, generationResult.usage.totalTokens || 0)

const currentSessionId = sessionId || crypto.randomUUID()
Expand Down Expand Up @@ -180,7 +185,14 @@ export async function generateAnswer({ prompt, tool, authorId, authorEmail, atta
.eq('user_id', authorId)

if (error) {
throw error
console.error('[chat_update_failed]', { userId: authorId, chatId, error })
const errorMessage = 'Your response was generated, but we could not save this chat. Please try again.'
return {
answer: errorMessage,
sessionId: sessionId,
chatId: chatId,
error: errorMessage
}
}
} else {
// Insert new row
Expand All @@ -199,7 +211,14 @@ export async function generateAnswer({ prompt, tool, authorId, authorEmail, atta
.single()

if (error) {
throw error
console.error('[chat_insert_failed]', { userId: authorId, sessionId: currentSessionId, error })
const errorMessage = 'Your response was generated, but we could not save this chat. Please try again.'
return {
answer: errorMessage,
sessionId: currentSessionId,
chatId: chatId,
error: errorMessage
}
}
if (data?.id) {
savedChatId = data.id
Expand All @@ -219,7 +238,7 @@ export async function generateAnswer({ prompt, tool, authorId, authorEmail, atta
let usageAccountingSucceeded = false

for (let attempt = 1; attempt <= maxAccountingAttempts; attempt += 1) {
usageAccountingSucceeded = await incrementUserCredits(authorId, tokenCost)
usageAccountingSucceeded = await incrementUserCredits(authorId, creditsToCharge)
if (usageAccountingSucceeded) {
break
}
Expand Down