update prompt

Author: chriskapp

src/Service/Agent/Intent/ActionIntent.php

@@ -46,25 +46,23 @@ public function getMessage(): string
         $hint.= "\n";
         $hint.= '--' . "\n";
         $hint.= <<<PHP
+Action: [NAME]
 <?php
 
 use Fusio\Worker;
 use Fusio\Engine;
 use Psr\Log\LoggerInterface;
 
-/**
- * Action: [NAME]
- */
 return function(Worker\ExecuteRequest \$request, Worker\ExecuteContext \$context, Engine\ConnectorInterface \$connector, Engine\Response\FactoryInterface \$response, Engine\DispatcherInterface \$dispatcher, LoggerInterface \$logger) {
 
-// [INSERT_CODE_HERE]
+[CODE]
 
 };
 
 PHP;
         $hint.= '--' . "\n";
         $hint.= "\n";
-        $hint.= 'Replace "// [INSERT_CODE_HERE]" with the code which you have generated.' . "\n";
+        $hint.= 'Replace "[CODE]" with the code which you have generated.' . "\n";
         $hint.= 'Replace "[NAME]" with a short and precise name as lower case and separated by hyphens which summarizes the business logic of the user message.' . "\n";
         $hint.= "\n";
         $hint.= 'If the business logic wants to interact with an external service i.e. a database or remote HTTP endpoint, then you can use the getConnection method at the connector argument to access those external services.' . "\n";

src/Service/Agent/Serializer/ActionResultSerializer.php

@@ -43,26 +43,54 @@ public function serialize(ResultInterface $result): AgentMessage
             throw new InvalidArgumentException('Expect a text result got: ' . $result::class);
         }
 
-        $content = trim($result->getContent(), ' -');
-
-        // try to extract the action name
-        preg_match('/\* Action: ([A-Za-z0-9-]+)/im', $content, $matches);
-
-        $name = $matches[1] ?? null;
-        if (empty($name)) {
-            $name = 'Action-' . substr(sha1($content), 0, 8);
-        }
+        $content = trim($result->getContent());
+        $name = $this->extractName($content);
+        $code = $this->extractCode($content);
 
         $object = new AgentMessageObject();
         $object->setType('object');
         $object->setPayload([
             'name' => $name,
             'class' => ClassName::serialize(WorkerPHPLocal::class),
             'config' => [
-                'code' => $content,
+                'code' => $code,
             ],
         ]);
 
         return $object;
     }
+
+    private function extractName(string $content): string
+    {
+        preg_match('/\* Action: ([A-Za-z0-9-]+)/im', $content, $matches);
+
+        $name = $matches[1] ?? null;
+        if (empty($name)) {
+            $name = 'Action-' . substr(sha1($content), 0, 8);
+        }
+
+        return $name;
+    }
+
+    private function extractCode(string $content): string
+    {
+        $capture = false;
+        $code = '';
+        $lines = explode("\n", $content);
+        foreach ($lines as $line) {
+            if ($line === '<?php') {
+                $capture = true;
+            }
+
+            if ($capture) {
+                $code.= $line . "\n";
+            }
+
+            if ($line === '};') {
+                break;
+            }
+        }
+
+        return $code;
+    }
 }