Skip to content

Fix stored tool conversation replay order #621

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

Open
gracjankubicki wants to merge 1 commit into
base: 0.x
Choose a base branch
from
+48 −3
Open

Fix stored tool conversation replay order #621

Show file tree
Hide file tree
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
6 changes: 5 additions & 1 deletion src/Storage/DatabaseConversationStore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public function getLatestConversationMessages(string $conversationId, int $limit
$messages = [];

$messages[] = new AssistantMessage(
$record->content ?: '',
'',
$toolCalls->map(fn ($toolCall) => new ToolCall(
id: $toolCall['id'],
name: $toolCall['name'],
Expand All @@ -182,6 +182,10 @@ public function getLatestConversationMessages(string $conversationId, int $limit
);
}

if ($record->content !== '') {
$messages[] = new AssistantMessage($record->content);
}

return $messages;
}

Expand Down
45 changes: 43 additions & 2 deletions tests/Feature/Storage/DatabaseConversationStoreTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,52 @@

$messages = $store->getLatestConversationMessages($conversationId, 10);

expect($messages)->toHaveCount(2)
expect($messages)->toHaveCount(3)
->and($messages[0])->toBeInstanceOf(AssistantMessage::class)
->and($messages[0]->toolCalls->keys()->all())->toBe([0, 1])
->and($messages[1])->toBeInstanceOf(ToolResultMessage::class)
->and($messages[1]->toolResults->keys()->all())->toBe([0, 1]);
->and($messages[1]->toolResults->keys()->all())->toBe([0, 1])
->and($messages[2])->toBeInstanceOf(AssistantMessage::class)
->and($messages[2]->content)->toBe('The order has shipped.');
});

test('it replays stored tool conversations before the final assistant response', function () {
$store = new DatabaseConversationStore;
$conversationId = $store->storeConversation(1, 'Tool conversation');

DB::table('agent_conversation_messages')->insert([
'id' => 'message-1',
'conversation_id' => $conversationId,
'user_id' => 1,
'agent' => ToolUsingAgent::class,
'role' => 'assistant',
'content' => 'The order has shipped.',
'attachments' => '[]',
'tool_calls' => json_encode([
['id' => 'call-1', 'name' => 'lookup_order', 'arguments' => ['id' => 1], 'result_id' => 'result-1'],
]),
'tool_results' => json_encode([
['id' => 'call-1', 'name' => 'lookup_order', 'arguments' => ['id' => 1], 'result' => ['status' => 'shipped'], 'result_id' => 'result-1'],
]),
'usage' => '[]',
'meta' => '[]',
'created_at' => now(),
'updated_at' => now(),
]);

$messages = $store->getLatestConversationMessages($conversationId, 10);

expect($messages)->toHaveCount(3)
->and($messages[0])->toBeInstanceOf(AssistantMessage::class)
->and($messages[0]->content)->toBe('')
->and($messages[0]->toolCalls)->toHaveCount(1)
->and($messages[0]->toolCalls[0]->resultId)->toBe('result-1')
->and($messages[1])->toBeInstanceOf(ToolResultMessage::class)
->and($messages[1]->toolResults)->toHaveCount(1)
->and($messages[1]->toolResults[0]->resultId)->toBe('result-1')
->and($messages[2])->toBeInstanceOf(AssistantMessage::class)
->and($messages[2]->content)->toBe('The order has shipped.')
->and($messages[2]->toolCalls)->toBeEmpty();
});

test('user messages with stored attachments are rehydrated as UserMessage', function () {
Expand Down