main: 增强工具功能与消息处理
- 添加 `FileReadTool`,支持文件内容读取与安全验证 - 引入 `hasToolMessages` 逻辑,优化工具历史上下文处理 - 修改工具选项逻辑,支持禁用工具时的动态调整 - 增加消息序列化逻辑,优化 Redis 序列管理与数据同步 - 扩展测试覆盖,验证序列化与工具调用场景 - 增强 Docker Compose 脚本,支持应用重置与日志清理 - 调整工具调用超时设置,提升运行时用户体验
This commit is contained in:
@@ -3,11 +3,13 @@
|
||||
namespace Tests\Feature;
|
||||
|
||||
use App\Enums\ChatSessionStatus;
|
||||
use App\Models\Message;
|
||||
use App\Models\User;
|
||||
use App\Services\ChatService;
|
||||
use Illuminate\Support\Carbon;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Illuminate\Support\Facades\Redis;
|
||||
use Mockery;
|
||||
use PHPOpenSourceSaver\JWTAuth\Facades\JWTAuth;
|
||||
use Tests\TestCase;
|
||||
|
||||
@@ -270,6 +272,9 @@ class ChatSessionTest extends TestCase
|
||||
|
||||
public function test_publish_to_redis_on_append(): void
|
||||
{
|
||||
Redis::shouldReceive('get')->andReturn(null);
|
||||
Redis::shouldReceive('setnx')->andReturn(1);
|
||||
Redis::shouldReceive('incr')->andReturn(1);
|
||||
Redis::shouldReceive('publish')->once()->andReturn(1);
|
||||
|
||||
$service = app(ChatService::class);
|
||||
@@ -283,6 +288,64 @@ class ChatSessionTest extends TestCase
|
||||
]);
|
||||
}
|
||||
|
||||
public function test_message_seq_seeds_from_db_when_redis_key_missing(): void
|
||||
{
|
||||
$service = app(ChatService::class);
|
||||
$session = $service->createSession('Seed Test');
|
||||
|
||||
Message::query()->create([
|
||||
'message_id' => (string) \Illuminate\Support\Str::uuid(),
|
||||
'session_id' => $session->session_id,
|
||||
'role' => Message::ROLE_USER,
|
||||
'type' => 'user.prompt',
|
||||
'content' => 'existing',
|
||||
'payload' => null,
|
||||
'seq' => 10,
|
||||
'reply_to' => null,
|
||||
'dedupe_key' => null,
|
||||
'created_at' => now(),
|
||||
]);
|
||||
|
||||
Redis::shouldReceive('get')->andReturn(null);
|
||||
Redis::shouldReceive('setnx')->once()->andReturn(1);
|
||||
Redis::shouldReceive('incr')->once()->andReturn(11);
|
||||
Redis::shouldReceive('publish')->zeroOrMoreTimes()->andReturn(1);
|
||||
|
||||
$message = $service->appendMessage([
|
||||
'session_id' => $session->session_id,
|
||||
'role' => Message::ROLE_USER,
|
||||
'type' => 'user.prompt',
|
||||
'content' => 'new',
|
||||
]);
|
||||
|
||||
$this->assertEquals(11, $message->seq);
|
||||
}
|
||||
|
||||
public function test_agent_delta_uses_redis_seq_and_publishes_with_seq(): void
|
||||
{
|
||||
$service = app(ChatService::class);
|
||||
$session = $service->createSession('Delta Seq');
|
||||
|
||||
Redis::shouldReceive('get')->andReturn(null);
|
||||
Redis::shouldReceive('setnx')->once()->with("chat_session:{$session->session_id}:seq", 0)->andReturn(1);
|
||||
Redis::shouldReceive('incr')->once()->with("chat_session:{$session->session_id}:seq")->andReturn(1);
|
||||
Redis::shouldReceive('publish')->once()->with(
|
||||
"session:{$session->session_id}:messages",
|
||||
Mockery::on(function ($payload) {
|
||||
$decoded = json_decode($payload, true);
|
||||
return is_array($decoded) && ($decoded['seq'] ?? null) === 1;
|
||||
})
|
||||
)->andReturn(1);
|
||||
|
||||
app(\App\Services\OutputSink::class)->appendAgentDelta(
|
||||
$session->session_id,
|
||||
'run-1',
|
||||
'partial',
|
||||
1,
|
||||
[]
|
||||
);
|
||||
}
|
||||
|
||||
public function test_sse_backlog_contains_messages(): void
|
||||
{
|
||||
$user = User::factory()->create();
|
||||
|
||||
@@ -106,6 +106,51 @@ class OpenAiAdapterTest extends TestCase
|
||||
$this->assertSame('call_1', $toolResultMessage['tool_call_id']);
|
||||
}
|
||||
|
||||
public function test_disable_tools_still_includes_definitions_when_history_has_tools(): void
|
||||
{
|
||||
$context = new AgentContext('run-1', 'session-1', 'system prompt', [
|
||||
[
|
||||
'message_id' => 'm1',
|
||||
'role' => Message::ROLE_USER,
|
||||
'type' => 'user.prompt',
|
||||
'content' => 'call tool',
|
||||
'payload' => [],
|
||||
'seq' => 1,
|
||||
],
|
||||
[
|
||||
'message_id' => 'm2',
|
||||
'role' => Message::ROLE_AGENT,
|
||||
'type' => 'tool.call',
|
||||
'content' => null,
|
||||
'payload' => [
|
||||
'tool_call_id' => 'call_1',
|
||||
'name' => 'get_time',
|
||||
'arguments' => ['format' => 'c'],
|
||||
],
|
||||
'seq' => 2,
|
||||
],
|
||||
[
|
||||
'message_id' => 'm3',
|
||||
'role' => Message::ROLE_TOOL,
|
||||
'type' => 'tool.result',
|
||||
'content' => '2024-01-01',
|
||||
'payload' => [
|
||||
'tool_call_id' => 'call_1',
|
||||
'name' => 'get_time',
|
||||
'output' => '2024-01-01',
|
||||
],
|
||||
'seq' => 3,
|
||||
],
|
||||
]);
|
||||
|
||||
$payload = (new ChatCompletionsRequestBuilder(new ToolRegistry()))->build($context, [
|
||||
'disable_tools' => true,
|
||||
]);
|
||||
|
||||
$this->assertSame('none', $payload['tool_choice']);
|
||||
$this->assertNotEmpty($payload['tools']);
|
||||
}
|
||||
|
||||
public function test_event_normalizer_maps_delta_and_done(): void
|
||||
{
|
||||
$normalizer = new OpenAiEventNormalizer();
|
||||
|
||||
Reference in New Issue
Block a user