Skip to content

The Unified and Autonomous Development Platform

chore: Refactoring chat tools

Robin Shen526773ab0cad
diff --git a/pom.xml b/pom.xml
index d8ec60709a..dde241b7c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -676,8 +676,8 @@
</repository>
</repositories>
<properties>
- <commons.version>3.1.4</commons.version>
- <agent.version>2.3.6</agent.version>
+ <commons.version>3.1.5</commons.version>
+ <agent.version>2.3.7</agent.version>
<slf4j.version>2.0.9</slf4j.version>
<logback.version>1.4.14</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-core/src/main/java/io/onedev/server/ai/HighlightedTextTool.java b/server-core/src/main/java/io/onedev/server/ai/HighlightedTextTool.java
index c43b5364a1..8ee81d9eae 100644
--- a/server-core/src/main/java/io/onedev/server/ai/HighlightedTextTool.java
+++ b/server-core/src/main/java/io/onedev/server/ai/HighlightedTextTool.java
@@ -21,7 +21,11 @@ public class HighlightedTextTool implements ChatTool {
private static final String OMITTED_LINES = "...OMITTED LINES...";
- private static final int CONTEXT_SIZE = 100;
+ private static final int START_CONTEXT_SIZE = 100;
+
+ private static final int BEFORE_CONTEXT_SIZE = 50;
+
+ private static final int AFTER_CONTEXT_SIZE = 50;
private final String fileName;
@@ -51,7 +55,7 @@ public class HighlightedTextTool implements ChatTool {
var map = Map.of(
"highlightedText", Joiner.on('\n').join(highlightRange.getContent(fileContent)),
"nameOfFileContainingHighlightedText", fileName,
- "contextOfHighlightedText", Joiner.on('\n').join(highlightRange.getContext(fileContent, HIGHLIGHT_BEGIN, HIGHLIGHT_END, OMITTED_LINES, CONTEXT_SIZE, CONTEXT_SIZE, CONTEXT_SIZE)),
+ "contextOfHighlightedText", Joiner.on('\n').join(highlightRange.getContext(fileContent, HIGHLIGHT_BEGIN, HIGHLIGHT_END, OMITTED_LINES, START_CONTEXT_SIZE, BEFORE_CONTEXT_SIZE, AFTER_CONTEXT_SIZE)),
"note", String.format("Highlighted text is between %s and %s in the context", HIGHLIGHT_BEGIN, HIGHLIGHT_END)
);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/ai/chat/ChatPanel.html b/server-core/src/main/java/io/onedev/server/web/component/ai/chat/ChatPanel.html
index 753eb762c6..ebf9e14e26 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/ai/chat/ChatPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/ai/chat/ChatPanel.html
@@ -20,7 +20,7 @@
</li>
</ul>
<form wicket:id="send" class="send flex-shrink-0 position-relative">
- <textarea wicket:id="input" class="form-control" t:placeholder="Type your message here (SHIFT+ENTER to start new line)"></textarea>
+ <textarea wicket:id="input" class="form-control" t:placeholder="Type your message (shift+enter for new line)"></textarea>
<a wicket:id="submit" class="submit position-absolute btn btn-primary btn-icon btn-sm" t:data-tippy-content="Send"><wicket:svg href="arrow2" class="icon rotate-270"></wicket:svg></a>
<a wicket:id="stop" class="stop position-absolute btn btn-primary btn-icon btn-sm" t:data-tippy-content="Stop"><wicket:svg href="stop" class="icon"></wicket:svg></a>
</form>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
index 1286b43357..6780cbb654 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
@@ -39,6 +39,7 @@ import com.google.common.base.Preconditions;
import com.ibm.icu.text.SpoofChecker;
import io.onedev.commons.utils.LinearRange;
+import io.onedev.commons.utils.PlanarRange;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.ai.HighlightedTextTool;
@@ -373,19 +374,35 @@ public class BlobTextDiffPanel extends Panel implements ChatToolAware {
"""
function(symbolEl) {
var $td = $(symbolEl).closest('td.content');
- if ($td.hasClass('old'))
- return 'old:' + $td.data('old');
- else
- return 'new:' + $td.data('new');
+ var side;
+ var row;
+ if ($td.hasClass('old')) {
+ side = "old";
+ row = $td.data('old');
+ } else {
+ side = "new";
+ row = $td.data('new');
+ }
+ var parentEl = symbolEl.parentElement;
+ var columnStart = 1;
+ for (var i = 0; i < parentEl.childNodes.length; i++) {
+ var node = parentEl.childNodes[i];
+ if (node === symbolEl)
+ break;
+ columnStart += node.textContent.length;
+ }
+ row++;
+ return side + ":" + row + "." + columnStart + "-" + row + "." + (columnStart + symbolEl.textContent.length);
+
}""";
}
@Override
- protected SymbolContext getSymbolContext(String symbolPosition, String symbolBegin, String symbolEnd,
- String truncationMark, int atStartContextSize, int beforeContextSize, int afterContextSize) {
+ protected SymbolContext getSymbolContext(String symbolPosition, String symbolBeginMark, String symbolEndMark,
+ String omittedLinesMark, int startContextSize, int beforeContextSize, int afterContextSize) {
String[] parts = symbolPosition.split(":");
boolean isNew = parts[0].equals("new");
- int lineNo = Integer.parseInt(parts[1]);
+ var range = new PlanarRange(parts[1]);
List<String> lines;
String path;
@@ -397,22 +414,9 @@ public class BlobTextDiffPanel extends Panel implements ChatToolAware {
path = change.getOldBlobIdent().path;
}
- List<String> linesBefore = new ArrayList<>();
- List<String> linesAfter = new ArrayList<>();
-
- for (int i = Math.max(0, lineNo - beforeContextSize); i < lineNo; i++) {
- linesBefore.add(lines.get(i));
- }
- for (int i = lineNo + 1; i <= Math.min(lineNo + afterContextSize, lines.size() - 1); i++) {
- linesAfter.add(lines.get(i));
- }
-
- List<String> linesAtStart = new ArrayList<>();
- for (int i = 0; i < Math.min(atStartContextSize, lines.size()); i++) {
- linesAtStart.add(lines.get(i));
- }
+ System.out.println(range.getContent(lines));
- return new SymbolContext(path, linesBefore);
+ return new SymbolContext(path, range.getContext(lines, symbolBeginMark, symbolEndMark, omittedLinesMark, startContextSize, beforeContextSize, afterContextSize));
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java
index e29881e6a8..d5e14fb68b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java
@@ -67,12 +67,12 @@ public abstract class SymbolTooltipPanel extends Panel {
private static final int QUERY_ENTRIES = 25;
+ private static final int START_CONTEXT_SIZE = 200;
+
private static final int BEFORE_CONTEXT_SIZE = 5;
private static final int AFTER_CONTEXT_SIZE = 5;
- private static final int AT_START_CONTEXT_SIZE = 200;
-
private static final String SYMBOL_BEGIN = "[SYMBOL_BEGIN]";
private static final String SYMBOL_END = "[SYMBOL_END]";
@@ -342,7 +342,8 @@ public abstract class SymbolTooltipPanel extends Panel {
var jsonOfSymbolHits = mapperCopy.writeValueAsString(symbolHits);
var symbolContext = getSymbolContext(symbolPosition, SYMBOL_BEGIN, SYMBOL_END, OMITTED_LINES,
- AT_START_CONTEXT_SIZE, BEFORE_CONTEXT_SIZE, AFTER_CONTEXT_SIZE);
+ START_CONTEXT_SIZE, BEFORE_CONTEXT_SIZE, AFTER_CONTEXT_SIZE);
+
var occurrenceMap = Map.of(
"symbolName", symbolName,
"blobPath", symbolContext.getBlobPath(),
@@ -367,7 +368,7 @@ public abstract class SymbolTooltipPanel extends Panel {
Possible symbol definitions json:
%s
- """, symbolName, jsonOfSymbolOccurrence, jsonOfSymbolHits));
+ """, jsonOfSymbolOccurrence, jsonOfSymbolHits));
index = Integer.parseInt(liteModel.chat(systemMessage, userMessage).aiMessage().text());
if (index < 0 || index >= symbolHits.size())
Session.get().warn("Unable to find most likely definition");
@@ -437,8 +438,8 @@ public abstract class SymbolTooltipPanel extends Panel {
protected abstract String getSymbolPositionCalcFunction();
- protected abstract SymbolContext getSymbolContext(String symbolPosition, String symbolBegin, String symbolEnd,
- String truncationMark, int atStartContextSize, int beforeContextSize, int afterContextSize);
+ protected abstract SymbolContext getSymbolContext(String symbolPosition, String symbolBeginMark, String symbolEndMark,
+ String omittedLinesMark, int startContextSize, int beforeContextSize, int afterContextSize);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
index 9e8ee992cf..6b1c688e23 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
@@ -516,7 +516,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
range = getRange(params, "param1", "param2", "param3", "param4");
context.onPosition(target, BlobRenderer.getSourcePosition(range));
var page = (LayoutPage) getPage();
- page.getChatter().show(target, "Help me understand highlighted text of current file. Display in " + getSession().getLocale().getDisplayLanguage());
+ page.getChatter().show(target, "Help me understand highlighted text. Display in " + getSession().getLocale().getDisplayLanguage());
target.appendJavaScript(String.format("onedev.server.sourceView.mark(%s, false);", convertToJson(range)));
break;
case "addComment":
@@ -884,23 +884,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
protected String getSymbolPositionCalcFunction() {
return
"""
- function(symbolEl) {
- function getNodeText(node) {
- if (node.nodeType === Node.TEXT_NODE) {
- return node.textContent;
- } else if (node.nodeType === Node.ELEMENT_NODE) {
- if (node.classList && node.classList.contains('cm-tab')) {
- return '\\t';
- }
- var text = '';
- for (var i = 0; i < node.childNodes.length; i++) {
- text += getNodeText(node.childNodes[i]);
- }
- return text;
- }
- return '';
- }
-
+ function(symbolEl) {
var cm = symbolEl.closest(".CodeMirror").CodeMirror;
if (cm) {
var lineEl = symbolEl.closest('.CodeMirror-line').parentElement;
@@ -908,17 +892,18 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
if (view.node === lineEl) {
var row = cm.getLineNumber(view.line);
var parentEl = symbolEl.parentElement;
- var text = '';
+ var columnStart = 1;
for (var i = 0; i < parentEl.childNodes.length; i++) {
var node = parentEl.childNodes[i];
if (node === symbolEl)
break;
- text += getNodeText(node);
+ columnStart += node.textContent.length;
+ $(node).find('.cm-tab').addBack('.cm-tab').each(function() {
+ columnStart -= $(this).text().length - 1;
+ });
}
row++;
- var columnStart = text.length + 1;
- var symbolText = getNodeText(symbolEl);
- return row + "." + columnStart + "-" + row + "." + (columnStart + symbolText.length);
+ return row + "." + columnStart + "-" + row + "." + (columnStart + symbolEl.textContent.length);
}
}
}
@@ -927,13 +912,14 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
}
@Override
- protected SymbolContext getSymbolContext(String symbolPosition, String symbolBegin, String symbolEnd,
- String truncationMark, int atStartContextSize, int beforeContextSize, int afterContextSize) {
- var range = new PlanarRange(symbolPosition);
+ protected SymbolContext getSymbolContext(String symbolPosition, String symbolBeginMark, String symbolEndMark,
+ String omittedLinesMark, int startContextSize, int beforeContextSize, int afterContextSize) {
+ var range = new PlanarRange(symbolPosition);
var lines = context.getProject().getBlob(context.getBlobIdent(), true).getText().getLines();
+ System.out.println(range.getContent(lines));
- var symbolContext = range.getContext(lines, symbolBegin, symbolEnd, truncationMark,
- atStartContextSize, beforeContextSize, afterContextSize);
+ var symbolContext = range.getContext(lines, symbolBeginMark, symbolEndMark, omittedLinesMark,
+ startContextSize, beforeContextSize, afterContextSize);
return new SymbolContext(context.getBlobIdent().path, symbolContext);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index e3a7878db1..f1727e618c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -22,7 +22,6 @@ public class TestPage extends BasePage {
@Override
public void onClick() {
- System.out.println("test2");
}
});
diff --git a/server-ee b/server-ee
index 2cc856a8b2..3d9d134b55 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit 2cc856a8b2db2970a64d4bad0b2a643d32a46072
+Subproject commit 3d9d134b55c4226add9b3a40cbbf43aa9ca7a6c9