feat(clients): use OpenAiClientService to save shared hosts and model ids

Author: Blarc

build.gradle.kts

@@ -89,6 +89,11 @@ tasks {
     buildPlugin {
         exclude { "coroutines" in it.name }
     }
+
+    buildSearchableOptions {
+        enabled = false
+    }
+
     prepareSandbox {
         exclude { "coroutines" in it.name }
     }

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

@@ -4,14 +4,11 @@ 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.clients.openAi.OpenAiClient
+import com.github.blarc.ai.commits.intellij.plugin.settings.clients.openAi.OpenAiClientService
 import com.github.blarc.ai.commits.intellij.plugin.settings.prompts.DefaultPrompts
 import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.components.PersistentStateComponent
-import com.intellij.openapi.components.Service
-import com.intellij.openapi.components.State
-import com.intellij.openapi.components.Storage
+import com.intellij.openapi.components.*
 import com.intellij.util.xmlb.Converter
 import com.intellij.util.xmlb.XmlSerializerUtil
 import com.intellij.util.xmlb.annotations.OptionTag
@@ -44,15 +41,12 @@ class AppSettings2 : PersistentStateComponent<AppSettings2> {
 
     @XCollection(
         elementTypes = [
-            OpenAIClient::class,
-            TestAIClient::class
+            OpenAiClient::class
         ],
         style = XCollection.Style.v2
     )
-    var llmClients = setOf(
-        OpenAIClient(),
-        TestAIClient(),
-        TestAIClient("TestAI2")
+    var llmClients = setOf<LLMClient>(
+        OpenAiClient()
     )
 
     private var activeLlmClient = "OpenAI"
@@ -95,8 +89,9 @@ class AppSettings2 : PersistentStateComponent<AppSettings2> {
             temperature = appSettings.openAITemperature
             AICommitsUtils.retrieveToken(appSettings.openAITokenTitle)?.let { token = it }
         }
-        OpenAIClient.hosts.addAll(appSettings.openAIHosts)
-        OpenAIClient.modelIds.addAll(appSettings.openAIModelIds)
+
+        service<OpenAiClientService>().hosts.addAll(appSettings.openAIHosts)
+        service<OpenAiClientService>().modelIds.addAll(appSettings.openAIModelIds)
     }
 
     fun recordHit() {

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

@@ -3,6 +3,7 @@ package com.github.blarc.ai.commits.intellij.plugin.settings.clients
 import com.github.blarc.ai.commits.intellij.plugin.AICommitsBundle.message
 import com.github.blarc.ai.commits.intellij.plugin.createColumn
 import com.github.blarc.ai.commits.intellij.plugin.settings.AppSettings2
+import com.github.blarc.ai.commits.intellij.plugin.settings.clients.openAi.OpenAiClient
 import com.intellij.openapi.ui.DialogPanel
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.openapi.ui.Splitter
@@ -115,6 +116,7 @@ class LLMClientTable {
             if (newLlmClient == null) {
                 (cardLayout.findComponentById(llmClient.displayName) as DialogPanel).apply()
             }
+            // TODO: Figure out how to call apply of the currently active panel
             super.doOKAction()
         }
 
@@ -130,8 +132,7 @@ class LLMClientTable {
             return if (newLLMClient == null) {
                 // TODO(@Blarc): Is there a better way to create the list of all possible LLM Clients that implement LLMClient abstract class
                 listOf(
-                    OpenAIClient(),
-                    TestAIClient()
+                    OpenAiClient()
                 )
             } else {
                 listOf(newLLMClient)

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

@@ -1,47 +1,35 @@
-package com.github.blarc.ai.commits.intellij.plugin.settings.clients
+package com.github.blarc.ai.commits.intellij.plugin.settings.clients.openAi
 
 import com.github.blarc.ai.commits.intellij.plugin.Icons
 import com.github.blarc.ai.commits.intellij.plugin.settings.AppSettings
-import com.intellij.util.xmlb.annotations.Attribute
+import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClient
+import com.intellij.openapi.components.service
 import dev.langchain4j.data.message.UserMessage
 import dev.langchain4j.model.openai.OpenAiChatModel
-import dev.langchain4j.model.openai.OpenAiChatModelName
 import java.net.InetSocketAddress
 import java.net.Proxy
 import java.net.URI
 import java.time.Duration
 import javax.swing.Icon
 
-class OpenAIClient(displayName: String = "OpenAI") : LLMClient(
+class OpenAiClient(displayName: String = "OpenAI") : LLMClient(
     displayName,
     "https://api.openai.com/v1",
     null,
     30,
     "gpt-3.5-turbo",
     "0.7"
 ) {
-
-    companion object {
-        // TODO @Blarc: Static fields probably can't be attributes...
-        @Attribute
-        val hosts = mutableSetOf("https://api.openai.com/v1")
-        @Attribute
-        val modelIds = OpenAiChatModelName.entries.stream()
-            .map { it.toString() }
-            .toList()
-            .toMutableSet()
-    }
-
     override fun getIcon(): Icon {
         return Icons.OPEN_AI
     }
 
     override fun getHosts(): Set<String> {
-        return hosts
+        return service<OpenAiClientService>().hosts
     }
 
     override fun getModelIds(): Set<String> {
-        return modelIds
+        return service<OpenAiClientService>().modelIds
     }
 
     override suspend fun generateCommitMessage(
@@ -72,7 +60,7 @@ class OpenAIClient(displayName: String = "OpenAI") : LLMClient(
     }
 
     override fun clone(): LLMClient {
-        val copy = OpenAIClient(displayName)
+        val copy = OpenAiClient(displayName)
         copy.host = host
         copy.proxyUrl = proxyUrl
         copy.timeout = timeout
@@ -112,7 +100,5 @@ class OpenAIClient(displayName: String = "OpenAI") : LLMClient(
         )
     }
 
-    override fun panel(): LLMClientPanel {
-        return OpenAIClientPanel(this)
-    }
+    override fun panel() = OpenAiClientPanel(this)
 }

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

@@ -1,10 +1,12 @@
-package com.github.blarc.ai.commits.intellij.plugin.settings.clients
+package com.github.blarc.ai.commits.intellij.plugin.settings.clients.openAi
 
 import com.github.blarc.ai.commits.intellij.plugin.AICommitsBundle.message
 import com.github.blarc.ai.commits.intellij.plugin.emptyText
 import com.github.blarc.ai.commits.intellij.plugin.isInt
+import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientPanel
 import com.github.blarc.ai.commits.intellij.plugin.temperatureValid
 import com.intellij.icons.AllIcons
+import com.intellij.openapi.components.service
 import com.intellij.openapi.progress.runBackgroundableTask
 import com.intellij.openapi.ui.ComboBox
 import com.intellij.openapi.ui.naturalSorted
@@ -19,9 +21,9 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import javax.swing.DefaultComboBoxModel
 
-class OpenAIClientPanel(private val client: OpenAIClient) : LLMClientPanel {
+class OpenAiClientPanel(private val client: OpenAiClient) : LLMClientPanel {
 
-    private val hostComboBox =  ComboBox(client.getHosts().toTypedArray())
+    private val hostComboBox = ComboBox(client.getHosts().toTypedArray())
     private val tokenPasswordField = JBPasswordField()
     private val verifyLabel = JBLabel()
     private val proxyTextField = JBTextField()
@@ -43,8 +45,8 @@ class OpenAIClientPanel(private val client: OpenAIClient) : LLMClientPanel {
             label(message("settings.openAIProxy"))
                 .widthGroup("label")
             cell(proxyTextField)
-                .bindText(client::proxyUrl.toNonNullableProperty(""))
                 .applyToComponent { minimumWidth = 400 }
+                .bindText(client::proxyUrl.toNonNullableProperty(""))
                 .resizableColumn()
                 .widthGroup("input")
         }
@@ -54,8 +56,8 @@ class OpenAIClientPanel(private val client: OpenAIClient) : LLMClientPanel {
         row {
             label(message("settings.openAISocketTimeout")).widthGroup("label")
             cell(socketTimeoutTextField)
-                .bindIntText(client::timeout)
                 .applyToComponent { minimumWidth = 400 }
+                .bindIntText(client::timeout)
                 .resizableColumn()
                 .widthGroup("input")
                 .validationOnInput { isInt(it.text) }
@@ -82,14 +84,17 @@ class OpenAIClientPanel(private val client: OpenAIClient) : LLMClientPanel {
                 .widthGroup("label")
 
             cell(modelComboBox)
+                .applyToComponent {
+                    isEditable = true
+                }
                 .bindItem({ client.modelId }, {
                     if (it != null) {
                         client.modelId = it
                     }
                 })
                 .widthGroup("input")
                 .resizableColumn()
-
+                .onApply { service<OpenAiClientService>().modelIds.add(modelComboBox.item) }
 
             client.getRefreshModelFunction()?.let { f ->
                 button(message("settings.refreshModels")) {
@@ -161,6 +166,7 @@ class OpenAIClientPanel(private val client: OpenAIClient) : LLMClientPanel {
 
     @Serializable
     data class OpenAiError(val message: String?, val type: String?, val param: String?, val code: String?)
+
     @Serializable
     data class OpenAiErrorWrapper(val error: OpenAiError)
 }

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

@@ -0,0 +1,26 @@
+package com.github.blarc.ai.commits.intellij.plugin.settings.clients.openAi
+
+import com.intellij.openapi.components.PersistentStateComponent
+import com.intellij.openapi.components.Service
+import com.intellij.openapi.components.State
+import com.intellij.openapi.components.Storage
+import com.intellij.util.xmlb.XmlSerializerUtil
+import dev.langchain4j.model.openai.OpenAiChatModelName
+
+@Service
+@State(name = "OpenAiClientService", storages = [Storage("AICommitsOpenAi.xml")])
+class OpenAiClientService : PersistentStateComponent<OpenAiClientService> {
+
+    val hosts = mutableSetOf("https://api.openai.com/v1")
+    val modelIds = OpenAiChatModelName.entries.stream()
+        .map { it.toString() }
+        .toList()
+        .toMutableSet()
+
+    override fun getState(): OpenAiClientService = this
+
+    override fun loadState(state: OpenAiClientService) {
+        XmlSerializerUtil.copyBean(state, this)
+    }
+
+}