feat(settings): save multiple llm clients

Author: Blarc

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/AICommitAction.kt

@@ -40,7 +40,7 @@ class AICommitAction : AnAction(), DumbAware {
 
             val branch = commonBranch(includedChanges, project)
             val hint = commitMessage?.text
-            val prompt = constructPrompt(AppSettings2.instance.currentPrompt.content, diff, branch, hint)
+            val prompt = constructPrompt(AppSettings2.instance.activePrompt.content, diff, branch, hint)
             if (isPromptTooLarge(prompt)) {
                 sendNotification(Notification.promptTooLarge())
                 return@runBackgroundableTask

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/notifications/Notification.kt

@@ -43,13 +43,10 @@ data class Notification(
         fun promptTooLarge() = Notification(DEFAULT_TITLE, message = message("notifications.prompt-too-large"))
         fun unsuccessfulRequest(message: String) = Notification(message = message("notifications.unsuccessful-request", message))
         fun noCommitMessage() = Notification(message = message("notifications.no-commit-message"))
-        fun unableToSaveToken() = Notification(message = message("notifications.unable-to-save-token"))
+        fun unableToSaveToken(message: String?) = Notification(message = message("notifications.unable-to-save-token", message ?: "Unknown error"))
         fun noCommonBranch() = Notification(message = message("notifications.no-common-branch"))
 
     }
-
-    fun isTransient() = type == Type.TRANSIENT
-    fun isPersistent() = !isTransient();
 }
 
 data class NotificationAction(val title: String, val run: (dismiss: () -> Unit) -> Unit) {

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/AppSettings2.kt

@@ -3,9 +3,10 @@ package com.github.blarc.ai.commits.intellij.plugin.settings
 import com.github.blarc.ai.commits.intellij.plugin.AICommitsUtils
 import com.github.blarc.ai.commits.intellij.plugin.notifications.Notification
 import com.github.blarc.ai.commits.intellij.plugin.notifications.sendNotification
+import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClient
+import com.github.blarc.ai.commits.intellij.plugin.settings.clients.OpenAIClient
+import com.github.blarc.ai.commits.intellij.plugin.settings.clients.TestAIClient
 import com.github.blarc.ai.commits.intellij.plugin.settings.prompts.DefaultPrompts
-import com.github.blarc.ai.commits.intellij.plugin.settings.providers.LLMClient
-import com.github.blarc.ai.commits.intellij.plugin.settings.providers.OpenAIClient
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.PersistentStateComponent
 import com.intellij.openapi.components.Service
@@ -14,6 +15,8 @@ import com.intellij.openapi.components.Storage
 import com.intellij.util.xmlb.Converter
 import com.intellij.util.xmlb.XmlSerializerUtil
 import com.intellij.util.xmlb.annotations.OptionTag
+import com.intellij.util.xmlb.annotations.XCollection
+import com.intellij.util.xmlb.annotations.XMap
 import java.util.*
 
 @State(
@@ -38,13 +41,24 @@ class AppSettings2 : PersistentStateComponent<AppSettings2> {
     @OptionTag(converter = LocaleConverter::class)
     var locale: Locale = Locale.ENGLISH
 
-    private var activeLlmClient = "OpenAI"
-    var llmClients = mapOf(
-        "OpenAI" to OpenAIClient()
+
+    @XCollection(
+        elementTypes = [
+            OpenAIClient::class,
+            TestAIClient::class
+        ],
+        style = XCollection.Style.v2
+    )
+    var llmClients = setOf(
+        OpenAIClient(),
+        TestAIClient(),
+        TestAIClient("TestAI2")
     )
+    private var activeLlmClient = "OpenAI"
 
+    @XMap
     var prompts = DefaultPrompts.toPromptsMap()
-    var currentPrompt = prompts["basic"]!!
+    var activePrompt = prompts["basic"]!!
 
     var appExclusions: Set<String> = setOf()
 
@@ -56,27 +70,32 @@ class AppSettings2 : PersistentStateComponent<AppSettings2> {
 
     override fun noStateLoaded() {
         val appSettings = AppSettings.instance
+        migrateSettingsFromVersion1(appSettings)
+        val openAiLlmClient = llmClients.find { it.displayName == "OpenAI" }
+        migrateOpenAiClientFromVersion1(openAiLlmClient, appSettings)
+    }
 
-        // Migration from old settings
+    private fun migrateSettingsFromVersion1(appSettings: AppSettings) {
         hits = appSettings.hits
         locale = appSettings.locale
         lastVersion = appSettings.lastVersion
         requestSupport = appSettings.requestSupport
-
         prompts = appSettings.prompts
-        currentPrompt = appSettings.currentPrompt
-
+        activePrompt = appSettings.currentPrompt
         appExclusions = appSettings.appExclusions
+    }
 
-        // TODO: currentLlmClient vs OpenAIClient.instance()
-        llmClients["OpenAI"]?.host = appSettings.openAIHost
-        llmClients["OpenAI"]?.hosts = appSettings.openAIHosts
-        appSettings.openAISocketTimeout.toIntOrNull()?.let { llmClients["OpenAI"]?.timeout = it }
-        appSettings.proxyUrl?.let { llmClients["OpenAI"]?.proxyUrl = it }
-        llmClients["OpenAI"]?.modelId = appSettings.openAIModelId
-        llmClients["OpenAI"]?.modelIds = appSettings.openAIModelIds
-        llmClients["OpenAI"]?.temperature = appSettings.openAITemperature
-        AICommitsUtils.retrieveToken( appSettings.openAITokenTitle)?.let { llmClients["OpenAI"]?.token = it }
+    private fun migrateOpenAiClientFromVersion1(openAiLlmClient: LLMClient?, appSettings: AppSettings) {
+        openAiLlmClient?.apply {
+            host = appSettings.openAIHost
+            hosts = appSettings.openAIHosts
+            appSettings.openAISocketTimeout.toIntOrNull()?.let { timeout = it }
+            proxyUrl = appSettings.proxyUrl
+            modelId = appSettings.openAIModelId
+            modelIds = appSettings.openAIModelIds
+            temperature = appSettings.openAITemperature
+            AICommitsUtils.retrieveToken(appSettings.openAITokenTitle)?.let { token = it }
+        }
     }
 
     fun recordHit() {
@@ -91,12 +110,12 @@ class AppSettings2 : PersistentStateComponent<AppSettings2> {
     }
 
     fun getActiveLLMClient(): LLMClient {
-        return llmClients[activeLlmClient]!!
+        return llmClients.find { it.displayName == activeLlmClient }!!
     }
 
     fun setActiveLlmClient(llmClientName: String) {
         // TODO @Blarc: Throw exception if llm client name is not valid
-        llmClients[llmClientName]?.let {
+        llmClients.find { it.displayName == llmClientName }?.let {
             activeLlmClient = llmClientName
         }
     }

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/AppSettingsConfigurable.kt

@@ -152,7 +152,7 @@ class AppSettingsConfigurable : BoundConfigurable(message("settings.general.grou
             row {
                 label(message("settings.prompt")).widthGroup("labelPrompt")
                 promptComboBox = comboBox(AppSettings2.instance.prompts.values, AppSettingsListCellRenderer())
-                    .bindItem(AppSettings2.instance::currentPrompt.toNullableProperty())
+                    .bindItem(AppSettings2.instance::activePrompt.toNullableProperty())
             }
             row {
                 toolbarDecorator = ToolbarDecorator.createDecorator(promptTable.table)

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/LLMClient.kt

@@ -0,0 +1,49 @@
+package com.github.blarc.ai.commits.intellij.plugin.settings.clients
+
+import com.github.blarc.ai.commits.intellij.plugin.AICommitsUtils.getCredentialAttributes
+import com.github.blarc.ai.commits.intellij.plugin.AICommitsUtils.retrieveToken
+import com.github.blarc.ai.commits.intellij.plugin.notifications.Notification
+import com.github.blarc.ai.commits.intellij.plugin.notifications.sendNotification
+import com.intellij.ide.passwordSafe.PasswordSafe
+import com.intellij.util.xmlb.annotations.Attribute
+import com.intellij.util.xmlb.annotations.Transient
+import com.intellij.util.xmlb.annotations.XCollection
+
+abstract class LLMClient(
+    @Attribute var displayName: String,
+    @Attribute var host: String,
+    @XCollection(style = XCollection.Style.v2, elementName = "host")
+    var hosts: MutableSet<String>,
+    @Attribute var proxyUrl: String?,
+    @Attribute var timeout: Int,
+    @Attribute var modelId: String,
+    @XCollection(style = XCollection.Style.v2, elementName = "modelId")
+    var modelIds: List<String>,
+    @Attribute var temperature: String
+) {
+
+    @get:Transient
+    var token: String
+        get() = retrieveToken(displayName) ?: ""
+        set(token) = saveToken(token)
+
+    abstract suspend fun generateCommitMessage(prompt: String): String
+
+    abstract suspend fun refreshModels()
+
+    @Throws(Exception::class)
+    abstract suspend fun verifyConfiguration(
+        newHost: String,
+        newProxy: String?,
+        newTimeout: String,
+        newToken: String
+    )
+
+    private fun saveToken(token: String) {
+        try {
+            PasswordSafe.instance.setPassword(getCredentialAttributes(displayName), token)
+        } catch (e: Exception) {
+            sendNotification(Notification.unableToSaveToken(e.message))
+        }
+    }
+}

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/providers/OpenAIClient.kt renamed to src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/OpenAIClient.kt

@@ -1,4 +1,4 @@
-package com.github.blarc.ai.commits.intellij.plugin.settings.providers
+package com.github.blarc.ai.commits.intellij.plugin.settings.clients
 
 import com.aallam.openai.api.chat.ChatCompletion
 import com.aallam.openai.api.chat.ChatCompletionRequest
@@ -10,21 +10,18 @@ import com.aallam.openai.client.OpenAI
 import com.aallam.openai.client.OpenAIConfig
 import com.aallam.openai.client.OpenAIHost
 import com.aallam.openai.client.ProxyConfig
-import com.intellij.util.xmlb.annotations.Tag
 import kotlin.time.Duration.Companion.seconds
 
-data class OpenAIClient(
-    override var host: String = OpenAIHost.OpenAI.baseUrl,
-    override var hosts: MutableSet<String> = mutableSetOf(OpenAIHost.OpenAI.baseUrl),
-    override var proxyUrl: String? = null,
-    override var timeout: Int = 30,
-    override var modelId: String = "gpt-3.5-turbo",
-    override var modelIds: List<String> = listOf("gpt-3.5-turbo", "gpt-4"),
-    override var temperature: String = "0.7"
-) : LLMClient {
-
-    override fun displayName() = "OpenAI"
-
+class OpenAIClient(displayName: String = "OpenAI") : LLMClient(
+    displayName,
+    OpenAIHost.OpenAI.baseUrl,
+    mutableSetOf(OpenAIHost.OpenAI.baseUrl),
+    null,
+    30,
+    "gpt-3.5-turbo",
+    listOf("gpt-3.5-turbo", "gpt-4"),
+    "0.7"
+) {
     override suspend fun generateCommitMessage(
         prompt: String
     ): String {

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/TestAIClient.kt

@@ -0,0 +1,23 @@
+package com.github.blarc.ai.commits.intellij.plugin.settings.clients
+
+class TestAIClient(displayName: String = "TestAI") : LLMClient(
+    displayName,
+    "testAiBaseUrl",
+    mutableSetOf("testAiBaseUrl"),
+    null,
+    30,
+    "gpt-3.5-turbo",
+    listOf("gpt-3.5-turbo", "gpt-4"),
+    "0.7"
+) {
+    override suspend fun generateCommitMessage(prompt: String): String {
+        return "hello world"
+    }
+
+    override suspend fun refreshModels() {
+    }
+
+    override suspend fun verifyConfiguration(newHost: String, newProxy: String?, newTimeout: String, newToken: String) {
+    }
+
+}

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/providers/LLMClient.kt

@@ -40,7 +40,7 @@ actions.take-me-there = Take me there.
 actions.sure-take-me-there=Sure, take me there.
 notifications.prompt-too-large=The diff is too large for the OpenAI API. Try reducing the number of staged changes, or write your own commit message.
 notifications.no-commit-message=Commit field has not been initialized correctly.
-notifications.unable-to-save-token=Token could not be saved.
+notifications.unable-to-save-token=Token could not be saved: {0}.
 settings.addPrompt=Add prompt
 settings.prompt.name=Name
 settings.prompt.content=Content