1.2.20 (#109)

SimiaCryptus · Nov 15, 2023 · 01ce74a · 01ce74a
1 parent ce9ad82
commit 01ce74a
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 19 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -25,7 +25,7 @@ repositories {
 val kotlin_version = "1.9.20"
 val jetty_version = "11.0.18"
 val slf4j_version = "2.0.9"
-val skyenet_version = "1.0.28"
+val skyenet_version = "1.0.30"
 dependencies {
 
     implementation(group = "com.simiacryptus", name = "joe-penai", version = "1.0.28")

diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 pluginName=intellij-aicoder
 pluginRepositoryUrl=https://github.com/SimiaCryptus/intellij-aicoder
 # SemVer format -> https://semver.org
-pluginVersion=1.2.19
+pluginVersion=1.2.20
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 #pluginSinceBuild = 203
 pluginSinceBuild=231

diff --git a/src/main/groovy/com/github/simiacryptus/aicoder/actions/generic/AnalogueFileAction.groovy b/src/main/groovy/com/github/simiacryptus/aicoder/actions/generic/AnalogueFileAction.groovy
@@ -13,7 +13,7 @@ import org.apache.commons.io.IOUtils
 import javax.swing.*
 import java.nio.file.Path
 
-class AnalogueFileAction extends FileContextAction<AnalogueFileAction.Settings> {
+class AnalogueFileAction extends FileContextAction<Settings> {
 
     private static class ProjectFile {
         public String path = ""
@@ -91,7 +91,7 @@ class AnalogueFileAction extends FileContextAction<AnalogueFileAction.Settings>
                             Paths should be relative to the project root and should not exist.
                             Output the file path using the a line with the format "File: <path>".
                             Output the file code directly after the header line with no additional decoration.
-                            """.stripIndent()
+                            """.stripIndent(), null
                 ),
                 new ChatMessage(
                         ChatMessage.Role.user, """
@@ -102,7 +102,7 @@ class AnalogueFileAction extends FileContextAction<AnalogueFileAction.Settings>
                             ```
                             ${baseFile.code}
                             ```
-                            """.stripIndent()
+                            """.stripIndent(), null
                 )
         ]
         String response = api.chat(

diff --git a/src/main/groovy/com/github/simiacryptus/aicoder/actions/generic/AppendAction.groovy b/src/main/groovy/com/github/simiacryptus/aicoder/actions/generic/AppendAction.groovy
@@ -20,11 +20,11 @@ class AppendAction extends SelectionAction<String> {
         request.messages = [
                 new OpenAIClient.ChatMessage(
                         OpenAIClient.ChatMessage.Role.system,
-                        "Append text to the end of the user's prompt"
+                        "Append text to the end of the user's prompt", null
                 ),
                 new OpenAIClient.ChatMessage(
                         OpenAIClient.ChatMessage.Role.user,
-                        state.selectedText.toString()
+                        state.selectedText.toString(), null
                 )
         ]
         def chatResponse = api.chat(request, AppSettingsState.instance.defaultChatModel())

diff --git a/src/main/groovy/com/github/simiacryptus/aicoder/actions/generic/CreateFileAction.groovy b/src/main/groovy/com/github/simiacryptus/aicoder/actions/generic/CreateFileAction.groovy
@@ -10,7 +10,7 @@ import com.simiacryptus.openai.OpenAIClient.ChatRequest
 
 import javax.swing.*
 
-class CreateFileAction extends FileContextAction<CreateFileAction.Settings> {
+class CreateFileAction extends FileContextAction<Settings> {
 
     CreateFileAction() {
         super(false, true)
@@ -94,15 +94,15 @@ class CreateFileAction extends FileContextAction<CreateFileAction.Settings> {
                     Paths should be relative to the project root and should not exist.
                     Output the file path using the a line with the format "File: <path>".
                     Output the file code directly after the header line with no additional decoration.
-                """.stripIndent()
+                """.stripIndent(), null
             ),
             //language=TEXT
             new ChatMessage(
                 ChatMessage.Role.user, """
                     Create a new file based on the following directive: $directive
                     
                     The file location should be based on the selected path `${basePath}`
-                """.stripIndent()
+                """.stripIndent(), null
             )
         ]
         def response = api.chat(
@@ -119,7 +119,7 @@ class CreateFileAction extends FileContextAction<CreateFileAction.Settings> {
         def pathPattern = ~"""File(?:name)?: ['`"]?([^'`"]+)['`"]?"""
         if (header =~ pathPattern) {
             def match = (header =~ pathPattern)[0]
-            outputPath = match[1].trim()
+            outputPath = match[1].toString()
         }
         return new ProjectFile(
             path: outputPath,

diff --git a/src/main/groovy/com/github/simiacryptus/aicoder/actions/generic/GenerateStoryAction.groovy b/src/main/groovy/com/github/simiacryptus/aicoder/actions/generic/GenerateStoryAction.groovy
@@ -11,7 +11,7 @@ import org.apache.commons.io.FileUtils
 
 import javax.swing.*
 
-class GenerateStoryAction extends FileContextAction<GenerateStoryAction.Settings> {
+class GenerateStoryAction extends FileContextAction<Settings> {
 
     GenerateStoryAction() {
         super(false, true)
@@ -239,7 +239,7 @@ class GenerateStoryAction extends FileContextAction<GenerateStoryAction.Settings
             outputFiles << storyFile
         }
 
-        return outputFiles.toArray()
+        return outputFiles.toArray(new File[0])
     }
 
 }
diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/dev/CodeChatServer.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/dev/CodeChatServer.kt
@@ -6,10 +6,6 @@ import com.simiacryptus.openai.OpenAIClient
 import com.simiacryptus.skyenet.chat.ChatServer
 import com.simiacryptus.skyenet.chat.ChatSession
 import com.simiacryptus.skyenet.util.ClasspathResource
-import com.simiacryptus.util.JsonUtil
-import jakarta.servlet.http.HttpServlet
-import jakarta.servlet.http.HttpServletRequest
-import jakarta.servlet.http.HttpServletResponse
 import org.eclipse.jetty.servlet.ServletHolder
 import org.eclipse.jetty.util.resource.Resource
 import org.eclipse.jetty.webapp.WebAppContext
@@ -26,7 +22,7 @@ class CodeChatServer(
     override val applicationName: String
         get() = "Code Chat"
 
-    override fun newSession(sessionId: String) = object : ChatSession(
+    override fun newSession(userId: String?, sessionId: String) = object : ChatSession(
         sessionId = sessionId,
         parent = this@CodeChatServer,
         model = AppSettingsState.instance.defaultChatModel(),

diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/config/ActionSettingsRegistry.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/config/ActionSettingsRegistry.kt
@@ -11,7 +11,7 @@ import java.util.stream.Collectors
 class ActionSettingsRegistry {
 
     val actionSettings: MutableMap<String, ActionSettings> = HashMap()
-    private val version = 2.0001
+    private val version = 2.0002
 
     fun edit(superChildren: Array<out AnAction>): Array<AnAction> {
         val children = superChildren.toList().toMutableList()