wip

Author: tymondesigns

config/cortex.php

@@ -308,7 +308,7 @@
 
         /**
          * Whether to check a models features before attempting to use it.
-         * Set to false by default, to ensure a given model feature is available.
+         * Set to true to ensure a given model feature is available.
          */
         'ignore_features' => env('CORTEX_MODEL_INFO_IGNORE_FEATURES', false),
 

scratchpad.php

@@ -6,10 +6,10 @@
 use Cortex\Agents\Agent;
 use Cortex\Prompts\Prompt;
 use Cortex\JsonSchema\Schema;
-use Cortex\Tools\Prebuilt\WeatherTool;
 use Cortex\Agents\Prebuilt\WeatherAgent;
 use Cortex\LLM\Data\Messages\UserMessage;
 use Cortex\LLM\Data\Messages\SystemMessage;
+use Cortex\Tools\Prebuilt\OpenMeteoWeatherTool;
 
 $prompt = Cortex::prompt([
     new SystemMessage('You are an expert at geography.'),
@@ -109,7 +109,7 @@
     ->withPrompt('You are a weather agent. You tell the weather in {location}.')
     ->withLLM('ollama:gpt-oss:20b')
     ->withTools([
-        WeatherTool::class,
+        OpenMeteoWeatherTool::class,
     ])
     ->withOutput(Schema::object()->properties(
         Schema::string('location')->required(),

src/Agents/Agent.php

@@ -19,8 +19,8 @@
 use Cortex\LLM\Enums\ToolChoice;
 use Cortex\LLM\Contracts\Message;
 use Cortex\Memory\Contracts\Store;
+use Cortex\Pipeline\RuntimeConfig;
 use Cortex\Support\Traits\CanPipe;
-use Cortex\Pipeline\RuntimeContext;
 use Cortex\Agents\Stages\AppendUsage;
 use Cortex\LLM\Data\ChatStreamResult;
 use Cortex\Exceptions\GenericException;
@@ -58,9 +58,8 @@ class Agent implements Pipeable
     protected Pipeline $pipeline;
 
     /**
-     * @param class-string|\Cortex\JsonSchema\Types\ObjectSchema $output
+     * @param class-string|\Cortex\JsonSchema\Types\ObjectSchema|array<array-key, \Cortex\JsonSchema\Contracts\JsonSchema>|null $output
      * @param array<int, \Cortex\LLM\Contracts\Tool|\Closure|string>|\Cortex\Contracts\ToolKit $tools
-     * @param class-string|class-string<\BackedEnum>|\Cortex\JsonSchema\Types\ObjectSchema|array<array-key, \Cortex\JsonSchema\Contracts\JsonSchema>|null $llm
      * @param array<string, mixed> $initialPromptVariables
      */
     public function __construct(
@@ -177,7 +176,7 @@ public function stream(array $messages = [], array $input = []): ChatStreamResul
         return $result;
     }
 
-    public function handlePipeable(mixed $payload, RuntimeContext $context, Closure $next): mixed
+    public function handlePipeable(mixed $payload, RuntimeConfig $config, Closure $next): mixed
     {
         $messages = match (true) {
             $payload instanceof MessageCollection => $payload->all(),
@@ -193,7 +192,7 @@ public function handlePipeable(mixed $payload, RuntimeContext $context, Closure
             default => [],
         };
 
-        return $next($this->invoke($messages, $input), $context);
+        return $next($this->invoke($messages, $input), $config);
     }
 
     public function getName(): string

src/Agents/Prebuilt/WeatherAgent.php

@@ -9,12 +9,12 @@
 use Cortex\Contracts\ToolKit;
 use Cortex\JsonSchema\Schema;
 use Cortex\LLM\Contracts\LLM;
-use Cortex\Tools\Prebuilt\WeatherTool;
 use Cortex\Agents\AbstractAgentBuilder;
 use Cortex\JsonSchema\Types\ObjectSchema;
 use Cortex\LLM\Data\Messages\UserMessage;
 use Cortex\LLM\Data\Messages\SystemMessage;
 use Cortex\Prompts\Builders\ChatPromptBuilder;
+use Cortex\Tools\Prebuilt\OpenMeteoWeatherTool;
 use Cortex\Prompts\Templates\ChatPromptTemplate;
 
 class WeatherAgent extends AbstractAgentBuilder
@@ -29,7 +29,7 @@ public function prompt(): ChatPromptTemplate|ChatPromptBuilder|string
         return Cortex::prompt([
             new SystemMessage('You are a weather agent. Output in sentences.'),
             new UserMessage('What is the weather in {location}?'),
-        ])->strict(false);
+        ]);
     }
 
     public function llm(): LLM|string|null
@@ -41,7 +41,7 @@ public function llm(): LLM|string|null
     public function tools(): array|ToolKit
     {
         return [
-            WeatherTool::class,
+            OpenMeteoWeatherTool::class,
         ];
     }
 

src/Agents/Stages/AddMessageToMemory.php

@@ -8,9 +8,9 @@
 use Cortex\Contracts\Pipeable;
 use Cortex\LLM\Data\ChatResult;
 use Cortex\Contracts\ChatMemory;
+use Cortex\Pipeline\RuntimeConfig;
 use Cortex\Support\Traits\CanPipe;
 use Cortex\LLM\Data\ChatGeneration;
-use Cortex\Pipeline\RuntimeContext;
 use Cortex\LLM\Data\ChatGenerationChunk;
 
 class AddMessageToMemory implements Pipeable
@@ -21,7 +21,7 @@ public function __construct(
         protected ChatMemory $memory,
     ) {}
 
-    public function handlePipeable(mixed $payload, RuntimeContext $context, Closure $next): mixed
+    public function handlePipeable(mixed $payload, RuntimeConfig $config, Closure $next): mixed
     {
         $message = match (true) {
             $payload instanceof ChatGeneration => $payload->message,
@@ -34,6 +34,6 @@ public function handlePipeable(mixed $payload, RuntimeContext $context, Closure
             $this->memory->addMessage($message);
         }
 
-        return $next($payload, $context);
+        return $next($payload, $config);
     }
 }

src/Agents/Stages/AppendUsage.php

@@ -8,8 +8,8 @@
 use Cortex\LLM\Data\Usage;
 use Cortex\Contracts\Pipeable;
 use Cortex\LLM\Data\ChatResult;
+use Cortex\Pipeline\RuntimeConfig;
 use Cortex\Support\Traits\CanPipe;
-use Cortex\Pipeline\RuntimeContext;
 use Cortex\LLM\Data\ChatGenerationChunk;
 
 class AppendUsage implements Pipeable
@@ -20,7 +20,7 @@ public function __construct(
         protected Usage $usage,
     ) {}
 
-    public function handlePipeable(mixed $payload, RuntimeContext $context, Closure $next): mixed
+    public function handlePipeable(mixed $payload, RuntimeConfig $config, Closure $next): mixed
     {
         $usage = match (true) {
             $payload instanceof ChatResult, $payload instanceof ChatGenerationChunk && $payload->isFinal => $payload->usage,
@@ -31,6 +31,6 @@ public function handlePipeable(mixed $payload, RuntimeContext $context, Closure
             $this->usage->add($usage);
         }
 
-        return $next($payload, $context);
+        return $next($payload, $config);
     }
 }

src/Agents/Stages/HandleToolCalls.php

@@ -9,10 +9,10 @@
 use Cortex\Contracts\Pipeable;
 use Cortex\LLM\Data\ChatResult;
 use Cortex\Contracts\ChatMemory;
+use Cortex\Pipeline\RuntimeConfig;
 use Cortex\Support\Traits\CanPipe;
 use Illuminate\Support\Collection;
 use Cortex\LLM\Data\ChatGeneration;
-use Cortex\Pipeline\RuntimeContext;
 use Cortex\LLM\Data\ChatGenerationChunk;
 use Cortex\LLM\Data\Messages\ToolMessage;
 
@@ -32,7 +32,7 @@ public function __construct(
         protected int $maxSteps,
     ) {}
 
-    public function handlePipeable(mixed $payload, RuntimeContext $context, Closure $next): mixed
+    public function handlePipeable(mixed $payload, RuntimeConfig $config, Closure $next): mixed
     {
         $generation = $this->getGeneration($payload);
 
@@ -50,14 +50,14 @@ public function handlePipeable(mixed $payload, RuntimeContext $context, Closure
                 $payload = $this->executionPipeline->invoke([
                     'messages' => $this->memory->getMessages(),
                     ...$this->memory->getVariables(),
-                ], $context);
+                ], $config);
 
                 // Update the generation so that the loop can check the new generation for tool calls.
                 $generation = $this->getGeneration($payload);
             }
         }
 
-        return $next($payload, $context);
+        return $next($payload, $config);
     }
 
     /**

src/Contracts/Pipeable.php

@@ -6,20 +6,20 @@
 
 use Closure;
 use Cortex\Pipeline;
-use Cortex\Pipeline\RuntimeContext;
+use Cortex\Pipeline\RuntimeConfig;
 
 interface Pipeable
 {
     /**
      * Handle the pipeline processing.
      *
      * @param mixed $payload The input to process
-     * @param RuntimeContext $context The runtime context containing settings
+     * @param RuntimeConfig $config The runtime context containing settings
      * @param Closure $next The next stage in the pipeline
      *
      * @return mixed The processed result
      */
-    public function handlePipeable(mixed $payload, RuntimeContext $context, Closure $next): mixed;
+    public function handlePipeable(mixed $payload, RuntimeConfig $config, Closure $next): mixed;
 
     /**
      * Pipe the pipeable into another pipeable.

src/Events/PipelineEnd.php

@@ -5,14 +5,14 @@
 namespace Cortex\Events;
 
 use Cortex\Pipeline;
-use Cortex\Pipeline\RuntimeContext;
+use Cortex\Pipeline\RuntimeConfig;
 
 readonly class PipelineEnd
 {
     public function __construct(
         public Pipeline $pipeline,
         public mixed $payload,
-        public RuntimeContext $context,
+        public RuntimeConfig $config,
         public mixed $result,
     ) {}
 }

src/Events/PipelineError.php

@@ -6,14 +6,14 @@
 
 use Throwable;
 use Cortex\Pipeline;
-use Cortex\Pipeline\RuntimeContext;
+use Cortex\Pipeline\RuntimeConfig;
 
 readonly class PipelineError
 {
     public function __construct(
         public Pipeline $pipeline,
         public mixed $payload,
-        public RuntimeContext $context,
+        public RuntimeConfig $config,
         public Throwable $exception,
     ) {}
 }