Send chat/prompt message to lsp

aws · Sep 18, 2024 · 187525b · 187525b
1 parent b570c64
commit 187525b
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 2 deletions.
diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/chat/ChatCommunicationManager.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/chat/ChatCommunicationManager.java
@@ -2,6 +2,8 @@
 
 package software.aws.toolkits.eclipse.amazonq.chat;
 
+import software.aws.toolkits.eclipse.amazonq.chat.models.ChatRequestParams;
+import software.aws.toolkits.eclipse.amazonq.chat.models.ChatResult;
 import software.aws.toolkits.eclipse.amazonq.chat.models.GenericTabParams;
 import software.aws.toolkits.eclipse.amazonq.util.JsonHandler;
 import software.aws.toolkits.eclipse.amazonq.util.PluginLogger;
@@ -17,11 +19,15 @@ public ChatCommunicationManager() {
         this.chatMessageProvider = new ChatMessageProvider();
     }
 
-    public void sendMessageToChatServerAsync(final Command command, final Object params) {
+    public ChatResult sendMessageToChatServerAsync(final Command command, final Object params) {
 
            String jsonParams = jsonHandler.serialize(params);
 
            switch (command) {
+               case CHAT_SEND_PROMPT:
+                   ChatRequestParams chatRequestParams = jsonHandler.deserialize(jsonParams, ChatRequestParams.class);
+                   ChatResult result = chatMessageProvider.sendChatPrompt(chatRequestParams);
+                   return result;
                case CHAT_READY:
                    chatMessageProvider.sendChatReady();
                    break;
@@ -32,5 +38,6 @@ public void sendMessageToChatServerAsync(final Command command, final Object par
                default:
                    PluginLogger.error("Unhandled chat command: " + command.toString());
            }
+           return null;
     }
 }
diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/chat/ChatMessageProvider.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/chat/ChatMessageProvider.java
@@ -4,6 +4,8 @@
 
 import java.util.concurrent.ExecutionException;
 
+import software.aws.toolkits.eclipse.amazonq.chat.models.ChatRequestParams;
+import software.aws.toolkits.eclipse.amazonq.chat.models.ChatResult;
 import software.aws.toolkits.eclipse.amazonq.chat.models.GenericTabParams;
 import software.aws.toolkits.eclipse.amazonq.lsp.AmazonQLspServer;
 import software.aws.toolkits.eclipse.amazonq.providers.LspProvider;
@@ -21,7 +23,19 @@ public ChatMessageProvider() {
             PluginLogger.error("Error occurred while retrieving Amazon Q LSP server. Failed to instantiate ChatMessageProvider.");
         }
     }
-
+
+    public ChatResult sendChatPrompt(final ChatRequestParams chatRequestParams) {
+        try {
+            PluginLogger.info("Sending " + Command.CHAT_SEND_PROMPT + " message to Amazon Q LSP server");
+            ChatResult chatResult = amazonQLspServer.sendChatPrompt(chatRequestParams).get();
+            return chatResult;
+        } catch (InterruptedException | ExecutionException e) {
+            PluginLogger.error("Error occurred while sending " + Command.CHAT_SEND_PROMPT + " message to Amazon Q LSP server", e);
+            e.printStackTrace();
+        }
+        return null;
+    }
+
     public void sendChatReady() {
         PluginLogger.info("Sending " + Command.CHAT_READY + " message to Amazon Q LSP server");
         amazonQLspServer.chatReady();

diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/lsp/AmazonQLspServer.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/lsp/AmazonQLspServer.java
@@ -9,6 +9,8 @@
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.services.LanguageServer;
 
+import software.aws.toolkits.eclipse.amazonq.chat.models.ChatRequestParams;
+import software.aws.toolkits.eclipse.amazonq.chat.models.ChatResult;
 import software.aws.toolkits.eclipse.amazonq.chat.models.GenericTabParams;
 import software.aws.toolkits.eclipse.amazonq.lsp.model.InlineCompletionParams;
 import software.aws.toolkits.eclipse.amazonq.lsp.model.InlineCompletionResponse;
@@ -19,6 +21,9 @@ public interface AmazonQLspServer extends LanguageServer {
     @JsonRequest("aws/textDocument/inlineCompletionWithReferences")
     CompletableFuture<InlineCompletionResponse> inlineCompletionWithReferences(InlineCompletionParams params);
 
+    @JsonRequest("aws/chat/sendChatPrompt")
+    CompletableFuture<ChatResult> sendChatPrompt(ChatRequestParams chatRequestParams);
+
     @JsonNotification("aws/chat/tabAdd")
     void tabAdd(GenericTabParams params);
 

diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/views/AmazonQChatViewActionHandler.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/views/AmazonQChatViewActionHandler.java
@@ -6,6 +6,7 @@
 import org.eclipse.swt.browser.Browser;
 
 import software.aws.toolkits.eclipse.amazonq.chat.ChatCommunicationManager;
+import software.aws.toolkits.eclipse.amazonq.chat.models.ChatResult;
 import software.aws.toolkits.eclipse.amazonq.util.PluginLogger;
 import software.aws.toolkits.eclipse.amazonq.views.model.Command;
 import software.aws.toolkits.eclipse.amazonq.views.model.ParsedCommand;
@@ -25,6 +26,10 @@ public final void handleCommand(final ParsedCommand parsedCommand, final Browser
         PluginLogger.info(command + " being processed by ActionHandler");
 
         switch (command) {
+            case CHAT_SEND_PROMPT:
+                ChatResult chatResult = chatCommunicationManager.sendMessageToChatServerAsync(command, params);
+                PluginLogger.info("Chat result: " + chatResult);
+                break;
             case CHAT_READY:
                 chatCommunicationManager.sendMessageToChatServerAsync(command, params);
                 break;

diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/views/model/Command.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/views/model/Command.java
@@ -10,6 +10,7 @@ public enum Command {
     // QChat
     CHAT_READY("aws/chat/ready"),
     CHAT_TAB_ADD("aws/chat/tabAdd"),
+    CHAT_SEND_PROMPT("aws/chat/sendChatPrompt"),
     TELEMETRY_EVENT("telemetry/event"),
 
     // Auth