tweaks

Author: tymondesigns

src/LLM/Drivers/OpenAIChat.php

@@ -115,7 +115,9 @@ protected function mapResponse(CreateResponse $response): ChatResult
             ->map(function (CreateResponseChoice $choice) use ($toolCalls, $finishReason, $usage, $response): ChatGeneration {
                 $generation = new ChatGeneration(
                     message: new AssistantMessage(
-                        content: $choice->message->content,
+                        content: [
+                            new TextContent($choice->message->content),
+                        ],
                         toolCalls: $toolCalls,
                         metadata: new ResponseMetadata(
                             id: $response->id,

tests/Unit/LLM/Drivers/OpenAIChatTest.php

@@ -19,6 +19,7 @@
 use Cortex\LLM\Data\Messages\UserMessage;
 use Cortex\Tasks\Enums\StructuredOutputMode;
 use Cortex\LLM\Data\Messages\AssistantMessage;
+use Cortex\LLM\Data\Messages\Content\TextContent;
 use OpenAI\Responses\Chat\CreateResponse as ChatCreateResponse;
 use OpenAI\Responses\Chat\CreateStreamedResponse as ChatCreateStreamedResponse;
 
@@ -44,7 +45,7 @@
         ->and($result->rawResponse)->toBeArray()->not->toBeEmpty()
         ->and($result->generations)->toHaveCount(1)
         ->and($result->generation->message)->toBeInstanceOf(AssistantMessage::class)
-        ->and($result->generation->message->content)->toBe('I am doing well, thank you for asking!');
+        ->and($result->generation->message->text())->toBe('I am doing well, thank you for asking!');
 });
 
 test('it can stream', function (): void {
@@ -152,8 +153,11 @@
         new UserMessage('Tell me about a person'),
     ]);
 
-    expect($result->generation->message->content)
-        ->toBe('{"name":"John Doe","age":30}');
+    expect($result->generation->message->text())
+        ->toBe('{"name":"John Doe","age":30}')
+        ->and($result->generation->message->content())
+        ->toBeArray()
+        ->toContainOnlyInstancesOf(TextContent::class);
 
     expect($result->generation->parsedOutput)->toBe([
         'name' => 'John Doe',
@@ -373,8 +377,11 @@ enum Sentiment: string
         new UserMessage('Tell me a joke'),
     ]);
 
-    expect($result->generation->message->content)
-        ->toBe('{"setup":"Why did the scarecrow win an award?","punchline":"Because he was outstanding in his field!"}');
+    expect($result->generation->message->text())
+        ->toBe('{"setup":"Why did the scarecrow win an award?","punchline":"Because he was outstanding in his field!"}')
+        ->and($result->generation->message->content())
+        ->toBeArray()
+        ->toContainOnlyInstancesOf(TextContent::class);
 });
 
 test('it can set temperature and max tokens', function (): void {

tests/Unit/Prompts/Templates/ChatPromptTemplateTest.php

@@ -33,7 +33,7 @@
 
     expect($messages)->toBeInstanceOf(MessageCollection::class);
     expect($messages)->toHaveCount(1);
-    expect($messages[0]->content())->toBe('Hello, my name is John!');
+    expect($messages[0]->text())->toBe('Hello, my name is John!');
 });
 
 test('it can format a chat prompt template with multiple variables and messages', function (): void {
@@ -190,7 +190,7 @@
     ]);
 
     expect($result)->toBeInstanceOf(ChatResult::class);
-    expect($result->generation->message->content)->toBe("Hello John! It's nice to meet you.");
+    expect($result->generation->message->text())->toBe("Hello John! It's nice to meet you.");
 
     /** @var \OpenAI\Testing\ClientFake $client */
     $client = $llm->getClient();