improvements

Author: tymondesigns

examples/skills-agent.php

@@ -45,7 +45,7 @@
 ]);
 
 // Get a generic agent builder from the prompt
-$agentBuilder = $prompt->agentBuilder();
+$agentBuilder = $prompt->agent();
 
 $result = $agentBuilder->invoke(input: [
     'country' => 'France',
@@ -69,6 +69,10 @@
     new UserMessage('What is the capital of {country}?'),
 ]);
 
+$result = $prompt->agent()->invoke(input: [
+    'country' => 'France',
+]);
+
 // Uses default llm driver
 $result = Cortex::llm()->invoke([
     new SystemMessage('You are a helpful assistant'),

scratchpad.php

@@ -449,6 +449,16 @@ public function getOutputParserError(): ?string
         return $this->outputParserError;
     }
 
+    public function getStructuredOutputConfig(): ?StructuredOutputConfig
+    {
+        return $this->structuredOutputConfig;
+    }
+
+    public function getStructuredOutputMode(): StructuredOutputMode
+    {
+        return $this->structuredOutputMode;
+    }
+
     /**
      * @return array<\Cortex\ModelInfo\Enums\ModelFeature>
      */

src/LLM/AbstractLLM.php

@@ -14,6 +14,7 @@
 use Cortex\JsonSchema\Types\ObjectSchema;
 use Cortex\ModelInfo\Enums\ModelProvider;
 use Cortex\LLM\Enums\StructuredOutputMode;
+use Cortex\LLM\Data\StructuredOutputConfig;
 use Cortex\LLM\Data\Messages\MessageCollection;
 
 interface LLM extends Pipeable
@@ -164,6 +165,23 @@ public function getModelProvider(): ModelProvider;
      */
     public function getModelInfo(): ?ModelInfo;
 
+    /**
+     * Get the parameters for the LLM.
+     *
+     * @return array<string, mixed>
+     */
+    public function getParameters(): array;
+
+    /**
+     * Get the structured output config for the LLM.
+     */
+    public function getStructuredOutputConfig(): ?StructuredOutputConfig;
+
+    /**
+     * Get the structured output mode for the LLM.
+     */
+    public function getStructuredOutputMode(): StructuredOutputMode;
+
     /**
      * Set whether the raw provider response should be included in the result, if available.
      */

src/LLM/Contracts/LLM.php

@@ -37,7 +37,7 @@ public function invokeAsToolMessages(Collection $availableTools, ?RuntimeConfig
             if ($matchingTool === null) {
                 // If we didn't find a matching tool, and there is only one tool and
                 // one tool call, we will assume it's the correct tool.
-                if ($availableTools->containsOneItem() && $this->containsOneItem()) {
+                if ($availableTools->hasSole() && $this->hasSole()) {
                     /** @var \Cortex\LLM\Contracts\Tool $matchingTool */
                     $matchingTool = $availableTools->first();
                 } else {

src/LLM/Data/ToolCallCollection.php

@@ -29,7 +29,7 @@ public function parse(ChatGeneration|ChatGenerationChunk|string $output): array
             throw OutputParserException::failed('Invalid input. Expected a message with tool calls.');
         }
 
-        if ($this->singleToolCall && $output->message->toolCalls->containsOneItem()) {
+        if ($this->singleToolCall && $output->message->toolCalls->hasSole()) {
             return $output->message->toolCalls->first()->function->arguments;
         }
 

src/OutputParsers/JsonOutputToolsParser.php

@@ -44,7 +44,7 @@ public function messages(MessageCollection|array|string $messages): self
     /**
      * Convenience method to build a generic agent builder from the chat prompt builder.
      */
-    public function agentBuilder(): GenericAgentBuilder
+    public function agent(): GenericAgentBuilder
     {
         return new GenericAgentBuilder()->withPrompt($this);
     }

src/Prompts/Builders/ChatPromptBuilder.php

@@ -7,6 +7,7 @@
 use Closure;
 use Cortex\Pipeline;
 use Cortex\Facades\LLM;
+use Cortex\Support\Utils;
 use Cortex\JsonSchema\Schema;
 use Cortex\Contracts\Pipeable;
 use Cortex\Pipeline\RuntimeConfig;
@@ -37,7 +38,7 @@ public function handlePipeable(mixed $payload, RuntimeConfig $config, Closure $n
 
         // If there is only one variable, and the input is a string,
         // we can assume the user is passing the value directly.
-        if (is_string($payload) && $variables->containsOneItem()) {
+        if (is_string($payload) && $variables->hasSole()) {
             return $next($this->format([
                 $variables->first() => $payload,
             ]), $config);
@@ -79,17 +80,7 @@ public function llm(
             throw new PromptException('No LLM provider or metadata provided.');
         }
 
-        if ($provider instanceof LLMContract) {
-            $llm = $provider;
-        } elseif ($provider === null) {
-            if (is_string($this->metadata?->provider)) {
-                $llm = LLM::provider($this->metadata->provider);
-            } else {
-                $llm = $this->metadata->provider;
-            }
-        } else {
-            $llm = LLM::provider($provider);
-        }
+        $llm = Utils::llm($provider ?? $this->metadata?->provider);
 
         if (is_string($model)) {
             $llm->withModel($model);
@@ -128,6 +119,13 @@ public function llm(
         return $this->pipe($llm);
     }
 
+    public function withMetadata(PromptMetadata $metadata): self
+    {
+        $this->metadata = $metadata;
+
+        return $this;
+    }
+
     public function withCompiler(PromptCompiler $compiler): self
     {
         $this->compiler = $compiler;

src/Prompts/Templates/AbstractPromptTemplate.php

@@ -108,7 +108,7 @@ public function getInputSchema(): ObjectSchema
     /**
      * Convenience method to build a generic agent builder from the prompt template.
      */
-    public function agentBuilder(): GenericAgentBuilder
+    public function agent(): GenericAgentBuilder
     {
         return new GenericAgentBuilder()->withPrompt($this);
     }

src/Prompts/Templates/ChatPromptTemplate.php

@@ -44,7 +44,7 @@
     expect($result->first())->toBeInstanceOf(UserMessage::class);
     expect($result->first()->text())->toBe('What is the capital of France?');
 
-    $agentBuilder = $prompt->agentBuilder();
+    $agentBuilder = $prompt->agent();
 
     expect($agentBuilder)->toBeInstanceOf(GenericAgentBuilder::class)
         ->and($agentBuilder->prompt())->toBe($prompt);