Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
67 changes: 67 additions & 0 deletions packages/core/src/core/geminiChat.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2796,4 +2796,71 @@ describe('GeminiChat', () => {
]);
});
});

describe('getHistory with curated: true', () => {
it('should not drop model turns with function calls and empty text', () => {
const history: Content[] = [
{ role: 'user', parts: [{ text: 'Hello' }] },
{
role: 'model',
parts: [{ functionCall: { name: 'test_tool', args: {} }, text: '' }],
},
{
role: 'user',
parts: [{ functionResponse: { name: 'test_tool', response: {} } }],
},
];
const chatWithHistory = new GeminiChat(mockConfig, '', [], history);

const curatedHistory = chatWithHistory.getHistory(true);

expect(curatedHistory.length).toBe(3);
expect(curatedHistory[1].role).toBe('model');
expect(curatedHistory[1].parts![0].functionCall).toBeDefined();
});

it('should not drop model turns with inlineData and empty text', () => {
const history: Content[] = [
{ role: 'user', parts: [{ text: 'Hello' }] },
{
role: 'model',
parts: [
{
inlineData: { mimeType: 'image/jpeg', data: 'base64...' },
text: '',
},
],
},
];
const chatWithHistory = new GeminiChat(mockConfig, '', [], history);

const curatedHistory = chatWithHistory.getHistory(true);

expect(curatedHistory.length).toBe(2);
expect(curatedHistory[1].role).toBe('model');
expect(curatedHistory[1].parts![0].inlineData).toBeDefined();
});

it('should not drop model turns with fileData and empty text', () => {
const history: Content[] = [
{ role: 'user', parts: [{ text: 'Hello' }] },
{
role: 'model',
parts: [
{
fileData: { mimeType: 'image/jpeg', fileUri: 'https://...' },
text: '',
},
],
},
];
const chatWithHistory = new GeminiChat(mockConfig, '', [], history);

const curatedHistory = chatWithHistory.getHistory(true);

expect(curatedHistory.length).toBe(2);
expect(curatedHistory[1].role).toBe('model');
expect(curatedHistory[1].parts![0].fileData).toBeDefined();
});
});
});
10 changes: 9 additions & 1 deletion packages/core/src/core/geminiChat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,15 @@ function isValidContent(content: Content): boolean {
if (part === undefined || Object.keys(part).length === 0) {
return false;
}
if (!part.thought && part.text !== undefined && part.text === '') {
if (
!part.thought &&
!part.functionCall &&
!part.functionResponse &&
!part.inlineData &&
!part.fileData &&
part.text !== undefined &&
part.text === ''
) {
return false;
Comment thread
danielweis marked this conversation as resolved.
}
}
Expand Down
Loading