bug #99 fix: Gemini multiple tools (valtzu)

This PR was merged into the main branch.

Discussion
----------

fix: Gemini multiple tools

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| Docs?         | no
| Issues        |
| License       | MIT

Cherry picking php-llm/llm-chain#380

Commits
-------

9b0d38f fix: Gemini multiple tools (#380)

Author: chr-hertel

src/platform/src/Bridge/Google/Contract/ToolNormalizer.php

@@ -38,23 +38,17 @@ protected function supportsModel(Model $model): bool
      * @param Tool $data
      *
      * @return array{
-     *     functionDeclarations: array{
-     *         name: string,
-     *         description: string,
-     *         parameters: JsonSchema|array{type: 'object'}
-     *     }[]
+     *     name: string,
+     *     description: string,
+     *     parameters: JsonSchema|array{type: 'object'}
      * }
      */
     public function normalize(mixed $data, ?string $format = null, array $context = []): array
     {
         return [
-            'functionDeclarations' => [
-                [
-                    'description' => $data->description,
-                    'name' => $data->name,
-                    'parameters' => $data->parameters ? $this->removeAdditionalProperties($data->parameters) : null,
-                ],
-            ],
+            'description' => $data->description,
+            'name' => $data->name,
+            'parameters' => $data->parameters ? $this->removeAdditionalProperties($data->parameters) : null,
         ];
     }
 

src/platform/src/Bridge/Google/ModelHandler.php

@@ -73,7 +73,7 @@ public function request(Model $model, array|string $payload, array $options = []
         unset($generationConfig['generationConfig']['server_tools']);
 
         if (isset($options['tools'])) {
-            $generationConfig['tools'] = $options['tools'];
+            $generationConfig['tools'][] = ['functionDeclarations' => $options['tools']];
             unset($options['tools']);
         }
 

src/platform/tests/Bridge/Google/Contract/ToolNormalizerTest.php

@@ -99,29 +99,25 @@ public static function normalizeDataProvider(): iterable
                 ],
             ),
             [
-                'functionDeclarations' => [
-                    [
-                        'description' => 'A tool with required parameters',
-                        'name' => 'tool_required_params',
-                        'parameters' => [
+                'description' => 'A tool with required parameters',
+                'name' => 'tool_required_params',
+                'parameters' => [
+                    'type' => 'object',
+                    'properties' => [
+                        'text' => [
+                            'type' => 'string',
+                            'description' => 'Text parameter',
+                        ],
+                        'number' => [
+                            'type' => 'integer',
+                            'description' => 'Number parameter',
+                        ],
+                        'nestedObject' => [
                             'type' => 'object',
-                            'properties' => [
-                                'text' => [
-                                    'type' => 'string',
-                                    'description' => 'Text parameter',
-                                ],
-                                'number' => [
-                                    'type' => 'integer',
-                                    'description' => 'Number parameter',
-                                ],
-                                'nestedObject' => [
-                                    'type' => 'object',
-                                    'description' => 'bar',
-                                ],
-                            ],
-                            'required' => ['text', 'number'],
+                            'description' => 'bar',
                         ],
                     ],
+                    'required' => ['text', 'number'],
                 ],
             ],
         ];
@@ -134,13 +130,9 @@ public static function normalizeDataProvider(): iterable
                 null,
             ),
             [
-                'functionDeclarations' => [
-                    [
-                        'description' => 'A tool without parameters',
-                        'name' => 'tool_no_params',
-                        'parameters' => null,
-                    ],
-                ],
+                'description' => 'A tool without parameters',
+                'name' => 'tool_no_params',
+                'parameters' => null,
             ],
         ];
     }