Merge branch 'main' into feat/anthropic-stream-0.51

Author: sentiasa

.github/workflows/formatting.yml

@@ -8,7 +8,7 @@ on:
   pull_request:
 
 env:
-  phpv: 8.3
+  phpv: 8.2
 
 jobs:
   formatting:
@@ -27,11 +27,6 @@ jobs:
       - name: Install composer dependencies
         uses: ramsey/composer-install@v3
 
-      - name: Install aspell
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y aspell
-
       - name: Run Pint
         run: |
           vendor/bin/pint
@@ -41,8 +36,3 @@ jobs:
         run: |
           vendor/bin/rector
           git diff --exit-code
-
-      - name: Run Peck
-        run: |
-          vendor/bin/peck
-          git diff --exit-code

.github/workflows/phpstan.yml

@@ -8,7 +8,7 @@ on:
   pull_request:
 
 env:
-  phpv: 8.3
+  phpv: 8.2
 
 jobs:
   phpstan:

.github/workflows/tests.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [8.3, 8.4]
+        php: [8.2, 8.3, 8.4]
         laravel: [11.*, 12.*]
         stability: [prefer-lowest, prefer-stable]
         include:
@@ -53,4 +53,4 @@ jobs:
         run: composer show -D
 
       - name: Execute tests
-        run: vendor/bin/pest --ci
+        run: vendor/bin/pest --parallel

bin/git-hooks/formatting

@@ -13,9 +13,6 @@ main() {
     _header "Running rector..."
     vendor/bin/rector process --no-diffs
 
-    _header "Running Peck..."
-    vendor/bin/peck
-
     files_after_format=$(git diff --name-only --diff-filter=d)
 
     # Find files fixed by pint by comparing file lists before and after pint run

composer.json

@@ -15,7 +15,7 @@
     }
   ],
   "require": {
-    "php": "^8.3",
+    "php": "^8.2",
     "laravel/framework": "^11.0|^12.0"
   },
   "config": {
@@ -39,7 +39,6 @@
     "mockery/mockery": "^1.6",
     "symplify/rule-doc-generator-contracts": "^11.2",
     "phpstan/phpdoc-parser": "^1.24",
-    "peckphp/peck": "^0.1.1",
     "spatie/laravel-ray": "^1.39"
   },
   "autoload-dev": {

docs/core-concepts/testing.md

@@ -281,6 +281,37 @@ it('can generate structured response', function () {
 });
 ```
 
+## Testing Embeddings
+
+```
+use Prism\Prism\Prism;
+use Prism\Prism\Enums\Provider;
+use Prism\Prism\ValueObjects\Embedding;
+use Prism\Prism\ValueObjects\EmbeddingsUsage;
+use Prism\Prism\Embeddings\Response as EmbeddingsResponse;
+
+it('can generate embeddings', function () {
+    $fakeResponse = new EmbeddingsResponse(
+        embeddings: [new Embedding(array_fill(0, 1536, 0.1))],
+        usage: new EmbeddingsUsage(
+            tokens: 10,
+        )
+    );
+
+    Prism::fake([$fakeResponse]);
+
+    $response = Prism::embeddings()
+        ->using(Provider::OpenAI, 'text-embedding-3-small')
+        ->fromInput('Test content for embedding generation.')
+        ->generate();
+
+    expect($response->embeddings)->toHaveCount(1)
+        ->and($response->embeddings[0]->embedding)
+        ->toBeArray()
+        ->toHaveCount(1536);
+});
+```
+
 ## Assertions
 
 PrismFake provides several helpful assertion methods:
@@ -294,8 +325,8 @@ $fake->assertCallCount(2);
 
 // Assert detailed request properties
 $fake->assertRequest(function ($requests) {
-    expect($requests[0]->provider)->toBe('anthropic');
-    expect($requests[0]->model)->toBe('claude-3-sonnet');
+    expect($requests[0]->provider())->toBe('anthropic');
+    expect($requests[0]->model())->toBe('claude-3-sonnet');
 });
 
 // Assert provider configuration

docs/getting-started/installation.md

@@ -6,7 +6,7 @@ Getting started with Prism is a breeze.
 
 Before we dive in, make sure your project meets these requirements:
 
-- PHP 8.3 or higher
+- PHP 8.2 or higher
 - Laravel 11.0 or higher
 
 ## Step 1: Composer Installation

docs/providers/voyageai.md

@@ -28,7 +28,7 @@ Prism::embeddings()
     ->using(Provider::VoyageAI, 'voyage-3-lite')
     ->fromInput('The food was delicious and the waiter...')
     ->withProviderMeta(Provider::VoyageAI, ['inputType' => 'query'])
-    ->generate();
+    ->asEmbeddings();
 ```
 
 For document retrieval:
@@ -41,7 +41,7 @@ Prism::embeddings()
     ->using(Provider::VoyageAI, 'voyage-3-lite')
     ->fromInput('The food was delicious and the waiter...')
     ->withProviderMeta(Provider::VoyageAI, ['inputType' => 'document'])
-    ->generate();
+    ->asEmbeddings();
 ```
 
 ### Truncation
@@ -58,7 +58,5 @@ Prism::embeddings()
     ->using(Provider::VoyageAI, 'voyage-3-lite')
     ->fromInput('The food was delicious and the waiter...')
     ->withProviderMeta(Provider::VoyageAI, ['truncation' => false])
-    ->generate();
+    ->asEmbeddings();
 ```
-
-### Truncation

peck.json

@@ -19,7 +19,7 @@
         ReorderMethodsRector::class,
     ])
     ->withSets([
-        LevelSetList::UP_TO_PHP_83,
+        LevelSetList::UP_TO_PHP_82,
         SetList::CODE_QUALITY,
         SetList::DEAD_CODE,
         SetList::EARLY_RETURN,

rector.php

@@ -24,11 +24,13 @@ protected function validateResponse(Response $response): void
         $data = $response->json();
 
         if (! $data || data_get($data, 'object') === 'error') {
+            $message = data_get($data, 'message', 'unknown');
+
             throw PrismException::providerResponseError(vsprintf(
                 'Mistral Error: [%s] %s',
                 [
                     data_get($data, 'type', 'unknown'),
-                    data_get($data, 'message', 'unknown'),
+                    is_array($message) ? json_encode($message) : $message,
                 ]
             ));
         }

src/Providers/Mistral/Concerns/ValidatesResponse.php

@@ -132,15 +132,19 @@ protected function addStep(array $data, Request $request, ClientResponse $client
     protected function sendRequest(Request $request): ClientResponse
     {
         try {
-            return $this->client->post('chat/completions', [
-                'model' => $request->model(),
-                'messages' => (new MessageMap($request->messages(), $request->systemPrompts()))(),
-                'tools' => ToolMap::map($request->tools()),
-                'temperature' => $request->temperature(),
-                'max_tokens' => $request->maxTokens(),
-                'top_p' => $request->topP(),
-                'tool_choice' => ToolChoiceMap::map($request->toolChoice()),
-            ]);
+            return $this->client->post(
+                'chat/completions',
+                array_merge([
+                    'model' => $request->model(),
+                    'messages' => (new MessageMap($request->messages(), $request->systemPrompts()))(),
+                    'max_tokens' => $request->maxTokens(),
+                ], array_filter([
+                    'temperature' => $request->temperature(),
+                    'top_p' => $request->topP(),
+                    'tools' => ToolMap::map($request->tools()),
+                    'tool_choice' => ToolChoiceMap::map($request->toolChoice()),
+                ]))
+            );
         } catch (Throwable $e) {
             throw PrismException::providerRequestError($request->model(), $e);
         }

src/Providers/Mistral/Handlers/Text.php

@@ -50,7 +50,7 @@ public function handle(Request $request): Response
         $data = $response->json();
 
         $responseMessage = new AssistantMessage(
-            data_get($data, 'message.content') ?? '',
+            data_get($data, 'choices.0.message.content') ?? '',
             ToolCallMap::map(data_get($data, 'choices.0.message.tool_calls', [])),
         );