Skip to content

fix: small fix for gemini model and headers #26

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 2 commits into from
Jul 15, 2025
Merged

fix: small fix for gemini model and headers #26

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
f520524
fix: gemini model to gemini-2.5-flash and header when streaming:true
ijusttookadnatest Jul 15, 2025
e4a9d96
fix: format
ijusttookadnatest Jul 15, 2025
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
2 changes: 1 addition & 1 deletion packages/backend/src/config/provider/gemini.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const loadGeminiChatModels = async () => {
'Gemini Flash 2.5': new ChatGoogleGenerativeAI({
temperature: 0.7,
apiKey: geminiApiKey,
modelName: 'gemini-2.5-flash-preview-04-17',
modelName: 'gemini-2.5-flash',
}),
};

Expand Down
49 changes: 39 additions & 10 deletions packages/backend/src/routes/chatCompletionHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,11 @@ export async function handleChatCompletion(
let responseContent = '';

agent.on('data', (data: any) => {
// Check if response is already finished
if (res.destroyed || res.writableEnded) {
return;
}

const parsed = JSON.parse(data);

if (parsed.type === 'response') {
Expand Down Expand Up @@ -162,14 +167,24 @@ export async function handleChatCompletion(

agent.on('error', (error: any) => {
console.error('Agent error:', error);
res.write(`data: ${JSON.stringify({ error: error.message })}\n\n`);
res.end();
if (!res.destroyed && !res.writableEnded) {
res.write(`data: ${JSON.stringify({ error: error.message })}\n\n`);
res.end();
}
});

agent.on('end', () => {
// Check if response is already finished
if (res.destroyed || res.writableEnded) {
return;
}

const tokenUsage = TokenTracker.getSessionTokenUsage();

res.setHeader('x-total-tokens', tokenUsage.totalTokens.toString());
// Check if headers haven't been sent yet
if (!res.headersSent) {
res.setHeader('x-total-tokens', tokenUsage.totalTokens.toString());
}

const finalChunk = {
id: uuidv4(),
Expand Down Expand Up @@ -210,16 +225,25 @@ export async function handleChatCompletion(

agent.on('error', (error: any) => {
console.error('Agent error:', error);
res.status(500).json({
error: {
message: error.message,
type: 'server_error',
code: 'internal_error',
},
});

// Check if headers haven't been sent yet
if (!res.headersSent) {
res.status(500).json({
error: {
message: error.message,
type: 'server_error',
code: 'internal_error',
},
});
}
});

agent.on('end', () => {
// Check if headers haven't been sent yet
if (res.headersSent) {
return;
}

const tokenUsage = TokenTracker.getSessionTokenUsage();

res.setHeader('x-total-tokens', tokenUsage.totalTokens.toString());
Expand Down Expand Up @@ -258,6 +282,11 @@ export async function handleChatCompletion(
} catch (error) {
console.error('Error in chat completion:', error);

// Check if headers haven't been sent yet
if (res.headersSent) {
return;
}

// Map common errors to OpenAI error format
if (error instanceof Error) {
const errorResponse: any = {
Expand Down