1.0.44 (#49)

SimiaCryptus · Dec 22, 2023 · 9ef93c5 · 9ef93c5
1 parent 7e0869c
commit 9ef93c5
Show file tree

Hide file tree

Showing 12 changed files with 313 additions and 227 deletions.
diff --git a/README.md b/README.md
@@ -76,18 +76,18 @@ Maven:
 <dependency>
     <groupId>com.simiacryptus</groupId>
     <artifactId>skyenet-webui</artifactId>
-    <version>1.0.43</version>
+    <version>1.0.44</version>
 </dependency>
 ```
 
 Gradle:
 
 ```groovy
-implementation group: 'com.simiacryptus', name: 'skyenet', version: '1.0.43'
+implementation group: 'com.simiacryptus', name: 'skyenet', version: '1.0.44'
 ```
 
 ```kotlin
-implementation("com.simiacryptus:skyenet:1.0.43")
+implementation("com.simiacryptus:skyenet:1.0.44")
 ```
 
 ### 🌟 To Use

diff --git a/core/src/main/java/com/simiacryptus/skyenet/core/OutputInterceptor.java b/core/src/main/java/com/simiacryptus/skyenet/core/OutputInterceptor.java
@@ -7,7 +7,7 @@
 import java.util.WeakHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public class OutputInterceptor {
+public final class OutputInterceptor {
 
     private OutputInterceptor() {
         // Prevent instantiation of the utility class

diff --git a/core/src/main/kotlin/com/simiacryptus/skyenet/core/actors/CodingActor.kt b/core/src/main/kotlin/com/simiacryptus/skyenet/core/actors/CodingActor.kt
@@ -36,7 +36,7 @@ open class CodingActor(
     get() = interpreterClass.java.getConstructor(Map::class.java).newInstance(symbols + runtimeSymbols)
 
   data class CodeRequest(
-    val messages: List<String>,
+    val messages: List<Pair<String, Role>>,
     val codePrefix: String = "",
     val autoEvaluate: Boolean = false,
     val fixIterations: Int = 4,
@@ -99,8 +99,8 @@ open class CodingActor(
       ),
     ) + questions.messages.map {
       ChatMessage(
-        role = Role.user,
-        content = it.toContentList()
+        role = it.second,
+        content = it.first.toContentList()
       )
     }
     if (questions.codePrefix.isNotBlank()) {
@@ -170,8 +170,8 @@ open class CodingActor(
     }
     log.info("Result: $result")
     //language=HTML
-    val executionResult = ExecutionResult(result.toString(), OutputInterceptor.getGlobalOutput())
-    OutputInterceptor.clearGlobalOutput()
+    val executionResult = ExecutionResult(result.toString(), OutputInterceptor.getThreadOutput())
+    OutputInterceptor.clearThreadOutput()
     return executionResult
   }
 
@@ -280,22 +280,22 @@ open class CodingActor(
           ChatMessage(
             Role.assistant,
             """
-                        |```${language.lowercase()}
-                        |${previousCode}
-                        |```
-                        |""".trimMargin().trim().toContentList()
+            |```${language.lowercase()}
+            |${previousCode}
+            |```
+            |""".trimMargin().trim().toContentList()
           ),
           ChatMessage(
             Role.system,
             """
-                        |The previous code failed with the following error:
-                        |
-                        |```
-                        |${error.message?.trim() ?: ""}
-                        |```
-                        |
-                        |Correct the code and try again.
-                        |""".trimMargin().trim().toContentList()
+            |The previous code failed with the following error:
+            |
+            |```
+            |${error.message?.trim() ?: ""}
+            |```
+            |
+            |Correct the code and try again.
+            |""".trimMargin().trim().toContentList()
           )
         )
       )

diff --git a/core/src/main/kotlin/com/simiacryptus/skyenet/core/platform/ApplicationServices.kt b/core/src/main/kotlin/com/simiacryptus/skyenet/core/platform/ApplicationServices.kt
@@ -171,6 +171,7 @@ interface UsageInterface {
     fun getUserUsageSummary(user: User): Map<OpenAIModel, ApiModel.Usage>
 
     fun getSessionUsageSummary(session: Session): Map<OpenAIModel, ApiModel.Usage>
+    fun clear()
 
     data class UsageKey(
         val session: Session,