From cb5b0505b16720465cb58ba8444276fe0e06fa30 Mon Sep 17 00:00:00 2001 From: Andrew Charneski Date: Mon, 23 Sep 2024 08:38:10 -0400 Subject: [PATCH] 1.6.4 (#187) * 1.6.4 * refactor * wip * Update settings.gradle.kts --- CHANGELOG.md | 4 ++-- build.gradle.kts | 4 ++-- gradle.properties | 2 +- package.json | 4 +--- .../aicoder/actions/code/DescribeAction.kt | 2 +- .../aicoder/actions/dev/LineFilterChatAction.kt | 2 +- .../actions/generic/CreateFileFromDescriptionAction.kt | 2 +- .../aicoder/actions/generic/CreateImageAction.kt | 8 ++++---- .../aicoder/actions/generic/DiffChatAction.kt | 2 +- .../actions/generic/GenerateDocumentationAction.kt | 4 +--- .../actions/generic/GenerateRelatedFileAction.kt | 7 ++++--- .../aicoder/actions/generic/MassPatchAction.kt | 7 +++---- .../aicoder/actions/generic/MultiCodeChatAction.kt | 10 +++++----- .../aicoder/actions/generic/MultiDiffChatAction.kt | 10 +++++----- .../aicoder/actions/generic/MultiStepPatchAction.kt | 9 +++++---- .../aicoder/actions/generic/PlanAheadAction.kt | 1 + .../aicoder/actions/generic/PlanChatAction.kt | 1 + .../aicoder/actions/generic/PrePlanAction.kt | 3 ++- .../ReactTypescriptWebDevelopmentAssistantAction.kt | 9 ++++----- .../aicoder/actions/generic/SimpleCommandAction.kt | 4 ++-- .../actions/generic/WebDevelopmentAssistantAction.kt | 9 ++++----- .../aicoder/actions/git/ReplicateCommitAction.kt | 4 ++-- .../aicoder/actions/legacy/AppendTextWithChatAction.kt | 2 +- .../aicoder/actions/legacy/ImplementStubAction.kt | 2 +- .../actions/legacy/ReplaceWithSuggestionsAction.kt | 2 +- .../aicoder/actions/markdown/MarkdownListAction.kt | 2 +- .../aicoder/actions/problems/AnalyzeProblemAction.kt | 4 ++-- .../aicoder/actions/test/TestResultAutofixAction.kt | 4 ++-- .../simiacryptus/aicoder/config/AppSettingsState.kt | 2 +- .../simiacryptus/aicoder/ui/TokenCountWidgetFactory.kt | 2 +- .../github/simiacryptus/aicoder/util/BlockComment.kt | 2 +- .../github/simiacryptus/aicoder/util/IdeaChatClient.kt | 4 ++-- .../simiacryptus/aicoder/util/IdeaOpenAIClient.kt | 2 +- .../github/simiacryptus/aicoder/util/IndentedText.kt | 2 +- .../github/simiacryptus/aicoder/util/LineComment.kt | 6 +++--- .../simiacryptus/aicoder/util/PluginStartupActivity.kt | 2 +- .../github/simiacryptus/aicoder/util/psi/PsiUtil.kt | 2 +- .../simiacryptus/aicoder/actions/ActionTestBase.kt | 3 +-- 38 files changed, 74 insertions(+), 77 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46279033..b1f6bf0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -177,7 +177,7 @@ - Token count handling -## [1.1.4] +## [1.1.5] ### Added @@ -499,7 +499,7 @@ [1.2.0]: https://github.com/SimiaCryptus/intellij-aicoder/compare/v1.1.4...v1.2.0 -[1.1.4]: https://github.com/SimiaCryptus/intellij-aicoder/compare/v1.1.3...v1.1.4 +[1.1.5]: https://github.com/SimiaCryptus/intellij-aicoder/compare/v1.1.3...v1.1.4 [1.1.3]: https://github.com/SimiaCryptus/intellij-aicoder/compare/v1.1.2...v1.1.3 diff --git a/build.gradle.kts b/build.gradle.kts index 427a4b2f..e045011b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -26,7 +26,7 @@ version = properties("pluginVersion") val kotlin_version = "2.0.20" // This line can be removed if not used elsewhere val jetty_version = "11.0.24" val slf4j_version = "2.0.16" -val skyenet_version = "1.2.3" +val skyenet_version = "1.2.4" val remoterobot_version = "0.11.21" val jackson_version = "2.17.2" @@ -41,7 +41,7 @@ dependencies { exclude(group = "org.jetbrains.kotlin", module = "") } - implementation(group = "com.simiacryptus", name = "jo-penai", version = "1.1.4") + implementation(group = "com.simiacryptus", name = "jo-penai", version = "1.1.5") { exclude(group = "org.jetbrains.kotlin", module = "") } diff --git a/gradle.properties b/gradle.properties index d685e129..ae154481 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ pluginName=intellij-aicoder pluginRepositoryUrl=https://github.com/SimiaCryptus/intellij-aicoder -pluginVersion=1.6.3 +pluginVersion=1.6.4 jvmArgs=-Xmx8g org.gradle.jvmargs=-Xmx8g diff --git a/package.json b/package.json index 6d764aa4..4ae011ad 100644 --- a/package.json +++ b/package.json @@ -11,9 +11,7 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0", "npm": ">=9.0.0" } - , - , "dependencies": { - {} + } } \ No newline at end of file diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/code/DescribeAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/code/DescribeAction.kt index 0e6c7151..6582cd42 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/code/DescribeAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/code/DescribeAction.kt @@ -7,7 +7,7 @@ import com.github.simiacryptus.aicoder.util.IndentedText import com.intellij.openapi.actionSystem.ActionUpdateThread import com.intellij.openapi.project.Project import com.simiacryptus.jopenai.proxy.ChatProxy -import com.simiacryptus.jopenai.util.StringUtil +import com.simiacryptus.util.StringUtil class DescribeAction : SelectionAction() { override fun getActionUpdateThread() = ActionUpdateThread.BGT diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/dev/LineFilterChatAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/dev/LineFilterChatAction.kt index d65ed879..20a89815 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/dev/LineFilterChatAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/dev/LineFilterChatAction.kt @@ -17,7 +17,7 @@ import com.simiacryptus.skyenet.core.platform.User import com.simiacryptus.skyenet.webui.application.ApplicationServer import com.simiacryptus.skyenet.webui.chat.ChatSocketManager import com.simiacryptus.skyenet.webui.session.SessionTask -import com.simiacryptus.skyenet.webui.util.MarkdownUtil.renderMarkdown +import com.simiacryptus.skyenet.util.MarkdownUtil.renderMarkdown import org.slf4j.LoggerFactory import java.awt.Desktop diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/CreateFileFromDescriptionAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/CreateFileFromDescriptionAction.kt index 5c281dea..5fa5901c 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/CreateFileFromDescriptionAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/CreateFileFromDescriptionAction.kt @@ -4,7 +4,7 @@ import com.github.simiacryptus.aicoder.actions.FileContextAction import com.github.simiacryptus.aicoder.config.AppSettingsState import com.github.simiacryptus.aicoder.config.AppSettingsState.Companion.chatModel import com.intellij.openapi.actionSystem.ActionUpdateThread -import com.simiacryptus.jopenai.ApiModel.* +import com.simiacryptus.jopenai.models.ApiModel.* import com.simiacryptus.jopenai.util.ClientUtil.toContentList import java.io.File diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/CreateImageAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/CreateImageAction.kt index 2ef5ed21..cdd5a385 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/CreateImageAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/CreateImageAction.kt @@ -3,7 +3,6 @@ import ai.grazie.utils.mpp.UUID import com.github.simiacryptus.aicoder.AppServer import com.github.simiacryptus.aicoder.actions.BaseAction -import com.github.simiacryptus.aicoder.actions.BaseAction.Companion import com.github.simiacryptus.aicoder.actions.generic.MultiStepPatchAction.AutoDevApp.Settings import com.github.simiacryptus.aicoder.config.AppSettingsState import com.github.simiacryptus.aicoder.config.AppSettingsState.Companion.imageModel @@ -13,8 +12,8 @@ import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.actionSystem.PlatformDataKeys import com.intellij.openapi.vfs.VirtualFile import com.simiacryptus.jopenai.API -import com.simiacryptus.jopenai.ApiModel -import com.simiacryptus.jopenai.ApiModel.Role +import com.simiacryptus.jopenai.models.ApiModel +import com.simiacryptus.jopenai.models.ApiModel.Role import com.simiacryptus.jopenai.ChatClient import com.simiacryptus.jopenai.models.ChatModels import com.simiacryptus.jopenai.util.ClientUtil.toContentList @@ -22,9 +21,10 @@ import com.simiacryptus.skyenet.Discussable import com.simiacryptus.skyenet.core.actors.* import com.simiacryptus.skyenet.core.platform.* import com.simiacryptus.skyenet.core.platform.file.DataStorage +import com.simiacryptus.skyenet.core.util.getModuleRootForFile import com.simiacryptus.skyenet.webui.application.ApplicationInterface import com.simiacryptus.skyenet.webui.application.ApplicationServer -import com.simiacryptus.skyenet.webui.util.MarkdownUtil.renderMarkdown +import com.simiacryptus.skyenet.util.MarkdownUtil.renderMarkdown import org.slf4j.LoggerFactory import java.awt.Desktop import java.io.ByteArrayOutputStream diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/DiffChatAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/DiffChatAction.kt index 03142927..9aabb99f 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/DiffChatAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/DiffChatAction.kt @@ -19,7 +19,7 @@ import com.simiacryptus.skyenet.core.platform.StorageInterface import com.simiacryptus.skyenet.webui.application.ApplicationInterface import com.simiacryptus.skyenet.webui.application.ApplicationServer import com.simiacryptus.skyenet.webui.session.SessionTask -import com.simiacryptus.skyenet.webui.util.MarkdownUtil.renderMarkdown +import com.simiacryptus.skyenet.util.MarkdownUtil.renderMarkdown import org.intellij.lang.annotations.Language import org.slf4j.LoggerFactory import java.awt.Desktop diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/GenerateDocumentationAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/GenerateDocumentationAction.kt index c58f6078..6a7cb90f 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/GenerateDocumentationAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/GenerateDocumentationAction.kt @@ -2,8 +2,6 @@ package com.github.simiacryptus.aicoder.actions.generic import com.github.simiacryptus.aicoder.actions.FileContextAction import com.github.simiacryptus.aicoder.actions.test.TestResultAutofixAction -import com.github.simiacryptus.aicoder.actions.test.TestResultAutofixAction.Companion -import com.github.simiacryptus.aicoder.actions.test.TestResultAutofixAction.Companion.findGitRoot import com.github.simiacryptus.aicoder.actions.test.TestResultAutofixAction.Companion.getProjectStructure import com.github.simiacryptus.aicoder.config.AppSettingsState import com.github.simiacryptus.aicoder.config.AppSettingsState.Companion.chatModel @@ -20,7 +18,7 @@ import com.intellij.ui.CheckBoxList import com.intellij.ui.components.JBScrollPane import com.intellij.ui.components.JBTextArea import com.intellij.ui.components.JBTextField -import com.simiacryptus.jopenai.ApiModel +import com.simiacryptus.jopenai.models.ApiModel import com.simiacryptus.jopenai.util.ClientUtil.toContentList import org.apache.commons.io.IOUtils import java.awt.BorderLayout diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/GenerateRelatedFileAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/GenerateRelatedFileAction.kt index 57fee303..92c88f58 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/GenerateRelatedFileAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/GenerateRelatedFileAction.kt @@ -11,10 +11,11 @@ import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.fileEditor.FileEditorManager import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.LocalFileSystem -import com.simiacryptus.jopenai.ApiModel -import com.simiacryptus.jopenai.ApiModel.ChatMessage -import com.simiacryptus.jopenai.ApiModel.Role +import com.simiacryptus.jopenai.models.ApiModel +import com.simiacryptus.jopenai.models.ApiModel.ChatMessage +import com.simiacryptus.jopenai.models.ApiModel.Role import com.simiacryptus.jopenai.util.ClientUtil.toContentList +import com.simiacryptus.skyenet.core.util.getModuleRootForFile import org.apache.commons.io.FileUtils import org.apache.commons.io.IOUtils import java.io.File diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/MassPatchAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/MassPatchAction.kt index f39daea9..d0f72521 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/MassPatchAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/MassPatchAction.kt @@ -16,10 +16,9 @@ import com.intellij.ui.components.JBScrollPane import com.intellij.ui.components.JBTextArea import com.simiacryptus.diff.FileValidationUtils.Companion.isLLMIncludable import com.simiacryptus.diff.addApplyFileDiffLinks -import com.simiacryptus.jopenai.ApiModel -import com.simiacryptus.jopenai.ApiModel.Role +import com.simiacryptus.jopenai.models.ApiModel +import com.simiacryptus.jopenai.models.ApiModel.Role import com.simiacryptus.jopenai.ChatClient -import com.simiacryptus.jopenai.OpenAIClient import com.simiacryptus.jopenai.util.ClientUtil.toContentList import com.simiacryptus.skyenet.Discussable import com.simiacryptus.skyenet.TabbedDisplay @@ -30,7 +29,7 @@ import com.simiacryptus.skyenet.core.platform.User import com.simiacryptus.skyenet.webui.application.ApplicationServer import com.simiacryptus.skyenet.webui.application.ApplicationSocketManager import com.simiacryptus.skyenet.webui.session.SocketManager -import com.simiacryptus.skyenet.webui.util.MarkdownUtil.renderMarkdown +import com.simiacryptus.skyenet.util.MarkdownUtil.renderMarkdown import java.awt.BorderLayout import java.awt.Desktop import java.awt.Dimension diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/MultiCodeChatAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/MultiCodeChatAction.kt index f1f48826..288f4746 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/MultiCodeChatAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/MultiCodeChatAction.kt @@ -11,20 +11,20 @@ import com.intellij.openapi.actionSystem.PlatformDataKeys import com.intellij.openapi.vfs.VirtualFile import com.simiacryptus.diff.addApplyFileDiffLinks import com.simiacryptus.jopenai.API -import com.simiacryptus.jopenai.ApiModel -import com.simiacryptus.jopenai.ApiModel.Role +import com.simiacryptus.jopenai.models.ApiModel +import com.simiacryptus.jopenai.models.ApiModel.Role import com.simiacryptus.jopenai.ChatClient -import com.simiacryptus.jopenai.GPT4Tokenizer +import com.simiacryptus.jopenai.util.GPT4Tokenizer import com.simiacryptus.jopenai.util.ClientUtil.toContentList import com.simiacryptus.skyenet.Discussable import com.simiacryptus.skyenet.core.actors.SimpleActor -import com.simiacryptus.skyenet.core.platform.ClientManager import com.simiacryptus.skyenet.core.platform.Session import com.simiacryptus.skyenet.core.platform.StorageInterface import com.simiacryptus.skyenet.core.platform.User +import com.simiacryptus.skyenet.core.util.getModuleRootForFile import com.simiacryptus.skyenet.webui.application.ApplicationInterface import com.simiacryptus.skyenet.webui.application.ApplicationServer -import com.simiacryptus.skyenet.webui.util.MarkdownUtil.renderMarkdown +import com.simiacryptus.skyenet.util.MarkdownUtil.renderMarkdown import org.slf4j.LoggerFactory import java.awt.Desktop import java.io.File diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/MultiDiffChatAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/MultiDiffChatAction.kt index 115e17a7..8108b68e 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/MultiDiffChatAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/MultiDiffChatAction.kt @@ -11,20 +11,20 @@ import com.intellij.openapi.actionSystem.PlatformDataKeys import com.intellij.openapi.vfs.VirtualFile import com.simiacryptus.diff.addApplyFileDiffLinks import com.simiacryptus.jopenai.API -import com.simiacryptus.jopenai.ApiModel -import com.simiacryptus.jopenai.ApiModel.Role +import com.simiacryptus.jopenai.models.ApiModel +import com.simiacryptus.jopenai.models.ApiModel.Role import com.simiacryptus.jopenai.ChatClient -import com.simiacryptus.jopenai.GPT4Tokenizer +import com.simiacryptus.jopenai.util.GPT4Tokenizer import com.simiacryptus.jopenai.util.ClientUtil.toContentList import com.simiacryptus.skyenet.Discussable import com.simiacryptus.skyenet.core.actors.SimpleActor -import com.simiacryptus.skyenet.core.platform.ClientManager import com.simiacryptus.skyenet.core.platform.Session import com.simiacryptus.skyenet.core.platform.StorageInterface import com.simiacryptus.skyenet.core.platform.User +import com.simiacryptus.skyenet.core.util.getModuleRootForFile import com.simiacryptus.skyenet.webui.application.ApplicationInterface import com.simiacryptus.skyenet.webui.application.ApplicationServer -import com.simiacryptus.skyenet.webui.util.MarkdownUtil.renderMarkdown +import com.simiacryptus.skyenet.util.MarkdownUtil.renderMarkdown import org.slf4j.LoggerFactory import java.awt.Desktop import java.io.File diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/MultiStepPatchAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/MultiStepPatchAction.kt index 38c0c6ab..bac80bf6 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/MultiStepPatchAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/MultiStepPatchAction.kt @@ -10,14 +10,14 @@ import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.actionSystem.PlatformDataKeys import com.simiacryptus.diff.addApplyFileDiffLinks import com.simiacryptus.jopenai.API -import com.simiacryptus.jopenai.ApiModel -import com.simiacryptus.jopenai.ApiModel.Role +import com.simiacryptus.jopenai.models.ApiModel +import com.simiacryptus.jopenai.models.ApiModel.Role import com.simiacryptus.jopenai.ChatClient import com.simiacryptus.jopenai.describe.Description import com.simiacryptus.jopenai.models.ChatModels import com.simiacryptus.jopenai.proxy.ValidatedObject import com.simiacryptus.jopenai.util.ClientUtil.toContentList -import com.simiacryptus.jopenai.util.JsonUtil.toJson +import com.simiacryptus.util.JsonUtil.toJson import com.simiacryptus.skyenet.AgentPatterns import com.simiacryptus.skyenet.Discussable import com.simiacryptus.skyenet.Retryable @@ -25,9 +25,10 @@ import com.simiacryptus.skyenet.TabbedDisplay import com.simiacryptus.skyenet.core.actors.* import com.simiacryptus.skyenet.core.platform.* import com.simiacryptus.skyenet.core.platform.file.DataStorage +import com.simiacryptus.skyenet.core.util.commonRoot import com.simiacryptus.skyenet.webui.application.ApplicationInterface import com.simiacryptus.skyenet.webui.application.ApplicationServer -import com.simiacryptus.skyenet.webui.util.MarkdownUtil.renderMarkdown +import com.simiacryptus.skyenet.util.MarkdownUtil.renderMarkdown import org.slf4j.LoggerFactory import java.awt.Desktop import java.io.File diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/PlanAheadAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/PlanAheadAction.kt index 3081837f..c15ceaf5 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/PlanAheadAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/PlanAheadAction.kt @@ -11,6 +11,7 @@ import com.simiacryptus.skyenet.apps.plan.PlanUtil.isWindows import com.simiacryptus.skyenet.apps.plan.PlanSettings import com.simiacryptus.skyenet.core.platform.StorageInterface import com.simiacryptus.skyenet.core.platform.file.DataStorage +import com.simiacryptus.skyenet.core.util.getModuleRootForFile import org.slf4j.LoggerFactory import java.awt.Desktop import kotlin.collections.set diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/PlanChatAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/PlanChatAction.kt index e2ee6a2c..a97c237f 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/PlanChatAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/PlanChatAction.kt @@ -11,6 +11,7 @@ import com.simiacryptus.skyenet.apps.plan.PlanUtil.isWindows import com.simiacryptus.skyenet.apps.plan.PlanSettings import com.simiacryptus.skyenet.core.platform.StorageInterface import com.simiacryptus.skyenet.core.platform.file.DataStorage +import com.simiacryptus.skyenet.core.util.getModuleRootForFile import org.slf4j.LoggerFactory import java.awt.Desktop import kotlin.collections.set diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/PrePlanAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/PrePlanAction.kt index a9338a53..50366e25 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/PrePlanAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/PrePlanAction.kt @@ -9,13 +9,14 @@ import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.ui.DialogWrapper import com.intellij.openapi.ui.Messages import com.intellij.ui.components.JBTextField -import com.simiacryptus.jopenai.util.JsonUtil +import com.simiacryptus.util.JsonUtil import com.simiacryptus.skyenet.apps.general.PlanAheadApp import com.simiacryptus.skyenet.apps.plan.PlanSettings import com.simiacryptus.skyenet.apps.plan.PlanUtil import com.simiacryptus.skyenet.apps.plan.PlanUtil.isWindows import com.simiacryptus.skyenet.core.platform.StorageInterface import com.simiacryptus.skyenet.core.platform.file.DataStorage +import com.simiacryptus.skyenet.core.util.getModuleRootForFile import org.slf4j.LoggerFactory import java.awt.Desktop import java.awt.GridBagConstraints diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/ReactTypescriptWebDevelopmentAssistantAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/ReactTypescriptWebDevelopmentAssistantAction.kt index 43217101..c1fad84a 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/ReactTypescriptWebDevelopmentAssistantAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/ReactTypescriptWebDevelopmentAssistantAction.kt @@ -9,8 +9,8 @@ import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.vfs.VirtualFile import com.simiacryptus.diff.addApplyFileDiffLinks import com.simiacryptus.jopenai.API -import com.simiacryptus.jopenai.ApiModel -import com.simiacryptus.jopenai.ApiModel.Role +import com.simiacryptus.jopenai.models.ApiModel +import com.simiacryptus.jopenai.models.ApiModel.Role import com.simiacryptus.jopenai.ChatClient import com.simiacryptus.jopenai.describe.Description import com.simiacryptus.jopenai.models.ChatModels @@ -18,12 +18,11 @@ import com.simiacryptus.jopenai.models.ImageModels import com.simiacryptus.jopenai.models.OpenAIModels import com.simiacryptus.jopenai.proxy.ValidatedObject import com.simiacryptus.jopenai.util.ClientUtil.toContentList -import com.simiacryptus.jopenai.util.JsonUtil +import com.simiacryptus.util.JsonUtil import com.simiacryptus.skyenet.AgentPatterns import com.simiacryptus.skyenet.Discussable import com.simiacryptus.skyenet.TabbedDisplay import com.simiacryptus.skyenet.core.actors.* -import com.simiacryptus.skyenet.core.platform.ClientManager import com.simiacryptus.skyenet.core.platform.Session import com.simiacryptus.skyenet.core.platform.StorageInterface import com.simiacryptus.skyenet.core.platform.User @@ -31,7 +30,7 @@ import com.simiacryptus.skyenet.core.platform.file.DataStorage import com.simiacryptus.skyenet.webui.application.ApplicationInterface import com.simiacryptus.skyenet.webui.application.ApplicationServer import com.simiacryptus.skyenet.webui.session.SessionTask -import com.simiacryptus.skyenet.webui.util.MarkdownUtil.renderMarkdown +import com.simiacryptus.skyenet.util.MarkdownUtil.renderMarkdown import org.slf4j.LoggerFactory import java.awt.Desktop import java.io.ByteArrayOutputStream diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/SimpleCommandAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/SimpleCommandAction.kt index ac2b181d..dd9954be 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/SimpleCommandAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/SimpleCommandAction.kt @@ -16,7 +16,7 @@ import com.simiacryptus.diff.FileValidationUtils.Companion.isLLMIncludable import com.simiacryptus.diff.addApplyFileDiffLinks import com.simiacryptus.jopenai.API import com.simiacryptus.jopenai.describe.Description -import com.simiacryptus.jopenai.util.JsonUtil +import com.simiacryptus.util.JsonUtil import com.simiacryptus.skyenet.AgentPatterns import com.simiacryptus.skyenet.Retryable import com.simiacryptus.skyenet.core.actors.ParsedActor @@ -27,7 +27,7 @@ import com.simiacryptus.skyenet.core.platform.User import com.simiacryptus.skyenet.webui.application.ApplicationInterface import com.simiacryptus.skyenet.webui.application.ApplicationServer import com.simiacryptus.skyenet.webui.session.SessionTask -import com.simiacryptus.skyenet.webui.util.MarkdownUtil.renderMarkdown +import com.simiacryptus.skyenet.util.MarkdownUtil.renderMarkdown import org.slf4j.LoggerFactory import java.awt.Desktop import java.io.File diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/WebDevelopmentAssistantAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/WebDevelopmentAssistantAction.kt index 98a649a2..74f87496 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/WebDevelopmentAssistantAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/WebDevelopmentAssistantAction.kt @@ -9,8 +9,8 @@ import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.vfs.VirtualFile import com.simiacryptus.diff.addApplyFileDiffLinks import com.simiacryptus.jopenai.API -import com.simiacryptus.jopenai.ApiModel -import com.simiacryptus.jopenai.ApiModel.Role +import com.simiacryptus.jopenai.models.ApiModel +import com.simiacryptus.jopenai.models.ApiModel.Role import com.simiacryptus.jopenai.ChatClient import com.simiacryptus.jopenai.describe.Description import com.simiacryptus.jopenai.models.ChatModels @@ -18,12 +18,11 @@ import com.simiacryptus.jopenai.models.ImageModels import com.simiacryptus.jopenai.models.OpenAIModels import com.simiacryptus.jopenai.proxy.ValidatedObject import com.simiacryptus.jopenai.util.ClientUtil.toContentList -import com.simiacryptus.jopenai.util.JsonUtil +import com.simiacryptus.util.JsonUtil import com.simiacryptus.skyenet.AgentPatterns import com.simiacryptus.skyenet.Discussable import com.simiacryptus.skyenet.TabbedDisplay import com.simiacryptus.skyenet.core.actors.* -import com.simiacryptus.skyenet.core.platform.ClientManager import com.simiacryptus.skyenet.core.platform.Session import com.simiacryptus.skyenet.core.platform.StorageInterface import com.simiacryptus.skyenet.core.platform.User @@ -31,7 +30,7 @@ import com.simiacryptus.skyenet.core.platform.file.DataStorage import com.simiacryptus.skyenet.webui.application.ApplicationInterface import com.simiacryptus.skyenet.webui.application.ApplicationServer import com.simiacryptus.skyenet.webui.session.SessionTask -import com.simiacryptus.skyenet.webui.util.MarkdownUtil.renderMarkdown +import com.simiacryptus.skyenet.util.MarkdownUtil.renderMarkdown import org.slf4j.LoggerFactory import java.awt.Desktop import java.io.ByteArrayOutputStream diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/git/ReplicateCommitAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/git/ReplicateCommitAction.kt index 7a1a9928..570261cf 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/git/ReplicateCommitAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/git/ReplicateCommitAction.kt @@ -19,7 +19,7 @@ import com.simiacryptus.diff.IterativePatchUtil import com.simiacryptus.diff.addApplyFileDiffLinks import com.simiacryptus.jopenai.API import com.simiacryptus.jopenai.describe.Description -import com.simiacryptus.jopenai.util.JsonUtil +import com.simiacryptus.util.JsonUtil import com.simiacryptus.skyenet.AgentPatterns import com.simiacryptus.skyenet.Retryable import com.simiacryptus.skyenet.core.actors.ParsedActor @@ -30,7 +30,7 @@ import com.simiacryptus.skyenet.core.platform.User import com.simiacryptus.skyenet.webui.application.ApplicationInterface import com.simiacryptus.skyenet.webui.application.ApplicationServer import com.simiacryptus.skyenet.webui.session.SessionTask -import com.simiacryptus.skyenet.webui.util.MarkdownUtil.renderMarkdown +import com.simiacryptus.skyenet.util.MarkdownUtil.renderMarkdown import org.slf4j.LoggerFactory import java.awt.Desktop import java.io.File diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/legacy/AppendTextWithChatAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/legacy/AppendTextWithChatAction.kt index 6b15c745..0dd2a607 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/legacy/AppendTextWithChatAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/legacy/AppendTextWithChatAction.kt @@ -6,7 +6,7 @@ import com.github.simiacryptus.aicoder.config.AppSettingsState.Companion.chatMod import com.intellij.openapi.actionSystem.ActionUpdateThread import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.project.Project -import com.simiacryptus.jopenai.ApiModel.* +import com.simiacryptus.jopenai.models.ApiModel.* import com.simiacryptus.jopenai.util.ClientUtil.toContentList class AppendTextWithChatAction : SelectionAction() { diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/legacy/ImplementStubAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/legacy/ImplementStubAction.kt index d82ab814..58920e52 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/legacy/ImplementStubAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/legacy/ImplementStubAction.kt @@ -9,7 +9,7 @@ import com.intellij.openapi.actionSystem.ActionUpdateThread import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.project.Project import com.simiacryptus.jopenai.proxy.ChatProxy -import com.simiacryptus.jopenai.util.StringUtil +import com.simiacryptus.util.StringUtil import java.util.* class ImplementStubAction : SelectionAction() { diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/legacy/ReplaceWithSuggestionsAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/legacy/ReplaceWithSuggestionsAction.kt index 189bb6a3..286cc713 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/legacy/ReplaceWithSuggestionsAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/legacy/ReplaceWithSuggestionsAction.kt @@ -8,7 +8,7 @@ import com.intellij.openapi.actionSystem.ActionUpdateThread import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.project.Project import com.simiacryptus.jopenai.proxy.ChatProxy -import com.simiacryptus.jopenai.util.StringUtil +import com.simiacryptus.util.StringUtil import kotlin.math.ceil import kotlin.math.ln import kotlin.math.pow diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/markdown/MarkdownListAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/markdown/MarkdownListAction.kt index 769b271c..3e44b7d6 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/markdown/MarkdownListAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/markdown/MarkdownListAction.kt @@ -14,7 +14,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.actionSystem.CommonDataKeys import com.intellij.openapi.application.ApplicationManager import com.simiacryptus.jopenai.proxy.ChatProxy -import com.simiacryptus.jopenai.util.StringUtil +import com.simiacryptus.util.StringUtil class MarkdownListAction : BaseAction() { override fun getActionUpdateThread() = ActionUpdateThread.BGT diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/problems/AnalyzeProblemAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/problems/AnalyzeProblemAction.kt index 2460f670..0666b13d 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/problems/AnalyzeProblemAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/problems/AnalyzeProblemAction.kt @@ -22,7 +22,7 @@ import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.PsiManager import com.simiacryptus.diff.addApplyFileDiffLinks import com.simiacryptus.jopenai.API -import com.simiacryptus.jopenai.util.JsonUtil +import com.simiacryptus.util.JsonUtil import com.simiacryptus.skyenet.AgentPatterns import com.simiacryptus.skyenet.Retryable import com.simiacryptus.skyenet.core.actors.ParsedActor @@ -35,7 +35,7 @@ import com.simiacryptus.skyenet.webui.application.ApplicationServer import com.simiacryptus.skyenet.webui.application.ApplicationSocketManager import com.simiacryptus.skyenet.webui.session.SessionTask import com.simiacryptus.skyenet.webui.session.SocketManager -import com.simiacryptus.skyenet.webui.util.MarkdownUtil.renderMarkdown +import com.simiacryptus.skyenet.util.MarkdownUtil.renderMarkdown import java.awt.Desktop import javax.swing.JOptionPane diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/test/TestResultAutofixAction.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/test/TestResultAutofixAction.kt index 5bd05ee7..84d9eaf0 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/actions/test/TestResultAutofixAction.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/actions/test/TestResultAutofixAction.kt @@ -14,7 +14,7 @@ import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.vfs.VirtualFile import com.simiacryptus.diff.FileValidationUtils.Companion.isGitignore import com.simiacryptus.diff.addApplyFileDiffLinks -import com.simiacryptus.jopenai.util.JsonUtil +import com.simiacryptus.util.JsonUtil import com.simiacryptus.skyenet.AgentPatterns import com.simiacryptus.skyenet.Retryable import com.simiacryptus.skyenet.core.actors.ParsedActor @@ -27,7 +27,7 @@ import com.simiacryptus.skyenet.webui.application.ApplicationServer import com.simiacryptus.skyenet.webui.application.ApplicationSocketManager import com.simiacryptus.skyenet.webui.session.SessionTask import com.simiacryptus.skyenet.webui.session.SocketManager -import com.simiacryptus.skyenet.webui.util.MarkdownUtil.renderMarkdown +import com.simiacryptus.skyenet.util.MarkdownUtil.renderMarkdown import org.jetbrains.annotations.NotNull import java.awt.Desktop import java.io.File diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/config/AppSettingsState.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/config/AppSettingsState.kt index ebcfa226..87974f43 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/config/AppSettingsState.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/config/AppSettingsState.kt @@ -9,7 +9,7 @@ import com.intellij.util.xmlb.XmlSerializerUtil import com.simiacryptus.jopenai.models.ChatModels import com.simiacryptus.jopenai.models.ImageModels import com.simiacryptus.jopenai.models.OpenAIModels -import com.simiacryptus.jopenai.util.JsonUtil +import com.simiacryptus.util.JsonUtil import java.io.File import java.util.* diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/ui/TokenCountWidgetFactory.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/ui/TokenCountWidgetFactory.kt index 07d89bd3..fb5c406d 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/ui/TokenCountWidgetFactory.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/ui/TokenCountWidgetFactory.kt @@ -12,7 +12,7 @@ import com.intellij.openapi.vfs.readText import com.intellij.openapi.wm.StatusBar import com.intellij.openapi.wm.StatusBarWidget import com.intellij.openapi.wm.StatusBarWidgetFactory -import com.simiacryptus.jopenai.GPT4Tokenizer +import com.simiacryptus.jopenai.util.GPT4Tokenizer import kotlinx.coroutines.CoroutineScope import java.awt.event.MouseEvent import java.util.concurrent.LinkedBlockingDeque diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/util/BlockComment.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/util/BlockComment.kt index de63da00..7ebade48 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/util/BlockComment.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/util/BlockComment.kt @@ -4,7 +4,7 @@ package com.github.simiacryptus.aicoder.util import com.github.simiacryptus.aicoder.util.TextBlock.Companion.DELIMITER import com.github.simiacryptus.aicoder.util.TextBlock.Companion.TAB_REPLACEMENT -import com.simiacryptus.jopenai.util.StringUtil +import com.simiacryptus.util.StringUtil import java.util.* import java.util.stream.Collectors diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/util/IdeaChatClient.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/util/IdeaChatClient.kt index 40a8eef8..f9def1cc 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/util/IdeaChatClient.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/util/IdeaChatClient.kt @@ -7,12 +7,12 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.ui.DialogWrapper import com.intellij.ui.components.JBScrollPane import com.intellij.util.ui.FormBuilder -import com.simiacryptus.jopenai.ApiModel.* +import com.simiacryptus.jopenai.models.ApiModel.* import com.simiacryptus.jopenai.ChatClient import com.simiacryptus.jopenai.models.APIProvider import com.simiacryptus.jopenai.models.OpenAIModel import com.simiacryptus.jopenai.models.OpenAITextModel -import com.simiacryptus.jopenai.util.JsonUtil +import com.simiacryptus.util.JsonUtil import com.simiacryptus.skyenet.core.platform.ApplicationServices import com.simiacryptus.skyenet.core.platform.StorageInterface import com.simiacryptus.skyenet.core.platform.User diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/util/IdeaOpenAIClient.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/util/IdeaOpenAIClient.kt index 3af51aff..d833e70b 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/util/IdeaOpenAIClient.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/util/IdeaOpenAIClient.kt @@ -1,7 +1,7 @@ package com.github.simiacryptus.aicoder.util import com.github.simiacryptus.aicoder.config.AppSettingsState -import com.simiacryptus.jopenai.ApiModel +import com.simiacryptus.jopenai.models.ApiModel import com.simiacryptus.jopenai.OpenAIClient import com.simiacryptus.jopenai.models.APIProvider import com.simiacryptus.jopenai.models.OpenAIModel diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/util/IndentedText.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/util/IndentedText.kt index 0c7ca6f9..df205963 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/util/IndentedText.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/util/IndentedText.kt @@ -1,6 +1,6 @@ package com.github.simiacryptus.aicoder.util -import com.simiacryptus.jopenai.util.StringUtil +import com.simiacryptus.util.StringUtil /** * This class provides a way to store and manipulate indented text blocks. diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/util/LineComment.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/util/LineComment.kt index b7630031..39df52dc 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/util/LineComment.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/util/LineComment.kt @@ -1,8 +1,8 @@ package com.github.simiacryptus.aicoder.util -import com.simiacryptus.jopenai.util.StringUtil.getWhitespacePrefix -import com.simiacryptus.jopenai.util.StringUtil.stripPrefix -import com.simiacryptus.jopenai.util.StringUtil.trimPrefix +import com.simiacryptus.util.StringUtil.getWhitespacePrefix +import com.simiacryptus.util.StringUtil.stripPrefix +import com.simiacryptus.util.StringUtil.trimPrefix import java.util.* import java.util.stream.Collectors diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/util/PluginStartupActivity.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/util/PluginStartupActivity.kt index 7820db3c..caebe468 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/util/PluginStartupActivity.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/util/PluginStartupActivity.kt @@ -86,7 +86,7 @@ class PluginStartupActivity : ProjectActivity { ApplicationServicesConfig.dataStorageRoot = AppSettingsState.instance.pluginHome.resolve(".skyenet") OutputInterceptor.setupInterceptor() ApplicationServices.clientManager = object : ClientManager() { - override fun createClient(session: Session, user: User?) = + override fun createChatClient(session: Session, user: User?) = IdeaChatClient.instance } ApplicationServices.usageManager = HSQLUsageManager(ApplicationServicesConfig.dataStorageRoot.resolve("usage")) diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/util/psi/PsiUtil.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/util/psi/PsiUtil.kt index 26882580..bf8d0ffd 100644 --- a/src/main/kotlin/com/github/simiacryptus/aicoder/util/psi/PsiUtil.kt +++ b/src/main/kotlin/com/github/simiacryptus/aicoder/util/psi/PsiUtil.kt @@ -5,7 +5,7 @@ import com.intellij.openapi.actionSystem.CommonDataKeys import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement import com.intellij.psi.PsiElementVisitor -import com.simiacryptus.jopenai.util.StringUtil +import com.simiacryptus.util.StringUtil import java.util.* import java.util.concurrent.atomic.AtomicReference import java.util.stream.Collectors 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 a5287fd3..d0d76db4 100644 --- a/src/test/kotlin/com/github/simiacryptus/aicoder/actions/ActionTestBase.kt +++ b/src/test/kotlin/com/github/simiacryptus/aicoder/actions/ActionTestBase.kt @@ -3,10 +3,9 @@ import com.github.simiacryptus.aicoder.config.AppSettingsState import com.github.simiacryptus.aicoder.util.ComputerLanguage import com.github.simiacryptus.aicoder.util.MarkdownProcessor -import com.simiacryptus.jopenai.models.ChatModels import com.simiacryptus.jopenai.models.OpenAIModels import com.simiacryptus.jopenai.util.ClientUtil -import com.simiacryptus.jopenai.util.JsonUtil +import com.simiacryptus.util.JsonUtil import org.junit.jupiter.api.Assertions import java.io.File import java.util.*