-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(issue-243): Fixing UI issue + refactoring of ChatResponsePanel
- Loading branch information
1 parent
f90df32
commit e03389b
Showing
7 changed files
with
216 additions
and
214 deletions.
There are no files selected for viewing
219 changes: 7 additions & 212 deletions
219
src/main/java/com/devoxx/genie/ui/panel/ChatResponsePanel.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,235 +1,30 @@ | ||
| package com.devoxx.genie.ui.panel; | ||
|
|
||
| import com.devoxx.genie.model.enumarations.ModelProvider; | ||
| import com.devoxx.genie.model.request.ChatMessageContext; | ||
| import com.devoxx.genie.model.request.EditorInfo; | ||
| import com.devoxx.genie.model.request.SemanticFile; | ||
| import com.devoxx.genie.service.FileListManager; | ||
| import com.devoxx.genie.service.ProjectContentService; | ||
| import com.devoxx.genie.service.gitdiff.GitMergeService; | ||
| import com.devoxx.genie.ui.component.ExpandablePanel; | ||
| import com.devoxx.genie.ui.processor.NodeProcessorFactory; | ||
| import com.devoxx.genie.ui.panel.chatresponse.*; | ||
| import com.devoxx.genie.ui.settings.DevoxxGenieStateService; | ||
| import com.devoxx.genie.util.DefaultLLMSettingsUtil; | ||
| import com.intellij.openapi.vfs.VirtualFile; | ||
| import com.intellij.ui.JBColor; | ||
| import com.knuddels.jtokkit.api.Encoding; | ||
| import dev.langchain4j.model.output.TokenUsage; | ||
| import org.commonmark.node.Block; | ||
| import org.commonmark.node.FencedCodeBlock; | ||
| import org.commonmark.node.IndentedCodeBlock; | ||
| import org.commonmark.node.Node; | ||
| import org.commonmark.parser.Parser; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| import javax.swing.*; | ||
| import java.awt.*; | ||
| import java.text.NumberFormat; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Locale; | ||
|
|
||
| import static com.devoxx.genie.ui.util.DevoxxGenieFontsUtil.SourceCodeProFontPlan14; | ||
|
|
||
| public class ChatResponsePanel extends BackgroundPanel { | ||
|
|
||
| private final transient ChatMessageContext chatMessageContext; | ||
|
|
||
| /** | ||
| * Create a new chat response panel. | ||
| * | ||
| * @param chatMessageContext the chat message context | ||
| */ | ||
| public ChatResponsePanel(@NotNull ChatMessageContext chatMessageContext) { | ||
| super(chatMessageContext.getId()); | ||
| setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); | ||
|
|
||
| this.chatMessageContext = chatMessageContext; | ||
|
|
||
| add(new ResponseHeaderPanel(chatMessageContext)); | ||
| addResponsePane(chatMessageContext); | ||
| } | ||
|
|
||
| /** | ||
| * Get the response pane with rendered HTML. | ||
| * | ||
| * @param chatMessageContext the chat message context | ||
| */ | ||
| private void addResponsePane(@NotNull ChatMessageContext chatMessageContext) { | ||
| String markDownResponse = chatMessageContext.getAiMessage().text(); | ||
| Node document = Parser.builder().build().parse(markDownResponse); | ||
|
|
||
| DevoxxGenieStateService stateService = DevoxxGenieStateService.getInstance(); | ||
| add(new ResponseDocumentPanel(chatMessageContext)); | ||
|
|
||
| // If git diff is activated, try to extract code blocks and show diff | ||
| if (Boolean.TRUE.equals(stateService.getGitDiffActivated())) { | ||
| processGitDiff(chatMessageContext, document); | ||
| } | ||
|
|
||
| addDocumentNodesToPanel(document); | ||
|
|
||
| // Add regular files panel | ||
| if (chatMessageContext.hasFiles()) { | ||
| java.util.List<VirtualFile> files = FileListManager.getInstance().getFiles(); | ||
| ExpandablePanel fileListPanel = new ExpandablePanel(chatMessageContext, files); | ||
| add(fileListPanel); | ||
| add(new FileListPanel(chatMessageContext)); | ||
| } | ||
|
|
||
| // Add semantic references panel | ||
| addSemanticSearchReferences(chatMessageContext); | ||
|
|
||
| if (Boolean.TRUE.equals(DevoxxGenieStateService.getInstance().getShowExecutionTime())) { | ||
| // Add execution time, token usage and cost information | ||
| addMetricExecutionInfo(chatMessageContext); | ||
| if (chatMessageContext.getSemanticReferences() != null && !chatMessageContext.getSemanticReferences().isEmpty()) { | ||
| add(new SemanticSearchReferencesPanel(chatMessageContext)); | ||
| } | ||
| } | ||
|
|
||
| private void addSemanticSearchReferences(@NotNull ChatMessageContext chatMessageContext) { | ||
| List<SemanticFile> semanticReferences = chatMessageContext.getSemanticReferences(); | ||
| if (semanticReferences != null && !semanticReferences.isEmpty()) { | ||
| ExpandablePanel semanticPanel = new ExpandablePanel(chatMessageContext.getProject(), semanticReferences); | ||
| semanticPanel.setName(chatMessageContext.getId() + "_semantic"); | ||
| add(semanticPanel); | ||
| } | ||
| } | ||
|
|
||
| private void addMetricExecutionInfo(@NotNull ChatMessageContext chatMessageContext) { | ||
| JPanel metricExecutionInfoPanel = new JPanel(new FlowLayout(FlowLayout.LEFT)); | ||
| metricExecutionInfoPanel.setOpaque(false); | ||
|
|
||
| String metricInfoLabel = String.format("ϟ %.2fs", chatMessageContext.getExecutionTimeMs() / 1000.0); | ||
|
|
||
| dev.langchain4j.model.output.TokenUsage tokenUsage = chatMessageContext.getTokenUsage(); | ||
| if (tokenUsage != null) { | ||
|
|
||
| String cost = ""; | ||
| if (DefaultLLMSettingsUtil.isApiKeyBasedProvider(chatMessageContext.getLanguageModel().getProvider())) { | ||
| cost = String.format("- %.5f $", chatMessageContext.getCost()); | ||
| } | ||
|
|
||
| tokenUsage = calcOllamaInputTokenCount(chatMessageContext, tokenUsage); | ||
|
|
||
| NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.getDefault()); | ||
| String formattedInputTokens = numberFormat.format(tokenUsage.inputTokenCount()); | ||
| String formattedOutputTokens = numberFormat.format(tokenUsage.outputTokenCount()); | ||
|
|
||
| metricInfoLabel += String.format(" - Tokens ↑ %s ↓️ %s %s", formattedInputTokens, formattedOutputTokens, cost); | ||
| } | ||
|
|
||
| JLabel tokenLabel = new JLabel(metricInfoLabel); | ||
|
|
||
| tokenLabel.setForeground(JBColor.GRAY); | ||
| tokenLabel.setFont(tokenLabel.getFont().deriveFont(12f)); | ||
|
|
||
| metricExecutionInfoPanel.add(tokenLabel); | ||
| add(metricExecutionInfoPanel); | ||
| } | ||
|
|
||
| /** | ||
| * Process the git diff. | ||
| * @param chatMessageContext the chat message context | ||
| * @param document the document | ||
| */ | ||
| private void processGitDiff(@NotNull ChatMessageContext chatMessageContext, @NotNull Node document) { | ||
| // Get original file info | ||
| EditorInfo editorInfo = chatMessageContext.getEditorInfo(); | ||
| if (editorInfo == null) { | ||
| return; | ||
| } | ||
|
|
||
| if (editorInfo.getSelectedFiles() != null && !editorInfo.getSelectedFiles().isEmpty()) { | ||
| List<VirtualFile> files = editorInfo.getSelectedFiles(); | ||
| List<String> modifiedContents = new ArrayList<>(); | ||
|
|
||
| // Collect modified contents from code blocks | ||
| Node node = document.getFirstChild(); | ||
| while (node != null) { | ||
| if (node instanceof FencedCodeBlock codeBlock) { | ||
| modifiedContents.add(codeBlock.getLiteral()); | ||
| } | ||
| node = node.getNext(); | ||
| } | ||
|
|
||
| GitMergeService.getInstance().showDiffView( | ||
| chatMessageContext.getProject(), | ||
| files.get(0), | ||
| modifiedContents.get(0)); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Ollama does not count the input context tokens in the token usage, this method fixes this. | ||
| * | ||
| * @param chatMessageContext the chat message context | ||
| * @param tokenUsage the token usage | ||
| * @return the updated token usage | ||
| */ | ||
| private static TokenUsage calcOllamaInputTokenCount(@NotNull ChatMessageContext chatMessageContext, TokenUsage tokenUsage) { | ||
| if (chatMessageContext.getLanguageModel().getProvider().equals(ModelProvider.Ollama)) { | ||
| int inputContextTokens = 0; | ||
| if (chatMessageContext.getContext() != null) { | ||
| Encoding encodingForProvider = ProjectContentService.getEncodingForProvider(chatMessageContext.getLanguageModel().getProvider()); | ||
| inputContextTokens = encodingForProvider.encode(chatMessageContext.getContext()).size(); | ||
| } | ||
| tokenUsage = new TokenUsage(tokenUsage.inputTokenCount() + inputContextTokens, tokenUsage.outputTokenCount()); | ||
| } | ||
| return tokenUsage; | ||
| } | ||
|
|
||
| /** | ||
| * Add document nodes to the panel. | ||
| * | ||
| * @param document the document | ||
| */ | ||
| private void addDocumentNodesToPanel(@NotNull Node document) { | ||
| JPanel jPanel = createPanel(); | ||
|
|
||
| Node node = document.getFirstChild(); | ||
|
|
||
| while (node != null) { | ||
| JPanel panel; | ||
| if (node instanceof FencedCodeBlock fencedCodeBlock) { | ||
| panel = processBlock(fencedCodeBlock); | ||
| } else if (node instanceof IndentedCodeBlock indentedCodeBlock) { | ||
| panel = processBlock(indentedCodeBlock); | ||
| } else { | ||
| panel = processBlock((Block) node); | ||
| } | ||
|
|
||
| setFullWidth(panel); | ||
| jPanel.add(panel); | ||
| node = node.getNext(); | ||
| if (Boolean.TRUE.equals(DevoxxGenieStateService.getInstance().getShowExecutionTime())) { | ||
| add(new MetricExecutionInfoPanel(chatMessageContext)); | ||
| } | ||
|
|
||
| add(jPanel); | ||
| } | ||
|
|
||
| private void setFullWidth(@NotNull JPanel panel) { | ||
| Dimension maximumSize = new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE); | ||
| panel.setMaximumSize(maximumSize); | ||
| panel.setMinimumSize(new Dimension(panel.getPreferredSize().width, panel.getPreferredSize().height)); | ||
| } | ||
|
|
||
| /** | ||
| * Create a panel. | ||
| * | ||
| * @return the panel | ||
| */ | ||
| private @NotNull JPanel createPanel() { | ||
| JPanel jPanel = new JPanel(); | ||
| jPanel.setLayout(new BoxLayout(jPanel, BoxLayout.Y_AXIS)); | ||
| jPanel.setOpaque(false); | ||
| jPanel.setFont(SourceCodeProFontPlan14); | ||
| return jPanel; | ||
| } | ||
|
|
||
| /** | ||
| * Process a block and return a panel. | ||
| * | ||
| * @param theBlock the block | ||
| * @return the panel | ||
| */ | ||
| private JPanel processBlock(Block theBlock) { | ||
| return NodeProcessorFactory.createProcessor(chatMessageContext, theBlock).processNode(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
src/main/java/com/devoxx/genie/ui/panel/chatresponse/FileListPanel.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package com.devoxx.genie.ui.panel.chatresponse; | ||
|
|
||
| import com.devoxx.genie.model.request.ChatMessageContext; | ||
| import com.devoxx.genie.service.FileListManager; | ||
| import com.devoxx.genie.ui.component.ExpandablePanel; | ||
|
|
||
| public class FileListPanel extends ExpandablePanel { | ||
|
|
||
| public FileListPanel(ChatMessageContext chatMessageContext) { | ||
| super(chatMessageContext, FileListManager.getInstance().getFiles()); | ||
| } | ||
| } |
58 changes: 58 additions & 0 deletions
58
src/main/java/com/devoxx/genie/ui/panel/chatresponse/MetricExecutionInfoPanel.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| package com.devoxx.genie.ui.panel.chatresponse; | ||
|
|
||
| import com.devoxx.genie.model.enumarations.ModelProvider; | ||
| import com.devoxx.genie.model.request.ChatMessageContext; | ||
| import com.devoxx.genie.service.ProjectContentService; | ||
| import com.devoxx.genie.util.DefaultLLMSettingsUtil; | ||
| import com.intellij.ui.JBColor; | ||
| import com.knuddels.jtokkit.api.Encoding; | ||
| import dev.langchain4j.model.output.TokenUsage; | ||
|
|
||
| import javax.swing.*; | ||
| import java.awt.*; | ||
| import java.text.NumberFormat; | ||
| import java.util.Locale; | ||
|
|
||
| public class MetricExecutionInfoPanel extends JPanel { | ||
|
|
||
| public MetricExecutionInfoPanel(ChatMessageContext chatMessageContext) { | ||
| setLayout(new FlowLayout(FlowLayout.LEFT)); | ||
| setOpaque(false); | ||
|
|
||
| String metricInfoLabel = String.format("ϟ %.2fs", chatMessageContext.getExecutionTimeMs() / 1000.0); | ||
| TokenUsage tokenUsage = chatMessageContext.getTokenUsage(); | ||
|
|
||
| if (tokenUsage != null) { | ||
| String cost = ""; | ||
| if (DefaultLLMSettingsUtil.isApiKeyBasedProvider(chatMessageContext.getLanguageModel().getProvider())) { | ||
| cost = String.format("- %.5f $", chatMessageContext.getCost()); | ||
| } | ||
|
|
||
| tokenUsage = calcOllamaInputTokenCount(chatMessageContext, tokenUsage); | ||
|
|
||
| NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.getDefault()); | ||
| String formattedInputTokens = numberFormat.format(tokenUsage.inputTokenCount()); | ||
| String formattedOutputTokens = numberFormat.format(tokenUsage.outputTokenCount()); | ||
|
|
||
| metricInfoLabel += String.format(" - Tokens ↑ %s ↓️ %s %s", formattedInputTokens, formattedOutputTokens, cost); | ||
| } | ||
|
|
||
|
|
||
| JLabel tokenLabel = new JLabel(metricInfoLabel); | ||
| tokenLabel.setForeground(JBColor.GRAY); | ||
| tokenLabel.setFont(tokenLabel.getFont().deriveFont(12f)); | ||
| add(tokenLabel); | ||
| } | ||
|
|
||
| private static TokenUsage calcOllamaInputTokenCount(ChatMessageContext chatMessageContext, TokenUsage tokenUsage) { | ||
| if (chatMessageContext.getLanguageModel().getProvider().equals(ModelProvider.Ollama)) { | ||
| int inputContextTokens = 0; | ||
| if (chatMessageContext.getContext() != null) { | ||
| Encoding encodingForProvider = ProjectContentService.getEncodingForProvider(chatMessageContext.getLanguageModel().getProvider()); | ||
| inputContextTokens = encodingForProvider.encode(chatMessageContext.getContext()).size(); | ||
| } | ||
| tokenUsage = new TokenUsage(tokenUsage.inputTokenCount() + inputContextTokens, tokenUsage.outputTokenCount()); | ||
| } | ||
| return tokenUsage; | ||
| } | ||
| } |
Oops, something went wrong.