From df14b8861730ccc598aafb641a46b60f6c6becad Mon Sep 17 00:00:00 2001 From: Carl-Robert Linnupuu Date: Tue, 6 Feb 2024 17:56:50 +0200 Subject: [PATCH] feat: add the latest OpenAI chat models --- .../main/kotlin/codegpt.java-conventions.gradle.kts | 2 +- .../actions/GenerateGitCommitMessageAction.java | 4 ++-- .../chat/standard/ModelComboBoxAction.java | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/buildSrc/src/main/kotlin/codegpt.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/codegpt.java-conventions.gradle.kts index 0c6560df..ed4f7d86 100644 --- a/buildSrc/src/main/kotlin/codegpt.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/codegpt.java-conventions.gradle.kts @@ -23,7 +23,7 @@ checkstyle { } dependencies { - implementation("ee.carlrobert:llm-client:0.3.1") + implementation("ee.carlrobert:llm-client:0.4.2") } tasks { diff --git a/src/main/java/ee/carlrobert/codegpt/actions/GenerateGitCommitMessageAction.java b/src/main/java/ee/carlrobert/codegpt/actions/GenerateGitCommitMessageAction.java index b2ada8ec..91707521 100644 --- a/src/main/java/ee/carlrobert/codegpt/actions/GenerateGitCommitMessageAction.java +++ b/src/main/java/ee/carlrobert/codegpt/actions/GenerateGitCommitMessageAction.java @@ -92,8 +92,8 @@ public class GenerateGitCommitMessageAction extends AnAction { } } - private CompletionEventListener getEventListener(Project project, Document document) { - return new CompletionEventListener() { + private CompletionEventListener getEventListener(Project project, Document document) { + return new CompletionEventListener<>() { private final StringBuilder messageBuilder = new StringBuilder(); @Override diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/standard/ModelComboBoxAction.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/standard/ModelComboBoxAction.java index 0b515f37..d36dbf2b 100644 --- a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/standard/ModelComboBoxAction.java +++ b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/standard/ModelComboBoxAction.java @@ -7,6 +7,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.actionSystem.ex.ComboBoxAction; +import com.intellij.openapi.project.DumbAwareAction; import ee.carlrobert.codegpt.Icons; import ee.carlrobert.codegpt.completions.llama.LlamaModel; import ee.carlrobert.codegpt.conversations.ConversationService; @@ -54,13 +55,12 @@ public class ModelComboBoxAction extends ComboBoxAction { var actionGroup = new DefaultActionGroup(); actionGroup.addSeparator("OpenAI"); List.of( - OpenAIChatCompletionModel.GPT_4_1106_128k, - OpenAIChatCompletionModel.GPT_3_5_1106_16k, + OpenAIChatCompletionModel.GPT_4_0125_128k, + OpenAIChatCompletionModel.GPT_3_5_0125_16k, OpenAIChatCompletionModel.GPT_4_32k, OpenAIChatCompletionModel.GPT_4, OpenAIChatCompletionModel.GPT_3_5) - .forEach( - model -> actionGroup.add(createOpenAIModelAction(model, presentation))); + .forEach(model -> actionGroup.add(createOpenAIModelAction(model, presentation))); actionGroup.addSeparator(); actionGroup.add( createModelAction(ServiceType.AZURE, "Azure OpenAI", Icons.Azure, presentation)); @@ -118,7 +118,7 @@ public class ModelComboBoxAction extends ComboBoxAction { String label, Icon icon, Presentation comboBoxPresentation) { - return new AnAction(label, "", icon) { + return new DumbAwareAction(label, "", icon) { @Override public void update(@NotNull AnActionEvent event) { var presentation = event.getPresentation(); @@ -154,7 +154,7 @@ public class ModelComboBoxAction extends ComboBoxAction { Presentation comboBoxPresentation) { createModelAction(ServiceType.OPENAI, model.getDescription(), Icons.OpenAI, comboBoxPresentation); - return new AnAction(model.getDescription(), "", Icons.OpenAI) { + return new DumbAwareAction(model.getDescription(), "", Icons.OpenAI) { @Override public void update(@NotNull AnActionEvent event) { var presentation = event.getPresentation();