ToolUse - cont.

examples/A05_Extras/LLMToolUse/run.php

@@ -43,6 +43,7 @@ function subtract_numbers(int $a, int $b) : int {
 $toolUse = (new ToolUse)
     ->withDriver($driver)
     ->withDefaultContinuationCriteria()
+    ->withDefaultProcessors()
     ->withMessages('Add 2455 and 3558 then subtract 4344 from the result.')
     ->withTools([
         $addTool,

src/Extras/ToolUse/Contracts/CanProcessStep.php

@@ -7,5 +7,5 @@
 
 interface CanProcessStep
 {
-    public function processStep(ToolUseContext $context, ToolUseStep $step): void;
+    public function processStep(ToolUseStep $step, ToolUseContext $context): ToolUseStep;
 }

src/Extras/ToolUse/Processors/AccumulateTokenUsage.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Cognesy\Instructor\Extras\ToolUse\Processors;
+
+use Cognesy\Instructor\Extras\ToolUse\Contracts\CanProcessStep;
+use Cognesy\Instructor\Extras\ToolUse\ToolUseContext;
+use Cognesy\Instructor\Extras\ToolUse\ToolUseStep;
+
+class AccumulateTokenUsage implements CanProcessStep
+{
+    public function processStep(ToolUseStep $step, ToolUseContext $context): ToolUseStep {
+        $context->accumulateUsage($step->usage());
+        return $step;
+    }
+}

src/Extras/ToolUse/Processors/AppendStepMessages.php

@@ -8,7 +8,8 @@
 
 class AppendStepMessages implements CanProcessStep
 {
-    public function processStep(ToolUseContext $context, ToolUseStep $step): void {
+    public function processStep(ToolUseStep $step, ToolUseContext $context): ToolUseStep {
         $context->appendMessages($step->messages());
+        return $step;
     }
 }

src/Extras/ToolUse/Processors/UpdateStep.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Cognesy\Instructor\Extras\ToolUse\Processors;
+
+use Cognesy\Instructor\Extras\ToolUse\Contracts\CanProcessStep;
+use Cognesy\Instructor\Extras\ToolUse\ToolUseContext;
+use Cognesy\Instructor\Extras\ToolUse\ToolUseStep;
+
+class UpdateStep implements CanProcessStep
+{
+    public function processStep(ToolUseStep $step, ToolUseContext $context): ToolUseStep {
+        $context->addStep($step);
+        $context->setCurrentStep($step);
+        return $step;
+    }
+}

src/Extras/ToolUse/ToolUse.php

@@ -51,15 +51,7 @@ public function context() : ToolUseContext {
 
     public function nextStep() : ToolUseStep {
         $step = $this->driver->useTools($this->context);
-
-        // process step results
-        $this->context->accumulateUsage($step->usage());
-        $this->context->addStep($step);
-        $this->context->setCurrentStep($step);
-
-        $this->context->appendMessages($step->messages());
-
-        return $step;
+        return $this->processStep($step, $this->context);
     }
 
     public function finalStep() : ToolUseStep {

src/Extras/ToolUse/Traits/ToolUse/HandlesStepProcessors.php

@@ -3,7 +3,9 @@
 namespace Cognesy\Instructor\Extras\ToolUse\Traits\ToolUse;
 
 use Cognesy\Instructor\Extras\ToolUse\Contracts\CanProcessStep;
+use Cognesy\Instructor\Extras\ToolUse\Processors\AccumulateTokenUsage;
 use Cognesy\Instructor\Extras\ToolUse\Processors\AppendStepMessages;
+use Cognesy\Instructor\Extras\ToolUse\Processors\UpdateStep;
 use Cognesy\Instructor\Extras\ToolUse\ToolUseContext;
 use Cognesy\Instructor\Extras\ToolUse\ToolUseStep;
 
@@ -18,14 +20,17 @@ public function withProcessors(CanProcessStep ...$processors): self {
 
     public function withDefaultProcessors(): self {
         $this->withProcessors(
+            new AccumulateTokenUsage(),
+            new UpdateStep(),
             new AppendStepMessages(),
         );
         return $this;
     }
 
-    public function processStep(ToolUseContext $context, ToolUseStep $step): void {
+    public function processStep(ToolUseStep $step, ToolUseContext $context): ToolUseStep {
         foreach ($this->processors as $processor) {
-            $processor->processStep($context, $step);
+            $step = $processor->processStep($step, $context);
         }
+        return $step;
     }
 }