diff --git a/build.gradle.kts b/build.gradle.kts index 5036926b..d226145f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,12 +23,12 @@ repositories { } val kotlin_version = "1.9.20" -val jetty_version = "11.0.15" +val jetty_version = "11.0.18" val slf4j_version = "2.0.9" -val skyenet_version = "1.0.26" +val skyenet_version = "1.0.27" dependencies { - implementation(group = "com.simiacryptus", name = "joe-penai", version = "1.0.27") + implementation(group = "com.simiacryptus", name = "joe-penai", version = "1.0.28") implementation(group = "com.simiacryptus.skyenet", name = "core", version = skyenet_version) implementation(group = "com.simiacryptus.skyenet", name = "webui", version = skyenet_version) diff --git a/src/test/kotlin/com/github/simiacryptus/aicoder/actions/ActionTestBase.kt b/src/test/kotlin/com/github/simiacryptus/aicoder/actions/ActionTestBase.kt index aa29e7e7..72d7997c 100644 --- a/src/test/kotlin/com/github/simiacryptus/aicoder/actions/ActionTestBase.kt +++ b/src/test/kotlin/com/github/simiacryptus/aicoder/actions/ActionTestBase.kt @@ -15,7 +15,7 @@ open class ActionTestBase { fun testScript_SelectionAction(selectionAction: SelectionAction, scriptPath: String) { AppSettingsState.instance.apiKey = OpenAIClient.keyTxt AppSettingsState.instance.temperature = 0.0 - AppSettingsState.instance.useGPT4 = false + AppSettingsState.instance.modelName = OpenAIClient.Models.GPT35Turbo.name val input = selectionAction.javaClass.getResourceAsStream(scriptPath)?.readAllBytes()?.toString(Charsets.UTF_8) ?: "" @@ -59,12 +59,11 @@ open class ActionTestBase { inline fun testScript_FileContextAction( selectionAction: FileContextAction, - scriptPath: String, - useGPT4: Boolean + scriptPath: String ) { AppSettingsState.instance.apiKey = OpenAIClient.keyTxt AppSettingsState.instance.temperature = 0.0 - AppSettingsState.instance.useGPT4 = useGPT4 + AppSettingsState.instance.modelName = OpenAIClient.Models.GPT35Turbo.name val input = selectionAction.javaClass.getResourceAsStream(scriptPath)?.readAllBytes()?.toString(Charsets.UTF_8) ?: "" diff --git a/src/test/kotlin/com/github/simiacryptus/aicoder/actions/code/GenerateProjectActionTest.kt b/src/test/kotlin/com/github/simiacryptus/aicoder/actions/code/GenerateProjectActionTest.kt index 19236dcf..201543e7 100644 --- a/src/test/kotlin/com/github/simiacryptus/aicoder/actions/code/GenerateProjectActionTest.kt +++ b/src/test/kotlin/com/github/simiacryptus/aicoder/actions/code/GenerateProjectActionTest.kt @@ -7,7 +7,7 @@ class GenerateProjectActionTest : ActionTestBase() { @Test fun testProcessing() { - testScript_FileContextAction(GenerateProjectAction(), "/GenerateProjectActionTest.md", false) + testScript_FileContextAction(GenerateProjectAction(), "/GenerateProjectActionTest.md") } diff --git a/src/test/kotlin/com/github/simiacryptus/aicoder/actions/generic/AnalogueFileActionTest.kt b/src/test/kotlin/com/github/simiacryptus/aicoder/actions/generic/AnalogueFileActionTest.kt index b6378baa..a73903ee 100644 --- a/src/test/kotlin/com/github/simiacryptus/aicoder/actions/generic/AnalogueFileActionTest.kt +++ b/src/test/kotlin/com/github/simiacryptus/aicoder/actions/generic/AnalogueFileActionTest.kt @@ -6,7 +6,7 @@ import org.junit.Test class AnalogueFileActionTest : ActionTestBase() { @Test fun testProcessing() { - testScript_FileContextAction(AnalogueFileAction(), "/AnalogueFileActionTest.md", false) + testScript_FileContextAction(AnalogueFileAction(), "/AnalogueFileActionTest.md") } } diff --git a/src/test/kotlin/com/github/simiacryptus/aicoder/actions/generic/CreateFileActionTest.kt b/src/test/kotlin/com/github/simiacryptus/aicoder/actions/generic/CreateFileActionTest.kt index dcf74bea..65a1ad69 100644 --- a/src/test/kotlin/com/github/simiacryptus/aicoder/actions/generic/CreateFileActionTest.kt +++ b/src/test/kotlin/com/github/simiacryptus/aicoder/actions/generic/CreateFileActionTest.kt @@ -6,6 +6,6 @@ import org.junit.Test class CreateFileActionTest : ActionTestBase() { @Test fun testProcessing() { - testScript_FileContextAction(CreateFileAction(), "/CreateFileActionTest.md", false) + testScript_FileContextAction(CreateFileAction(), "/CreateFileActionTest.md") } } \ No newline at end of file diff --git a/src/test/kotlin/com/github/simiacryptus/aicoder/actions/generic/GenerateStoryActionTest.kt b/src/test/kotlin/com/github/simiacryptus/aicoder/actions/generic/GenerateStoryActionTest.kt index eeff19dd..81723c6a 100644 --- a/src/test/kotlin/com/github/simiacryptus/aicoder/actions/generic/GenerateStoryActionTest.kt +++ b/src/test/kotlin/com/github/simiacryptus/aicoder/actions/generic/GenerateStoryActionTest.kt @@ -1,14 +1,13 @@ package com.github.simiacryptus.aicoder.actions.generic import com.github.simiacryptus.aicoder.actions.ActionTestBase -import com.github.simiacryptus.aicoder.actions.generic.GenerateStoryAction import org.junit.Test class GenerateStoryActionTest : ActionTestBase() { @Test fun testProcessing() { - testScript_FileContextAction(GenerateStoryAction(), "/GenerateStoryActionTest.md", false) + testScript_FileContextAction(GenerateStoryAction(), "/GenerateStoryActionTest.md") }