feat(settings): panel for OpenAI client

Author: Blarc

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

@@ -88,14 +88,14 @@ class AppSettings2 : PersistentStateComponent<AppSettings2> {
     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 }
         }
+        OpenAIClient.hosts.addAll(appSettings.openAIHosts)
+        OpenAIClient.modelIds.addAll(appSettings.openAIModelIds)
     }
 
     fun recordHit() {

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

@@ -1,144 +1,29 @@
 package com.github.blarc.ai.commits.intellij.plugin.settings
 
-import com.aallam.openai.api.exception.OpenAIAPIException
-import com.github.blarc.ai.commits.intellij.plugin.*
+import com.github.blarc.ai.commits.intellij.plugin.AICommitsBundle
 import com.github.blarc.ai.commits.intellij.plugin.AICommitsBundle.message
 import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientTable
 import com.github.blarc.ai.commits.intellij.plugin.settings.prompts.Prompt
 import com.github.blarc.ai.commits.intellij.plugin.settings.prompts.PromptTable
-import com.intellij.icons.AllIcons
 import com.intellij.openapi.options.BoundConfigurable
-import com.intellij.openapi.progress.runBackgroundableTask
 import com.intellij.openapi.ui.ComboBox
-import com.intellij.openapi.ui.naturalSorted
 import com.intellij.ui.CommonActionsPanel
 import com.intellij.ui.ToolbarDecorator
 import com.intellij.ui.components.JBLabel
-import com.intellij.ui.components.JBPasswordField
-import com.intellij.ui.components.JBTextField
 import com.intellij.ui.dsl.builder.*
-import com.intellij.ui.util.minimumWidth
-import kotlinx.coroutines.*
 import java.util.*
-import javax.swing.DefaultComboBoxModel
 
 class AppSettingsConfigurable : BoundConfigurable(message("settings.general.group.title")) {
 
-    private val hostComboBox = ComboBox<String>()
-    private val tokenPasswordField = JBPasswordField()
-    private val verifyLabel = JBLabel()
-    private val proxyTextField = JBTextField()
-    private val socketTimeoutTextField = JBTextField()
-    private var modelComboBox = ComboBox<String>()
     private val llmClientTable = LLMClientTable()
     private val promptTable = PromptTable()
     private lateinit var llmClientToolbarDecorator: ToolbarDecorator
     private lateinit var toolbarDecorator: ToolbarDecorator
     private lateinit var promptComboBox: Cell<ComboBox<Prompt>>
 
-    init {
-        hostComboBox.isEditable = true
-        hostComboBox.model = DefaultComboBoxModel(Vector(AppSettings2.instance.getActiveLLMClient().hosts.naturalSorted()))
-        modelComboBox.model = DefaultComboBoxModel(Vector(AppSettings2.instance.getActiveLLMClient().modelIds.naturalSorted()))
-        modelComboBox.renderer = AppSettingsListCellRenderer()
-    }
-
     override fun createPanel() = panel {
 
         group(JBLabel("OpenAI")) {
-            row {
-                label(message("settings.openAIHost"))
-                    .widthGroup("label")
-
-                cell(hostComboBox)
-                    .bindItem(AppSettings2.instance.getActiveLLMClient()::host.toNullableProperty())
-                    .widthGroup("input")
-            }
-            row {
-                label(message("settings.openAIProxy")).widthGroup("label")
-                cell(proxyTextField)
-                    .bindText(AppSettings2.instance.getActiveLLMClient()::proxyUrl.toNonNullableProperty(""))
-                    .applyToComponent { minimumWidth = 400 }
-                    .resizableColumn()
-                    .widthGroup("input")
-            }
-            row {
-                comment(message("settings.openAIProxyComment"))
-            }
-            row {
-                label(message("settings.openAISocketTimeout")).widthGroup("label")
-                cell(socketTimeoutTextField)
-                    .bindIntText(AppSettings2.instance.getActiveLLMClient()::timeout)
-                    .applyToComponent { minimumWidth = 400 }
-                    .resizableColumn()
-                    .widthGroup("input")
-                    .validationOnInput { isInt(it.text) }
-            }
-            row {
-                label(message("settings.openAIToken"))
-                    .widthGroup("label")
-                cell(tokenPasswordField)
-                    .bindText(
-                        { AppSettings2.instance.getActiveLLMClient().token.orEmpty() },
-                        { AppSettings2.instance.getActiveLLMClient().token = it }
-                    )
-                    .emptyText(message("settings.openAITokenExample"))
-                    .align(Align.FILL)
-                    .resizableColumn()
-                    .focused()
-                button(message("settings.verifyToken")) { verifyToken() }
-                    .align(AlignX.RIGHT)
-                    .widthGroup("button")
-            }
-            row {
-                comment(message("settings.openAITokenComment"))
-                    .align(AlignX.LEFT)
-                cell(verifyLabel)
-                    .align(AlignX.RIGHT)
-            }
-            row {
-                label(message("settings.openAIModel")).widthGroup("label")
-
-                cell(modelComboBox)
-                    .bindItem({ AppSettings2.instance.getActiveLLMClient().modelId }, {
-                        if (it != null) {
-                            AppSettings2.instance.getActiveLLMClient().modelId = it
-                        }
-                    })
-                    .resizableColumn()
-                    .align(Align.FILL)
-                button(message("settings.refreshModels")) {
-                    runBackgroundableTask(message("settings.loadingModels")) {
-                        runBlocking(Dispatchers.IO) {
-                            OpenAIService.instance.refreshOpenAIModelIds()
-                            modelComboBox.model = DefaultComboBoxModel(Vector(AppSettings2.instance.getActiveLLMClient().modelIds.naturalSorted()))
-                            modelComboBox.item = AppSettings2.instance.getActiveLLMClient().modelId
-                        }
-                    }
-                }
-                    .align(AlignX.RIGHT)
-                    .widthGroup("button")
-            }
-
-            row {
-                label(message("settings.openAITemperature"))
-                    .widthGroup("label")
-
-                textField()
-                    .bindText(AppSettings2.instance.getActiveLLMClient()::temperature)
-                    .applyToComponent { minimumWidth = 400 }
-                    .resizableColumn()
-                    .widthGroup("input")
-                    .validationOnInput { temperatureValid(it.text) }
-
-                contextHelp(message("settings.openAITemperatureComment"))
-            }
-
-            row {
-                cell(verifyLabel)
-                    .align(AlignX.RIGHT)
-            }
-
             row {
                 llmClientToolbarDecorator = ToolbarDecorator.createDecorator(llmClientTable.table)
                     .setAddAction {
@@ -151,8 +36,6 @@ class AppSettingsConfigurable : BoundConfigurable(message("settings.general.grou
             }
         }
 
-
-
         group(JBLabel("Prompt")) {
             row {
                 label(message("settings.locale")).widthGroup("labelPrompt")
@@ -224,7 +107,8 @@ class AppSettingsConfigurable : BoundConfigurable(message("settings.general.grou
     }
 
     override fun apply() {
-        AppSettings2.instance.getActiveLLMClient().hosts.add(hostComboBox.item)
+        // TODO @Blarc
+        // AppSettings2.instance.getActiveLLMClient().hosts.add(hostComboBox.item)
         promptTable.apply()
         super.apply()
     }
@@ -234,34 +118,4 @@ class AppSettingsConfigurable : BoundConfigurable(message("settings.general.grou
         super.reset()
     }
 
-    @OptIn(DelicateCoroutinesApi::class)
-    private fun verifyToken() {
-        runBackgroundableTask(message("settings.verify.running")) {
-            if (tokenPasswordField.password.isEmpty()) {
-                verifyLabel.icon = AllIcons.General.InspectionsError
-                verifyLabel.text = message("settings.verify.token-is-empty")
-            } else {
-                verifyLabel.icon = AllIcons.General.InlineRefreshHover
-                verifyLabel.text = message("settings.verify.running")
-
-                GlobalScope.launch(Dispatchers.IO) {
-                    try {
-                        OpenAIService.instance.verifyOpenAIConfiguration(hostComboBox.item, String(tokenPasswordField.password), proxyTextField.text, socketTimeoutTextField.text)
-                        verifyLabel.text = message("settings.verify.valid")
-                        verifyLabel.icon = AllIcons.General.InspectionsOK
-                    } catch (e: OpenAIAPIException) {
-                        verifyLabel.text = message("settings.verify.invalid", e.statusCode)
-                        verifyLabel.icon = AllIcons.General.InspectionsError
-                    } catch (e: NumberFormatException) {
-                        verifyLabel.text = message("settings.verify.invalid", e.localizedMessage)
-                        verifyLabel.icon = AllIcons.General.InspectionsError
-                    } catch (e: Exception) {
-                        verifyLabel.text = message("settings.verify.invalid", "Unknown")
-                        verifyLabel.icon = AllIcons.General.InspectionsError
-                    }
-                }
-            }
-        }
-
-    }
 }

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

@@ -7,18 +7,13 @@ import com.github.blarc.ai.commits.intellij.plugin.notifications.sendNotificatio
 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
 ) {
 
@@ -27,6 +22,10 @@ abstract class LLMClient(
         get() = retrieveToken(displayName) ?: ""
         set(token) = saveToken(token)
 
+    abstract fun getHosts(): Set<String>
+
+    abstract fun getModelIds(): Set<String>
+
     abstract suspend fun generateCommitMessage(prompt: String): String
 
     abstract suspend fun refreshModels()

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

@@ -3,15 +3,14 @@ package com.github.blarc.ai.commits.intellij.plugin.settings.clients
 import com.github.blarc.ai.commits.intellij.plugin.AICommitsBundle
 import com.github.blarc.ai.commits.intellij.plugin.createColumn
 import com.github.blarc.ai.commits.intellij.plugin.settings.AppSettings2
-import com.intellij.openapi.ui.ComboBox
+import com.github.blarc.ai.commits.intellij.plugin.settings.AppSettingsListCellRenderer
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.ui.JBCardLayout
 import com.intellij.ui.components.Panel
 import com.intellij.ui.dsl.builder.Align
 import com.intellij.ui.dsl.builder.panel
 import com.intellij.ui.table.TableView
 import com.intellij.util.ui.ListTableModel
-import javax.swing.DefaultComboBoxModel
 import javax.swing.ListSelectionModel.SINGLE_SELECTION
 
 class LLMClientTable {
@@ -43,7 +42,6 @@ class LLMClientTable {
         private val cardLayout = JBCardLayout()
         private val cardPanel = Panel(null, cardLayout)
         private val llmClients: List<LLMClient> = getLlmClients(newLlmClient)
-        private val llmClientsComboBox: ComboBox<LLMClient> = createLlmClientsComboBox(newLlmClient)
 
         init {
             title = newLlmClient?.let { "Edit LLM Client" } ?: "Add LLM Client"
@@ -55,12 +53,15 @@ class LLMClientTable {
         }
 
         override fun createCenterPanel() = panel {
-            row("Type") {
-                cell(llmClientsComboBox)
+            row("Client") {
+                comboBox(llmClients, AppSettingsListCellRenderer())
                     .align(Align.FILL)
                     .applyToComponent {
                         addItemListener { cardLayout.show(cardPanel, (it.item as LLMClient).displayName) }
                     }
+                    .applyToComponent {
+                        isEnabled = newLlmClient == null
+                    }
             }
             row {
                 cell(cardPanel)
@@ -78,15 +79,6 @@ class LLMClientTable {
                 listOf(newLLMClient)
             }
         }
-
-        private fun createLlmClientsComboBox(newLLMClient: LLMClient?) : ComboBox<LLMClient> {
-            val comboBoxModel = DefaultComboBoxModel(getLlmClients(newLLMClient).toTypedArray())
-            with(ComboBox(comboBoxModel)){
-                // Type of LLM Client can not be changed when editing a LLM Client
-                if (newLLMClient != null) isEnabled = false
-                return this
-            }
-        }
     }
 
 }

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

@@ -10,18 +10,34 @@ 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.Attribute
 import kotlin.time.Duration.Companion.seconds
 
 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"
 ) {
+
+    companion object {
+        // TODO @Blarc: Static fields probably can't be attributes...
+        @Attribute
+        val hosts = mutableSetOf(OpenAIHost.OpenAI.baseUrl)
+        @Attribute
+        val modelIds = mutableSetOf("gpt-3.5-turbo", "gpt-4")
+    }
+
+    override fun getHosts(): Set<String> {
+        return hosts
+    }
+
+    override fun getModelIds(): Set<String> {
+        return modelIds
+    }
+
     override suspend fun generateCommitMessage(
         prompt: String
     ): String {
@@ -49,7 +65,9 @@ class OpenAIClient(displayName: String = "OpenAI") : LLMClient(
 
     override suspend fun refreshModels() {
         val openAI = OpenAI(openAIConfig())
-        modelIds = openAI.models().map { it.id.id }
+        openAI.models()
+            .map { it.id.id }
+            .forEach { modelIds.add(it) }
     }
 
     @Throws(Exception::class)