wip

Author: tymondesigns

src/Agents/Agent.php

@@ -153,10 +153,18 @@ public function stream(array $messages = [], array $input = []): ChatStreamResul
         $messages = $this->memory->getMessages()->merge($messages);
         $this->memory->setMessages($messages);
 
-        return $this->pipeline()->stream([
+        /** @var \Cortex\LLM\Data\ChatStreamResult $result */
+        $result = $this->pipeline()->stream([
             ...$input,
             'messages' => $this->memory->getMessages(),
         ]);
+
+        // Ensure that any nested ChatStreamResults are flattened
+        // so that the stream is a single stream of chunks.
+        // TODO: This breaks things like the JSON output parser.
+        // return $result->flatten();
+
+        return $result;
     }
 
     public function pipe(Pipeable|callable $pipeable): Pipeline

src/Events/ChatModelEnd.php

@@ -5,11 +5,11 @@
 namespace Cortex\Events;
 
 use Cortex\LLM\Data\ChatResult;
-use Cortex\LLM\Data\ChatGenerationChunk;
+use Cortex\LLM\Data\ChatStreamResult;
 
 readonly class ChatModelEnd
 {
     public function __construct(
-        public ChatResult|ChatGenerationChunk $result,
+        public ChatResult|ChatStreamResult $result,
     ) {}
 }

src/Http/Controllers/AgentsController.php

@@ -31,7 +31,7 @@ public function invoke(string $agent, Request $request): JsonResponse
                         vsprintf('{"location": "%s", "conditions": "%s", "temperature": %s, "unit": "celsius"}', [
                             $location,
                             Arr::random(['sunny', 'cloudy', 'rainy', 'snowing']),
-                            random_int(10, 20),
+                            14,
                         ]),
                 ),
             ],

src/LLM/Data/ChatGeneration.php

@@ -17,7 +17,6 @@
 {
     public function __construct(
         public AssistantMessage $message,
-        public int $index,
         public DateTimeInterface $createdAt,
         public FinishReason $finishReason,
         public mixed $parsedOutput = null,
@@ -28,7 +27,6 @@ public function cloneWithMessage(AssistantMessage $message): self
     {
         return new self(
             $message,
-            $this->index,
             $this->createdAt,
             $this->finishReason,
             $this->parsedOutput,
@@ -40,7 +38,6 @@ public function cloneWithParsedOutput(mixed $parsedOutput): self
     {
         return new self(
             $this->message,
-            $this->index,
             $this->createdAt,
             $this->finishReason,
             $parsedOutput,
@@ -53,7 +50,6 @@ public static function fromMessage(AssistantMessage $message, ?FinishReason $fin
         // TODO: move to FakeChatGeneration
         return new self(
             message: $message,
-            index: 0,
             createdAt: new DateTimeImmutable(),
             finishReason: $finishReason ?? FinishReason::Stop,
         );
@@ -62,12 +58,11 @@ public static function fromMessage(AssistantMessage $message, ?FinishReason $fin
     public function toArray(): array
     {
         return [
-            'index' => $this->index,
-            'created_at' => $this->createdAt,
+            'message' => $this->message->toArray(),
             'finish_reason' => $this->finishReason->value,
             'parsed_output' => $this->parsedOutput,
             'output_parser_error' => $this->outputParserError,
-            'message' => $this->message,
+            'created_at' => $this->createdAt,
         ];
     }
 }

src/LLM/Data/ChatGenerationChunk.php

@@ -6,65 +6,33 @@
 
 use DateTimeInterface;
 use Cortex\LLM\Enums\ChunkType;
-use Cortex\LLM\Enums\MessageRole;
 use Cortex\LLM\Enums\FinishReason;
+use Illuminate\Contracts\Support\Arrayable;
 use Cortex\LLM\Data\Messages\AssistantMessage;
 
-readonly class ChatGenerationChunk
+/**
+ * @implements Arrayable<string, mixed>
+ */
+readonly class ChatGenerationChunk implements Arrayable
 {
-    public ?ChunkType $type;
-
     public function __construct(
         public string $id,
         public AssistantMessage $message,
-        public int $index,
         public DateTimeInterface $createdAt,
-        ?ChunkType $type = null,
+        public ChunkType $type,
         public ?FinishReason $finishReason = null,
         public ?Usage $usage = null,
         public string $contentSoFar = '',
         public bool $isFinal = false,
         public mixed $parsedOutput = null,
         public ?string $outputParserError = null,
-    ) {
-        $this->type = $type ?? $this->resolveType();
-    }
-
-    /**
-     * Fallback method to resolve chunk type when not explicitly provided by the LLM driver.
-     * This is a best-effort inference and may not be as accurate as driver-specific logic.
-     * Prefer having the LLM driver provide the chunk type explicitly when possible.
-     */
-    private function resolveType(): ChunkType
-    {
-        // Final chunks: Use finish reason to determine completion type
-        if ($this->finishReason !== null) {
-            return match ($this->finishReason) {
-                FinishReason::ToolCalls => ChunkType::ToolInputEnd,
-                default => ChunkType::Done,
-            };
-        }
-
-        // First chunk: Assistant message with no accumulated content
-        if ($this->message->role() === MessageRole::Assistant && $this->contentSoFar === '') {
-            return ChunkType::MessageStart;
-        }
-
-        // Tool-related chunks: Has tool calls
-        if ($this->message->toolCalls?->isNotEmpty()) {
-            return ChunkType::ToolInputDelta;
-        }
-
-        // Default: Treat as text delta
-        return ChunkType::TextDelta;
-    }
+    ) {}
 
     public function cloneWithParsedOutput(mixed $parsedOutput): self
     {
         return new self(
             $this->id,
             $this->message,
-            $this->index,
             $this->createdAt,
             $this->type,
             $this->finishReason,
@@ -75,4 +43,20 @@ public function cloneWithParsedOutput(mixed $parsedOutput): self
             $this->outputParserError,
         );
     }
+
+    public function toArray(): array
+    {
+        return [
+            'id' => $this->id,
+            'type' => $this->type->value,
+            'message' => $this->message->toArray(),
+            'finish_reason' => $this->finishReason?->value,
+            'usage' => $this->usage?->toArray(),
+            'content_so_far' => $this->contentSoFar,
+            'is_final' => $this->isFinal,
+            'parsed_output' => $this->parsedOutput,
+            'output_parser_error' => $this->outputParserError,
+            'created_at' => $this->createdAt,
+        ];
+    }
 }

src/LLM/Data/ChatResult.php

@@ -11,21 +11,26 @@
  */
 readonly class ChatResult implements Arrayable
 {
-    public ChatGeneration $generation;
-
     public mixed $parsedOutput;
 
     /**
-     * @param array<int, ChatGeneration> $generations
      * @param array<int, mixed> $rawResponse
      */
     public function __construct(
-        public array $generations,
+        public ChatGeneration $generation,
         public Usage $usage,
         public array $rawResponse = [],
     ) {
-        $this->generation = $generations[0];
-        $this->parsedOutput = $generations[0]->parsedOutput;
+        $this->parsedOutput = $this->generation->parsedOutput;
+    }
+
+    public function cloneWithGeneration(ChatGeneration $generation): self
+    {
+        return new self(
+            $generation,
+            $this->usage,
+            $this->rawResponse,
+        );
     }
 
     public function toArray(): array

src/LLM/Data/ChatStreamResult.php

@@ -5,13 +5,14 @@
 namespace Cortex\LLM\Data;
 
 use DateTimeImmutable;
+use Cortex\LLM\Enums\ChunkType;
 use Cortex\LLM\Enums\FinishReason;
 use Illuminate\Support\LazyCollection;
 use Cortex\LLM\Streaming\AgUiDataStream;
 use Cortex\LLM\Streaming\VercelDataStream;
 use Cortex\LLM\Streaming\VercelTextStream;
-use Cortex\LLM\Data\Messages\AssistantMessage;
 use Cortex\LLM\Contracts\StreamingProtocol;
+use Cortex\LLM\Data\Messages\AssistantMessage;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 /**
@@ -77,8 +78,8 @@ public static function fake(?string $string = null, ?ToolCallCollection $toolCal
                 $chunk = new ChatGenerationChunk(
                     id: 'fake-' . $index,
                     message: new AssistantMessage($chunk, $toolCalls),
-                    index: $index,
                     createdAt: new DateTimeImmutable(),
+                    type: ChunkType::TextDelta,
                     finishReason: $isFinal ? FinishReason::Stop : null,
                     usage: new Usage(
                         promptTokens: 0,

src/LLM/Data/ResponseMetadata.php

@@ -19,6 +19,7 @@ public function __construct(
         public ModelProvider $provider,
         public ?FinishReason $finishReason = null,
         public ?Usage $usage = null,
+        public array $providerMetadata = [],
     ) {}
 
     /**
@@ -32,6 +33,7 @@ public function toArray(): array
             'provider' => $this->provider->value,
             'finish_reason' => $this->finishReason?->value,
             'usage' => $this->usage?->toArray(),
+            'provider_metadata' => $this->providerMetadata,
         ];
     }
 }

src/LLM/Drivers/AnthropicChat.php …/LLM/Drivers/Anthropic/AnthropicChat.phpsrc/LLM/Drivers/AnthropicChat.php renamed to src/LLM/Drivers/Anthropic/AnthropicChat.php src/LLM/Drivers/AnthropicChat.php renamed to src/LLM/Drivers/Anthropic/AnthropicChat.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Cortex\LLM\Drivers;
+namespace Cortex\LLM\Drivers\Anthropic;
 
 use Generator;
 use Throwable;
@@ -15,6 +15,7 @@
 use Cortex\LLM\Contracts\Tool;
 use Cortex\Events\ChatModelEnd;
 use Cortex\LLM\Data\ChatResult;
+use Cortex\LLM\Enums\ChunkType;
 use Cortex\LLM\Enums\ToolChoice;
 use Anthropic\Testing\ClientFake;
 use Cortex\Events\ChatModelError;
@@ -148,15 +149,14 @@ protected function mapResponse(CreateResponse $response): ChatResult
                     usage: $usage,
                 ),
             ),
-            index: 0,
             createdAt: new DateTimeImmutable(),
             finishReason: $finishReason,
         );
 
         $generation = $this->applyOutputParserIfApplicable($generation);
 
         $result = new ChatResult(
-            [$generation],
+            $generation,
             $usage,
             $response->toArray(), // @phpstan-ignore argument.type
         );
@@ -255,7 +255,7 @@ protected function mapStreamResponse(StreamResponse $response): ChatStreamResult
                         collect($toolCallsSoFar)
                             ->map(function (array $toolCall): ToolCall {
                                 try {
-                                    $arguments = json_decode($toolCall['function']['arguments'], true, flags: JSON_THROW_ON_ERROR);
+                                    $arguments = json_decode((string) $toolCall['function']['arguments'], true, flags: JSON_THROW_ON_ERROR);
                                 } catch (JsonException) {
                                     $arguments = [];
                                 }
@@ -286,8 +286,8 @@ protected function mapStreamResponse(StreamResponse $response): ChatStreamResult
                             usage: $usage,
                         ),
                     ),
-                    index: 0,
                     createdAt: new DateTimeImmutable(),
+                    type: ChunkType::TextDelta, // TODO
                     finishReason: $finishReason,
                     usage: $usage,
                     contentSoFar: $contentSoFar,
@@ -296,11 +296,7 @@ protected function mapStreamResponse(StreamResponse $response): ChatStreamResult
 
                 $chunk = $this->applyOutputParserIfApplicable($chunk);
 
-                $this->dispatchEvent(
-                    $chunk->isFinal
-                        ? new ChatModelEnd($chunk)
-                        : new ChatModelStream($chunk),
-                );
+                $this->dispatchEvent(new ChatModelStream($chunk));
 
                 yield $chunk;
             }

src/LLM/Drivers/FakeChat.php

@@ -71,7 +71,7 @@ public function invoke(
 
         $currentGeneration = $currentGeneration->cloneWithMessage($message);
 
-        $result = new ChatResult([$currentGeneration], $usage);
+        $result = new ChatResult($currentGeneration, $usage);
 
         $this->dispatchEvent(new ChatModelEnd($result));