wip

Author: tymondesigns

src/AGUI/Contracts/Event.php

@@ -36,6 +36,8 @@ public function withRawEvent(mixed $rawEvent): static;
 
     /**
      * Convert the event to an array.
+     *
+     * @return array<string, mixed>
      */
     public function toArray(): array;
 }

src/AGUI/Events/AbstractEvent.php

@@ -13,7 +13,7 @@ abstract class AbstractEvent implements Event
 {
     public protected(set) EventType $type;
 
-    public protected(set) ?DateTimeImmutable $timestamp;
+    public protected(set) ?DateTimeImmutable $timestamp = null;
 
     public protected(set) mixed $rawEvent;
 
@@ -36,6 +36,11 @@ protected function formattedTimestamp(): ?string
         return $this->timestamp?->format(DateTimeInterface::ATOM);
     }
 
+    /**
+     * @param array<string, mixed> $additional
+     *
+     * @return array<string, mixed>
+     */
     protected function buildArray(array $additional = []): array
     {
         $payload = [
@@ -47,6 +52,6 @@ protected function buildArray(array $additional = []): array
             $payload['timestamp'] = $this->formattedTimestamp();
         }
 
-        return $payload;
+        return array_filter($payload, fn(mixed $value): bool => $value !== null);
     }
 }

src/AGUI/Events/Custom.php

@@ -4,7 +4,6 @@
 
 namespace Cortex\AGUI\Events;
 
-use DateTimeImmutable;
 use Cortex\AGUI\Enums\EventType;
 use Illuminate\Contracts\Support\Arrayable;
 

src/AGUI/Events/ReasoningMessageStart.php

@@ -10,7 +10,7 @@
 /**
  * @implements Arrayable<string, mixed>
  */
-final class ReasoningMessageStart extends AbstractEvent
+final class ReasoningMessageStart extends AbstractEvent implements Arrayable
 {
     public EventType $type = EventType::ReasoningMessageStart;
 

src/Http/Controllers/AgentsController.php

@@ -14,7 +14,9 @@
 use Cortex\Events\AgentStepStart;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Routing\Controller;
+use Cortex\LLM\Enums\StreamingProtocol;
 use Cortex\LLM\Data\Messages\UserMessage;
+use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class AgentsController extends Controller
 {
@@ -77,7 +79,7 @@ public function invoke(string $agent, Request $request): JsonResponse
         ]);
     }
 
-    public function stream(string $agent, Request $request)//: void// : StreamedResponse
+    public function stream(string $agent, Request $request): StreamedResponse
     {
         $agent = Cortex::agent($agent);
 
@@ -120,16 +122,16 @@ public function stream(string $agent, Request $request)//: void// : StreamedResp
             //     // dump($chunk->toArray());
             // }
 
-            return $result->agUiStreamResponse();
+            return $result->streamResponse(StreamingProtocol::AGUI);
         } catch (Throwable $e) {
             dd($e);
         }
 
-        dd([
-            'total_usage' => $agent->getTotalUsage()->toArray(),
-            'steps' => $agent->getSteps()->toArray(),
-            'parsed_output' => $agent->getParsedOutput(),
-            'memory' => $agent->getMemory()->getMessages()->toArray(),
-        ]);
+        // dd([
+        //     'total_usage' => $agent->getTotalUsage()->toArray(),
+        //     'steps' => $agent->getSteps()->toArray(),
+        //     'parsed_output' => $agent->getParsedOutput(),
+        //     'memory' => $agent->getMemory()->getMessages()->toArray(),
+        // ]);
     }
 }

src/LLM/AbstractLLM.php

@@ -16,7 +16,6 @@
 use Cortex\LLM\Contracts\Tool;
 use Cortex\Events\ChatModelEnd;
 use Cortex\LLM\Data\ToolConfig;
-use Cortex\LLM\Enums\ChunkType;
 use Cortex\LLM\Enums\ToolChoice;
 use Cortex\Events\ChatModelError;
 use Cortex\Events\ChatModelStart;

src/LLM/Drivers/Anthropic/Concerns/MapStreamResponse.php

@@ -26,7 +26,6 @@
 use Cortex\SDK\Anthropic\Data\Messages\Streaming\ThinkingDelta;
 use Cortex\SDK\Anthropic\Data\Messages\Streaming\InputJsonDelta;
 use Cortex\SDK\Anthropic\Data\Messages\Streaming\SignatureDelta;
-use Cortex\SDK\Anthropic\Data\Messages\Streaming\Events\MessageStop;
 use Cortex\SDK\Anthropic\Data\Messages\Streaming\Events\MessageDelta;
 use Cortex\SDK\Anthropic\Data\Messages\Streaming\Events\MessageStart;
 use Cortex\SDK\Anthropic\Data\Messages\ContentBlocks\TextContentBlock;

src/LLM/Enums/ChunkType.php

@@ -72,6 +72,12 @@ enum ChunkType: string
 
     case ChatModelEnd = 'chat_model_end';
 
+    case OutputParserStart = 'output_parser_start';
+
+    case OutputParserEnd = 'output_parser_end';
+
+    case OutputParserError = 'output_parser_error';
+
     public function isText(): bool
     {
         return match ($this) {

src/LLM/Streaming/AgUiDataStream.php

@@ -26,9 +26,9 @@
 use Cortex\AGUI\Events\TextMessageStart;
 use Cortex\LLM\Data\ChatGenerationChunk;
 use Cortex\AGUI\Events\TextMessageContent;
-use Cortex\LLM\Contracts\StreamingProtocolDriver;
 use Cortex\AGUI\Contracts\Event as AgUiEvent;
 use Cortex\AGUI\Events\ReasoningMessageContent;
+use Cortex\LLM\Contracts\StreamingProtocolDriver;
 
 /**
  * AG-UI (Agent User Interaction Protocol) streaming implementation.
@@ -76,13 +76,13 @@ protected function mapChunkToEvent(ChatGenerationChunk $chunk): AgUiEvent
 
         return match ($chunk->type) {
             ChunkType::RunStart => new RunStarted(
-                runId: $this->runId = $chunk->metadata['run_id'],
                 threadId: $this->threadId = $chunk->metadata['thread_id'],
+                runId: $this->runId = $chunk->metadata['run_id'],
             ),
 
             ChunkType::RunEnd => new RunFinished(
-                runId: $this->runId,
                 threadId: $this->threadId,
+                runId: $this->runId,
             ),
 
             ChunkType::TextStart => new TextMessageStart(
@@ -162,8 +162,6 @@ protected function mapChunkToEvent(ChatGenerationChunk $chunk): AgUiEvent
 
     /**
      * Send a single event to the output stream.
-     *
-     * @param \Cortex\AGUI\Contracts\Event $event
      */
     protected function sendEvent(AgUiEvent $event): void
     {

tests/Unit/LLM/Streaming/AgUiDataStreamTest.php

@@ -3,4 +3,3 @@
 declare(strict_types=1);
 
 namespace Tests\Unit\LLM\Streaming;
-