Merge branch 'main' into 2.x

Author: ilvalerione

examples/workflow/workflow-interrupt.php

@@ -34,7 +34,7 @@
 }
 
 // Resume the workflow providing external data
-$finalState = $workflow->start(true, 'approved')->getResult();
+$finalState = $workflow->wakeup('approved')->getResult();
 
 // It should print "approved"
 echo $finalState->get('received_feedback').\PHP_EOL;

src/Console/Make/Stubs/node.stub

@@ -11,8 +11,13 @@ use NeuronAI\Workflow\WorkflowState;
 
 class [classname] extends Node
 {
+    /**
+     * Implement the Node's logic
+     */
     public function __invoke(StartEvent $event, WorkflowState $state): StopEvent
     {
+        // ...
+
         return new StopEvent();
     }
 }

src/Console/Make/Stubs/tool.stub

@@ -4,7 +4,9 @@ declare(strict_types=1);
 
 namespace [namespace];
 
+use NeuronAI\Tools\PropertyType;
 use NeuronAI\Tools\Tool;
+use NeuronAI\Tools\ToolProperty;
 
 class [classname] extends Tool
 {
@@ -18,20 +20,27 @@ class [classname] extends Tool
     }
 
     /**
-     * Return the list of properties.
+     * Properties are the input arguments of the __invoke method.
      */
     protected function properties(): array
     {
         return [
-            // ...
+            new ToolProperty(
+                name: 'input',
+                type: PropertyType::STRING,
+                description: 'The input to the tool',
+                required: true,
+            ),
         ];
     }
 
     /**
      * Implementing the tool logic
      */
-    public function __invoke(): string
+    public function __invoke(string $input): string
     {
         // ...
+
+        return $input;
     }
 }

src/HandleStructured.php

@@ -85,6 +85,8 @@ public function structured(Message|array $messages, ?string $class = null, int $
                     return self::structured($toolCallResult, $class, $maxRetries);
                 }
 
+                $this->fillChatHistory($response);
+
                 $output = $this->processResponse($response, $schema, $class);
                 $this->notify('structured-stop');
                 return $output;

src/Providers/OpenAI/AzureOpenAI.php

@@ -15,8 +15,11 @@ public function __construct(
         protected string $endpoint,
         protected string $model,
         protected string $version,
+        protected bool $strict_response = false,
         protected array $parameters = [],
     ) {
+        parent::__construct($key, $model, $parameters, $strict_response);
+
         $this->setBaseUrl();
 
         $this->client = new Client([

src/Tools/Toolkits/Supadata/SupadataVideoMetadataTool.php

@@ -8,6 +8,9 @@
 use NeuronAI\Tools\Tool;
 use NeuronAI\Tools\ToolProperty;
 
+/**
+ * @method static static make(string $key)
+ */
 class SupadataVideoMetadataTool extends Tool
 {
     use HttpClient;

src/Tools/Toolkits/Supadata/SupadataYoutubeChannelTool.php

@@ -8,6 +8,9 @@
 use NeuronAI\Tools\Tool;
 use NeuronAI\Tools\ToolProperty;
 
+/**
+ * @method static static make(string $key)
+ */
 class SupadataYoutubeChannelTool extends Tool
 {
     use HttpClient;

src/Tools/Toolkits/Supadata/SupadataYoutubePlaylistTool.php

@@ -8,6 +8,9 @@
 use NeuronAI\Tools\Tool;
 use NeuronAI\Tools\ToolProperty;
 
+/**
+ * @method static static make(string $key)
+ */
 class SupadataYoutubePlaylistTool extends Tool
 {
     use HttpClient;

src/Workflow/Node.php

@@ -11,7 +11,7 @@ abstract class Node implements NodeInterface
     protected WorkflowState $currentState;
     protected Event $currentEvent;
     protected bool $isResuming = false;
-    protected array $feedback = [];
+    protected mixed $feedback = null;
 
     public function run(Event $event, WorkflowState $state): \Generator|Event
     {
@@ -23,7 +23,7 @@ public function setWorkflowContext(
         WorkflowState $currentState,
         Event $currentEvent,
         bool $isResuming = false,
-        array $feedback = []
+        mixed $feedback = null
     ): void {
         $this->currentState = $currentState;
         $this->currentEvent = $currentEvent;
@@ -37,10 +37,10 @@ public function setWorkflowContext(
      */
     protected function interrupt(array $data): mixed
     {
-        if ($this->isResuming && isset($this->feedback[static::class])) {
-            $feedback = $this->feedback[static::class];
+        if ($this->isResuming && !\is_null($this->feedback)) {
+            $feedback = $this->feedback;
             // Clear both feedback and resuming state after use to allow subsequent interrupts
-            unset($this->feedback[static::class]);
+            $this->feedback = null;
             $this->isResuming = false;
             return $feedback;
         }

src/Workflow/Workflow.php

@@ -72,6 +72,11 @@ public function start(
         return new WorkflowHandler($this, $resume, $externalFeedback);
     }
 
+    public function wakeup(mixed $feedback = null): WorkflowHandler
+    {
+        return new WorkflowHandler($this, true, $feedback);
+    }
+
     /**
      * @throws WorkflowInterrupt|WorkflowException|\Throwable
      */
@@ -134,15 +139,13 @@ protected function execute(
         bool $resuming = false,
         mixed $externalFeedback = null
     ): \Generator {
-        $feedback = $resuming ? [$currentNode::class => $externalFeedback] : [];
-
         try {
             while (!($currentEvent instanceof StopEvent)) {
                 $currentNode->setWorkflowContext(
                     $this->state,
                     $currentEvent,
                     $resuming,
-                    $feedback
+                    $externalFeedback
                 );
 
                 $this->notify('workflow-node-start', new WorkflowNodeStart($currentNode::class, $this->state));