Merge pull request #6 from llm-agents-php/feature/tool-choise

Adds an ability configuring function calling behavior using the `tool_choice` parameter

Author: butschster

Diff for: composer.json

@@ -5,7 +5,7 @@
   "require": {
     "php": "^8.3",
     "openai-php/client": "^0.10.1",
-    "llm-agents/agents": "^1.5",
+    "llm-agents/agents": "^1.6",
     "guzzlehttp/guzzle": "^7.0"
   },
   "require-dev": {

Diff for: src/LLM.php

@@ -15,6 +15,7 @@
 use LLM\Agents\OpenAI\Client\Exception\LimitExceededException;
 use LLM\Agents\OpenAI\Client\Exception\RateLimitException;
 use LLM\Agents\OpenAI\Client\Exception\TimeoutException;
+use LLM\Agents\Tool\ToolChoice;
 use OpenAI\Contracts\ClientContract;
 
 final class LLM implements LLMInterface
@@ -61,16 +62,7 @@ public function generate(
         }
 
         if ($options->has(Option::Tools)) {
-            $tools = \array_values(
-                \array_map(
-                    fn(Tool $tool): array => $this->messageMapper->map($tool),
-                    $options->get(Option::Tools),
-                ),
-            );
-
-            if ($tools !== []) {
-                $request['tools'] = $tools;
-            }
+            $request = $this->configureTools($options, $request);
         }
 
         $callback = null;
@@ -88,7 +80,7 @@ public function generate(
             return $this->streamParser->parse($stream, $callback);
         } catch (LimitExceededException) {
             throw new \LLM\Agents\LLM\Exception\LimitExceededException(
-                currentLimit: $request['max_tokens'],
+                currentLimit: $request[Option::MaxTokens->value],
             );
         } catch (RateLimitException) {
             throw new \LLM\Agents\LLM\Exception\RateLimitException();
@@ -115,4 +107,37 @@ protected function buildOptions(OptionsInterface $options): array
         // filter out null options
         return \array_filter($result, static fn($value): bool => $value !== null);
     }
+
+    protected function configureTools(Options $options, array $request): array
+    {
+        $tools = \array_values(
+            \array_map(
+                fn(Tool $tool): array => $this->messageMapper->map($tool),
+                $options->get(Option::Tools),
+            ),
+        );
+
+        if ($tools === []) {
+            return $request;
+        }
+
+        $request['tools'] = $tools;
+
+        $choice = $options->get(Option::ToolChoice->value);
+        if ($choice instanceof ToolChoice) {
+            $request['tool_choice'] = match (true) {
+                $choice->isAuto() => 'auto',
+                $choice->isAny() => 'required',
+                $choice->isNone() => 'none',
+                $choice->isSpecific() => [
+                    'type' => 'function',
+                    'function' => [
+                        'name' => $choice->toolName,
+                    ],
+                ],
+            };
+        }
+
+        return $request;
+    }
 }

Diff for: src/Option.php

@@ -21,5 +21,6 @@ enum Option: string
 
     // Application options
     case Tools = 'tools';
+    case ToolChoice = 'tool_choice';
     case StreamChunkCallback = 'stream_chunk_callback';
 }