Merge branch 'main' into refactor-multi-agents-execution

Signed-off-by: Yulong Ruan <[email protected]>
opensearch-project · Dec 26, 2024 · e56d2c3 · e56d2c3
2 parents 9bd7e17 + faa409f
commit e56d2c3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### Bug Fixes
 
 - Optimize the response of AI agent APIs ([#373](https://github.com/opensearch-project/dashboards-assistant/pull/373))
+- fixed incorrect message id field used ([#378](https://github.com/opensearch-project/dashboards-assistant/pull/378))
 
 ### Infrastructure
 

diff --git a/server/services/chat/olly_chat_service.ts b/server/services/chat/olly_chat_service.ts
@@ -19,7 +19,7 @@ interface AgentRunPayload {
 }
 
 const MEMORY_ID_FIELD = 'memory_id';
-const INTERACTION_ID_FIELD = 'parent_interaction_id';
+const INTERACTION_ID_FIELDS = ['parent_message_id', 'parent_interaction_id'];
 
 export class OllyChatService implements ChatService {
   static abortControllers: Map<string, AbortController> = new Map();
@@ -67,7 +67,9 @@ export class OllyChatService implements ChatService {
       }>;
       const outputBody = agentFrameworkResponse.body.inference_results?.[0]?.output;
       const conversationIdItem = outputBody?.find((item) => item.name === MEMORY_ID_FIELD);
-      const interactionIdItem = outputBody?.find((item) => item.name === INTERACTION_ID_FIELD);
+      const interactionIdItem = outputBody?.find((item) =>
+        INTERACTION_ID_FIELDS.includes(item.name)
+      );
       return {
         /**
          * Interactions will be stored in Agent framework,