Add tests and improve handling for tool calls and parameterless tools…

src/Bedrock.php

@@ -99,7 +99,7 @@ public function schema(PrismRequest $request): BedrockSchema
     {
         $override = $request->providerOptions();
 
-        $override = data_get($override, 'apiSchema', null);
+        $override = data_get($override, 'apiSchema');
 
         return $override ?? BedrockSchema::fromModelString($request->model());
     }

src/BedrockServiceProvider.php

@@ -35,7 +35,7 @@ public static function getCredentials(array $config): Credentials
     protected function registerWithPrism(): void
     {
         $this->app->extend(PrismManager::class, function (PrismManager $prismManager): \Prism\Prism\PrismManager {
-            $prismManager->extend(Bedrock::KEY, fn ($app, $config): Bedrock => new Bedrock(
+            $prismManager->extend(Bedrock::KEY, fn ($app, array $config): Bedrock => new Bedrock(
                 credentials: BedrockServiceProvider::getCredentials($config),
                 region: $config['region']
             ));

src/Schemas/Anthropic/AnthropicStructuredHandler.php

@@ -105,8 +105,8 @@ protected function prepareTempResponse(): void
             usage: new Usage(
                 promptTokens: data_get($data, 'usage.input_tokens'),
                 completionTokens: data_get($data, 'usage.output_tokens'),
-                cacheWriteInputTokens: data_get($data, 'usage.cache_creation_input_tokens', null),
-                cacheReadInputTokens: data_get($data, 'usage.cache_read_input_tokens', null)
+                cacheWriteInputTokens: data_get($data, 'usage.cache_creation_input_tokens'),
+                cacheReadInputTokens: data_get($data, 'usage.cache_read_input_tokens')
             ),
             meta: new Meta(
                 id: data_get($data, 'id'),

src/Schemas/Anthropic/AnthropicTextHandler.php

@@ -155,6 +155,7 @@ protected function addStep(Request $request, array $toolResults = []): void
             finishReason: $this->tempResponse->finishReason,
             toolCalls: $this->tempResponse->toolCalls,
             toolResults: $toolResults,
+            providerToolCalls: [],
             usage: $this->tempResponse->usage,
             meta: $this->tempResponse->meta,
             messages: $request->messages(),

src/Schemas/Anthropic/Concerns/ExtractsToolCalls.php

@@ -14,10 +14,12 @@ protected function extractToolCalls(array $data): array
     {
         $toolCalls = array_map(function ($content): ?ToolCall {
             if (data_get($content, 'type') === 'tool_use') {
+                $input = data_get($content, 'input');
+
                 return new ToolCall(
                     id: data_get($content, 'id'),
                     name: data_get($content, 'name'),
-                    arguments: data_get($content, 'input')
+                    arguments: is_string($input) ? (json_decode($input, true) ?? []) : ($input ?? [])
                 );
             }
 

src/Schemas/Anthropic/Maps/MessageMap.php

@@ -28,7 +28,7 @@ public static function map(array $messages): array
         }
 
         return array_map(
-            fn (Message $message): array => self::mapMessage($message),
+            self::mapMessage(...),
             $messages
         );
     }
@@ -40,7 +40,7 @@ public static function map(array $messages): array
     public static function mapSystemMessages(array $messages): array
     {
         return array_map(
-            fn (Message $message): array => self::mapSystemMessage($message),
+            self::mapSystemMessage(...),
             $messages
         );
     }
@@ -65,7 +65,7 @@ protected static function mapSystemMessage(SystemMessage $systemMessage): array
     {
         $providerOptions = $systemMessage->providerOptions();
 
-        $cacheType = data_get($providerOptions, 'cacheType', null);
+        $cacheType = data_get($providerOptions, 'cacheType');
 
         return array_filter([
             'type' => 'text',
@@ -96,7 +96,7 @@ protected static function mapUserMessage(UserMessage $message): array
     {
         $providerOptions = $message->providerOptions();
 
-        $cacheType = data_get($providerOptions, 'cacheType', null);
+        $cacheType = data_get($providerOptions, 'cacheType');
         $cache_control = $cacheType ? ['type' => $cacheType instanceof BackedEnum ? $cacheType->value : $cacheType] : null;
 
         if ($message->documents() !== []) {
@@ -123,7 +123,7 @@ protected static function mapAssistantMessage(AssistantMessage $message): array
     {
         $providerOptions = $message->providerOptions();
 
-        $cacheType = data_get($providerOptions, 'cacheType', null);
+        $cacheType = data_get($providerOptions, 'cacheType');
 
         $content = [];
 
@@ -150,7 +150,7 @@ protected static function mapAssistantMessage(AssistantMessage $message): array
                 'type' => 'tool_use',
                 'id' => $toolCall->id,
                 'name' => $toolCall->name,
-                'input' => $toolCall->arguments(),
+                'input' => $toolCall->arguments() === [] ? new \stdClass : $toolCall->arguments(),
             ], $message->toolCalls)
             : [];
 

src/Schemas/Anthropic/Maps/ToolMap.php

@@ -16,14 +16,14 @@ class ToolMap
     public static function map(array $tools): array
     {
         return array_map(function (PrismTool $tool): array {
-            $cacheType = data_get($tool->providerOptions(), 'cacheType', null);
+            $cacheType = data_get($tool->providerOptions(), 'cacheType');
 
             return array_filter([
                 'name' => $tool->name(),
                 'description' => $tool->description(),
                 'input_schema' => [
                     'type' => 'object',
-                    'properties' => $tool->parametersAsArray(),
+                    'properties' => $tool->parametersAsArray() ?: (object) [],
                     'required' => $tool->requiredParameters(),
                 ],
                 'cache_control' => $cacheType

src/Schemas/Cohere/CohereEmbeddingsHandler.php

@@ -65,7 +65,7 @@ protected function buildResponse(): EmbeddingsResponse
         $body = $this->httpResponse->json();
 
         return new EmbeddingsResponse(
-            embeddings: array_map(fn (array $item): Embedding => Embedding::fromArray($item), data_get($body, 'embeddings', [])),
+            embeddings: array_map(Embedding::fromArray(...), data_get($body, 'embeddings', [])),
             usage: new EmbeddingsUsage(
                 tokens: (int) $this->httpResponse->header('X-Amzn-Bedrock-Input-Token-Count')
             ),

src/Schemas/Converse/Concerns/ExtractsToolCalls.php

@@ -18,10 +18,12 @@ protected function extractToolCalls(array $data): array
                 return;
             }
 
+            $input = data_get($use, 'input');
+
             return new ToolCall(
                 id: data_get($use, 'toolUseId'),
                 name: data_get($use, 'name'),
-                arguments: data_get($use, 'input')
+                arguments: is_string($input) ? (json_decode($input, true) ?? []) : ($input ?? [])
             );
 
         }, data_get($data, 'output.message.content', []));

src/Schemas/Converse/ConverseTextHandler.php

@@ -161,6 +161,7 @@ protected function addStep(Request $request, array $toolResults = []): void
             finishReason: $this->tempResponse->finishReason,
             toolCalls: $this->tempResponse->toolCalls,
             toolResults: $toolResults,
+            providerToolCalls: [],
             usage: $this->tempResponse->usage,
             meta: $this->tempResponse->meta,
             messages: $request->messages(),

src/Schemas/Converse/Maps/MessageMap.php

@@ -28,7 +28,7 @@ public static function map(array $messages): array
         }
 
         return array_map(
-            fn (Message $message): array => self::mapMessage($message),
+            self::mapMessage(...),
             $messages
         );
     }
@@ -44,7 +44,7 @@ public static function mapSystemMessages(array $systemPrompts): array
         foreach ($systemPrompts as $prompt) {
             $output[] = self::mapSystemMessage($prompt);
 
-            $cacheType = data_get($prompt->providerOptions(), 'cacheType', null);
+            $cacheType = data_get($prompt->providerOptions(), 'cacheType');
 
             if ($cacheType) {
                 $output[] = ['cachePoint' => ['type' => $cacheType]];
@@ -102,7 +102,7 @@ protected static function mapToolResultMessage(ToolResultMessage $message): arra
      */
     protected static function mapUserMessage(UserMessage $message): array
     {
-        $cacheType = data_get($message->providerOptions(), 'cacheType', null);
+        $cacheType = data_get($message->providerOptions(), 'cacheType');
 
         return [
             'role' => 'user',
@@ -120,7 +120,7 @@ protected static function mapUserMessage(UserMessage $message): array
      */
     protected static function mapAssistantMessage(AssistantMessage $message): array
     {
-        $cacheType = data_get($message->providerOptions(), 'cacheType', null);
+        $cacheType = data_get($message->providerOptions(), 'cacheType');
 
         return [
             'role' => 'assistant',
@@ -142,7 +142,7 @@ protected static function mapToolCalls(array $parts): array
             'toolUse' => [
                 'toolUseId' => $toolCall->id,
                 'name' => $toolCall->name,
-                'input' => $toolCall->arguments(),
+                'input' => $toolCall->arguments() === [] ? new \stdClass : $toolCall->arguments(),
             ],
         ], $parts);
     }

tests/BedrockServiceProviderTest.php

@@ -7,7 +7,7 @@
 use Prism\Prism\Prism;
 
 it('registers itself as a provider with prism', function (): void {
-    $pendingRequest = Prism::text()->using('bedrock', 'test-model');
+    $pendingRequest = (new Prism())->text()->using('bedrock', 'test-model');
 
     expect($pendingRequest->provider())->toBeInstanceOf(Bedrock::class);
 });
@@ -16,7 +16,7 @@
     Http::fake();
     Http::preventStrayRequests();
 
-    Prism::embeddings()
+    (new Prism())->embeddings()
         ->using('bedrock', 'test-model')
         ->withProviderOptions(['apiSchema' => BedrockSchema::Anthropic])
         ->fromInput('Hello world')
@@ -27,7 +27,7 @@
     Http::fake();
     Http::preventStrayRequests();
 
-    Prism::embeddings()
+    (new Prism())->embeddings()
         ->using('bedrock', 'test-model')
         ->fromInput('Hello world')
         ->asEmbeddings();

tests/Schemas/Anthropic/AnthropicStructuredHandlerTest.php

@@ -26,7 +26,7 @@
         ['weather', 'game_time', 'coat_required']
     );
 
-    $response = Prism::structured()
+    $response = (new Prism())->structured()
         ->withSchema($schema)
         ->using('bedrock', 'anthropic.claude-3-5-haiku-20241022-v1:0')
         ->withSystemPrompt('The tigers game is at 3pm and the temperature will be 70º')
@@ -60,7 +60,7 @@
 
     $customMessage = 'Please return a JSON response using this custom format instruction';
 
-    Prism::structured()
+    (new Prism())->structured()
         ->withSchema($schema)
         ->using('bedrock', 'anthropic.claude-3-5-haiku-20241022-v1:0')
         ->withProviderOptions([
@@ -95,7 +95,7 @@
 
     $defaultMessage = 'Respond with ONLY JSON (i.e. not in backticks or a code block, with NO CONTENT outside the JSON) that matches the following schema:';
 
-    Prism::structured()
+    (new Prism())->structured()
         ->withSchema($schema)
         ->using('bedrock', 'anthropic.claude-3-5-haiku-20241022-v1:0')
         ->withSystemPrompt('The tigers game is at 3pm and the temperature will be 70º')
@@ -125,7 +125,7 @@
         ['weather', 'game_time', 'coat_required']
     );
 
-    Prism::structured()
+    (new Prism())->structured()
         ->withSchema($schema)
         ->using('bedrock', 'anthropic.claude-3-5-haiku-20241022-v1:0')
         ->withProviderOptions([

tests/Schemas/Anthropic/AnthropicTextHandlerTest.php

@@ -14,7 +14,7 @@
 it('can generate text with a prompt', function (): void {
     FixtureResponse::fakeResponseSequence('invoke', 'anthropic/generate-text-with-a-prompt');
 
-    $response = Prism::text()
+    $response = (new Prism())->text()
         ->using('bedrock', 'anthropic.claude-3-5-haiku-20241022-v1:0')
         ->withPrompt('Who are you?')
         ->asText();
@@ -33,7 +33,7 @@
 it('can generate text with a system prompt', function (): void {
     FixtureResponse::fakeResponseSequence('invoke', 'anthropic/generate-text-with-system-prompt');
 
-    $response = Prism::text()
+    $response = (new Prism())->text()
         ->using('bedrock', 'anthropic.claude-3-5-haiku-20241022-v1:0')
         ->withSystemPrompt('MODEL ADOPTS ROLE of [PERSONA: Nyx the Cthulhu]!')
         ->withPrompt('Who are you?')
@@ -62,7 +62,7 @@
             ->using(fn (string $query): string => 'The tigers game is at 3pm in detroit'),
     ];
 
-    $response = Prism::text()
+    $response = (new Prism())->text()
         ->using('bedrock', 'anthropic.claude-3-5-haiku-20241022-v1:0')
         ->withTools($tools)
         ->withMaxSteps(3)
@@ -102,7 +102,7 @@
 it('can send images from file', function (): void {
     FixtureResponse::fakeResponseSequence('invoke', 'anthropic/generate-text-with-image');
 
-    Prism::text()
+    (new Prism())->text()
         ->using('bedrock', 'anthropic.claude-3-5-haiku-20241022-v1:0')
         ->withMessages([
             new UserMessage(
@@ -146,7 +146,7 @@
             ->using(fn (string $query): string => 'The tigers game is at 3pm in detroit'),
     ];
 
-    $response = Prism::text()
+    $response = (new Prism())->text()
         ->using('bedrock', 'anthropic.claude-3-5-haiku-20241022-v1:0')
         ->withPrompt('Do something')
         ->withTools($tools)
@@ -159,7 +159,7 @@
 it('can calculate cache usage correctly', function (): void {
     FixtureResponse::fakeResponseSequence('invoke', 'anthropic/calculate-cache-usage');
 
-    $response = Prism::text()
+    $response = (new Prism())->text()
         ->using('bedrock', 'anthropic.claude-3-5-haiku-20241022-v1:0')
         ->withSystemPrompt(new SystemMessage('Old context'))->withProviderOptions(['cacheType' => 'ephemeral'])
         ->withMessages([
@@ -174,7 +174,7 @@
 it('does not enable prompt caching if the enableCaching provider meta is not set on the request', function (): void {
     FixtureResponse::fakeResponseSequence('invoke', 'anthropic/generate-text-with-a-prompt');
 
-    Prism::text()
+    (new Prism())->text()
         ->using('bedrock', 'anthropic.claude-3-5-haiku-20241022-v1:0')
         ->withPrompt('Who are you?')
         ->asText();
@@ -185,7 +185,7 @@
 it('enables prompt caching if the enableCaching provider meta is set on the request', function (): void {
     FixtureResponse::fakeResponseSequence('invoke', 'anthropic/generate-text-with-a-prompt');
 
-    Prism::text()
+    (new Prism())->text()
         ->using('bedrock', 'anthropic.claude-3-5-haiku-20241022-v1:0')
         ->withProviderOptions(['enableCaching' => true])
         ->withPrompt('Who are you?')
@@ -197,7 +197,7 @@
 it('does not remove 0 values from payloads', function (): void {
     FixtureResponse::fakeResponseSequence('invoke', 'anthropic/generate-text-with-a-prompt');
 
-    Prism::text()
+    (new Prism())->text()
         ->using('bedrock', 'anthropic.claude-3-5-haiku-20241022-v1:0')
         ->withPrompt('Who are you?')
         ->usingTemperature(0)