tryFindActiveTabPanel() {
var selectedIndex = getSelectedIndex();
if (selectedIndex == -1) {
return Optional.empty();
@@ -116,7 +116,7 @@ public class StandardChatToolWindowTabbedPane extends JBTabbedPane {
Disposer.dispose(tabPanel);
activeTabMapping.remove(getTitleAt(getSelectedIndex()));
removeTabAt(getSelectedIndex());
- addNewTab(new StandardChatToolWindowTabPanel(
+ addNewTab(new ChatToolWindowTabPanel(
project,
ConversationService.getInstance().startConversation()));
repaint();
@@ -180,8 +180,8 @@ public class StandardChatToolWindowTabbedPane extends JBTabbedPane {
@Override
public void show(Component invoker, int x, int y) {
- selectedPopupTabIndex = StandardChatToolWindowTabbedPane.this.getUI()
- .tabForCoordinate(StandardChatToolWindowTabbedPane.this, x, y);
+ selectedPopupTabIndex = ChatToolWindowTabbedPane.this.getUI()
+ .tabForCoordinate(ChatToolWindowTabbedPane.this, x, y);
if (selectedPopupTabIndex > 0) {
super.show(invoker, x, y);
}
diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/standard/EditorAction.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/standard/EditorAction.java
deleted file mode 100644
index 5baf396d..00000000
--- a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/standard/EditorAction.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package ee.carlrobert.codegpt.toolwindow.chat.standard;
-
-enum EditorAction {
- FIND_BUGS(
- "Find Bugs",
- "Find bugs in the selected code",
- "Find bugs and output code with bugs fixed in the selected code: {{selectedCode}}"),
- WRITE_TESTS(
- "Write Tests",
- "Write unit tests for the selected code",
- "Write unit tests for the selected code: {{selectedCode}}"),
- EXPLAIN(
- "Explain",
- "Explain the selected code",
- "Explain the selected code: {{selectedCode}}"),
- REFACTOR(
- "Refactor",
- "Refactor the selected code",
- "Refactor the selected code: {{selectedCode}}"),
- OPTIMIZE(
- "Optimize",
- "Optimize the selected code",
- "Optimize the selected code: {{selectedCode}}");
-
- private final String label;
- private final String userMessage;
- private final String prompt;
-
- EditorAction(String label, String userMessage, String prompt) {
- this.label = label;
- this.userMessage = userMessage;
- this.prompt = prompt;
- }
-
- public String getLabel() {
- return label;
- }
-
- public String getPrompt() {
- return prompt;
- }
-
- public String getUserMessage() {
- return userMessage;
- }
-}
diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/standard/EditorActionEvent.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/standard/EditorActionEvent.java
deleted file mode 100644
index c8af738c..00000000
--- a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/standard/EditorActionEvent.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package ee.carlrobert.codegpt.toolwindow.chat.standard;
-
-import java.awt.Point;
-
-@FunctionalInterface
-public interface EditorActionEvent {
-
- void handleAction(EditorAction action, Point locationOnScreen);
-}
diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/standard/StandardChatToolWindowLandingPanel.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/standard/StandardChatToolWindowLandingPanel.java
deleted file mode 100644
index eab81f22..00000000
--- a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/standard/StandardChatToolWindowLandingPanel.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package ee.carlrobert.codegpt.toolwindow.chat.standard;
-
-import static java.lang.String.format;
-
-import com.intellij.ui.components.ActionLink;
-import com.intellij.util.ui.JBUI;
-import ee.carlrobert.codegpt.Icons;
-import ee.carlrobert.codegpt.settings.GeneralSettings;
-import ee.carlrobert.codegpt.toolwindow.chat.ui.ResponsePanel;
-import ee.carlrobert.codegpt.ui.UIUtil;
-import java.awt.BorderLayout;
-import javax.swing.Box;
-import javax.swing.BoxLayout;
-import javax.swing.JPanel;
-
-class StandardChatToolWindowLandingPanel extends ResponsePanel {
-
- StandardChatToolWindowLandingPanel(EditorActionEvent onAction) {
- addContent(createContent(onAction));
- }
-
- private ActionLink createEditorActionLink(EditorAction action, EditorActionEvent onAction) {
- var link = new ActionLink(action.getUserMessage(), event -> {
- onAction.handleAction(action, ((ActionLink) event.getSource()).getLocationOnScreen());
- });
- link.setIcon(Icons.Sparkle);
- return link;
- }
-
- private JPanel createContent(EditorActionEvent onAction) {
- var panel = new JPanel(new BorderLayout());
- panel.add(UIUtil.createTextPane(
- ""
- + format(
- ""
- + "Welcome %s , I'm your intelligent code companion, here to be"
- + " your partner-in-crime for getting things done in a flash."
- + "
", GeneralSettings.getCurrentState().getDisplayName())
- + ""
- + "Feel free to ask me anything you'd like, but my true superpower lies in assisting "
- + "you with your code! Here are a few examples of how I can assist you:"
- + "
"
- + "",
- false), BorderLayout.NORTH);
- panel.add(createEditorActionsListPanel(onAction), BorderLayout.CENTER);
- panel.add(UIUtil.createTextPane(
- ""
- + ""
- + "Being an AI-powered assistant, I may occasionally have surprises or make mistakes. "
- + "Therefore, it's wise to double-check any code or suggestions I provide."
- + "
"
- + "",
- false), BorderLayout.SOUTH);
- return panel;
- }
-
- private JPanel createEditorActionsListPanel(EditorActionEvent onAction) {
- var listPanel = new JPanel();
- listPanel.setLayout(new BoxLayout(listPanel, BoxLayout.PAGE_AXIS));
- listPanel.setBorder(JBUI.Borders.emptyLeft(4));
- listPanel.add(Box.createVerticalStrut(4));
- listPanel.add(createEditorActionLink(EditorAction.WRITE_TESTS, onAction));
- listPanel.add(Box.createVerticalStrut(4));
- listPanel.add(createEditorActionLink(EditorAction.EXPLAIN, onAction));
- listPanel.add(Box.createVerticalStrut(4));
- listPanel.add(createEditorActionLink(EditorAction.FIND_BUGS, onAction));
- listPanel.add(Box.createVerticalStrut(4));
- return listPanel;
- }
-}
diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/standard/StandardChatToolWindowPanel.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/standard/StandardChatToolWindowPanel.java
deleted file mode 100644
index 18e1d43b..00000000
--- a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/standard/StandardChatToolWindowPanel.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package ee.carlrobert.codegpt.toolwindow.chat.standard;
-
-import com.intellij.openapi.Disposable;
-import com.intellij.openapi.actionSystem.ActionManager;
-import com.intellij.openapi.actionSystem.ActionToolbar;
-import com.intellij.openapi.actionSystem.DefaultCompactActionGroup;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.SimpleToolWindowPanel;
-import com.intellij.openapi.util.Disposer;
-import com.intellij.util.ui.JBUI;
-import ee.carlrobert.codegpt.ReferencedFile;
-import ee.carlrobert.codegpt.actions.IncludeFilesInContextNotifier;
-import ee.carlrobert.codegpt.actions.toolwindow.ClearChatWindowAction;
-import ee.carlrobert.codegpt.actions.toolwindow.CreateNewConversationAction;
-import ee.carlrobert.codegpt.actions.toolwindow.OpenInEditorAction;
-import ee.carlrobert.codegpt.conversations.ConversationService;
-import ee.carlrobert.codegpt.conversations.ConversationsState;
-import ee.carlrobert.codegpt.toolwindow.chat.ui.SelectedFilesNotification;
-import java.awt.BorderLayout;
-import java.util.List;
-import javax.swing.JPanel;
-import org.jetbrains.annotations.NotNull;
-
-public class StandardChatToolWindowPanel extends SimpleToolWindowPanel {
-
- private final SelectedFilesNotification selectedFilesNotification;
- private StandardChatToolWindowTabbedPane tabbedPane;
-
- public StandardChatToolWindowPanel(
- @NotNull Project project,
- @NotNull Disposable parentDisposable) {
- super(true);
- selectedFilesNotification = new SelectedFilesNotification(project);
- init(project, selectedFilesNotification, parentDisposable);
-
- project.getMessageBus()
- .connect()
- .subscribe(IncludeFilesInContextNotifier.FILES_INCLUDED_IN_CONTEXT_TOPIC,
- (IncludeFilesInContextNotifier) this::displaySelectedFilesNotification);
- }
-
- public void displaySelectedFilesNotification(List referencedFiles) {
- selectedFilesNotification.displaySelectedFilesNotification(referencedFiles);
- }
-
- public void clearSelectedFilesNotification() {
- selectedFilesNotification.clearSelectedFilesNotification();
- }
-
- private void init(
- Project project,
- SelectedFilesNotification selectedFilesNotification,
- Disposable parentDisposable) {
- var conversation = ConversationsState.getCurrentConversation();
- if (conversation == null) {
- conversation = ConversationService.getInstance().startConversation();
- }
-
- var tabPanel = new StandardChatToolWindowTabPanel(project, conversation);
- tabbedPane = createTabbedPane(tabPanel, parentDisposable);
- Runnable onAddNewTab = () -> {
- tabbedPane.addNewTab(new StandardChatToolWindowTabPanel(
- project,
- ConversationService.getInstance().startConversation()));
- repaint();
- revalidate();
- };
- var actionToolbarPanel = new JPanel(new BorderLayout());
- actionToolbarPanel.add(
- createActionToolbar(project, tabbedPane, onAddNewTab).getComponent(),
- BorderLayout.LINE_START);
-
- setToolbar(actionToolbarPanel);
- setContent(
- JBUI.Panels.simplePanel(tabbedPane).addToBottom(selectedFilesNotification));
-
- Disposer.register(parentDisposable, tabPanel);
- }
-
- private ActionToolbar createActionToolbar(
- Project project,
- StandardChatToolWindowTabbedPane tabbedPane,
- Runnable onAddNewTab) {
- var actionGroup = new DefaultCompactActionGroup("TOOLBAR_ACTION_GROUP", false);
- actionGroup.add(new CreateNewConversationAction(onAddNewTab));
- actionGroup.add(
- new ClearChatWindowAction(() -> tabbedPane.resetCurrentlyActiveTabPanel(project)));
- actionGroup.addSeparator();
- actionGroup.add(new OpenInEditorAction());
-
- var toolbar = ActionManager.getInstance()
- .createActionToolbar("NAVIGATION_BAR_TOOLBAR", actionGroup, true);
- toolbar.setTargetComponent(this);
- return toolbar;
- }
-
- private StandardChatToolWindowTabbedPane createTabbedPane(
- StandardChatToolWindowTabPanel tabPanel,
- Disposable parentDisposable) {
- var tabbedPane = new StandardChatToolWindowTabbedPane(parentDisposable);
- tabbedPane.addNewTab(tabPanel);
- return tabbedPane;
- }
-
- public StandardChatToolWindowTabbedPane getChatTabbedPane() {
- return tabbedPane;
- }
-}
diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/standard/StandardChatToolWindowTabPanel.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/standard/StandardChatToolWindowTabPanel.java
deleted file mode 100644
index ef340acf..00000000
--- a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/standard/StandardChatToolWindowTabPanel.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package ee.carlrobert.codegpt.toolwindow.chat.standard;
-
-import static java.lang.String.format;
-
-import com.intellij.openapi.editor.impl.EditorImpl;
-import com.intellij.openapi.project.Project;
-import ee.carlrobert.codegpt.completions.ConversationType;
-import ee.carlrobert.codegpt.conversations.Conversation;
-import ee.carlrobert.codegpt.conversations.message.Message;
-import ee.carlrobert.codegpt.settings.service.you.YouSettings;
-import ee.carlrobert.codegpt.toolwindow.chat.ChatToolWindowTabPanel;
-import ee.carlrobert.codegpt.toolwindow.chat.ui.ChatMessageResponseBody;
-import ee.carlrobert.codegpt.toolwindow.chat.ui.ResponsePanel;
-import ee.carlrobert.codegpt.toolwindow.chat.ui.UserMessagePanel;
-import ee.carlrobert.codegpt.ui.OverlayUtil;
-import ee.carlrobert.codegpt.util.EditorUtil;
-import ee.carlrobert.codegpt.util.file.FileUtil;
-import javax.swing.JComponent;
-import org.jetbrains.annotations.NotNull;
-
-public class StandardChatToolWindowTabPanel extends ChatToolWindowTabPanel {
-
- public StandardChatToolWindowTabPanel(
- @NotNull Project project,
- @NotNull Conversation conversation) {
- super(project, conversation, false);
- if (conversation.getMessages().isEmpty()) {
- displayLandingView();
- } else {
- displayConversation(conversation);
- }
- }
-
- @Override
- protected JComponent getLandingView() {
- return new StandardChatToolWindowLandingPanel((action, locationOnScreen) -> {
- var editor = EditorUtil.getSelectedEditor(project);
- if (editor == null || !editor.getSelectionModel().hasSelection()) {
- OverlayUtil.showWarningBalloon(
- editor == null ? "Unable to locate a selected editor"
- : "Please select a target code before proceeding",
- locationOnScreen);
- return;
- }
-
- var fileExtension = FileUtil.getFileExtension(
- ((EditorImpl) editor).getVirtualFile().getName());
- var message = new Message(action.getPrompt().replace(
- "{{selectedCode}}",
- format("\n```%s\n%s\n```", fileExtension, editor.getSelectionModel().getSelectedText())));
- message.setUserMessage(action.getUserMessage());
-
- sendMessage(message, ConversationType.DEFAULT);
- });
- }
-
- private void displayConversation(@NotNull Conversation conversation) {
- clearWindow();
- conversation.getMessages().forEach(message -> {
- var messageResponseBody =
- new ChatMessageResponseBody(project, this).withResponse(message.getResponse());
-
- var serpResults = message.getSerpResults();
- if (YouSettings.getCurrentState().isDisplayWebSearchResults()
- && serpResults != null && !serpResults.isEmpty()) {
- messageResponseBody.displaySerpResults(serpResults);
- }
- messageResponseBody.hideCaret();
-
- var messagePanel = toolWindowScrollablePanel.addMessage(message.getId());
- messagePanel.add(new UserMessagePanel(project, message, this));
- messagePanel.add(new ResponsePanel()
- .withReloadAction(() -> reloadMessage(message, conversation, ConversationType.DEFAULT))
- .withDeleteAction(() -> removeMessage(message.getId(), conversation))
- .addContent(messageResponseBody));
- });
- }
-}
diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/ImageAccordion.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/ImageAccordion.java
new file mode 100644
index 00000000..250be68e
--- /dev/null
+++ b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/ImageAccordion.java
@@ -0,0 +1,86 @@
+package ee.carlrobert.codegpt.toolwindow.chat.ui;
+
+import static com.intellij.util.ui.JBUI.Panels.simplePanel;
+
+import com.intellij.icons.AllIcons.General;
+import com.intellij.ui.components.JBLabel;
+import com.intellij.util.ui.JBUI;
+import ee.carlrobert.codegpt.CodeGPTBundle;
+import java.awt.BorderLayout;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.event.ItemEvent;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import javax.imageio.ImageIO;
+import javax.swing.BoxLayout;
+import javax.swing.ImageIcon;
+import javax.swing.JPanel;
+import javax.swing.JToggleButton;
+import javax.swing.SwingConstants;
+
+public class ImageAccordion extends JPanel {
+
+ public ImageAccordion(String fileName, byte[] imageData) {
+ super(new BorderLayout());
+ setOpaque(false);
+
+ var contentPanel = createContentPanel(fileName, imageData);
+ add(createToggleButton(contentPanel), BorderLayout.NORTH);
+ add(contentPanel, BorderLayout.CENTER);
+ }
+
+ private JPanel createContentPanel(String fileName, byte[] imageData) {
+ var panel = new JPanel();
+ panel.setOpaque(false);
+ panel.setVisible(true);
+ panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
+ panel.setBorder(JBUI.Borders.empty(4, 0));
+ try {
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(imageData);
+ BufferedImage originalImage = ImageIO.read(inputStream);
+ int maxHeight = 80;
+ BufferedImage resizedImage = resizeImage(originalImage, maxHeight);
+ panel.add(simplePanel()
+ .andTransparent()
+ .addToTop(
+ new JBLabel("%s referencedFiles) {
- if (referencedFiles.isEmpty()) {
- return;
- }
-
- label.setText(referencedFiles.size() + " files selected");
- var referencedFilePaths = referencedFiles.stream()
- .map(ReferencedFile::getFilePath)
- .collect(Collectors.toList());
- label.setToolTipText(getHtml(referencedFilePaths));
- setVisible(true);
- }
-
- public void clearSelectedFilesNotification() {
- project.putUserData(CodeGPTKeys.SELECTED_FILES, emptyList());
- project.getMessageBus()
- .syncPublisher(IncludeFilesInContextNotifier.FILES_INCLUDED_IN_CONTEXT_TOPIC)
- .filesIncluded(emptyList());
-
- label.setText("0 files selected");
- label.setToolTipText(null);
- setVisible(false);
- }
-
- private String getHtml(List referencedFilePaths) {
- var html = referencedFilePaths.stream()
- .map(filePath -> format("%s ", Paths.get(filePath).getFileName().toString()))
- .collect(Collectors.joining());
- return format("", html);
- }
-
- private String getSelectedFilesLabel() {
- var selectedFiles = project.getUserData(CodeGPTKeys.SELECTED_FILES);
- var fileCount = selectedFiles == null ? 0 : selectedFiles.size();
- return fileCount + " files selected";
- }
-}
diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/ToolWindowFooterNotification.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/ToolWindowFooterNotification.java
new file mode 100644
index 00000000..52bcc66f
--- /dev/null
+++ b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/ToolWindowFooterNotification.java
@@ -0,0 +1,50 @@
+package ee.carlrobert.codegpt.toolwindow.chat.ui;
+
+import com.intellij.icons.AllIcons.General;
+import com.intellij.ui.JBColor;
+import com.intellij.ui.components.ActionLink;
+import com.intellij.ui.components.JBLabel;
+import com.intellij.util.ui.JBUI;
+import com.intellij.util.ui.JBUI.CurrentTheme.NotificationInfo;
+import java.awt.BorderLayout;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+
+public class ToolWindowFooterNotification extends JPanel {
+
+ private final JBLabel label;
+
+ public ToolWindowFooterNotification(Runnable onRemove) {
+ this("", onRemove);
+ }
+
+ public ToolWindowFooterNotification(String text, Runnable onRemove) {
+ super(new BorderLayout());
+ this.label = new JBLabel(text, General.BalloonInformation, SwingConstants.LEADING);
+
+ setVisible(false);
+ setBorder(JBUI.Borders.compound(
+ JBUI.Borders.customLine(JBColor.border(), 1, 0, 0, 0),
+ JBUI.Borders.empty(8, 12)));
+
+ setBackground(NotificationInfo.backgroundColor());
+ setForeground(NotificationInfo.foregroundColor());
+ add(label, BorderLayout.LINE_START);
+ add(new ActionLink("Remove", (event) -> {
+ hideNotification();
+ onRemove.run();
+ }), BorderLayout.LINE_END);
+ }
+
+ public void show(String text, String toolTipText) {
+ label.setText(text);
+ label.setToolTipText(toolTipText);
+ setVisible(true);
+ }
+
+ public void hideNotification() {
+ label.setText("");
+ label.setToolTipText(null);
+ setVisible(false);
+ }
+}
diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/UserMessagePanel.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/UserMessagePanel.java
index 5e723ed4..5db6de56 100644
--- a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/UserMessagePanel.java
+++ b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/UserMessagePanel.java
@@ -1,5 +1,6 @@
package ee.carlrobert.codegpt.toolwindow.chat.ui;
+import com.intellij.icons.AllIcons.General;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.project.Project;
import com.intellij.ui.ColorUtil;
@@ -11,6 +12,9 @@ import ee.carlrobert.codegpt.Icons;
import ee.carlrobert.codegpt.conversations.message.Message;
import ee.carlrobert.codegpt.settings.GeneralSettings;
import java.awt.BorderLayout;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
@@ -39,6 +43,18 @@ public class UserMessagePanel extends JPanel {
}
}
+ public void displayImage(String imageFilePath) {
+ try {
+ var path = Paths.get(imageFilePath);
+ add(new ImageAccordion(path.getFileName().toString(), Files.readAllBytes(path)));
+ } catch (IOException e) {
+ add(new JBLabel(
+ "Unable to load image %s ".formatted(imageFilePath),
+ General.Error,
+ SwingConstants.LEFT));
+ }
+ }
+
private ChatMessageResponseBody createResponseBody(
Project project,
String prompt,
diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/AttachImageNotifier.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/AttachImageNotifier.java
new file mode 100644
index 00000000..77acddf2
--- /dev/null
+++ b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/AttachImageNotifier.java
@@ -0,0 +1,11 @@
+package ee.carlrobert.codegpt.toolwindow.chat.ui.textarea;
+
+import com.intellij.util.messages.Topic;
+
+public interface AttachImageNotifier {
+
+ Topic IMAGE_ATTACHMENT_FILE_PATH_TOPIC =
+ Topic.create("imageAttachmentFilePath", AttachImageNotifier.class);
+
+ void imageAttached(String filePath);
+}
diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/ModelComboBoxAction.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/ModelComboBoxAction.java
index d7f11dc6..1d1b14b5 100644
--- a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/ModelComboBoxAction.java
+++ b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/ModelComboBoxAction.java
@@ -18,8 +18,6 @@ import ee.carlrobert.codegpt.Icons;
import ee.carlrobert.codegpt.completions.llama.LlamaModel;
import ee.carlrobert.codegpt.completions.you.YouUserManager;
import ee.carlrobert.codegpt.completions.you.auth.SignedOutNotifier;
-import ee.carlrobert.codegpt.conversations.ConversationService;
-import ee.carlrobert.codegpt.conversations.ConversationsState;
import ee.carlrobert.codegpt.settings.GeneralSettings;
import ee.carlrobert.codegpt.settings.GeneralSettingsState;
import ee.carlrobert.codegpt.settings.service.ServiceType;
@@ -39,13 +37,13 @@ import org.jetbrains.annotations.NotNull;
public class ModelComboBoxAction extends ComboBoxAction {
- private final Runnable onAddNewTab;
+ private final Runnable onModelChange;
private final GeneralSettingsState settings;
private final OpenAISettingsState openAISettings;
private final YouSettingsState youSettings;
- public ModelComboBoxAction(Runnable onAddNewTab, ServiceType selectedService) {
- this.onAddNewTab = onAddNewTab;
+ public ModelComboBoxAction(Runnable onModelChange, ServiceType selectedService) {
+ this.onModelChange = onModelChange;
settings = GeneralSettings.getCurrentState();
openAISettings = OpenAISettings.getCurrentState();
youSettings = YouSettings.getCurrentState();
@@ -74,6 +72,7 @@ public class ModelComboBoxAction extends ComboBoxAction {
var actionGroup = new DefaultActionGroup();
actionGroup.addSeparator("OpenAI");
List.of(
+ OpenAIChatCompletionModel.GPT_4_VISION_PREVIEW,
OpenAIChatCompletionModel.GPT_4_0125_128k,
OpenAIChatCompletionModel.GPT_3_5_0125_16k,
OpenAIChatCompletionModel.GPT_4_32k,
@@ -210,7 +209,7 @@ public class ModelComboBoxAction extends ComboBoxAction {
@Override
public void actionPerformed(@NotNull AnActionEvent e) {
- handleProviderChange(serviceType, label, icon, comboBoxPresentation);
+ handleModelChange(serviceType, label, icon, comboBoxPresentation);
}
@Override
@@ -220,7 +219,7 @@ public class ModelComboBoxAction extends ComboBoxAction {
};
}
- private void handleProviderChange(
+ private void handleModelChange(
ServiceType serviceType,
String label,
Icon icon,
@@ -228,13 +227,7 @@ public class ModelComboBoxAction extends ComboBoxAction {
settings.setSelectedService(serviceType);
comboBoxPresentation.setIcon(icon);
comboBoxPresentation.setText(label);
-
- var currentConversation = ConversationsState.getCurrentConversation();
- if (currentConversation != null && !currentConversation.getMessages().isEmpty()) {
- onAddNewTab.run();
- } else {
- ConversationService.getInstance().startConversation();
- }
+ onModelChange.run();
}
private AnAction createOpenAIModelAction(
@@ -252,7 +245,7 @@ public class ModelComboBoxAction extends ComboBoxAction {
@Override
public void actionPerformed(@NotNull AnActionEvent e) {
openAISettings.setModel(model.getCode());
- handleProviderChange(
+ handleModelChange(
OPENAI,
model.getDescription(),
Icons.OpenAI,
@@ -281,7 +274,7 @@ public class ModelComboBoxAction extends ComboBoxAction {
@Override
public void actionPerformed(@NotNull AnActionEvent e) {
youSettings.setChatMode(mode);
- handleProviderChange(
+ handleModelChange(
YOU,
mode.getDescription(),
Icons.YouSmall,
@@ -311,7 +304,7 @@ public class ModelComboBoxAction extends ComboBoxAction {
public void actionPerformed(@NotNull AnActionEvent e) {
youSettings.setCustomModel(model);
youSettings.setChatMode(YouCompletionMode.CUSTOM);
- handleProviderChange(
+ handleModelChange(
YOU,
model.getDescription(),
Icons.YouSmall,
diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/TotalTokensPanel.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/TotalTokensPanel.java
index 88763678..c9b0da5c 100644
--- a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/TotalTokensPanel.java
+++ b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/TotalTokensPanel.java
@@ -17,6 +17,8 @@ import ee.carlrobert.codegpt.EncodingManager;
import ee.carlrobert.codegpt.ReferencedFile;
import ee.carlrobert.codegpt.actions.IncludeFilesInContextNotifier;
import ee.carlrobert.codegpt.conversations.Conversation;
+import ee.carlrobert.codegpt.settings.GeneralSettings;
+import ee.carlrobert.codegpt.settings.service.ServiceType;
import java.awt.FlowLayout;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
@@ -154,12 +156,28 @@ public class TotalTokensPanel extends JPanel {
entry.getKey(),
entry.getValue()))
.collect(Collectors.joining());
- iconLabel.setToolTipText("" + html + "");
+ iconLabel.setToolTipText(getIconToolTipText(html));
}
});
return iconLabel;
}
+ private String getIconToolTipText(String html) {
+ if (GeneralSettings.getCurrentState().getSelectedService() != ServiceType.OPENAI) {
+ return """
+
+
+ ⓘ Keep in mind that the output values might vary across different
+ large language models due to variations in their encoding methods.
+
+
+ %s
+ """.formatted(html);
+ }
+ return "";
+ }
+
private String getLabelHtml(int total) {
return format("Tokens: %d ", total);
}
diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/UserPromptTextArea.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/UserPromptTextArea.java
index aca839b6..fe2e302f 100644
--- a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/UserPromptTextArea.java
+++ b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/UserPromptTextArea.java
@@ -1,6 +1,12 @@
package ee.carlrobert.codegpt.toolwindow.chat.ui.textarea;
+import static ee.carlrobert.codegpt.settings.service.ServiceType.ANTHROPIC;
+import static ee.carlrobert.codegpt.settings.service.ServiceType.OPENAI;
+import static ee.carlrobert.llm.client.openai.completion.OpenAIChatCompletionModel.GPT_4_VISION_PREVIEW;
+
import com.intellij.icons.AllIcons;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.ex.util.EditorUtil;
import com.intellij.openapi.util.registry.Registry;
@@ -10,11 +16,14 @@ import com.intellij.ui.components.JBTextArea;
import com.intellij.util.ui.JBUI;
import ee.carlrobert.codegpt.CodeGPTBundle;
import ee.carlrobert.codegpt.Icons;
+import ee.carlrobert.codegpt.actions.AttachImageAction;
import ee.carlrobert.codegpt.completions.CompletionRequestHandler;
+import ee.carlrobert.codegpt.settings.GeneralSettings;
+import ee.carlrobert.codegpt.settings.service.openai.OpenAISettings;
+import ee.carlrobert.codegpt.ui.IconActionButton;
import ee.carlrobert.codegpt.ui.UIUtil;
import java.awt.BasicStroke;
import java.awt.BorderLayout;
-import java.awt.Cursor;
import java.awt.FlowLayout;
import java.awt.Graphics;
import java.awt.Graphics2D;
@@ -23,16 +32,14 @@ import java.awt.RenderingHints;
import java.awt.event.ActionEvent;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
import javax.swing.AbstractAction;
-import javax.swing.Icon;
-import javax.swing.JButton;
import javax.swing.JPanel;
import javax.swing.UIManager;
import javax.swing.event.DocumentEvent;
import javax.swing.text.BadLocationException;
import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
public class UserPromptTextArea extends JPanel {
@@ -41,11 +48,12 @@ public class UserPromptTextArea extends JPanel {
private static final JBColor BACKGROUND_COLOR = JBColor.namedColor(
"Editor.SearchField.background", com.intellij.util.ui.UIUtil.getTextFieldBackground());
+ private final AtomicReference requestHandlerRef =
+ new AtomicReference<>();
private final JBTextArea textArea;
-
private final int textAreaRadius = 16;
private final Consumer onSubmit;
- private JButton stopButton;
+ private IconActionButton stopButton;
private JPanel iconsPanel;
private boolean submitEnabled = true;
@@ -82,12 +90,6 @@ public class UserPromptTextArea extends JPanel {
UserPromptTextArea.super.paintBorder(UserPromptTextArea.super.getGraphics());
}
});
- textArea.getDocument().addDocumentListener(new DocumentAdapter() {
- @Override
- protected void textChanged(@NotNull DocumentEvent e) {
- iconsPanel.getComponents()[0].setEnabled(e.getDocument().getLength() > 0);
- }
- });
updateFont();
init();
}
@@ -150,6 +152,10 @@ public class UserPromptTextArea extends JPanel {
stopButton.setEnabled(!submitEnabled);
}
+ public void setRequestHandler(@NotNull CompletionRequestHandler handler) {
+ requestHandlerRef.set(handler);
+ }
+
private void handleSubmit() {
if (submitEnabled && !textArea.getText().isEmpty()) {
// Replacing each newline with two newlines to ensure proper Markdown formatting
@@ -163,12 +169,34 @@ public class UserPromptTextArea extends JPanel {
setOpaque(false);
add(textArea, BorderLayout.CENTER);
- stopButton = createIconButton(AllIcons.Actions.Suspend, null);
+ stopButton = new IconActionButton(
+ new AnAction("Stop", "Stop current inference", AllIcons.Actions.Suspend) {
+ @Override
+ public void actionPerformed(@NotNull AnActionEvent e) {
+ var handler = requestHandlerRef.get();
+ if (handler != null) {
+ handler.cancel();
+ }
+ }
+ });
+ stopButton.setEnabled(false);
var flowLayout = new FlowLayout(FlowLayout.RIGHT);
flowLayout.setHgap(8);
iconsPanel = new JPanel(flowLayout);
- iconsPanel.add(createIconButton(Icons.Send, this::handleSubmit));
+ iconsPanel.add(new IconActionButton(
+ new AnAction("Send Message", "Send message", Icons.Send) {
+ @Override
+ public void actionPerformed(@NotNull AnActionEvent e) {
+ handleSubmit();
+ }
+ }));
+ var selectedService = GeneralSettings.getCurrentState().getSelectedService();
+ if (selectedService == ANTHROPIC
+ || (selectedService == OPENAI
+ && GPT_4_VISION_PREVIEW.getCode().equals(OpenAISettings.getCurrentState().getModel()))) {
+ iconsPanel.add(new IconActionButton(new AttachImageAction()));
+ }
iconsPanel.add(stopButton);
add(iconsPanel, BorderLayout.EAST);
}
@@ -180,19 +208,4 @@ public class UserPromptTextArea extends JPanel {
textArea.setFont(UIManager.getFont("TextField.font"));
}
}
-
- // TODO: IconActionButton?
- private JButton createIconButton(Icon icon, @Nullable Runnable submitListener) {
- var button = UIUtil.createIconButton(icon);
- if (submitListener != null) {
- button.addActionListener((e) -> handleSubmit());
- }
- button.setCursor(new Cursor(Cursor.HAND_CURSOR));
- button.setEnabled(false);
- return button;
- }
-
- public void setRequestHandler(@NotNull CompletionRequestHandler requestService) {
- stopButton.addActionListener(e -> requestService.cancel());
- }
}
diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/UserPromptTextAreaHeader.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/UserPromptTextAreaHeader.java
deleted file mode 100644
index d350d857..00000000
--- a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/UserPromptTextAreaHeader.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package ee.carlrobert.codegpt.toolwindow.chat.ui.textarea;
-
-import com.intellij.openapi.actionSystem.ActionPlaces;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.ui.components.JBCheckBox;
-import com.intellij.util.messages.MessageBusConnection;
-import com.intellij.util.ui.JBUI;
-import ee.carlrobert.codegpt.completions.you.YouSubscriptionNotifier;
-import ee.carlrobert.codegpt.completions.you.auth.SignedOutNotifier;
-import ee.carlrobert.codegpt.settings.service.ServiceType;
-import java.awt.BorderLayout;
-import javax.swing.JPanel;
-
-public class UserPromptTextAreaHeader extends JPanel {
-
- public UserPromptTextAreaHeader(
- ServiceType selectedService,
- TotalTokensPanel totalTokensPanel,
- Runnable onAddNewTab) {
- super(new BorderLayout());
- setOpaque(false);
- setBorder(JBUI.Borders.emptyBottom(8));
- switch (selectedService) {
- case OPENAI:
- case AZURE:
- add(totalTokensPanel, BorderLayout.LINE_START);
- break;
- case YOU:
- break;
- default:
- }
- add(new ModelComboBoxAction(onAddNewTab, selectedService)
- .createCustomComponent(ActionPlaces.UNKNOWN), BorderLayout.LINE_END);
- }
-
- private void subscribeToYouTopics(JBCheckBox gpt4CheckBox) {
- var messageBusConnection = ApplicationManager.getApplication().getMessageBus().connect();
- subscribeToYouSubscriptionTopic(messageBusConnection, gpt4CheckBox);
- subscribeToSignedOutTopic(messageBusConnection, gpt4CheckBox);
- }
-
- private void subscribeToSignedOutTopic(
- MessageBusConnection messageBusConnection,
- JBCheckBox gpt4CheckBox) {
- messageBusConnection.subscribe(
- SignedOutNotifier.SIGNED_OUT_TOPIC,
- (SignedOutNotifier) () -> gpt4CheckBox.setEnabled(false));
- }
-
- private void subscribeToYouSubscriptionTopic(
- MessageBusConnection messageBusConnection,
- JBCheckBox gpt4CheckBox) {
- messageBusConnection.subscribe(
- YouSubscriptionNotifier.SUBSCRIPTION_TOPIC,
- (YouSubscriptionNotifier) () -> gpt4CheckBox.setEnabled(true));
- }
-}
diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/conversations/ConversationPanel.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/conversations/ConversationPanel.java
index 4e82f767..d3386062 100644
--- a/src/main/java/ee/carlrobert/codegpt/toolwindow/conversations/ConversationPanel.java
+++ b/src/main/java/ee/carlrobert/codegpt/toolwindow/conversations/ConversationPanel.java
@@ -9,7 +9,7 @@ import ee.carlrobert.codegpt.actions.toolwindow.DeleteConversationAction;
import ee.carlrobert.codegpt.conversations.Conversation;
import ee.carlrobert.codegpt.conversations.ConversationsState;
import ee.carlrobert.codegpt.settings.GeneralSettings;
-import ee.carlrobert.codegpt.toolwindow.chat.standard.StandardChatToolWindowContentManager;
+import ee.carlrobert.codegpt.toolwindow.chat.ChatToolWindowContentManager;
import ee.carlrobert.codegpt.ui.IconActionButton;
import ee.carlrobert.codegpt.ui.ModelIconLabel;
import java.awt.BorderLayout;
@@ -30,12 +30,12 @@ class ConversationPanel extends JPanel {
@NotNull Conversation conversation,
@NotNull Runnable onDelete) {
super(new BorderLayout());
- var toolWindowContentManager = project.getService(StandardChatToolWindowContentManager.class);
+ var toolWindowContentManager = project.getService(ChatToolWindowContentManager.class);
init(toolWindowContentManager, conversation, onDelete);
}
private void init(
- StandardChatToolWindowContentManager toolWindowContentManager,
+ ChatToolWindowContentManager toolWindowContentManager,
Conversation conversation,
Runnable onDelete) {
setBackground(JBColor.background());
diff --git a/src/main/java/ee/carlrobert/codegpt/util/file/FileUtil.java b/src/main/java/ee/carlrobert/codegpt/util/file/FileUtil.java
index 1ec5746d..9a898f08 100644
--- a/src/main/java/ee/carlrobert/codegpt/util/file/FileUtil.java
+++ b/src/main/java/ee/carlrobert/codegpt/util/file/FileUtil.java
@@ -141,6 +141,15 @@ public class FileUtil {
}
}
+ public static String getImageMediaType(String fileName) {
+ var fileExtension = getFileExtension(fileName);
+ return switch (fileExtension) {
+ case "png" -> "image/png";
+ case "jpg", "jpeg" -> "image/jpeg";
+ default -> throw new IllegalArgumentException("Unsupported image type: " + fileExtension);
+ };
+ }
+
public static String getResourceContent(String name) {
try (var stream = Objects.requireNonNull(FileUtil.class.getResourceAsStream(name))) {
return new String(stream.readAllBytes(), StandardCharsets.UTF_8);
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/CodeGPTProjectActivity.kt b/src/main/kotlin/ee/carlrobert/codegpt/CodeGPTProjectActivity.kt
index f8cfc21e..13317571 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/CodeGPTProjectActivity.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/CodeGPTProjectActivity.kt
@@ -1,9 +1,11 @@
package ee.carlrobert.codegpt
+import com.intellij.notification.NotificationAction
import com.intellij.notification.NotificationType
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.startup.ProjectActivity
+import com.intellij.openapi.util.Disposer
import ee.carlrobert.codegpt.actions.editor.EditorActionsUtil
import ee.carlrobert.codegpt.completions.you.YouUserManager
import ee.carlrobert.codegpt.completions.you.auth.AuthenticationHandler
@@ -13,8 +15,11 @@ import ee.carlrobert.codegpt.completions.you.auth.response.YouAuthenticationResp
import ee.carlrobert.codegpt.credentials.CredentialsStore
import ee.carlrobert.codegpt.credentials.CredentialsStore.CredentialKey
import ee.carlrobert.codegpt.credentials.CredentialsStore.getCredential
+import ee.carlrobert.codegpt.settings.configuration.ConfigurationSettings
import ee.carlrobert.codegpt.settings.service.you.YouSettings
+import ee.carlrobert.codegpt.toolwindow.chat.ui.textarea.AttachImageNotifier
import ee.carlrobert.codegpt.ui.OverlayUtil
+import java.nio.file.Paths
class CodeGPTProjectActivity : ProjectActivity {
@@ -23,12 +28,24 @@ class CodeGPTProjectActivity : ProjectActivity {
CredentialsStore.loadAll()
if (YouUserManager.getInstance().authenticationResponse == null) {
- ApplicationManager.getApplication()
- .executeOnPooledThread { this.handleYouServiceAuthentication() }
+ handleYouServiceAuthenticationAsync()
+ }
+
+ if (!ApplicationManager.getApplication().isUnitTestMode
+ && ConfigurationSettings.getCurrentState().isCheckForNewScreenshots
+ ) {
+ val pathToWatch = Paths.get(System.getProperty("user.home"), "Desktop")
+ val fileWatcher = FileWatcher(pathToWatch)
+ fileWatcher.watch {
+ if (listOf("jpg", "jpeg", "png").contains(it.extension)) {
+ showImageAttachmentNotification(project, it.absolutePath)
+ }
+ }
+ Disposer.register(project, fileWatcher)
}
}
- private fun handleYouServiceAuthentication() {
+ private fun handleYouServiceAuthenticationAsync() {
val settings = YouSettings.getCurrentState()
val password = getCredential(CredentialKey.YOU_ACCOUNT_PASSWORD)
if (settings.email.isNotEmpty() && !password.isNullOrEmpty()) {
@@ -57,4 +74,27 @@ class CodeGPTProjectActivity : ProjectActivity {
})
}
}
+
+ private fun showImageAttachmentNotification(project: Project, filePath: String) {
+ OverlayUtil.getDefaultNotification(
+ CodeGPTBundle.get("imageAttachmentNotification.content"),
+ NotificationType.INFORMATION
+ )
+ .addAction(NotificationAction.createSimpleExpiring(
+ CodeGPTBundle.get("imageAttachmentNotification.action")
+ ) {
+ CodeGPTKeys.IMAGE_ATTACHMENT_FILE_PATH.set(project, filePath)
+ project.messageBus
+ .syncPublisher(
+ AttachImageNotifier.IMAGE_ATTACHMENT_FILE_PATH_TOPIC
+ )
+ .imageAttached(filePath)
+ })
+ .addAction(NotificationAction.createSimpleExpiring(
+ CodeGPTBundle.get("shared.notification.doNotShowAgain")
+ ) {
+ ConfigurationSettings.getCurrentState().isCheckForNewScreenshots = false
+ })
+ .notify(project)
+ }
}
\ No newline at end of file
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/CodeGPTUpdateActivity.kt b/src/main/kotlin/ee/carlrobert/codegpt/CodeGPTUpdateActivity.kt
index af31c937..505c5bea 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/CodeGPTUpdateActivity.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/CodeGPTUpdateActivity.kt
@@ -1,4 +1,4 @@
-package ee.carlrobert.codegpt;
+package ee.carlrobert.codegpt
import com.intellij.ide.plugins.InstalledPluginsState
import com.intellij.notification.NotificationAction
@@ -39,7 +39,7 @@ class CodeGPTUpdateActivity : ProjectActivity {
Task.Backgroundable(project, CodeGPTBundle.get("checkForUpdatesTask.title"), true) {
override fun run(indicator: ProgressIndicator) {
val isLatestVersion =
- !InstalledPluginsState.getInstance().hasNewerVersion(CodeGPTPlugin.CODEGPT_ID);
+ !InstalledPluginsState.getInstance().hasNewerVersion(CodeGPTPlugin.CODEGPT_ID)
if (project.isDisposed || isLatestVersion) {
return
}
@@ -55,7 +55,7 @@ class CodeGPTUpdateActivity : ProjectActivity {
.executeOnPooledThread { installCodeGPTUpdate(project) }
})
.addAction(NotificationAction.createSimpleExpiring(
- CodeGPTBundle.get("checkForUpdatesTask.notification.hideButton")
+ CodeGPTBundle.get("shared.notification.doNotShowAgain")
) {
ConfigurationSettings.getCurrentState().isCheckForPluginUpdates = false
})
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/FileWatcher.kt b/src/main/kotlin/ee/carlrobert/codegpt/FileWatcher.kt
new file mode 100644
index 00000000..d1c20669
--- /dev/null
+++ b/src/main/kotlin/ee/carlrobert/codegpt/FileWatcher.kt
@@ -0,0 +1,29 @@
+package ee.carlrobert.codegpt
+
+import com.intellij.openapi.Disposable
+import org.apache.commons.io.monitor.FileAlterationListenerAdaptor
+import org.apache.commons.io.monitor.FileAlterationMonitor
+import org.apache.commons.io.monitor.FileAlterationObserver
+import java.io.File
+import java.nio.file.Path
+
+class FileWatcher(private val pathToWatch: Path) : Disposable {
+
+ private val fileMonitor =
+ FileAlterationMonitor(500, FileAlterationObserver(pathToWatch.toFile()))
+
+ fun watch(onFileCreated: (File) -> Unit) {
+ val observer = FileAlterationObserver(pathToWatch.toFile())
+ observer.addListener(object : FileAlterationListenerAdaptor() {
+ override fun onFileCreate(file: File) {
+ onFileCreated(file)
+ }
+ })
+ fileMonitor.addObserver(observer)
+ fileMonitor.start()
+ }
+
+ override fun dispose() {
+ fileMonitor.stop()
+ }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/actions/AttachImageAction.kt b/src/main/kotlin/ee/carlrobert/codegpt/actions/AttachImageAction.kt
new file mode 100644
index 00000000..509ed8c2
--- /dev/null
+++ b/src/main/kotlin/ee/carlrobert/codegpt/actions/AttachImageAction.kt
@@ -0,0 +1,40 @@
+package ee.carlrobert.codegpt.actions
+
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.fileChooser.FileChooser
+import com.intellij.openapi.fileChooser.FileChooserDescriptor
+import ee.carlrobert.codegpt.CodeGPTBundle
+import ee.carlrobert.codegpt.CodeGPTKeys
+import ee.carlrobert.codegpt.Icons
+import ee.carlrobert.codegpt.toolwindow.chat.ui.textarea.AttachImageNotifier
+
+class AttachImageAction : AnAction(
+ CodeGPTBundle.get("action.attachImage"),
+ CodeGPTBundle.get("action.attachImageDescription"),
+ Icons.Upload
+) {
+
+ override fun actionPerformed(e: AnActionEvent) {
+ FileChooser.chooseFiles(createSingleImageFileDescriptor(), e.project, null).also { files ->
+ if (files.isNotEmpty()) {
+ check(files.size == 1) { "Expected exactly one file to be selected" }
+ e.project?.let { project ->
+ CodeGPTKeys.IMAGE_ATTACHMENT_FILE_PATH[project] = files.first().path
+ project.messageBus
+ .syncPublisher(AttachImageNotifier.IMAGE_ATTACHMENT_FILE_PATH_TOPIC)
+ .imageAttached(files.first().path)
+ }
+ }
+ }
+ }
+
+ private fun createSingleImageFileDescriptor() = FileChooserDescriptor(
+ true, false, false, false, false, false
+ ).apply {
+ withFileFilter { file ->
+ file.extension in listOf("jpg", "jpeg", "png")
+ }
+ withTitle(CodeGPTBundle.get("imageFileChooser.title"))
+ }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/actions/CodeCompletionFeatureToggleActions.kt b/src/main/kotlin/ee/carlrobert/codegpt/actions/CodeCompletionFeatureToggleActions.kt
new file mode 100644
index 00000000..c9dc223e
--- /dev/null
+++ b/src/main/kotlin/ee/carlrobert/codegpt/actions/CodeCompletionFeatureToggleActions.kt
@@ -0,0 +1,54 @@
+package ee.carlrobert.codegpt.actions
+
+import com.intellij.openapi.actionSystem.ActionUpdateThread
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.project.DumbAwareAction
+import ee.carlrobert.codegpt.settings.GeneralSettings
+import ee.carlrobert.codegpt.settings.service.ServiceType
+import ee.carlrobert.codegpt.settings.service.ServiceType.LLAMA_CPP
+import ee.carlrobert.codegpt.settings.service.ServiceType.OPENAI
+import ee.carlrobert.codegpt.settings.service.llama.LlamaSettings
+import ee.carlrobert.codegpt.settings.service.openai.OpenAISettings
+
+abstract class CodeCompletionFeatureToggleActions(
+ private val enableFeatureAction: Boolean
+) : DumbAwareAction() {
+
+ override fun actionPerformed(e: AnActionEvent) {
+ GeneralSettings.getCurrentState().selectedService
+ .takeIf { it in listOf(OPENAI, LLAMA_CPP) }
+ ?.also { selectedService ->
+ if (OPENAI == selectedService) {
+ OpenAISettings.getCurrentState().isCodeCompletionsEnabled = enableFeatureAction
+ } else {
+ LlamaSettings.getCurrentState().isCodeCompletionsEnabled = enableFeatureAction
+ }
+ }
+ }
+
+ override fun update(e: AnActionEvent) {
+ val selectedService = GeneralSettings.getCurrentState().selectedService
+ val codeCompletionEnabled = isCodeCompletionsEnabled(selectedService)
+ e.presentation.isEnabled = codeCompletionEnabled != enableFeatureAction
+ e.presentation.isVisible =
+ e.presentation.isEnabled && listOf(OPENAI, LLAMA_CPP).contains(
+ selectedService
+ )
+ }
+
+ override fun getActionUpdateThread(): ActionUpdateThread {
+ return ActionUpdateThread.BGT
+ }
+
+ private fun isCodeCompletionsEnabled(serviceType: ServiceType): Boolean {
+ return when (serviceType) {
+ OPENAI -> OpenAISettings.getCurrentState().isCodeCompletionsEnabled
+ LLAMA_CPP -> LlamaSettings.getCurrentState().isCodeCompletionsEnabled
+ else -> false
+ }
+ }
+}
+
+class EnableCompletionsAction : CodeCompletionFeatureToggleActions(true)
+
+class DisableCompletionsAction : CodeCompletionFeatureToggleActions(false)
\ No newline at end of file
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/codecompletions/CodeCompletionRequestFactory.kt b/src/main/kotlin/ee/carlrobert/codegpt/codecompletions/CodeCompletionRequestFactory.kt
index 0738062c..26c35063 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/codecompletions/CodeCompletionRequestFactory.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/codecompletions/CodeCompletionRequestFactory.kt
@@ -2,34 +2,34 @@ package ee.carlrobert.codegpt.codecompletions
import ee.carlrobert.codegpt.completions.llama.LlamaModel
import ee.carlrobert.codegpt.settings.service.llama.LlamaSettings
+import ee.carlrobert.codegpt.settings.service.llama.LlamaSettingsState
+import ee.carlrobert.codegpt.settings.service.openai.OpenAISettings
import ee.carlrobert.llm.client.llama.completion.LlamaCompletionRequest
import ee.carlrobert.llm.client.openai.completion.request.OpenAITextCompletionRequest
object CodeCompletionRequestFactory {
- private const val MAX_TOKENS = 128
-
fun buildOpenAIRequest(details: InfillRequestDetails): OpenAITextCompletionRequest {
return OpenAITextCompletionRequest.Builder(details.prefix)
.setSuffix(details.suffix)
.setStream(true)
- .setMaxTokens(MAX_TOKENS)
+ .setMaxTokens(OpenAISettings.getCurrentState().codeCompletionMaxTokens)
.setTemperature(0.4)
.build()
}
fun buildLlamaRequest(details: InfillRequestDetails): LlamaCompletionRequest {
- val promptTemplate = getLlamaInfillPromptTemplate()
+ val settings = LlamaSettings.getCurrentState()
+ val promptTemplate = getLlamaInfillPromptTemplate(settings)
val prompt = promptTemplate.buildPrompt(details.prefix, details.suffix)
return LlamaCompletionRequest.Builder(prompt)
- .setN_predict(MAX_TOKENS)
+ .setN_predict(settings.codeCompletionMaxTokens)
.setStream(true)
.setTemperature(0.4)
.setStop(promptTemplate.stopTokens)
.build()
}
- private fun getLlamaInfillPromptTemplate(): InfillPromptTemplate {
- val settings = LlamaSettings.getCurrentState()
+ private fun getLlamaInfillPromptTemplate(settings: LlamaSettingsState): InfillPromptTemplate {
if (!settings.isRunLocalServer) {
return settings.remoteModelInfillPromptTemplate
}
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/codecompletions/CodeGPTInlineCompletionProvider.kt b/src/main/kotlin/ee/carlrobert/codegpt/codecompletions/CodeGPTInlineCompletionProvider.kt
index 48f6890b..37045650 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/codecompletions/CodeGPTInlineCompletionProvider.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/codecompletions/CodeGPTInlineCompletionProvider.kt
@@ -4,7 +4,6 @@ import com.intellij.codeInsight.inline.completion.InlineCompletionEvent
import com.intellij.codeInsight.inline.completion.InlineCompletionProvider
import com.intellij.codeInsight.inline.completion.InlineCompletionProviderID
import com.intellij.codeInsight.inline.completion.InlineCompletionRequest
-import com.intellij.codeInsight.inline.completion.elements.InlineCompletionElement
import com.intellij.codeInsight.inline.completion.elements.InlineCompletionGrayTextElement
import com.intellij.codeInsight.inline.completion.suggestion.InlineCompletionSingleSuggestion
import com.intellij.codeInsight.inline.completion.suggestion.InlineCompletionSuggestionUpdateManager
@@ -15,14 +14,18 @@ import com.intellij.codeInsight.inline.completion.suggestion.InlineCompletionVar
import com.intellij.openapi.application.EDT
import com.intellij.openapi.diagnostic.Logger
import ee.carlrobert.codegpt.completions.CompletionRequestService
-import ee.carlrobert.codegpt.settings.configuration.ConfigurationSettings
+import ee.carlrobert.codegpt.settings.GeneralSettings
+import ee.carlrobert.codegpt.settings.service.ServiceType
+import ee.carlrobert.codegpt.settings.service.llama.LlamaSettings
+import ee.carlrobert.codegpt.settings.service.openai.OpenAISettings
import ee.carlrobert.codegpt.treesitter.CodeCompletionParserFactory
import ee.carlrobert.llm.completion.CompletionEventListener
-import kotlinx.coroutines.*
-import kotlinx.coroutines.channels.ProducerScope
+import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.flow.channelFlow
import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
import okhttp3.sse.EventSource
import java.util.concurrent.atomic.AtomicReference
@@ -33,7 +36,6 @@ class CodeGPTInlineCompletionProvider : InlineCompletionProvider {
}
private val currentCall = AtomicReference(null)
- private val providerScope = CoroutineScope(Dispatchers.Default + SupervisorJob())
override val id: InlineCompletionProviderID
get() = InlineCompletionProviderID("CodeGPTInlineCompletionProvider")
@@ -51,11 +53,18 @@ class CodeGPTInlineCompletionProvider : InlineCompletionProvider {
val infillRequest = withContext(Dispatchers.EDT) {
InfillRequestDetails.fromInlineCompletionRequest(request)
}
- cancelCurrentCall()
currentCall.set(
CompletionRequestService.getInstance().getCodeCompletionAsync(
infillRequest,
- getCodeCompletionEventListener(infillRequest)
+ CodeCompletionEventListener(infillRequest) {
+ launch {
+ try {
+ trySend(InlineCompletionGrayTextElement(it))
+ } catch (e: Exception) {
+ LOG.error("Failed to send inline completion suggestion", e)
+ }
+ }
+ }
)
)
awaitClose { cancelCurrentCall() }
@@ -63,20 +72,13 @@ class CodeGPTInlineCompletionProvider : InlineCompletionProvider {
}
override fun isEnabled(event: InlineCompletionEvent): Boolean {
- return event is InlineCompletionEvent.DocumentChange
- && ConfigurationSettings.getCurrentState().isCodeCompletionsEnabled
- }
-
- private fun ProducerScope.getCodeCompletionEventListener(
- infillRequest: InfillRequestDetails
- ) = CodeCompletionEventListener(infillRequest) {
- providerScope.launch {
- try {
- send(InlineCompletionGrayTextElement(it))
- } catch (e: Exception) {
- LOG.error("Failed to send inline completion suggestion", e)
- }
+ val selectedService = GeneralSettings.getCurrentState().selectedService
+ val codeCompletionsEnabled = when (selectedService) {
+ ServiceType.OPENAI -> OpenAISettings.getCurrentState().isCodeCompletionsEnabled
+ ServiceType.LLAMA_CPP -> LlamaSettings.getCurrentState().isCodeCompletionsEnabled
+ else -> false
}
+ return event is InlineCompletionEvent.DocumentChange && codeCompletionsEnabled
}
private fun cancelCurrentCall() {
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/settings/service/CodeCompletionConfigurationForm.kt b/src/main/kotlin/ee/carlrobert/codegpt/settings/service/CodeCompletionConfigurationForm.kt
new file mode 100644
index 00000000..1fddb3fa
--- /dev/null
+++ b/src/main/kotlin/ee/carlrobert/codegpt/settings/service/CodeCompletionConfigurationForm.kt
@@ -0,0 +1,49 @@
+package ee.carlrobert.codegpt.settings.service
+
+import com.intellij.openapi.ui.panel.ComponentPanelBuilder
+import com.intellij.ui.components.JBCheckBox
+import com.intellij.ui.components.fields.IntegerField
+import com.intellij.util.ui.FormBuilder
+import ee.carlrobert.codegpt.CodeGPTBundle
+import javax.swing.JPanel
+
+class CodeCompletionConfigurationForm(codeCompletionsEnabled: Boolean, maxTokens: Int) {
+
+ private val codeCompletionsEnabledCheckBox = JBCheckBox(
+ CodeGPTBundle.get("codeCompletionsForm.enableFeatureText"),
+ codeCompletionsEnabled
+ )
+ private val codeCompletionMaxTokensField =
+ IntegerField("completion_max_tokens", 8, 4096).apply {
+ columns = 12
+ value = maxTokens
+ }
+
+ fun getForm(): JPanel {
+ return FormBuilder.createFormBuilder()
+ .addComponent(codeCompletionsEnabledCheckBox)
+ .addVerticalGap(4)
+ .addLabeledComponent(
+ CodeGPTBundle.get("codeCompletionsForm.maxTokensLabel"),
+ codeCompletionMaxTokensField
+ )
+ .addComponentToRightColumn(
+ ComponentPanelBuilder.createCommentComponent(
+ CodeGPTBundle.get("codeCompletionsForm.maxTokensComment"), true, 48, true
+ )
+ )
+ .panel
+ }
+
+ var isCodeCompletionsEnabled: Boolean
+ get() = codeCompletionsEnabledCheckBox.isSelected
+ set(enabled) {
+ codeCompletionsEnabledCheckBox.isSelected = enabled
+ }
+
+ var maxTokens: Int
+ get() = codeCompletionMaxTokensField.value
+ set(maxTokens) {
+ codeCompletionMaxTokensField.value = maxTokens
+ }
+}
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/toolwindow/chat/ChatToolWindowListener.kt b/src/main/kotlin/ee/carlrobert/codegpt/toolwindow/chat/ChatToolWindowListener.kt
new file mode 100644
index 00000000..6c15f218
--- /dev/null
+++ b/src/main/kotlin/ee/carlrobert/codegpt/toolwindow/chat/ChatToolWindowListener.kt
@@ -0,0 +1,23 @@
+package ee.carlrobert.codegpt.toolwindow.chat
+
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.wm.ToolWindow
+import com.intellij.openapi.wm.ex.ToolWindowManagerListener
+
+class ChatToolWindowListener : ToolWindowManagerListener {
+
+ override fun toolWindowShown(toolWindow: ToolWindow) {
+ if ("CodeGPT" == toolWindow.id) {
+ requestFocusForTextArea(toolWindow.project)
+ }
+ }
+
+ private fun requestFocusForTextArea(project: Project) {
+ val contentManager = project.getService(ChatToolWindowContentManager::class.java)
+ contentManager.tryFindChatTabbedPane().ifPresent { tabbedPane ->
+ tabbedPane.tryFindActiveTabPanel().ifPresent { tabPanel ->
+ tabPanel.requestFocusForTextArea()
+ }
+ }
+ }
+}
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/toolwindow/ui/ChatToolWindowLandingPanel.kt b/src/main/kotlin/ee/carlrobert/codegpt/toolwindow/ui/ChatToolWindowLandingPanel.kt
new file mode 100644
index 00000000..7318ea3b
--- /dev/null
+++ b/src/main/kotlin/ee/carlrobert/codegpt/toolwindow/ui/ChatToolWindowLandingPanel.kt
@@ -0,0 +1,100 @@
+package ee.carlrobert.codegpt.toolwindow.ui
+
+import com.intellij.ui.components.ActionLink
+import com.intellij.util.ui.JBUI
+import ee.carlrobert.codegpt.Icons
+import ee.carlrobert.codegpt.settings.GeneralSettings
+import ee.carlrobert.codegpt.toolwindow.chat.ui.ResponsePanel
+import ee.carlrobert.codegpt.ui.UIUtil.createTextPane
+import java.awt.BorderLayout
+import java.awt.Point
+import java.awt.event.ActionListener
+import javax.swing.Box
+import javax.swing.BoxLayout
+import javax.swing.JPanel
+
+class ChatToolWindowLandingPanel(onAction: (LandingPanelAction, Point) -> Unit) : ResponsePanel() {
+
+ init {
+ addContent(createContent(onAction))
+ }
+
+ private fun createContent(onAction: (LandingPanelAction, Point) -> Unit): JPanel {
+ return JPanel(BorderLayout()).apply {
+ add(createTextPane(getWelcomeMessage(), false), BorderLayout.NORTH)
+ add(createActionsListPanel(onAction), BorderLayout.CENTER)
+ add(createTextPane(getCautionMessage(), false), BorderLayout.SOUTH)
+ }
+ }
+
+ private fun createActionsListPanel(onAction: (LandingPanelAction, Point) -> Unit): JPanel {
+ val listPanel = JPanel()
+ listPanel.layout = BoxLayout(listPanel, BoxLayout.PAGE_AXIS)
+ listPanel.border = JBUI.Borders.emptyLeft(4)
+ listPanel.add(Box.createVerticalStrut(4))
+ listPanel.add(createEditorActionLink(LandingPanelAction.WRITE_TESTS, onAction))
+ listPanel.add(Box.createVerticalStrut(4))
+ listPanel.add(createEditorActionLink(LandingPanelAction.EXPLAIN, onAction))
+ listPanel.add(Box.createVerticalStrut(4))
+ listPanel.add(createEditorActionLink(LandingPanelAction.FIND_BUGS, onAction))
+ listPanel.add(Box.createVerticalStrut(4))
+ return listPanel
+ }
+
+ private fun createEditorActionLink(
+ action: LandingPanelAction,
+ onAction: (LandingPanelAction, Point) -> Unit
+ ): ActionLink {
+ return ActionLink(action.userMessage, ActionListener { event ->
+ onAction(action, (event.source as ActionLink).locationOnScreen)
+ }).apply {
+ icon = Icons.Sparkle
+ }
+ }
+
+ private fun getWelcomeMessage(): String {
+ return """
+
+
+ Welcome ${GeneralSettings.getCurrentState().displayName} , I'm your intelligent code companion, here to be your partner-in-crime for getting things done in a flash.
+
+
+ Feel free to ask me anything you'd like, but my true superpower lies in assisting you with your code! Here are a few examples of how I can assist you:
+
+
+ """.trimIndent()
+ }
+
+ private fun getCautionMessage(): String {
+ return """
+
+
+ Being an AI-powered assistant, I may occasionally have surprises or make mistakes. Therefore, it's wise to double-check any code or suggestions I provide.
+
+
+ """.trimIndent()
+ }
+}
+
+enum class LandingPanelAction(
+ val label: String,
+ val userMessage: String,
+ val prompt: String
+) {
+ FIND_BUGS(
+ "Find Bugs",
+ "Find bugs in the selected code",
+ "Find bugs and output code with bugs fixed in the selected code: {{selectedCode}}"
+ ),
+ WRITE_TESTS(
+ "Write Tests",
+ "Write unit tests for the selected code",
+ "Write unit tests for the selected code: {{selectedCode}}"
+ ),
+ EXPLAIN(
+ "Explain",
+ "Explain the selected code",
+ "Explain the selected code: {{selectedCode}}"
+ )
+}
+
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 27da0491..0a72741c 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -9,6 +9,8 @@
diff --git a/src/main/resources/icons/send.svg b/src/main/resources/icons/send.svg
index 89cf3907..b6101d19 100644
--- a/src/main/resources/icons/send.svg
+++ b/src/main/resources/icons/send.svg
@@ -1,6 +1,6 @@
-
+
diff --git a/src/main/resources/icons/send_dark.svg b/src/main/resources/icons/send_dark.svg
index 5dd4ba3b..d3d497c5 100644
--- a/src/main/resources/icons/send_dark.svg
+++ b/src/main/resources/icons/send_dark.svg
@@ -1,6 +1,6 @@
-
+
diff --git a/src/main/resources/icons/upload.svg b/src/main/resources/icons/upload.svg
new file mode 100644
index 00000000..b26837f5
--- /dev/null
+++ b/src/main/resources/icons/upload.svg
@@ -0,0 +1,7 @@
+
+
+
diff --git a/src/main/resources/icons/upload_dark.svg b/src/main/resources/icons/upload_dark.svg
new file mode 100644
index 00000000..2241155e
--- /dev/null
+++ b/src/main/resources/icons/upload_dark.svg
@@ -0,0 +1,7 @@
+
+
+
diff --git a/src/main/resources/messages/codegpt.properties b/src/main/resources/messages/codegpt.properties
index dc6c02ca..c31b2b00 100644
--- a/src/main/resources/messages/codegpt.properties
+++ b/src/main/resources/messages/codegpt.properties
@@ -87,6 +87,7 @@ configurationConfigurable.table.header.promptColumnLabel=Prompt
configurationConfigurable.table.action.revertToDefaults.text=Revert to Defaults
configurationConfigurable.table.action.addKeymap.text=Add Shortcut
configurationConfigurable.checkForPluginUpdates.label=Check for plugin updates automatically
+configurationConfigurable.checkForNewScreenshots.label=Check for new screenshots automatically
configurationConfigurable.openNewTabCheckBox.label=Open a new chat on each action
configurationConfigurable.enableMethodNameGeneration.label=Enable method name lookup suggestions
configurationConfigurable.autoFormatting.label=Enable automatic code formatting
@@ -178,7 +179,6 @@ validation.error.mustBeGreaterThanZero=Value must be greater than 0
checkForUpdatesTask.title=Checking for CodeGPT update...
checkForUpdatesTask.notification.message=An update for CodeGPT is available.
checkForUpdatesTask.notification.installButton=Install update
-checkForUpdatesTask.notification.hideButton=Do not show again
llamaServerAgent.buildingProject.description=Building llama.cpp...
llamaServerAgent.serverBootup.description=Booting up server...
notification.compilationError.description=CodeGPT has detected a compilation error. Would you like assistance in resolving it?
@@ -190,4 +190,15 @@ shared.infillPromptTemplate=Infill template:
shared.apiVersion=API version:
shared.configuration=Configuration
shared.port=Port:
-codeCompletion.progress.title=Code completion in progress
\ No newline at end of file
+shared.notification.doNotShowAgain=Do not show again
+codeCompletion.progress.title=Code completion in progress
+imageAttachmentNotification.content=New image detected on desktop. Would you like to attach it to your current conversation?
+imageAttachmentNotification.action=Attach image
+action.attachImage=Attach Image
+action.attachImageDescription=Attach an image
+imageFileChooser.title=Select Image
+imageAccordion.title=Attached image
+shared.codeCompletions=Code Completions
+codeCompletionsForm.enableFeatureText=Enable code completions
+codeCompletionsForm.maxTokensLabel=Max tokens:
+codeCompletionsForm.maxTokensComment=The maximum number of tokens that can be generated in the code completion.
diff --git a/src/test/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionServiceTest.java b/src/test/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionServiceTest.java
new file mode 100644
index 00000000..e69de29b
diff --git a/src/test/java/ee/carlrobert/codegpt/completions/DefaultCompletionRequestHandlerTest.java b/src/test/java/ee/carlrobert/codegpt/completions/DefaultCompletionRequestHandlerTest.java
index 5e1900d8..18fa3020 100644
--- a/src/test/java/ee/carlrobert/codegpt/completions/DefaultCompletionRequestHandlerTest.java
+++ b/src/test/java/ee/carlrobert/codegpt/completions/DefaultCompletionRequestHandlerTest.java
@@ -6,10 +6,8 @@ import static ee.carlrobert.llm.client.util.JSONUtil.e;
import static ee.carlrobert.llm.client.util.JSONUtil.jsonArray;
import static ee.carlrobert.llm.client.util.JSONUtil.jsonMap;
import static ee.carlrobert.llm.client.util.JSONUtil.jsonMapResponse;
-import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.http.HttpHeaders.AUTHORIZATION;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.awaitility.Awaitility.await;
import ee.carlrobert.codegpt.CodeGPTPlugin;
import ee.carlrobert.codegpt.conversations.ConversationService;
@@ -50,7 +48,7 @@ public class DefaultCompletionRequestHandlerTest extends IntegrationTest {
requestHandler.call(new CallParameters(conversation, ConversationType.DEFAULT, message, false));
- await().atMost(5, SECONDS).until(() -> "Hello!".equals(message.getResponse()));
+ waitExpecting(() -> "Hello!".equals(message.getResponse()));
}
public void testAzureChatCompletionCall() {
@@ -86,7 +84,7 @@ public class DefaultCompletionRequestHandlerTest extends IntegrationTest {
requestHandler.call(new CallParameters(conversation, ConversationType.DEFAULT, message, false));
- await().atMost(5, SECONDS).until(() -> "Hello!".equals(message.getResponse()));
+ waitExpecting(() -> "Hello!".equals(message.getResponse()));
}
public void testYouChatCompletionCall() {
@@ -137,7 +135,7 @@ public class DefaultCompletionRequestHandlerTest extends IntegrationTest {
requestHandler.call(new CallParameters(conversation, ConversationType.DEFAULT, message, false));
- await().atMost(5, SECONDS).until(() -> "Hello!".equals(message.getResponse()));
+ waitExpecting(() -> "Hello!".equals(message.getResponse()));
}
public void testLlamaChatCompletionCall() {
@@ -171,7 +169,7 @@ public class DefaultCompletionRequestHandlerTest extends IntegrationTest {
requestHandler.call(new CallParameters(conversation, ConversationType.DEFAULT, message, false));
- await().atMost(5, SECONDS).until(() -> "Hello!".equals(message.getResponse()));
+ waitExpecting(() -> "Hello!".equals(message.getResponse()));
}
private CompletionResponseEventListener getRequestEventListener(Message message) {
diff --git a/src/test/java/ee/carlrobert/codegpt/toolwindow/chat/StandardChatToolWindowTabPanelTest.java b/src/test/java/ee/carlrobert/codegpt/toolwindow/chat/ChatToolWindowTabPanelTest.java
similarity index 66%
rename from src/test/java/ee/carlrobert/codegpt/toolwindow/chat/StandardChatToolWindowTabPanelTest.java
rename to src/test/java/ee/carlrobert/codegpt/toolwindow/chat/ChatToolWindowTabPanelTest.java
index a7ec0ed0..4835894b 100644
--- a/src/test/java/ee/carlrobert/codegpt/toolwindow/chat/StandardChatToolWindowTabPanelTest.java
+++ b/src/test/java/ee/carlrobert/codegpt/toolwindow/chat/ChatToolWindowTabPanelTest.java
@@ -7,10 +7,9 @@ import static ee.carlrobert.llm.client.util.JSONUtil.e;
import static ee.carlrobert.llm.client.util.JSONUtil.jsonArray;
import static ee.carlrobert.llm.client.util.JSONUtil.jsonMap;
import static ee.carlrobert.llm.client.util.JSONUtil.jsonMapResponse;
-import static java.util.concurrent.TimeUnit.SECONDS;
+import static java.util.Objects.requireNonNull;
import static org.apache.http.HttpHeaders.AUTHORIZATION;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.awaitility.Awaitility.await;
import ee.carlrobert.codegpt.CodeGPTKeys;
import ee.carlrobert.codegpt.EncodingManager;
@@ -21,20 +20,23 @@ import ee.carlrobert.codegpt.conversations.ConversationService;
import ee.carlrobert.codegpt.conversations.message.Message;
import ee.carlrobert.codegpt.settings.configuration.ConfigurationSettings;
import ee.carlrobert.codegpt.settings.service.llama.LlamaSettings;
-import ee.carlrobert.codegpt.toolwindow.chat.standard.StandardChatToolWindowTabPanel;
import ee.carlrobert.llm.client.http.exchange.StreamHttpExchange;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Base64;
import java.util.List;
import java.util.Map;
import testsupport.IntegrationTest;
-public class StandardChatToolWindowTabPanelTest extends IntegrationTest {
+public class ChatToolWindowTabPanelTest extends IntegrationTest {
public void testSendingOpenAIMessage() {
useOpenAIService();
ConfigurationSettings.getCurrentState().setSystemPrompt(COMPLETION_SYSTEM_PROMPT);
var message = new Message("Hello!");
var conversation = ConversationService.getInstance().startConversation();
- var panel = new StandardChatToolWindowTabPanel(getProject(), conversation);
+ var panel = new ChatToolWindowTabPanel(getProject(), conversation);
expectOpenAI((StreamHttpExchange) request -> {
assertThat(request.getUri().getPath()).isEqualTo("/v1/chat/completions");
assertThat(request.getMethod()).isEqualTo("POST");
@@ -57,11 +59,10 @@ public class StandardChatToolWindowTabPanelTest extends IntegrationTest {
panel.sendMessage(message);
- await().atMost(5, SECONDS)
- .until(() -> {
- var messages = conversation.getMessages();
- return !messages.isEmpty() && "Hello!".equals(messages.get(0).getResponse());
- });
+ waitExpecting(() -> {
+ var messages = conversation.getMessages();
+ return !messages.isEmpty() && "Hello!".equals(messages.get(0).getResponse());
+ });
var encodingManager = EncodingManager.getInstance();
assertThat(panel.getTokenDetails()).extracting(
"systemPromptTokens",
@@ -100,7 +101,7 @@ public class StandardChatToolWindowTabPanelTest extends IntegrationTest {
message.setReferencedFilePaths(
List.of("TEST_FILE_PATH_1", "TEST_FILE_PATH_2", "TEST_FILE_PATH_3"));
var conversation = ConversationService.getInstance().startConversation();
- var panel = new StandardChatToolWindowTabPanel(getProject(), conversation);
+ var panel = new ChatToolWindowTabPanel(getProject(), conversation);
expectOpenAI((StreamHttpExchange) request -> {
assertThat(request.getUri().getPath()).isEqualTo("/v1/chat/completions");
assertThat(request.getMethod()).isEqualTo("POST");
@@ -114,23 +115,28 @@ public class StandardChatToolWindowTabPanelTest extends IntegrationTest {
List.of(
Map.of("role", "system", "content", COMPLETION_SYSTEM_PROMPT),
Map.of("role", "user", "content",
- "Use the following context to answer question at the end:\n\n"
- + "File Path: TEST_FILE_PATH_1\n"
- + "File Content:\n"
- + "```TEST_FILE_NAME_1\n"
- + "TEST_FILE_CONTENT_1\n"
- + "```\n\n"
- + "File Path: TEST_FILE_PATH_2\n"
- + "File Content:\n"
- + "```TEST_FILE_NAME_2\n"
- + "TEST_FILE_CONTENT_2\n"
- + "```\n\n"
- + "File Path: TEST_FILE_PATH_3\n"
- + "File Content:\n"
- + "```TEST_FILE_NAME_3\n"
- + "TEST_FILE_CONTENT_3\n"
- + "```\n\n"
- + "Question: TEST_MESSAGE")));
+ """
+ Use the following context to answer question at the end:
+
+ File Path: TEST_FILE_PATH_1
+ File Content:
+ ```TEST_FILE_NAME_1
+ TEST_FILE_CONTENT_1
+ ```
+
+ File Path: TEST_FILE_PATH_2
+ File Content:
+ ```TEST_FILE_NAME_2
+ TEST_FILE_CONTENT_2
+ ```
+
+ File Path: TEST_FILE_PATH_3
+ File Content:
+ ```TEST_FILE_NAME_3
+ TEST_FILE_CONTENT_3
+ ```
+
+ Question: TEST_MESSAGE""")));
return List.of(
jsonMapResponse("choices", jsonArray(jsonMap("delta", jsonMap("role", "assistant")))),
jsonMapResponse("choices", jsonArray(jsonMap("delta", jsonMap("content", "Hel")))),
@@ -140,11 +146,10 @@ public class StandardChatToolWindowTabPanelTest extends IntegrationTest {
panel.sendMessage(message);
- await().atMost(5, SECONDS)
- .until(() -> {
- var messages = conversation.getMessages();
- return !messages.isEmpty() && "Hello!".equals(messages.get(0).getResponse());
- });
+ waitExpecting(() -> {
+ var messages = conversation.getMessages();
+ return !messages.isEmpty() && "Hello!".equals(messages.get(0).getResponse());
+ });
var encodingManager = EncodingManager.getInstance();
assertThat(panel.getTokenDetails()).extracting(
"systemPromptTokens",
@@ -175,6 +180,79 @@ public class StandardChatToolWindowTabPanelTest extends IntegrationTest {
List.of("TEST_FILE_PATH_1", "TEST_FILE_PATH_2", "TEST_FILE_PATH_3"));
}
+ public void testSendingOpenAIMessageWithImage() {
+ var testImagePath = requireNonNull(getClass().getResource("/images/test-image.png")).getPath();
+ getProject().putUserData(CodeGPTKeys.IMAGE_ATTACHMENT_FILE_PATH, testImagePath);
+ useOpenAIService("gpt-4-vision-preview");
+ ConfigurationSettings.getCurrentState().setSystemPrompt(COMPLETION_SYSTEM_PROMPT);
+ var message = new Message("TEST_MESSAGE");
+ var conversation = ConversationService.getInstance().startConversation();
+ var panel = new ChatToolWindowTabPanel(getProject(), conversation);
+ expectOpenAI((StreamHttpExchange) request -> {
+ assertThat(request.getUri().getPath()).isEqualTo("/v1/chat/completions");
+ assertThat(request.getMethod()).isEqualTo("POST");
+ assertThat(request.getHeaders().get(AUTHORIZATION).get(0)).isEqualTo("Bearer TEST_API_KEY");
+ try {
+ var testImageUrl = "data:image/png;base64,"
+ + Base64.getEncoder().encodeToString(Files.readAllBytes(Path.of(testImagePath)));
+ assertThat(request.getBody())
+ .extracting("model", "messages")
+ .containsExactly(
+ "gpt-4-vision-preview",
+ List.of(
+ Map.of("role", "system", "content", COMPLETION_SYSTEM_PROMPT),
+ Map.of("role", "user", "content", List.of(
+ Map.of(
+ "type", "image_url",
+ "image_url", Map.of("url", testImageUrl)),
+ Map.of("type", "text", "text", "TEST_MESSAGE")
+ ))));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ return List.of(
+ jsonMapResponse("choices", jsonArray(jsonMap("delta", jsonMap("role", "assistant")))),
+ jsonMapResponse("choices", jsonArray(jsonMap("delta", jsonMap("content", "Hel")))),
+ jsonMapResponse("choices", jsonArray(jsonMap("delta", jsonMap("content", "lo")))),
+ jsonMapResponse("choices", jsonArray(jsonMap("delta", jsonMap("content", "!")))));
+ });
+
+ panel.sendMessage(message);
+
+ waitExpecting(() -> {
+ var messages = conversation.getMessages();
+ return !messages.isEmpty() && "Hello!".equals(messages.get(0).getResponse());
+ });
+ var encodingManager = EncodingManager.getInstance();
+ assertThat(panel.getTokenDetails()).extracting(
+ "systemPromptTokens",
+ "conversationTokens",
+ "userPromptTokens",
+ "highlightedTokens")
+ .containsExactly(
+ encodingManager.countTokens(COMPLETION_SYSTEM_PROMPT),
+ encodingManager.countTokens(message.getPrompt()),
+ 0,
+ 0);
+ assertThat(panel.getConversation())
+ .isNotNull()
+ .extracting("id", "model", "clientCode", "discardTokenLimit")
+ .containsExactly(
+ conversation.getId(),
+ conversation.getModel(),
+ conversation.getClientCode(),
+ false);
+ var messages = panel.getConversation().getMessages();
+ assertThat(messages.size()).isOne();
+ assertThat(messages.get(0))
+ .extracting("id", "prompt", "response", "imageFilePath")
+ .containsExactly(
+ message.getId(),
+ message.getPrompt(),
+ message.getResponse(),
+ message.getImageFilePath());
+ }
+
public void testFixCompileErrorsWithOpenAIService() {
getProject().putUserData(CodeGPTKeys.SELECTED_FILES, List.of(
new ReferencedFile("TEST_FILE_NAME_1", "TEST_FILE_PATH_1", "TEST_FILE_CONTENT_1"),
@@ -187,7 +265,7 @@ public class StandardChatToolWindowTabPanelTest extends IntegrationTest {
message.setReferencedFilePaths(
List.of("TEST_FILE_PATH_1", "TEST_FILE_PATH_2", "TEST_FILE_PATH_3"));
var conversation = ConversationService.getInstance().startConversation();
- var panel = new StandardChatToolWindowTabPanel(getProject(), conversation);
+ var panel = new ChatToolWindowTabPanel(getProject(), conversation);
expectOpenAI((StreamHttpExchange) request -> {
assertThat(request.getUri().getPath()).isEqualTo("/v1/chat/completions");
assertThat(request.getMethod()).isEqualTo("POST");
@@ -201,23 +279,28 @@ public class StandardChatToolWindowTabPanelTest extends IntegrationTest {
List.of(
Map.of("role", "system", "content", FIX_COMPILE_ERRORS_SYSTEM_PROMPT),
Map.of("role", "user", "content",
- "Use the following context to answer question at the end:\n\n"
- + "File Path: TEST_FILE_PATH_1\n"
- + "File Content:\n"
- + "```TEST_FILE_NAME_1\n"
- + "TEST_FILE_CONTENT_1\n"
- + "```\n\n"
- + "File Path: TEST_FILE_PATH_2\n"
- + "File Content:\n"
- + "```TEST_FILE_NAME_2\n"
- + "TEST_FILE_CONTENT_2\n"
- + "```\n\n"
- + "File Path: TEST_FILE_PATH_3\n"
- + "File Content:\n"
- + "```TEST_FILE_NAME_3\n"
- + "TEST_FILE_CONTENT_3\n"
- + "```\n\n"
- + "Question: TEST_MESSAGE")));
+ """
+ Use the following context to answer question at the end:
+
+ File Path: TEST_FILE_PATH_1
+ File Content:
+ ```TEST_FILE_NAME_1
+ TEST_FILE_CONTENT_1
+ ```
+
+ File Path: TEST_FILE_PATH_2
+ File Content:
+ ```TEST_FILE_NAME_2
+ TEST_FILE_CONTENT_2
+ ```
+
+ File Path: TEST_FILE_PATH_3
+ File Content:
+ ```TEST_FILE_NAME_3
+ TEST_FILE_CONTENT_3
+ ```
+
+ Question: TEST_MESSAGE""")));
return List.of(
jsonMapResponse("choices", jsonArray(jsonMap("delta", jsonMap("role", "assistant")))),
jsonMapResponse("choices", jsonArray(jsonMap("delta", jsonMap("content", "Hel")))),
@@ -227,11 +310,10 @@ public class StandardChatToolWindowTabPanelTest extends IntegrationTest {
panel.sendMessage(message, ConversationType.FIX_COMPILE_ERRORS);
- await().atMost(5, SECONDS)
- .until(() -> {
- var messages = conversation.getMessages();
- return !messages.isEmpty() && "Hello!".equals(messages.get(0).getResponse());
- });
+ waitExpecting(() -> {
+ var messages = conversation.getMessages();
+ return !messages.isEmpty() && "Hello!".equals(messages.get(0).getResponse());
+ });
var encodingManager = EncodingManager.getInstance();
assertThat(panel.getTokenDetails()).extracting(
"systemPromptTokens",
@@ -277,7 +359,7 @@ public class StandardChatToolWindowTabPanelTest extends IntegrationTest {
llamaSettings.setRepeatPenalty(1.3);
var message = new Message("TEST_PROMPT");
var conversation = ConversationService.getInstance().startConversation();
- var panel = new StandardChatToolWindowTabPanel(getProject(), conversation);
+ var panel = new ChatToolWindowTabPanel(getProject(), conversation);
expectLlama((StreamHttpExchange) request -> {
assertThat(request.getUri().getPath()).isEqualTo("/completion");
assertThat(request.getBody())
@@ -312,11 +394,10 @@ public class StandardChatToolWindowTabPanelTest extends IntegrationTest {
panel.sendMessage(message, ConversationType.DEFAULT);
- await().atMost(5, SECONDS)
- .until(() -> {
- var messages = conversation.getMessages();
- return !messages.isEmpty() && "Hello!".equals(messages.get(0).getResponse());
- });
+ waitExpecting(() -> {
+ var messages = conversation.getMessages();
+ return !messages.isEmpty() && "Hello!".equals(messages.get(0).getResponse());
+ });
assertThat(panel.getConversation())
.isNotNull()
.extracting("id", "model", "clientCode", "discardTokenLimit")
diff --git a/src/test/java/ee/carlrobert/codegpt/toolwindow/chat/StandardChatToolWindowTabbedPaneTest.java b/src/test/java/ee/carlrobert/codegpt/toolwindow/chat/ChatToolWindowTabbedPaneTest.java
similarity index 64%
rename from src/test/java/ee/carlrobert/codegpt/toolwindow/chat/StandardChatToolWindowTabbedPaneTest.java
rename to src/test/java/ee/carlrobert/codegpt/toolwindow/chat/ChatToolWindowTabbedPaneTest.java
index 17411989..0746f538 100644
--- a/src/test/java/ee/carlrobert/codegpt/toolwindow/chat/StandardChatToolWindowTabbedPaneTest.java
+++ b/src/test/java/ee/carlrobert/codegpt/toolwindow/chat/ChatToolWindowTabbedPaneTest.java
@@ -6,13 +6,11 @@ import com.intellij.openapi.util.Disposer;
import com.intellij.testFramework.fixtures.BasePlatformTestCase;
import ee.carlrobert.codegpt.conversations.ConversationService;
import ee.carlrobert.codegpt.conversations.message.Message;
-import ee.carlrobert.codegpt.toolwindow.chat.standard.StandardChatToolWindowTabPanel;
-import ee.carlrobert.codegpt.toolwindow.chat.standard.StandardChatToolWindowTabbedPane;
-public class StandardChatToolWindowTabbedPaneTest extends BasePlatformTestCase {
+public class ChatToolWindowTabbedPaneTest extends BasePlatformTestCase {
public void testClearAllTabs() {
- var tabbedPane = new StandardChatToolWindowTabbedPane(Disposer.newDisposable());
+ var tabbedPane = new ChatToolWindowTabbedPane(Disposer.newDisposable());
tabbedPane.addNewTab(createNewTabPanel());
tabbedPane.clearAll();
@@ -22,7 +20,7 @@ public class StandardChatToolWindowTabbedPaneTest extends BasePlatformTestCase {
public void testAddingNewTabs() {
- var tabbedPane = new StandardChatToolWindowTabbedPane(Disposer.newDisposable());
+ var tabbedPane = new ChatToolWindowTabbedPane(Disposer.newDisposable());
tabbedPane.addNewTab(createNewTabPanel());
tabbedPane.addNewTab(createNewTabPanel());
@@ -33,10 +31,10 @@ public class StandardChatToolWindowTabbedPaneTest extends BasePlatformTestCase {
}
public void testResetCurrentlyActiveTabPanel() {
- var tabbedPane = new StandardChatToolWindowTabbedPane(Disposer.newDisposable());
+ var tabbedPane = new ChatToolWindowTabbedPane(Disposer.newDisposable());
var conversation = ConversationService.getInstance().startConversation();
conversation.addMessage(new Message("TEST_PROMPT", "TEST_RESPONSE"));
- tabbedPane.addNewTab(new StandardChatToolWindowTabPanel(getProject(), conversation));
+ tabbedPane.addNewTab(new ChatToolWindowTabPanel(getProject(), conversation));
tabbedPane.resetCurrentlyActiveTabPanel(getProject());
@@ -44,8 +42,8 @@ public class StandardChatToolWindowTabbedPaneTest extends BasePlatformTestCase {
assertThat(tabPanel.getConversation().getMessages()).isEmpty();
}
- private StandardChatToolWindowTabPanel createNewTabPanel() {
- return new StandardChatToolWindowTabPanel(
+ private ChatToolWindowTabPanel createNewTabPanel() {
+ return new ChatToolWindowTabPanel(
getProject(),
ConversationService.getInstance().startConversation());
}
diff --git a/src/test/java/testsupport/IntegrationTest.java b/src/test/java/testsupport/IntegrationTest.java
index 726d521b..f92be8e2 100644
--- a/src/test/java/testsupport/IntegrationTest.java
+++ b/src/test/java/testsupport/IntegrationTest.java
@@ -1,5 +1,6 @@
package testsupport;
+import com.intellij.openapi.util.Key;
import com.intellij.testFramework.fixtures.BasePlatformTestCase;
import ee.carlrobert.codegpt.CodeGPTKeys;
import ee.carlrobert.llm.client.mixin.ExternalServiceTestMixin;
@@ -17,7 +18,17 @@ public class IntegrationTest extends BasePlatformTestCase implements
@Override
protected void tearDown() throws Exception {
ExternalServiceTestMixin.clearAll();
- getProject().putUserData(CodeGPTKeys.SELECTED_FILES, Collections.emptyList());
+ clearKeys();
super.tearDown();
}
+
+ private void clearKeys() {
+ putUserData(CodeGPTKeys.SELECTED_FILES, Collections.emptyList());
+ putUserData(CodeGPTKeys.PREVIOUS_INLAY_TEXT, "");
+ putUserData(CodeGPTKeys.IMAGE_ATTACHMENT_FILE_PATH, "");
+ }
+
+ private void putUserData(Key key, T value) {
+ getProject().putUserData(key, value);
+ }
}
diff --git a/src/test/java/testsupport/mixin/ShortcutsTestMixin.java b/src/test/java/testsupport/mixin/ShortcutsTestMixin.java
index c6f19be6..9c7d4aa2 100644
--- a/src/test/java/testsupport/mixin/ShortcutsTestMixin.java
+++ b/src/test/java/testsupport/mixin/ShortcutsTestMixin.java
@@ -3,19 +3,25 @@ package testsupport.mixin;
import static ee.carlrobert.codegpt.credentials.CredentialsStore.CredentialKey.AZURE_OPENAI_API_KEY;
import static ee.carlrobert.codegpt.credentials.CredentialsStore.CredentialKey.OPENAI_API_KEY;
+import com.intellij.testFramework.PlatformTestUtil;
import ee.carlrobert.codegpt.credentials.CredentialsStore;
import ee.carlrobert.codegpt.settings.GeneralSettings;
import ee.carlrobert.codegpt.settings.service.ServiceType;
import ee.carlrobert.codegpt.settings.service.azure.AzureSettings;
import ee.carlrobert.codegpt.settings.service.llama.LlamaSettings;
import ee.carlrobert.codegpt.settings.service.openai.OpenAISettings;
+import java.util.function.BooleanSupplier;
public interface ShortcutsTestMixin {
default void useOpenAIService() {
+ useOpenAIService("gpt-4");
+ }
+
+ default void useOpenAIService(String model) {
GeneralSettings.getCurrentState().setSelectedService(ServiceType.OPENAI);
CredentialsStore.INSTANCE.setCredential(OPENAI_API_KEY, "TEST_API_KEY");
- OpenAISettings.getCurrentState().setModel("gpt-4");
+ OpenAISettings.getCurrentState().setModel(model);
}
default void useAzureService() {
@@ -35,4 +41,11 @@ public interface ShortcutsTestMixin {
GeneralSettings.getCurrentState().setSelectedService(ServiceType.LLAMA_CPP);
LlamaSettings.getCurrentState().setServerPort(null);
}
+
+ default void waitExpecting(BooleanSupplier condition) {
+ PlatformTestUtil.waitWithEventsDispatching(
+ "Waiting for message response timed out or did not meet expected conditions",
+ condition,
+ 5);
+ }
}
diff --git a/src/test/resources/images/test-image.png b/src/test/resources/images/test-image.png
new file mode 100644
index 00000000..8ed28a16
Binary files /dev/null and b/src/test/resources/images/test-image.png differ
-
+## Feedback
-> **Note**: If you're already running a server and wish to configure the plugin against that, then simply select the port and click `Apply/OK`.
+Your input helps us grow. Reach out through:
-## Features
-
-The plugin provides several key features, such as:
-
-### Chat with AI
-
-Ask anything you'd like.
-
-
-
-### Select and Ask
-
-Ask anything related to your selected code.
-
-
-
-### Replace Generated Code
-
-Instantly replace a selected code block in the editor with suggested code generated by AI.
-
-
-
-### Regenerate Response
-
-Expected a different answer? Re-generate any response of your choosing.
-
-
-
-## Other features
-
-- **Conversation History** - View recent conversation history and restore previous sessions, making it easy to pick up where you left off
-- **Concurrent conversations** - Chat with the AI in multiple tabs simultaneously
-- **Seamless conversations** - Chat with the AI regardless of the maximum token limitations
-- **Predefined Actions** - Create your own editor actions or override the existing ones, saving time rewriting the same prompt repeatedly
+- [Issue Tracker](https://github.com/carlrobertoh/CodeGPT/issues)
+- [Discord](https://discord.gg/8dTGGrwcnR)
+- [Email](mailto:carlrobertoh@gmail.com)
diff --git a/GETTING_STARTED.md b/GETTING_STARTED.md
new file mode 100644
index 00000000..02558808
--- /dev/null
+++ b/GETTING_STARTED.md
@@ -0,0 +1,86 @@
+## Getting Started
+
+1. **Download the Plugin**
+
+2. **Choose Your Preferred Service**:
+
+ a) **OpenAI** - Requires authentication via OpenAI API key.
+
+ b) **Azure** - Requires authentication via Active Directory or API key.
+
+ c) **Custom OpenAI-compatible service** - Choose between multiple different providers, such as Together, Anyscale,
+ Groq, Ollama and many more.
+
+ d) **Anthropic** - Requires authentication via API key.
+
+ e) **You.com** - A free, web-connected service with an optional upgrade to You⚡Pro for enhanced features.
+
+ f) **LLaMA C/C++ Port** - Recommended to have a decent computer to handle the computational requirements of running
+ inference.
+ > **Note**: Currently supported only on Linux and MacOS.
+
+3. **Start Using the Features**
+
+### Installation
+
+The plugin is available from [JetBrains Marketplace][plugin-repo].
+You can install it directly from your IDE via the `File | Settings/Preferences | Plugins` screen.
+On the `Marketplace` tab simply search for `codegpt` and select the `CodeGPT` suggestion:
+
+![marketplace][marketplace-img]
+
+### OpenAI
+
+After successful installation, configure your API key. Navigate to the plugin's settings via **File |
+Settings/Preferences | Tools | CodeGPT**. Paste your OpenAI API key into the field and click `Apply/OK`.
+
+### Azure OpenAI
+
+For Azure OpenAI services, you'll need to input three additional fields:
+
+- **Resource name**: The name of your Azure OpenAI Cognitive Services. It's the first part of the url you're provided to
+ use the service: "https://**my-resource-name**.openai.azure.com/". You can find it in your Azure Cognitive Services
+ page, under `Resource Management` → `Resource Management` → `Keys and Endpoints`.
+- **Deployment ID**: The name of your Deployment. You can find it in the Azure AI Studio,
+ under `Management` → `Deployment` → `Deployment Name` column in the table.
+- **API version**: The most recent non-preview version.
+
+In addition to these, you need to input one of the two API Keys provided, found along with the `Resource Name`.
+
+### You.com (Free)
+
+**You.com** is a search engine that summarizes the best parts of the internet for **you**, with private ads and with
+privacy options.
+
+**You⚡Pro**
+
+Use the **CodeGPT** coupon for a free month of unlimited GPT-4 usage.
+
+Check out the full [feature list](https://about.you.com/hc/youpro/what-features-are-included-in-youpro/) for more
+details.
+
+### LLaMA C/C++ Port (Free, Local)
+
+> **Note**: Currently supported only on Linux and MacOS.
+
+The main goal of `llama.cpp` is to run the LLaMA model using 4-bit integer quantization on a MacBook.
+
+#### Getting Started
+
+1. **Select the Model**: Depending on your hardware capabilities, choose the appropriate model from the provided list.
+ Once selected, click on the `Download Model` link. A progress bar will appear, indicating the download process.
+
+2. **Start the Server**: After successfully downloading the model, initiate the server by clicking on the `Start Server`
+ button. A status message will be displayed, indicating that the server is starting up.
+
+3. **Apply Settings**: With the server running, you can now apply the settings to start using the features. Click on
+ the `Apply/OK` button to save your settings and start using the application.
+
+
-
-
-
-