Merge pull request #27 from The-Nefarious-Developer/fix-context

Fix editor context retrieval due to async chat operation

Author: NickChecan

com.developer.nefarious.zjoule.plugin/src/com/developer/nefarious/zjoule/plugin/chat/ChatOrchestrator.java

@@ -4,7 +4,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.developer.nefarious.zjoule.plugin.chat.utils.EditorContentReader;
 import com.developer.nefarious.zjoule.plugin.models.Role;
 
 /**
@@ -18,8 +17,7 @@ public class ChatOrchestrator implements IChatOrchestrator {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public String getAnswer(final String userPrompt) {
-
+	public String getAnswer(final String userPrompt, final String editorContent) {
 		List<IChatMessage> messages = new ArrayList<>();
 
 		// 0. Define which AI Client should be used
@@ -32,10 +30,8 @@ public String getAnswer(final String userPrompt) {
 		List<IChatMessage> messageHistory = aiClient.getMessageHistory();
 		messages.addAll(messageHistory);
 
-		// 2. Get content of the active window
+		// 2. Get context
 		String baseInstructions = Instruction.getMessage();
-		String editorContent = EditorContentReader.readActiveEditorContent();
-
 		String systemInstructions = editorContent != null
 				? baseInstructions + " Consider the following code as context: " + editorContent
 				: baseInstructions;

com.developer.nefarious.zjoule.plugin/src/com/developer/nefarious/zjoule/plugin/chat/IChatOrchestrator.java

@@ -19,9 +19,10 @@ public interface IChatOrchestrator {
      *   <li>Returning the response message as a string.</li>
      * </ol>
      *
-     * @param userPrompt the prompt or query provided by the user.
+     * @param userPrompt the prompt or query provided by the user
+     * @param editorContent the editor content to be provided as context 
      * @return the AI-generated response as a {@link String}.
      */
-	String getAnswer(final String userPrompt);
+	String getAnswer(final String userPrompt, final String editorContent);
 
 }

com.developer.nefarious.zjoule.plugin/src/com/developer/nefarious/zjoule/plugin/core/functions/PromptHandler.java

@@ -7,6 +7,7 @@
 import org.eclipse.swt.widgets.Display;
 
 import com.developer.nefarious.zjoule.plugin.chat.ChatOrchestrator;
+import com.developer.nefarious.zjoule.plugin.chat.utils.EditorContentReader;
 
 /**
  * Handles user prompts from the browser and communicates with the chat orchestrator to generate responses.
@@ -49,9 +50,9 @@ public PromptHandler(final Browser browser, final String name) {
      * Handles a user prompt from the browser and initiates asynchronous processing to generate an AI response.
      *
      * <p>This method is invoked via the {@link BrowserFunction} interface when a corresponding JavaScript
-     * function is called in the browser widget. It processes the first argument as a user prompt, retrieves
-     * an AI-generated response asynchronously using the {@link ChatOrchestrator}, and delivers the response
-     * back to the browser environment through the JavaScript function {@code receiveMessage}.</p>
+     * function is called in the browser widget. It processes the first argument as a user prompt, read the editor
+     * content, retrieves an AI-generated response asynchronously using the {@link ChatOrchestrator}, and delivers 
+     * the response back to the browser environment through the JavaScript function {@code receiveMessage}.</p>
      *
      * <p>The response is escaped to ensure it is safe for inclusion in JavaScript code, avoiding issues
      * caused by special characters.</p>
@@ -65,8 +66,10 @@ public PromptHandler(final Browser browser, final String name) {
     @Override
     public Object function(final Object[] arguments) {
         String userPrompt = arguments[0].toString();
+        String editorContent = EditorContentReader.readActiveEditorContent();
 
-        CompletableFuture<String> futureResponse = CompletableFuture.supplyAsync(() -> chatOrchestrator.getAnswer(userPrompt));
+        CompletableFuture<String> futureResponse = CompletableFuture.supplyAsync(
+        		() -> chatOrchestrator.getAnswer(userPrompt, editorContent));
 
         futureResponse.thenAccept(response -> {
             Display.getDefault().asyncExec(new Runnable() {

com.developer.nefarious.zjoule.test/src/com/developer/nefarious/zjoule/test/chat/ChatOrchestratorTest.java

@@ -68,8 +68,9 @@ public void shouldNotStopIfThereIsNoMessageHistory() throws IOException, Interru
 
 		List<IChatMessage> mockMessageHistory = new ArrayList<>();
 		when(mockAIClient.getMessageHistory()).thenReturn(mockMessageHistory);
-
-		mockedStaticEditorContentReader.when(EditorContentReader::readActiveEditorContent).thenReturn(null);
+		
+		String mockEditorContent = null;
+		mockedStaticEditorContentReader.when(EditorContentReader::readActiveEditorContent).thenReturn(mockEditorContent);
 
 		IChatMessage mockSystemMessage = mock(IChatMessage.class);
 		when(mockAIClient.createMessage(Role.SYSTEM, mockBaseInstructions)).thenReturn(mockSystemMessage);
@@ -84,7 +85,7 @@ public void shouldNotStopIfThereIsNoMessageHistory() throws IOException, Interru
 		when(mockAnswer.getMessage()).thenReturn(expectedValue);
 
 		// Act
-		String returnValue = cut.getAnswer(mockUserPrompt);
+		String returnValue = cut.getAnswer(mockUserPrompt, mockEditorContent);
 
 		// Assert
 		verify(mockAIClient).setMessageHistory(mockAllMessages);
@@ -125,7 +126,7 @@ public void shouldPlumbAnswer() throws IOException, InterruptedException {
 		when(mockAnswer.getMessage()).thenReturn(expectedValue);
 
 		// Act
-		String returnValue = cut.getAnswer(mockUserPrompt);
+		String returnValue = cut.getAnswer(mockUserPrompt, mockEditorContent);
 
 		// Assert
 		verify(mockAIClient).setMessageHistory(mockAllMessages);
@@ -145,7 +146,8 @@ public void shouldPlumbErrorMessageIfChatCompletionDoesntWork() throws IOExcepti
 		List<IChatMessage> mockMessageHistory = Arrays.asList(mockOldMessage);
 		when(mockAIClient.getMessageHistory()).thenReturn(mockMessageHistory);
 
-		mockedStaticEditorContentReader.when(EditorContentReader::readActiveEditorContent).thenReturn(null);
+		String mockEditorContent = null;
+		mockedStaticEditorContentReader.when(EditorContentReader::readActiveEditorContent).thenReturn(mockEditorContent);
 
 		IChatMessage mockSystemMessage = mock(IChatMessage.class);
 		when(mockAIClient.createMessage(Role.SYSTEM, mockBaseInstructions)).thenReturn(mockSystemMessage);
@@ -156,7 +158,7 @@ public void shouldPlumbErrorMessageIfChatCompletionDoesntWork() throws IOExcepti
 		String expectedValue = "Error during the AI request execution";
 
 		// Act
-		String returnValue = cut.getAnswer(mockUserPrompt);
+		String returnValue = cut.getAnswer(mockUserPrompt, mockEditorContent);
 
 		// Assert
 		verify(mockAIClient, never()).setMessageHistory(any());
@@ -170,11 +172,14 @@ public void shouldReturnErrorIfModelIsIncompatible() {
 		String expectedValue = "The model you have selected is incompatible with the current "
 				+ "operation. Please verify the model's configuration or choose a "
 				+ "compatible alternative.";
+		
+		String mockEditorContent = null;
+		mockedStaticEditorContentReader.when(EditorContentReader::readActiveEditorContent).thenReturn(mockEditorContent);
 
 		mockedStaticAIClientFactory.when(AIClientFactory::getClient).thenReturn(null);
 
 		// Act
-		String returnValue = cut.getAnswer(mockUserPrompt);
+		String returnValue = cut.getAnswer(mockUserPrompt, mockEditorContent);
 
 		// Assert
 		assertEquals(expectedValue, returnValue);