handle parent

Author: chriskapp

src/Backend/Action/Agent/Message/Submit.php

@@ -48,7 +48,8 @@ public function handle(RequestInterface $request, ParametersInterface $configura
         assert($body instanceof AgentInput);
 
         $output = $this->sender->send(
-            $request->get('agent_id'),
+            (int) $request->get('agent_id'),
+            (int) $request->get('parent'),
             $body,
             $context,
         );

src/Installation/NewInstallation.php

@@ -350,6 +350,7 @@ private static function getOperations(): array
                     httpPath: '/agent/$agent_id<[0-9]+|^~>/message',
                     httpCode: 201,
                     outgoing: Model\Backend\AgentOutput::class,
+                    parameters: ['parent' => PropertyTypeFactory::getInteger()],
                     incoming: Model\Backend\AgentInput::class,
                     throws: [999 => Model\Common\Message::class],
                     description: 'Submits a new agent message',

src/Service/Agent/Sender.php

@@ -73,7 +73,7 @@ public function __construct(
         $this->objectMapper = new ObjectMapper($schemaManager);
     }
 
-    public function send(int $agentId, AgentInput $message, ContextInterface $context): AgentOutput
+    public function send(int $agentId, int $parentId, AgentInput $message, ContextInterface $context): AgentOutput
     {
         $row = $this->agentTable->findOneByTenantAndId($context->getTenantId(), $context->getUser()->getCategoryId(), $agentId);
         if (!$row instanceof Table\Generated\AgentRow) {
@@ -93,11 +93,13 @@ public function send(int $agentId, AgentInput $message, ContextInterface $contex
             $messages = new MessageBag();
             $messages->add(Message::forSystem($row->getIntroduction()));
 
-            $messages = $this->loadPreviousMessages($agentId, $context->getUser()->getId(), $messages);
+            if ($parentId > 0) {
+                $messages = $this->loadPreviousMessages($agentId, $context->getUser()->getId(), $parentId, $messages);
+            }
 
             $userMessages = $this->messageUnserializer->unserialize($input);
 
-            $this->persistUserMessages($agentId, $context->getUser()->getId(), $userMessages);
+            $parentId = $this->persistUserMessages($agentId, $context->getUser()->getId(), $parentId, $userMessages);
 
             $messages = $messages->merge($userMessages);
 
@@ -126,7 +128,7 @@ public function send(int $agentId, AgentInput $message, ContextInterface $contex
                 $output = $this->resultSerializer->serialize($result);
             }
 
-            $messageRow = $this->messageTable->addAssistantMessage($row->getId(), $context->getUser()->getId(), $output);
+            $messageRow = $this->messageTable->addAssistantMessage($row->getId(), $context->getUser()->getId(), $parentId, $output);
 
             $this->agentTable->commit();
 
@@ -145,11 +147,16 @@ public function send(int $agentId, AgentInput $message, ContextInterface $contex
         }
     }
 
-    private function loadPreviousMessages(int $agentId, int $userId, MessageBag $messages): MessageBag
+    private function loadPreviousMessages(int $agentId, int $userId, int $parentId, MessageBag $messages): MessageBag
     {
+        $idCondition = Condition::withOr();
+        $idCondition->equals(Table\Generated\AgentMessageColumn::ID, $parentId);
+        $idCondition->equals(Table\Generated\AgentMessageColumn::PARENT_ID, $parentId);
+
         $condition = Condition::withAnd();
         $condition->equals(Table\Generated\AgentMessageColumn::AGENT_ID, $agentId);
         $condition->equals(Table\Generated\AgentMessageColumn::USER_ID, $userId);
+        $condition->add($idCondition);
 
         $count = $this->messageTable->getCount($condition);
         $startIndex = max(0, $count - self::CONTEXT_MESSAGES_LENGTH);
@@ -178,13 +185,19 @@ private function loadPreviousMessages(int $agentId, int $userId, MessageBag $mes
         return $messages;
     }
 
-    private function persistUserMessages(int $agentId, int $userId, MessageBag $userMessages): void
+    private function persistUserMessages(int $agentId, int $userId, int $parentId, MessageBag $userMessages): int
     {
         foreach ($userMessages as $userMessage) {
             foreach ($this->messageSerializer->serialize($userMessage) as $content) {
-                $this->messageTable->addUserMessage($agentId, $userId, $content);
+                $message = $this->messageTable->addUserMessage($agentId, $userId, $parentId, $content);
+
+                if ($parentId === 0) {
+                    $parentId = $message->getId();
+                }
             }
         }
+
+        return $parentId;
     }
 
     private function getResponseSchema(Table\Generated\AgentRow $row): ?array

src/Table/Agent/Message.php

@@ -39,19 +39,19 @@ class Message extends Generated\AgentMessageTable
     public const ORIGIN_ASSISTANT = 0x2;
     public const ORIGIN_SYSTEM    = 0x3;
 
-    public function addUserMessage(int $agentId, int $userId, AgentContent $content): Generated\AgentMessageRow
+    public function addUserMessage(int $agentId, int $userId, int $parentId, AgentContent $content): Generated\AgentMessageRow
     {
-        return $this->addMessage($agentId, $userId, self::ORIGIN_USER, $content);
+        return $this->addMessage($agentId, $userId, $parentId, self::ORIGIN_USER, $content);
     }
 
-    public function addAssistantMessage(int $agentId, int $userId, AgentContent $content): Generated\AgentMessageRow
+    public function addAssistantMessage(int $agentId, int $userId, int $parentId, AgentContent $content): Generated\AgentMessageRow
     {
-        return $this->addMessage($agentId, $userId, self::ORIGIN_ASSISTANT, $content);
+        return $this->addMessage($agentId, $userId, $parentId, self::ORIGIN_ASSISTANT, $content);
     }
 
-    public function addSystemMessage(int $agentId, int $userId, AgentContent $content): Generated\AgentMessageRow
+    public function addSystemMessage(int $agentId, int $userId, int $parentId, AgentContent $content): Generated\AgentMessageRow
     {
-        return $this->addMessage($agentId, $userId, self::ORIGIN_SYSTEM, $content);
+        return $this->addMessage($agentId, $userId, $parentId, self::ORIGIN_SYSTEM, $content);
     }
 
     public function reset(int $agentId, int $userId): void
@@ -63,11 +63,12 @@ public function reset(int $agentId, int $userId): void
         $this->deleteBy($condition);
     }
 
-    private function addMessage(int $agentId, int $userId, int $role, AgentContent $content): Generated\AgentMessageRow
+    private function addMessage(int $agentId, int $userId, int $parentId, int $role, AgentContent $content): Generated\AgentMessageRow
     {
         $row = new Generated\AgentMessageRow();
         $row->setAgentId($agentId);
         $row->setUserId($userId);
+        $row->setParentId($parentId === 0 ? null : $parentId);
         $row->setOrigin($role);
         $row->setContent(Parser::encode($content));
         $row->setInsertDate(LocalDateTime::now());