]*>(.*?)", RegexOption.DOT_MATCHES_ALL),
- if(tabs) """
- |
- |
- | Diagram
- | Source
- |
- |
- |
- |
$1
- |""".trimMargin()
- )
- //language=HTML
- return if(tabs) {
- displayMapInTabs(mapOf(
- "HTML" to htmlContent,
- "Markdown" to """${markdown.replace(Regex("<"), "<").replace(Regex(">"), ">")}]*>(.*?)", RegexOption.DOT_MATCHES_ALL)
+ val matches = mermaidRegex.findAll(html)
+ var htmlContent = html
+ matches.forEach { match ->
+ var mermaidCode = match.groups[1]!!.value
+ // HTML Decode mermaidCode
+ mermaidCode = mermaidCode
+ val fixedMermaidCode = fixupMermaidCode(mermaidCode)
+ var mermaidDiagramHTML = """$fixedMermaidCode """
+ try {
+ val svg = renderMermaidToSVG(fixedMermaidCode)
+ if(null != ui) {
+ val newTask = ui.newTask(false)
+ newTask.complete(svg)
+ mermaidDiagramHTML = newTask.placeholder
+ } else {
+ mermaidDiagramHTML = svg
+ }
+ } catch (e: Exception) {
+ log.warn("Failed to render Mermaid diagram", e)
+ }
+ val replacement = if (tabs) """
+ |
+ |
+ | Diagram
+ | Source
+ |
+ |
$mermaidDiagramHTML
+ |
+ |
${
+ markdown.replace(Regex("<"), "<").replace(Regex(">"), ">")
+ } = listOf("powershell", "mmdc")
+ private fun renderMermaidToSVG(mermaidCode: String): String {
+ // mmdc -i input.mmd -o output.svg
+ val tempInputFile = Files.createTempFile("mermaid", ".mmd").toFile()
+ val tempOutputFile = Files.createTempFile("mermaid", ".svg").toFile()
+ tempInputFile.writeText(StringEscapeUtils.unescapeHtml4(mermaidCode))
+ val strings = MMDC_CMD + listOf("-i", tempInputFile.absolutePath, "-o", tempOutputFile.absolutePath)
+ val processBuilder =
+ ProcessBuilder(*strings.toTypedArray())
+ processBuilder.redirectErrorStream(true)
+ val process = processBuilder.start()
+ val output = StringBuilder()
+ val errorOutput = StringBuilder()
+ process.inputStream.bufferedReader().use {
+ it.lines().forEach { line -> output.append(line) }
+ }
+ process.errorStream.bufferedReader().use {
+ it.lines().forEach { line -> errorOutput.append(line) }
+ }
+ process.waitFor()
+ val svgContent = tempOutputFile.readText()
+ tempInputFile.delete()
+ tempOutputFile.delete()
+ if (output.isNotEmpty()) {
+ log.error("Mermaid CLI Output: $output")
+ }
+ if (errorOutput.isNotEmpty()) {
+ log.error("Mermaid CLI Error: $errorOutput")
+ }
+ if(svgContent.isNullOrBlank()) {
+ throw RuntimeException("Mermaid CLI failed to generate SVG")
+ }
+ return svgContent
+ }
+
+ // Simplified parsing states
+ enum class State {
+ DEFAULT, IN_NODE, IN_EDGE, IN_LABEL, IN_KEYWORD
+ }
+ fun fixupMermaidCode(code: String): String {
+ val stringBuilder = StringBuilder()
+ var index = 0
+
+ var currentState = State.DEFAULT
+ var labelStart = -1
+ val keywords = listOf("graph", "subgraph", "end", "classDef", "class", "click", "style")
+
+ while (index < code.length) {
+ when (currentState) {
+ State.DEFAULT -> {
+ if (code.startsWith(keywords.find { code.startsWith(it, index) } ?: "", index)) {
+ // Start of a keyword
+ currentState = State.IN_KEYWORD
+ stringBuilder.append(code[index])
+ } else
+ if (code[index] == '[' || code[index] == '(' || code[index] == '{') {
+ // Possible start of a label
+ currentState = State.IN_LABEL
+ labelStart = index
+ } else if (code[index].isWhitespace() || code[index] == '-') {
+ // Continue in default state, possibly an edge
+ stringBuilder.append(code[index])
+ } else {
+ // Start of a node
+ currentState = State.IN_NODE
+ stringBuilder.append(code[index])
+ }
+ }
+ State.IN_KEYWORD -> {
+ if (code[index].isWhitespace()) {
+ // End of a keyword
+ currentState = State.DEFAULT
+ }
+ stringBuilder.append(code[index])
+ }
+ State.IN_NODE -> {
+ if (code[index] == '-' || code[index] == '>' || code[index].isWhitespace()) {
+ // End of a node, start of an edge or space
+ currentState = if (code[index].isWhitespace()) State.DEFAULT else State.IN_EDGE
+ stringBuilder.append(code[index])
+ } else {
+ // Continue in node
+ stringBuilder.append(code[index])
+ }
+ }
+ State.IN_EDGE -> {
+ if (!code[index].isWhitespace() && code[index] != '-' && code[index] != '>') {
+ // End of an edge, start of a node
+ currentState = State.IN_NODE
+ stringBuilder.append(code[index])
+ } else {
+ // Continue in edge
+ stringBuilder.append(code[index])
+ }
+ }
+ State.IN_LABEL -> {
+ if (code[index] == ']' || code[index] == ')' || code[index] == '}') {
+ // End of a label
+ val label = code.substring(labelStart + 1, index)
+ val escapedLabel = "\"${label.replace("\"", "'")}\""
+ stringBuilder.append(escapedLabel)
+ stringBuilder.append(code[index])
+ currentState = State.DEFAULT
+ }
+ }
+ }
+ index++
+ }
+
+ return stringBuilder.toString()
+ }
private fun defaultOptions(): MutableDataSet {
val options = MutableDataSet()
options.set(Parser.EXTENSIONS, listOf(TablesExtension.create()))
return options
}
+
+ private val log = org.slf4j.LoggerFactory.getLogger(MarkdownUtil::class.java)
}
\ No newline at end of file
diff --git a/webui/src/main/resources/application/main.js b/webui/src/main/resources/application/main.js
index 5243df40..26506b25 100644
--- a/webui/src/main/resources/application/main.js
+++ b/webui/src/main/resources/application/main.js
@@ -36,6 +36,7 @@ let messageMap = {};
let singleInput = false;
let stickyInput = false;
let loadImages = "true";
+let showMenubar = true;
(function () {
class SvgPanZoom {
@@ -188,24 +189,24 @@ function onWebSocketText(event) {
messageDiv.innerHTML = messageContent;
if (messagesDiv) messagesDiv.appendChild(messageDiv);
substituteMessages(messageId, messageDiv);
- if (singleInput) {
- const mainInput = document.getElementById('main-input');
- if (mainInput) {
- mainInput.style.display = 'none';
- } else {
- console.log("Error: Could not find .main-input");
- }
+ }
+ if (singleInput) {
+ const mainInput = document.getElementById('main-input');
+ if (mainInput) {
+ mainInput.style.display = 'none';
+ } else {
+ console.log("Error: Could not find .main-input");
}
- if (stickyInput) {
- const mainInput = document.getElementById('main-input');
- if (mainInput) {
- // Keep at top of screen
- mainInput.style.position = 'sticky';
- mainInput.style.zIndex = '1';
- mainInput.style.top = '30px';
- } else {
- console.log("Error: Could not find .main-input");
- }
+ }
+ if (stickyInput) {
+ const mainInput = document.getElementById('main-input');
+ if (mainInput) {
+ // Keep at top of screen
+ mainInput.style.position = 'sticky';
+ mainInput.style.zIndex = '1';
+ mainInput.style.top = showMenubar ? '30px' : '0px';
+ } else {
+ console.log("Error: Could not find .main-input");
}
}
if (messagesDiv) messagesDiv.scrollTop = messagesDiv.scrollHeight;
@@ -499,6 +500,7 @@ document.addEventListener('DOMContentLoaded', () => {
if (!response.ok) {
console.error('There was a problem with the fetch operation:', error);
}
+ return response.json();
})
.then(data => {
if (data) {
@@ -514,6 +516,25 @@ document.addEventListener('DOMContentLoaded', () => {
if (data.loadImages) {
loadImages = data.loadImages;
}
+ if (data.showMenubar != null) {
+ showMenubar = data.showMenubar;
+ if (data.showMenubar === false) {
+ const menubar = document.getElementById('toolbar');
+ if (menubar) menubar.style.display = 'none';
+ const namebar = document.getElementById('namebar');
+ if (namebar) namebar.style.display = 'none';
+ const mainInput = document.getElementById('main-input');
+ if (mainInput) {
+ mainInput.style.top = '0px';
+ }
+ const session = document.getElementById('session');
+ if (session) {
+ session.style.top = '0px';
+ session.style.width = '100%';
+ session.style.position = 'absolute';
+ }
+ }
+ }
}
})
.catch(error => {
@@ -578,5 +599,4 @@ document.addEventListener('DOMContentLoaded', () => {
tosLink.addEventListener('click', () => showModal('/tos.html', false));
}
})
-;
-
+;
\ No newline at end of file
diff --git a/webui/src/main/resources/shared/_main.scss b/webui/src/main/resources/shared/_main.scss
index 82c670d4..f5440dba 100644
--- a/webui/src/main/resources/shared/_main.scss
+++ b/webui/src/main/resources/shared/_main.scss
@@ -1,390 +1,428 @@
// Mixins
@mixin typography($font-family: $font-family-primary, $font-size: $font-size-base, $font-weight: $font-weight-normal) {
- font-family: $font-family;
- font-size: $font-size;
- font-weight: $font-weight;
+ font-family: $font-family;
+ font-size: $font-size;
+ font-weight: $font-weight;
}
@mixin flex-container($direction: column) {
- display: flex;
- flex-direction: $direction;
+ display: flex;
+ flex-direction: $direction;
}
@mixin fixed-full {
- position: fixed;
- top: 0;
- left: 0;
- width: 100vw;
- height: 100%;
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100vw;
+ height: 100%;
}
@mixin link-hover-transition {
- transition: color $transition-speed;
- &:hover {
- color: $link-hover-color;
- }
+ transition: color $transition-speed;
+ &:hover {
+ color: $link-hover-color;
+ }
}
@mixin message-style {
- padding: 10px;
- margin-bottom: 10px;
- border-radius: $border-radius;
+ padding: 10px;
+ margin-bottom: 10px;
+ border-radius: $border-radius;
}
// Root styles
body {
- @include typography($font-family-secondary);
- color: $primary-text-color;
- background-color: $primary-bg-color;
- margin: 0;
- padding: 30px 0 50px;
+ @include typography($font-family-secondary);
+ color: $primary-text-color;
+ background-color: $primary-bg-color;
+ margin: 0;
+ padding: 30px 0 50px;
}
#messages {
- @include flex-container;
- padding: 10px;
- background-color: $secondary-bg-color;
- box-shadow: $box-shadow;
+ @include flex-container;
+ padding: 10px;
+ background-color: $secondary-bg-color;
+ box-shadow: $box-shadow;
}
.chat-input,
.reply-input {
- background-color: $secondary-bg-color;
- color: $primary-text-color;
- border-radius: $border-radius;
- padding: 10px;
- margin-bottom: 10px;
- overflow: auto;
- resize: vertical;
- flex: 1;
- border: 1px solid $border-color;
- box-shadow: $box-shadow;
+ background-color: $secondary-bg-color;
+ color: $primary-text-color;
+ border-radius: $border-radius;
+ padding: 10px;
+ margin-bottom: 10px;
+ overflow: auto;
+ resize: vertical;
+ flex: 1;
+ border: 1px solid $border-color;
+ box-shadow: $box-shadow;
}
#main-input,
.reply-form,
.code-execution {
- @include flex-container(row);
- padding: 5px;
- width: -webkit-fill-available;
- background-color: $primary-bg-color;
+ @include flex-container(row);
+ padding: 5px;
+ width: -webkit-fill-available;
+ background-color: $primary-bg-color;
}
.href-link {
- text-decoration: none;
- color: $link-color;
- @include link-hover-transition;
+ text-decoration: none;
+ color: $link-color;
+ @include link-hover-transition;
}
#disconnected-overlay {
- @include fixed-full;
- display: none;
- background-color: $modal-overlay-color;
- z-index: 50;
- @include flex-container;
- color: white;
- font-size: $font-size-large;
- p {
- @include typography($font-size: $font-size-large, $font-weight: $font-weight-bold);
- line-height: 1.5;
- margin-bottom: 20px;
- animation: bounce $transition-speed infinite alternate;
- position: relative;
- color: firebrick;
- }
+ @include fixed-full;
+ display: none;
+ background-color: $modal-overlay-color;
+ z-index: 50;
+ @include flex-container;
+ color: white;
+ font-size: $font-size-large;
+
+ p {
+ @include typography($font-size: $font-size-large, $font-weight: $font-weight-bold);
+ line-height: 1.5;
+ margin-bottom: 20px;
+ animation: bounce $transition-speed infinite alternate;
+ position: relative;
+ color: firebrick;
+ }
}
.spinner-border {
- display: block;
- width: 40px;
- height: 40px;
- border: 4px solid $spinner-border-color;
- border-left-color: $link-color;
- border-radius: 50%;
- animation: spin 1s linear infinite;
+ display: block;
+ width: 40px;
+ height: 40px;
+ border: 4px solid $spinner-border-color;
+ border-left-color: $link-color;
+ border-radius: 50%;
+ animation: spin 1s linear infinite;
}
.sr-only {
- position: absolute;
- width: 1px;
- height: 1px;
- padding: 0;
- margin: -1px;
- overflow: hidden;
- clip: rect(0, 0, 0, 0);
- white-space: nowrap;
- border: 0;
+ position: absolute;
+ width: 1px;
+ height: 1px;
+ padding: 0;
+ margin: -1px;
+ overflow: hidden;
+ clip: rect(0, 0, 0, 0);
+ white-space: nowrap;
+ border: 0;
}
#toolbar,
#namebar {
- background-color: $toolbar-bg-color;
+ background-color: $toolbar-bg-color;
+ padding: 5px;
+ position: fixed;
+ top: 0;
+ text-align: left;
+ box-shadow: $box-shadow;
+
+ a {
+ color: $toolbar-text-color;
+ text-decoration: none;
padding: 5px;
- position: fixed;
- top: 0;
- text-align: left;
- box-shadow: $box-shadow;
- a {
- color: $toolbar-text-color;
- text-decoration: none;
- padding: 5px;
- @include link-hover-transition;
- &:hover {
- background-color: $toolbar-hover-bg-color;
- color: $toolbar-hover-text-color;
- }
+ @include link-hover-transition;
+
+ &:hover {
+ background-color: $toolbar-hover-bg-color;
+ color: $toolbar-hover-text-color;
}
+ }
}
#toolbar {
- width: 100vw;
- z-index: 2;
+ width: 100vw;
+ z-index: 2;
}
#namebar {
- z-index: 3;
- right: 0;
+ z-index: 3;
+ right: 0;
}
.modal {
- @include fixed-full;
- display: none;
- z-index: 100;
- overflow: auto;
- background-color: $modal-overlay-color;
- .modal-content {
- background-color: $secondary-bg-color;
- margin: 10% auto;
- padding: 30px;
- border: 1px solid $border-color;
- width: 60%;
- position: relative;
- border-radius: $border-radius;
- box-shadow: $box-shadow;
- }
- .close {
- @include typography($font-weight: $font-weight-bold);
- color: $close-color;
- float: right;
- font-size: $font-size-large;
- cursor: pointer;
- &:hover,
- &:focus {
- color: $close-hover-color;
- }
+ @include fixed-full;
+ display: none;
+ z-index: 100;
+ overflow: auto;
+ background-color: $modal-overlay-color;
+
+ .modal-content {
+ background-color: $secondary-bg-color;
+ margin: 10% auto;
+ padding: 30px;
+ border: 1px solid $border-color;
+ width: 60%;
+ position: relative;
+ border-radius: $border-radius;
+ box-shadow: $box-shadow;
+ }
+
+ .close {
+ @include typography($font-weight: $font-weight-bold);
+ color: $close-color;
+ float: right;
+ font-size: $font-size-large;
+ cursor: pointer;
+
+ &:hover,
+ &:focus {
+ color: $close-hover-color;
}
+ }
}
.close-button {
- margin-left: 95%;
+ margin-left: 95%;
}
.play-button,
.regen-button,
.cancel-button,
.close-button {
- @include typography($font-size: 1.5rem, $font-weight: $font-weight-bold);
- border: 2px solid transparent;
- background: $primary-bg-color;
- cursor: pointer;
- transition: all $transition-speed;
- padding: 5px 10px;
- border-radius: $border-radius;
- text-decoration: unset;
- &:focus,
- &:hover {
- outline: none;
- background-color: darken($primary-bg-color, 5%);
- border-color: $link-color;
- }
- &:active {
- transform: scale(0.95);
- }
+ @include typography($font-size: 1.5rem, $font-weight: $font-weight-bold);
+ border: 2px solid transparent;
+ background: $primary-bg-color;
+ cursor: pointer;
+ transition: all $transition-speed;
+ padding: 5px 10px;
+ border-radius: $border-radius;
+ text-decoration: unset;
+
+ &:focus,
+ &:hover {
+ outline: none;
+ background-color: darken($primary-bg-color, 5%);
+ border-color: $link-color;
+ }
+
+ &:active {
+ transform: scale(0.95);
+ }
}
.cancel-button {
- right: 0;
- position: absolute;
+ right: 0;
+ position: absolute;
}
.error {
- color: $error-color;
+ color: $error-color;
}
.verbose {
- display: block;
+ display: block;
}
.verbose-hidden {
- display: none;
+ display: none;
}
.user-message,
.response-message,
.reply-message {
- @include message-style;
+ @include message-style;
}
.user-message {
- background-color: $user-message-bg;
- border: 1px solid $user-message-border;
+ background-color: $user-message-bg;
+ border: 1px solid $user-message-border;
}
.reply-message {
- background-color: $reply-message-bg;
- border: 1px solid $reply-message-border;
- display: flex;
+ background-color: $reply-message-bg;
+ border: 1px solid $reply-message-border;
+ display: flex;
}
.response-message {
- background-color: $response-message-bg;
- border: 1px solid $response-message-border;
- display: block;
+ background-color: $response-message-bg;
+ border: 1px solid $response-message-border;
+ display: block;
}
pre.verbose,
pre.response-message {
- background-color: $verbose-pre-bg;
- border: 1px solid $verbose-pre-border;
- border-radius: $border-radius;
- padding: 15px;
- overflow-x: auto;
- font-family: 'Courier New', Courier, monospace;
+ background-color: $verbose-pre-bg;
+ border: 1px solid $verbose-pre-border;
+ border-radius: $border-radius;
+ padding: 15px;
+ overflow-x: auto;
+ font-family: 'Courier New', Courier, monospace;
}
.response-header {
- font-weight: $font-weight-bold;
- margin-top: 20px;
- margin-bottom: 10px;
+ font-weight: $font-weight-bold;
+ margin-top: 20px;
+ margin-bottom: 10px;
}
#footer {
- position: fixed;
- bottom: 0;
- width: 100vw;
- text-align: right;
- z-index: 1000;
- a {
- color: $footer-link-color;
- text-decoration: none;
- font-weight: $font-weight-bold;
- &:hover {
- text-decoration: underline;
- color: $footer-link-hover-color;
- }
+ position: fixed;
+ bottom: 0;
+ width: 100vw;
+ text-align: right;
+ z-index: 1000;
+
+ a {
+ color: $footer-link-color;
+ text-decoration: none;
+ font-weight: $font-weight-bold;
+
+ &:hover {
+ text-decoration: underline;
+ color: $footer-link-hover-color;
}
+ }
}
.dropdown {
- position: relative;
- display: inline-block;
- &:hover {
- .dropdown-content {
- display: block;
- }
- .dropbtn {
- background-color: $dropdown-btn-bg;
- }
- }
+ position: relative;
+ display: inline-block;
+
+ &:hover {
.dropdown-content {
- display: none;
- position: absolute;
- background-color: $dropdown-content-bg;
- min-width: 160px;
- box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
- z-index: 1;
- a {
- color: $primary-text-color;
- padding: 12px 16px;
- text-decoration: none;
- display: block;
- &:hover {
- background-color: $dropdown-content-hover-bg;
- }
- }
+ display: block;
}
+
.dropbtn {
- border: none;
- cursor: pointer;
+ background-color: $dropdown-btn-bg;
+ }
+ }
+
+ .dropdown-content {
+ display: none;
+ position: absolute;
+ background-color: $dropdown-content-bg;
+ min-width: 160px;
+ box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
+ z-index: 1;
+
+ a {
+ color: $primary-text-color;
+ padding: 12px 16px;
+ text-decoration: none;
+ display: block;
+
+ &:hover {
+ background-color: $dropdown-content-hover-bg;
+ }
}
+ }
+
+ .dropbtn {
+ border: none;
+ cursor: pointer;
+ }
}
.applist {
- border-collapse: collapse;
- margin-top: 20px;
- th {
- padding-top: 15px;
- padding-bottom: 15px;
- background-color: $applist-header-bg;
- color: $applist-header-text;
- text-transform: uppercase;
- font-weight: $font-weight-bold;
- }
- td, th {
- border: 1px solid #ddd;
- padding: 8px;
- text-align: left;
- }
- tr {
- &:nth-child(even) {
- background-color: $applist-row-even-bg;
- }
- &:hover {
- background-color: $applist-row-hover-bg;
- }
- }
- th {
- padding-top: 12px;
- padding-bottom: 12px;
- background-color: $applist-header-bg;
- color: $applist-header-text;
+ border-collapse: collapse;
+ margin-top: 20px;
+
+ th {
+ padding-top: 15px;
+ padding-bottom: 15px;
+ background-color: $applist-header-bg;
+ color: $applist-header-text;
+ text-transform: uppercase;
+ font-weight: $font-weight-bold;
+ }
+
+ td, th {
+ border: 1px solid #ddd;
+ padding: 8px;
+ text-align: left;
+ }
+
+ tr {
+ &:nth-child(even) {
+ background-color: $applist-row-even-bg;
}
- a {
- color: $applist-link-color;
- text-decoration: none;
- margin-right: 10px;
+
+ &:hover {
+ background-color: $applist-row-hover-bg;
}
+ }
+
+ th {
+ padding-top: 12px;
+ padding-bottom: 12px;
+ background-color: $applist-header-bg;
+ color: $applist-header-text;
+ }
+
+ a {
+ color: $applist-link-color;
+ text-decoration: none;
+ margin-right: 10px;
+ }
}
.new-session-link {
- background-color: $new-session-link-bg;
- color: white;
- padding: 5px 10px;
- border-radius: 5px;
- display: inline-block;
- margin-right: 0;
- &:hover {
- background-color: $new-session-link-hover-bg;
- }
+ background-color: $new-session-link-bg;
+ color: white;
+ padding: 5px 10px;
+ border-radius: 5px;
+ display: inline-block;
+ margin-right: 0;
+
+ &:hover {
+ background-color: $new-session-link-hover-bg;
+ }
}
// Keyframes
@keyframes bounce {
- 0% {
- transform: translateY(0);
- }
- 100% {
- transform: translateY(-10px);
- }
+ 0% {
+ transform: translateY(0);
+ }
+ 100% {
+ transform: translateY(-10px);
+ }
}
@keyframes spin {
- 0% {
- transform: rotate(0deg);
- }
- 100% {
- transform: rotate(360deg);
- }
+ 0% {
+ transform: rotate(0deg);
+ }
+ 100% {
+ transform: rotate(360deg);
+ }
}
.tab-content {
- display: none;
+ display: none;
}
.tab-content.active {
- display: block;
+ display: block;
}
.tab-button.active {
- background-color: $button-bg-color;
+ background-color: $button-bg-color;
+}
+
+.cmd-button {
+ background-color: $button-bg-color;
+ color: $button-text-color;
+ padding: 10px 15px;
+ border-radius: $border-radius;
+ border: none;
+ cursor: pointer;
+ transition: background-color $transition-speed;
+
+ &:hover {
+ background-color: darken($button-bg-color, 10%);
+ color: lighten($button-text-color, 10%);
+ }
}
diff --git a/webui/src/test/kotlin/com/github/simiacryptus/aicoder/util/ApxPatchUtilTest.kt b/webui/src/test/kotlin/com/github/simiacryptus/diff/ApxPatchUtilTest.kt
similarity index 82%
rename from webui/src/test/kotlin/com/github/simiacryptus/aicoder/util/ApxPatchUtilTest.kt
rename to webui/src/test/kotlin/com/github/simiacryptus/diff/ApxPatchUtilTest.kt
index 971cd095..901913bd 100644
--- a/webui/src/test/kotlin/com/github/simiacryptus/aicoder/util/ApxPatchUtilTest.kt
+++ b/webui/src/test/kotlin/com/github/simiacryptus/diff/ApxPatchUtilTest.kt
@@ -1,6 +1,6 @@
-package com.github.simiacryptus.aicoder.util
+package com.github.simiacryptus.diff
-import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.Test
internal class ApxPatchUtilTest {
@@ -18,7 +18,7 @@ internal class ApxPatchUtilTest {
""".trimIndent()
val expected = "Added Line\nLine 1\nLine 2\nLine 3"
val result = ApxPatchUtil.patch(source, patch)
- assertEquals(expected, result)
+ Assertions.assertEquals(expected, result)
}
@Test
@@ -33,6 +33,6 @@ internal class ApxPatchUtilTest {
""".trimIndent()
val expected = "Line 1\nLine 3"
val result = ApxPatchUtil.patch(source, patch)
- assertEquals(expected, result)
+ Assertions.assertEquals(expected, result)
}
}
\ No newline at end of file
diff --git a/webui/src/test/kotlin/com/github/simiacryptus/aicoder/util/DiffUtilTest.kt b/webui/src/test/kotlin/com/github/simiacryptus/diff/DiffUtilTest.kt
similarity index 86%
rename from webui/src/test/kotlin/com/github/simiacryptus/aicoder/util/DiffUtilTest.kt
rename to webui/src/test/kotlin/com/github/simiacryptus/diff/DiffUtilTest.kt
index 048052ec..b0c87fd4 100644
--- a/webui/src/test/kotlin/com/github/simiacryptus/aicoder/util/DiffUtilTest.kt
+++ b/webui/src/test/kotlin/com/github/simiacryptus/diff/DiffUtilTest.kt
@@ -1,6 +1,6 @@
-package com.github.simiacryptus.aicoder.util
+package com.github.simiacryptus.diff
-import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.Test
class DiffUtilTest {
@@ -27,7 +27,7 @@ class DiffUtilTest {
line2
+ line3
""".trimIndent()
- assertEquals(expectedDiff, formattedDiff, "The diff should correctly represent an addition.")
+ Assertions.assertEquals(expectedDiff, formattedDiff, "The diff should correctly represent an addition.")
}
// @Test
@@ -41,7 +41,7 @@ class DiffUtilTest {
- line2
line3
""".trimIndent()
- assertEquals(expectedDiff, formattedDiff, "The diff should correctly represent a deletion.")
+ Assertions.assertEquals(expectedDiff, formattedDiff, "The diff should correctly represent a deletion.")
}
@Test
@@ -56,7 +56,7 @@ class DiffUtilTest {
+ line3
line4
""".trimIndent()
- assertEquals(expectedDiff, formattedDiff, "The diff should correctly represent mixed changes.")
+ Assertions.assertEquals(expectedDiff, formattedDiff, "The diff should correctly represent mixed changes.")
}
// @Test
@@ -71,7 +71,7 @@ class DiffUtilTest {
+ changed_line2
line3
""".trimIndent()
- assertEquals(expectedDiff, formattedDiff, "The diff should correctly include context lines.")
+ Assertions.assertEquals(expectedDiff, formattedDiff, "The diff should correctly include context lines.")
}
@Test
@@ -85,7 +85,7 @@ class DiffUtilTest {
+ changed_line1
line2
""".trimIndent()
- assertEquals(expectedDiff, formattedDiff, "The diff should correctly represent changes at the start.")
+ Assertions.assertEquals(expectedDiff, formattedDiff, "The diff should correctly represent changes at the start.")
}
@Test
@@ -99,7 +99,7 @@ class DiffUtilTest {
- line2
+ changed_line2
""".trimIndent()
- assertEquals(expectedDiff, formattedDiff, "The diff should correctly represent changes at the end.")
+ Assertions.assertEquals(expectedDiff, formattedDiff, "The diff should correctly represent changes at the end.")
}
// @Test
@@ -114,7 +114,11 @@ class DiffUtilTest {
+ changed_line2
line3
""".trimIndent()
- assertEquals(expectedDiff, formattedDiff, "The diff should correctly handle cases with no context lines.")
+ Assertions.assertEquals(
+ expectedDiff,
+ formattedDiff,
+ "The diff should correctly handle cases with no context lines."
+ )
}
@Test
@@ -183,4 +187,4 @@ class DiffUtilTest {
println("\n\nEcho Patch:\n\n")
DiffUtil.formatDiff(patchLines).lines().forEach { println(it) }
}
-}
+}
\ No newline at end of file
diff --git a/webui/src/test/kotlin/com/github/simiacryptus/aicoder/util/IterativePatchUtilTest.kt b/webui/src/test/kotlin/com/github/simiacryptus/diff/IterativePatchUtilTest.kt
similarity index 88%
rename from webui/src/test/kotlin/com/github/simiacryptus/aicoder/util/IterativePatchUtilTest.kt
rename to webui/src/test/kotlin/com/github/simiacryptus/diff/IterativePatchUtilTest.kt
index f4cc732b..7e4e2463 100644
--- a/webui/src/test/kotlin/com/github/simiacryptus/aicoder/util/IterativePatchUtilTest.kt
+++ b/webui/src/test/kotlin/com/github/simiacryptus/diff/IterativePatchUtilTest.kt
@@ -1,6 +1,6 @@
-package com.github.simiacryptus.aicoder.util
+package com.github.simiacryptus.diff
-import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.Test
class IterativePatchUtilTest {
@@ -18,7 +18,7 @@ class IterativePatchUtilTest {
line3
""".trimIndent()
val result = IterativePatchUtil.patch(source, patch)
- assertEquals(source.replace("\r\n", "\n"), result.replace("\r\n", "\n"))
+ Assertions.assertEquals(source.replace("\r\n", "\n"), result.replace("\r\n", "\n"))
}
@Test
@@ -41,7 +41,7 @@ class IterativePatchUtilTest {
line3
""".trimIndent()
val result = IterativePatchUtil.patch(source, patch)
- assertEquals(expected.replace("\r\n", "\n"), result.replace("\r\n", "\n"))
+ Assertions.assertEquals(expected.replace("\r\n", "\n"), result.replace("\r\n", "\n"))
}
@Test
@@ -63,7 +63,7 @@ class IterativePatchUtilTest {
line3
""".trimIndent()
val result = IterativePatchUtil.patch(source, patch)
- assertEquals(expected.replace("\r\n", "\n"), result.replace("\r\n", "\n"))
+ Assertions.assertEquals(expected.replace("\r\n", "\n"), result.replace("\r\n", "\n"))
}
@Test
@@ -75,6 +75,7 @@ class IterativePatchUtilTest {
""".trimIndent()
val patch = """
line1
+ - line2
line3
""".trimIndent()
val expected = """
@@ -82,7 +83,7 @@ class IterativePatchUtilTest {
line3
""".trimIndent()
val result = IterativePatchUtil.patch(source, patch)
- assertEquals(expected.replace("\r\n", "\n"), result.replace("\r\n", "\n"))
+ Assertions.assertEquals(expected.replace("\r\n", "\n"), result.replace("\r\n", "\n"))
}
@Test
fun testFromData() {
@@ -145,8 +146,9 @@ class IterativePatchUtilTest {
}
""".trimIndent()
val result = IterativePatchUtil.patch(source, patch)
- assertEquals(
- expected.replace("\r\n", "\n").replace("\\s{1,}".toRegex(), " "),
- result.replace("\r\n", "\n").replace("\\s{1,}".toRegex(), " "))
+ Assertions.assertEquals(
+ expected.replace("\r\n", "\n").replace("\\s{1,}".toRegex(), " "),
+ result.replace("\r\n", "\n").replace("\\s{1,}".toRegex(), " ")
+ )
}
}
\ No newline at end of file
diff --git a/webui/src/test/kotlin/com/simiacryptus/skyenet/webui/util/MarkdownUtilTest.kt b/webui/src/test/kotlin/com/simiacryptus/skyenet/webui/util/MarkdownUtilTest.kt
new file mode 100644
index 00000000..3fe67d80
--- /dev/null
+++ b/webui/src/test/kotlin/com/simiacryptus/skyenet/webui/util/MarkdownUtilTest.kt
@@ -0,0 +1,34 @@
+package com.simiacryptus.skyenet.webui.util
+
+import com.vladsch.flexmark.util.data.MutableDataSet
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+class MarkdownUtilTest {
+
+ private val markdownUtil = MarkdownUtil
+
+ @Test
+ fun testRenderMarkdown_BlankInput() {
+ val result = markdownUtil.renderMarkdown("")
+ assertEquals("", result, "Rendering blank markdown should return an empty string.")
+ }
+
+ @Test
+ fun testRenderMarkdown_SimpleMarkdown() {
+ val markdown = "# Heading\n\nThis is a test."
+ val expectedHtml = "Heading \nThis is a test.
\n"
+ val result = markdownUtil.renderMarkdown(markdown, MutableDataSet(), false, null)
+ assert(result.contains(expectedHtml)) { "Rendered HTML should contain the expected HTML content." }
+ }
+
+ @Test
+ fun testFixupMermaidCode() {
+ val input = "graph TD; A-->B; A[Square Rect] -- Link text --> C(Round Rect); C --> D{Rhombus};"
+ val expected = "graph TD; A-->B; A[Square Rect] -- Link text --> C(Round Rect); C --> D{Rhombus};"
+ val result = markdownUtil.fixupMermaidCode(input)
+ assertEquals(expected, result, "The Mermaid code should be correctly formatted.")
+ }
+
+
+}
\ No newline at end of file