wip

SimiaCryptus · Dec 8, 2024 · e49fe05 · e49fe05
1 parent 5987b0a
commit e49fe05
Show file tree

Hide file tree

Showing 7 changed files with 173 additions and 137 deletions.
diff --git a/webapp/src/utils/tabHandling.ts b/webapp/src/utils/tabHandling.ts
diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/TabbedDisplay.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/TabbedDisplay.kt
@@ -6,6 +6,7 @@ import java.util.*
 open class TabbedDisplay(
   val task: SessionTask,
   val tabs: MutableList<Pair<String, StringBuilder>> = mutableListOf(),
+  val additionalClasses: String = ""
 ) {
   var selectedTab: Int = 0
 
@@ -17,7 +18,7 @@ open class TabbedDisplay(
   val tabId = UUID.randomUUID()
   private fun render() = if (tabs.isEmpty()) "<div/>" else {
     """
-  <div class="tabs-container" id="$tabId">
+  <div class="${(additionalClasses.split(" ").toSet() + setOf("tabs-container")).filter { it.isNotEmpty() }.joinToString(" ")}" id="$tabId">
   ${renderTabButtons()}
   ${
       tabs.toTypedArray().withIndex().joinToString("\n")
@@ -32,24 +33,21 @@ open class TabbedDisplay(
     task.add(render())!!
   }
 
-  protected open fun renderTabButtons() = """
-<div class="tabs">${
+  protected open fun renderTabButtons() = """<div class="tabs">${
     tabs.toTypedArray().withIndex().joinToString("\n") { (idx, pair) ->
       if (idx == selectedTab) {
         """<button class="tab-button active" data-for-tab="$idx">${pair.first}</button>"""
       } else {
         """<button class="tab-button" data-for-tab="$idx">${pair.first}</button>"""
       }
     }
-  }</div>
-"""
+  }</div>"""
 
-  protected open fun renderContentTab(t: Pair<String, StringBuilder>, idx: Int) = """
-<div class="tab-content ${
-    when {
-      idx == selectedTab -> "active"
-      else -> ""
-    }
+  protected open fun renderContentTab(t: Pair<String, StringBuilder>, idx: Int) = """<div class="${
+    (additionalClasses.split(" ") + setOf("tab-content") + when {
+      idx == selectedTab -> setOf("active")
+      else -> emptySet()
+    }).filter { it.isNotEmpty() }.joinToString(" ")
   }" data-tab="$idx">${t.second}</div>"""
 
 

diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/apps/code/CodingAgent.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/apps/code/CodingAgent.kt
@@ -171,7 +171,7 @@ open class CodingAgent<T : Interpreter>(
       |${if (!canPlay) "" else playButton(task, request, response, formText) { formHandle!! }}
       |</div>
       |${reviseMsg(task, request, response, formText) { formHandle!! }}
-      """.trimMargin(), className = "reply-message"
+      """.trimMargin(), additionalClasses = "reply-message"
     )
     formText.append(formHandle.toString())
     formHandle.toString()

diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/apps/code/ShellToolAgent.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/apps/code/ShellToolAgent.kt
@@ -89,7 +89,7 @@ abstract class ShellToolAgent<T : Interpreter>(
       |${createToolButton(task, request, response, formText) { formHandle!! }}
       |</div>  
       |${super.reviseMsg(task, request, response, formText) { formHandle!! }}
-      """.trimMargin(), className = "reply-message"
+      """.trimMargin(), additionalClasses = "reply-message"
     )
     formText.append(formHandle.toString())
     formHandle.toString()
@@ -460,7 +460,7 @@ abstract class ShellToolAgent<T : Interpreter>(
           }
         }
       }
-      """.trimMargin(), className = "reply-message"
+      """.trimMargin(), additionalClasses = "reply-message"
     )
     formText.append(formHandle.toString())
     formHandle.toString()

diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/apps/general/AutoPlanChatApp.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/apps/general/AutoPlanChatApp.kt
@@ -233,7 +233,7 @@ open class AutoPlanChatApp(
               task.verbose("API log: <a href=\"file:///$this\">$this</a>")
             }
           }
-          val tabbedDisplay = TabbedDisplay(task)
+          val tabbedDisplay = TabbedDisplay(task, additionalClasses = "iteration")
           ui.newTask(false).apply {
             tabbedDisplay["Inputs"] = placeholder
             header("Project Info")

diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/apps/plan/RunShellCommandTask.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/apps/plan/RunShellCommandTask.kt
@@ -102,7 +102,7 @@ Note: This task is for running simple and safe commands. Avoid executing command
  ${acceptButton(response)}
  </div>
  ${super.reviseMsg(task, request, response, formText) { formHandle!! }}
-                    """.trimMargin(), className = "reply-message"
+                    """.trimMargin(), additionalClasses = "reply-message"
         )
         formText.append(formHandle.toString())
         formHandle.toString()

diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/session/SessionTask.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/session/SessionTask.kt
@@ -56,9 +56,9 @@ abstract class SessionTask(
     showSpinner: Boolean = true,
     @Description("The html tag to wrap the message in (default: div)")
     tag: String = "div",
-    @Description("The css class to apply to the message (default: response-message)")
-    className: String = "response-message"
-  ) = append("""<$tag class="$className">$message</$tag>""", showSpinner)
+    @Description("Additional css class(es) to apply to the message")
+    additionalClasses: String = ""
+  ) = append("""<$tag class="${(setOf(additionalClasses.split(" ")) + setOf("response-message")).joinToString(" ")}">$message</$tag>""", showSpinner)
 
   @Description("Adds a hideable message to the task output.")
   fun hideable(
@@ -69,8 +69,8 @@ abstract class SessionTask(
     showSpinner: Boolean = true,
     @Description("The html tag to wrap the message in (default: div)")
     tag: String = "div",
-    @Description("The css class to apply to the message (default: response-message)")
-    className: String = "response-message"
+    @Description("Additional css class(es) to apply to the message")
+    additionalClasses: String = ""
   ): StringBuilder? {
     var windowBuffer: StringBuilder? = null
     val closeButton = """<span class="close">${
@@ -79,7 +79,7 @@ abstract class SessionTask(
         send()
       }
     }</span>"""
-    windowBuffer = append("""<$tag class="$className">$closeButton$message</$tag>""", showSpinner)
+    windowBuffer = append("""<$tag class="${(additionalClasses.split(" ").toSet() + setOf("response-message")).joinToString(" ")}">$closeButton$message</$tag>""", showSpinner)
     return windowBuffer
   }
 
@@ -101,8 +101,8 @@ abstract class SessionTask(
     showSpinner: Boolean = true,
     @Description("The html tag to wrap the message in (default: div)")
     tag: String = "div",
-    classname: String = "response-header"
-  ) = add(message, showSpinner, tag, classname)
+    additionalClasses: String = ""
+  ) = add(message, showSpinner, tag, additionalClasses)
 
   @Description("Adds a verbose message to the task output; verbose messages are hidden by default.")
   fun verbose(
@@ -177,9 +177,9 @@ abstract class SessionTask(
     message: String = "",
     @Description("The html tag to wrap the message in (default: div)")
     tag: String = "div",
-    @Description("The css class to apply to the message (default: response-message)")
-    className: String = "response-message"
-  ) = append(if (message.isNotBlank()) """<$tag class="$className">$message</$tag>""" else "", false)
+    @Description("Additional css class(es) to apply to the message")
+    additionalClasses: String = ""
+  ) = append(if (message.isNotBlank()) """<$tag class="${(additionalClasses.split(" ").toSet() + setOf("response-message")).joinToString(" ")}">$message</$tag>""" else "", false)
 
   @Description("Displays an image to the task output.")
   fun image(