1.0.67 (#72)

* 1.0.66

* misc fixes

* Update AddApplyFileDiffLinks.kt

* 1.0.55

* Update UsageManager.kt

* Update DataStorage.kt

* Update WebDevApp.kt

* Update README.md

* Update UsageManager.kt

* improve filename extract

* wip

* wip

* move packages

* Update Discussable.kt

* Update gradle.properties

gradle.properties

@@ -1,4 +1,4 @@
 # Gradle Releases -> https://github.com/gradle/gradle/releases
 libraryGroup = com.simiacryptus.skyenet
-libraryVersion = 1.0.66
+libraryVersion = 1.0.67
 gradleVersion = 7.6.1

webui/src/main/kotlin/com/github/simiacryptus/diff/AddApplyDiffLinks.kt → webui/src/main/kotlin/com/simiacryptus/diff/AddApplyDiffLinks.kt

@@ -1,4 +1,4 @@
-package com.github.simiacryptus.diff
+package com.simiacryptus.diff
 
 import com.simiacryptus.skyenet.AgentPatterns.displayMapInTabs
 import com.simiacryptus.skyenet.set

webui/src/main/kotlin/com/github/simiacryptus/diff/AddApplyFileDiffLinks.kt → webui/src/main/kotlin/com/simiacryptus/diff/AddApplyFileDiffLinks.kt

@@ -1,6 +1,6 @@
-package com.github.simiacryptus.diff
+package com.simiacryptus.diff
 
-import com.github.simiacryptus.diff.IterativePatchUtil.patch
+import com.simiacryptus.diff.IterativePatchUtil.patch
 import com.simiacryptus.skyenet.AgentPatterns
 import com.simiacryptus.skyenet.set
 import com.simiacryptus.skyenet.webui.application.ApplicationInterface
@@ -77,12 +77,12 @@ fun SocketManagerBase.addApplyFileDiffLinks(
                     "Patch" to MarkdownUtil.renderMarkdown("""
                       |```diff
                       |${
-                            DiffUtil.formatDiff(
-                                DiffUtil.generateDiff(
-                                    prevCode.lines(),
-                                    codeValue.lines()
-                                )
+                        DiffUtil.formatDiff(
+                            DiffUtil.generateDiff(
+                                prevCode.lines(),
+                                codeValue.lines()
                             )
+                        )
                         }
                       |```
                       """.trimMargin(), ui = ui

webui/src/main/kotlin/com/github/simiacryptus/diff/AddSaveLinks.kt → webui/src/main/kotlin/com/simiacryptus/diff/AddSaveLinks.kt

@@ -1,4 +1,4 @@
-package com.github.simiacryptus.diff
+package com.simiacryptus.diff
 
 import com.simiacryptus.skyenet.set
 import com.simiacryptus.skyenet.webui.application.ApplicationInterface

webui/src/main/kotlin/com/github/simiacryptus/diff/ApxPatchUtil.kt → webui/src/main/kotlin/com/simiacryptus/diff/ApxPatchUtil.kt

@@ -1,4 +1,4 @@
-package com.github.simiacryptus.diff
+package com.simiacryptus.diff
 
 import org.apache.commons.text.similarity.LevenshteinDistance
 

webui/src/main/kotlin/com/github/simiacryptus/diff/DiffMatchPatch.kt → webui/src/main/kotlin/com/simiacryptus/diff/DiffMatchPatch.kt

@@ -1,4 +1,4 @@
-package com.github.simiacryptus.diff
+package com.simiacryptus.diff
 
 import java.io.UnsupportedEncodingException
 import java.net.URLDecoder

webui/src/main/kotlin/com/github/simiacryptus/diff/DiffUtil.kt → webui/src/main/kotlin/com/simiacryptus/diff/DiffUtil.kt

@@ -1,6 +1,6 @@
-package com.github.simiacryptus.diff
+package com.simiacryptus.diff
 
-import com.github.simiacryptus.diff.PatchLineType.*
+import com.simiacryptus.diff.PatchLineType.*
 
 enum class PatchLineType {
     Added, Deleted, Unchanged

webui/src/main/kotlin/com/github/simiacryptus/diff/IterativePatchUtil.kt → webui/src/main/kotlin/com/simiacryptus/diff/IterativePatchUtil.kt

@@ -1,4 +1,4 @@
-package com.github.simiacryptus.diff
+package com.simiacryptus.diff
 
 import org.apache.commons.text.similarity.LevenshteinDistance
 

webui/src/main/kotlin/com/github/simiacryptus/diff/PatchUtil.kt → webui/src/main/kotlin/com/simiacryptus/diff/PatchUtil.kt

@@ -1,3 +1,3 @@
-package com.github.simiacryptus.diff
+package com.simiacryptus.diff
 
 typealias PatchUtil = IterativePatchUtil

webui/src/main/kotlin/com/simiacryptus/skyenet/Discussable.kt

@@ -52,8 +52,9 @@ class Discussable<T : Any>(
             val userMessage = userMessage()
             history.add(userMessage to Role.user)
             val design = initialResponse(userMessage)
-            history.add(outputFn(design) to Role.assistant)
-            val tabContent = task.add(outputFn(design))!!
+            val rendered = outputFn(design)
+            history.add(rendered to Role.assistant)
+            val tabContent = task.add(rendered)!!
             val feedbackForm = feedbackForm(tabIndex, tabContent, design, history, task)
             tabContent?.append("\n" + feedbackForm.placeholder)
             task.complete()

webui/src/main/kotlin/com/simiacryptus/skyenet/apps/general/WebDevApp.kt

@@ -1,7 +1,7 @@
 package com.simiacryptus.skyenet.apps.general
 
 import com.github.simiacryptus.aicoder.actions.generic.commonRoot
-import com.github.simiacryptus.diff.addApplyFileDiffLinks
+import com.simiacryptus.diff.addApplyFileDiffLinks
 import com.simiacryptus.jopenai.API
 import com.simiacryptus.jopenai.ApiModel
 import com.simiacryptus.jopenai.ApiModel.Role

webui/src/test/kotlin/com/github/simiacryptus/diff/ApxPatchUtilTest.kt → webui/src/test/kotlin/com/simiacryptus/diff/ApxPatchUtilTest.kt

@@ -1,4 +1,4 @@
-package com.github.simiacryptus.diff
+package com.simiacryptus.diff
 
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test

webui/src/test/kotlin/com/github/simiacryptus/diff/DiffUtilTest.kt → webui/src/test/kotlin/com/simiacryptus/diff/DiffUtilTest.kt

@@ -1,4 +1,4 @@
-package com.github.simiacryptus.diff
+package com.simiacryptus.diff
 
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test

webui/src/test/kotlin/com/github/simiacryptus/diff/IterativePatchUtilTest.kt → webui/src/test/kotlin/com/simiacryptus/diff/IterativePatchUtilTest.kt

@@ -1,4 +1,4 @@
-package com.github.simiacryptus.diff
+package com.simiacryptus.diff
 
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test