- Fix conflict merge impact

humcqc · Jul 24, 2024 · 02e82db · 02e82db
1 parent e00ecea
commit 02e82db
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/...va/io/quarkiverse/langchain4j/runtime/aiservice/AiServiceMethodImplementationSupport.java b/...va/io/quarkiverse/langchain4j/runtime/aiservice/AiServiceMethodImplementationSupport.java
@@ -216,9 +216,7 @@ public void accept(Response<AiMessage> message) {
 
             if (!aiMessage.hasToolExecutionRequests()) {
                 // If there is no tool Execution request we add the Ai Message directly in the chatMEmory
-                if (context.hasChatMemory()) {
-                    context.chatMemory(memoryId).add(aiMessage);
-                }
+                chatMemory.add(aiMessage);
                 break;
             }
 
@@ -247,10 +245,9 @@ public void accept(Response<AiMessage> message) {
             // In case of tool Execution request we need to update the AiMessage with tools results
             // before adding it into chatMemory
             aiMessage = variableHandler.substituteVariables(aiMessage);
-            if (context.hasChatMemory()) {
-                chatMemory.add(aiMessage);
-                tmpToolExecutionResultMessages.forEach(chatMemory::add);
-            }
+
+            chatMemory.add(aiMessage);
+            tmpToolExecutionResultMessages.forEach(chatMemory::add);
 
             log.debug("Attempting to obtain AI response");
             response = context.chatModel.generate(chatMemory.messages(), toolSpecifications);