wip

Author: tymondesigns

composer.json

@@ -18,7 +18,7 @@
     "require": {
         "php": "^8.3",
         "adhocore/json-fixer": "^1.0",
-        "cortexphp/json-schema": "^0.6",
+        "cortexphp/json-schema": "dev-main",
         "cortexphp/model-info": "^0.3",
         "illuminate/collections": "^12.0",
         "mozex/anthropic-php": "^1.1",

config/cortex.php

@@ -249,7 +249,7 @@
 
             'cache' => [
                 'enabled' => env('CORTEX_PROMPT_CACHE_ENABLED', false),
-                'store' => env('CORTEX_PROMPT_CACHE_STORE', null),
+                'store' => env('CORTEX_PROMPT_CACHE_STORE'),
                 'ttl' => env('CORTEX_PROMPT_CACHE_TTL', 3600),
             ],
         ],
@@ -365,15 +365,15 @@
          * Defaults to app_path('Agents').
          * Agents will be discovered from this directory and its subdirectories.
          */
-        'path' => env('CORTEX_AGENTS_PATH', null),
+        'path' => env('CORTEX_AGENTS_PATH'),
     ],
 
     /*
      * Configure the cache settings.
      */
     'cache' => [
         'enabled' => env('CORTEX_CACHE_ENABLED', false),
-        'store' => env('CORTEX_CACHE_STORE', null),
+        'store' => env('CORTEX_CACHE_STORE'),
         'ttl' => env('CORTEX_CACHE_TTL', 3600),
     ],
 ];

rector.php

@@ -26,7 +26,6 @@
         typeDeclarations: true,
         instanceOf: true,
         earlyReturn: true,
-        strictBooleans: true,
     )
     ->withFluentCallNewLine()
     ->withSkip([

scratchpad.php

@@ -5,7 +5,7 @@
 use Cortex\Cortex;
 use Cortex\Agents\Agent;
 use Cortex\Prompts\Prompt;
-use Cortex\JsonSchema\SchemaFactory;
+use Cortex\JsonSchema\Schema;
 use Cortex\Tools\Prebuilt\WeatherTool;
 use Cortex\Agents\Prebuilt\WeatherAgent;
 use Cortex\LLM\Data\Messages\UserMessage;
@@ -25,8 +25,8 @@
     ->metadata(
         provider: 'anthropic',
         model: 'claude-3-5-sonnet-20240620',
-        structuredOutput: SchemaFactory::object()->properties(
-            SchemaFactory::string('capital'),
+        structuredOutput: Schema::object()->properties(
+            Schema::string('capital'),
         ),
     )
     ->llm()
@@ -67,8 +67,8 @@
     new UserMessage('What is the capital of France?'),
 ]);
 
-$schema = SchemaFactory::object()->properties(
-    SchemaFactory::string('capital'),
+$schema = Schema::object()->properties(
+    Schema::string('capital'),
 );
 
 $result = Cortex::llm()->withStructuredOutput($schema)->invoke([
@@ -111,9 +111,9 @@
     ->withTools([
         WeatherTool::class,
     ])
-    ->withOutput(SchemaFactory::object()->properties(
-        SchemaFactory::string('location')->required(),
-        SchemaFactory::string('summary')->required(),
+    ->withOutput(Schema::object()->properties(
+        Schema::string('location')->required(),
+        Schema::string('summary')->required(),
     ))
     ->withMaxSteps(3)
     ->withStrict(true);

src/Agents/Agent.php

@@ -11,6 +11,7 @@
 use Cortex\Prompts\Prompt;
 use Illuminate\Support\Str;
 use Cortex\Contracts\ToolKit;
+use Cortex\JsonSchema\Schema;
 use Cortex\Memory\ChatMemory;
 use UnexpectedValueException;
 use Cortex\Contracts\Pipeable;
@@ -19,15 +20,15 @@
 use Cortex\LLM\Contracts\Message;
 use Cortex\Memory\Contracts\Store;
 use Cortex\Support\Traits\CanPipe;
-use Cortex\JsonSchema\SchemaFactory;
+use Cortex\Pipeline\RuntimeContext;
 use Cortex\Agents\Stages\AppendUsage;
 use Cortex\LLM\Data\ChatStreamResult;
 use Cortex\Exceptions\GenericException;
-use Cortex\JsonSchema\Contracts\Schema;
 use Cortex\Memory\Stores\InMemoryStore;
 use Cortex\Agents\Stages\HandleToolCalls;
 use Cortex\JsonSchema\Types\ObjectSchema;
 use Cortex\LLM\Enums\StructuredOutputMode;
+use Cortex\JsonSchema\Contracts\JsonSchema;
 use Cortex\LLM\Data\Messages\SystemMessage;
 use Illuminate\Contracts\Support\Arrayable;
 use Cortex\Agents\Stages\AddMessageToMemory;
@@ -59,7 +60,7 @@ class Agent implements Pipeable
     /**
      * @param class-string|\Cortex\JsonSchema\Types\ObjectSchema $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\Schema>|null $output
+     * @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(
@@ -176,7 +177,7 @@ public function stream(array $messages = [], array $input = []): ChatStreamResul
         return $result;
     }
 
-    public function handlePipeable(mixed $payload, Closure $next): mixed
+    public function handlePipeable(mixed $payload, RuntimeContext $context, Closure $next): mixed
     {
         $messages = match (true) {
             $payload instanceof MessageCollection => $payload->all(),
@@ -192,7 +193,7 @@ public function handlePipeable(mixed $payload, Closure $next): mixed
             default => [],
         };
 
-        return $next($this->invoke($messages, $input));
+        return $next($this->invoke($messages, $input), $context);
     }
 
     public function getName(): string
@@ -319,20 +320,20 @@ protected static function buildLLM(
     /**
      * Build the output schema for the agent.
      *
-     * @param class-string|class-string<\BackedEnum>|\Cortex\JsonSchema\Types\ObjectSchema|array<array-key, \Cortex\JsonSchema\Contracts\Schema>|null $output
+     * @param class-string|class-string<\BackedEnum>|\Cortex\JsonSchema\Types\ObjectSchema|array<array-key, \Cortex\JsonSchema\Contracts\JsonSchema>|null $output
      *
      * @throws \Cortex\Exceptions\GenericException
      */
     protected static function buildOutput(ObjectSchema|array|string|null $output): ObjectSchema|string|null
     {
         if (is_array($output)) {
             try {
-                collect($output)->ensure(Schema::class);
+                collect($output)->ensure(JsonSchema::class);
             } catch (UnexpectedValueException $e) {
                 throw new GenericException('Invalid output schema: ' . $e->getMessage(), previous: $e);
             }
 
-            return SchemaFactory::object()->properties(...$output);
+            return Schema::object()->properties(...$output);
         }
 
         return $output;

src/Agents/Prebuilt/WeatherAgent.php

@@ -7,8 +7,8 @@
 use Override;
 use Cortex\Cortex;
 use Cortex\Contracts\ToolKit;
+use Cortex\JsonSchema\Schema;
 use Cortex\LLM\Contracts\LLM;
-use Cortex\JsonSchema\SchemaFactory;
 use Cortex\Tools\Prebuilt\WeatherTool;
 use Cortex\Agents\AbstractAgentBuilder;
 use Cortex\JsonSchema\Types\ObjectSchema;
@@ -47,9 +47,9 @@ public function tools(): array|ToolKit
 
     public function output(): ObjectSchema|string|null
     {
-        return SchemaFactory::object()->properties(
-            SchemaFactory::string('location')->required(),
-            SchemaFactory::string('summary')->required(),
+        return Schema::object()->properties(
+            Schema::string('location')->required(),
+            Schema::string('summary')->required(),
         );
     }
 }

src/Agents/Stages/AddMessageToMemory.php

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

src/Agents/Stages/AppendUsage.php

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

src/Agents/Stages/HandleToolCalls.php

@@ -12,6 +12,7 @@
 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;
 
@@ -31,7 +32,7 @@ public function __construct(
         protected int $maxSteps,
     ) {}
 
-    public function handlePipeable(mixed $payload, Closure $next): mixed
+    public function handlePipeable(mixed $payload, RuntimeContext $context, Closure $next): mixed
     {
         $generation = $this->getGeneration($payload);
 
@@ -49,14 +50,14 @@ public function handlePipeable(mixed $payload, Closure $next): mixed
                 $payload = $this->executionPipeline->invoke([
                     'messages' => $this->memory->getMessages(),
                     ...$this->memory->getVariables(),
-                ]);
+                ], $context);
 
                 // Update the generation so that the loop can check the new generation for tool calls.
                 $generation = $this->getGeneration($payload);
             }
         }
 
-        return $next($payload);
+        return $next($payload, $context);
     }
 
     /**

src/Contracts/Pipeable.php

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