Merge pull request #592 from devoxx/issue-588

Fixed regression for streaming response

Author: stephanj

build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "com.devoxx.genie"
-version = "0.5.2"
+version = "0.5.3"
 
 repositories {
     mavenCentral()

src/main/java/com/devoxx/genie/service/prompt/memory/ChatMemoryManager.java

@@ -139,6 +139,29 @@ public void removeLastUserMessage(@NotNull ChatMessageContext context) {
         }
     }
 
+    /**
+     * Adds user message to memory from the provided context
+     * @param context The chat message context containing the user message
+     */
+    public void addUserMessage(@NotNull ChatMessageContext context) {
+        try {
+            if (context.getUserMessage() == null && context.getUserPrompt() != null) {
+                // Create user message if not already set
+                context.setUserMessage(UserMessage.from(context.getUserPrompt()));
+            }
+            
+            if (context.getUserMessage() != null) {
+                log.debug("Adding user message to memory for context ID: {}", context.getId());
+                chatMemoryService.addMessage(context.getProject(), context.getUserMessage());
+                log.debug("Successfully added user message to memory");
+            } else {
+                log.warn("Attempted to add null user message to memory for context ID: {}", context.getId());
+            }
+        } catch (Exception e) {
+            throw new MemoryException("Failed to add user message to memory", e);
+        }
+    }
+
     /**
      * Removes only the last AI message from memory
      * @param context The chat message context containing the AI message to remove

src/main/java/com/devoxx/genie/service/prompt/strategy/AbstractPromptExecutionStrategy.java

@@ -80,15 +80,14 @@ protected abstract void executeStrategySpecific(
      */
     protected abstract String getStrategyName();
 
-//    /**
-//     * Prepares memory with system message if needed and adds the user message.
-//     *
-//     * @param context The chat message context
-//     */
-//    protected void prepareMemory(@NotNull ChatMessageContext context) {
-//        chatMemoryManager.prepareMemory(context);
-//        // chatMemoryManager.addUserMessage(context);
-//    }
+    /**
+     * Prepares memory with system message if needed and adds the user message.
+     *
+     * @param context The chat message context
+     */
+    protected void prepareMemory(@NotNull ChatMessageContext context) {
+        chatMemoryManager.prepareMemory(context);
+    }
 
     /**
      * Standardized error handling for execution exceptions.

src/main/java/com/devoxx/genie/service/prompt/strategy/NonStreamingPromptStrategy.java

@@ -59,6 +59,10 @@ protected void executeStrategySpecific(
         log.debug("Before memory preparation - context ID: {}", context.getId());
         chatMemoryManager.logMemoryState(context.getProject());
 
+        // Prepare memory and add user message
+        prepareMemory(context);
+        chatMemoryManager.addUserMessage(context);
+        
         log.debug("After memory preparation - context ID: {}", context.getId());
         chatMemoryManager.logMemoryState(context.getProject());
 

src/main/java/com/devoxx/genie/service/prompt/strategy/StreamingPromptStrategy.java

@@ -55,7 +55,9 @@ protected void executeStrategySpecific(
         log.debug("Before memory preparation (streaming) - context ID: {}", context.getId());
         chatMemoryManager.logMemoryState(context.getProject());
 
-        // prepareMemory(context);
+        // Prepare memory and add user message
+        prepareMemory(context);
+        chatMemoryManager.addUserMessage(context);
 
         log.debug("After memory preparation (streaming) - context ID: {}", context.getId());
         chatMemoryManager.logMemoryState(context.getProject());

src/main/resources/META-INF/plugin.xml

@@ -38,6 +38,7 @@
         <h2>v0.5.3</h2>
         <UL>
             <Li>Feat #586 : Added Gemini 2.5 Pro model by @stephanj</LI>
+            <LI>Fix #588 : Fix streaming responses regression by @stephanj</LI>
         </UL>
         <h2>v0.5.2</h2>
         <UL>

src/main/resources/application.properties

@@ -1 +1 @@
-version=0.5.2
+version=0.5.3