refactor(clients): remove host, proxyUrl and timeout properties from LLMClientConfiguration

Author: Blarc

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

@@ -9,9 +9,6 @@ import javax.swing.Icon
 
 abstract class LLMClientConfiguration(
     @Attribute var name: String,
-    @Attribute var host: String,
-    @Attribute var proxyUrl: String?,
-    @Attribute var timeout: Int,
     @Attribute var modelId: String,
     @Attribute var temperature: String,
 ) : Cloneable, Comparable<LLMClientConfiguration> {

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

@@ -9,23 +9,21 @@ import com.intellij.ui.components.JBLabel
 import com.intellij.ui.components.JBTextField
 import com.intellij.ui.dsl.builder.*
 import com.intellij.ui.util.minimumWidth
+import kotlin.reflect.KMutableProperty0
 
 
 abstract class LLMClientPanel(
     private val clientConfiguration: LLMClientConfiguration,
 ) {
 
     val hostComboBox = ComboBox(clientConfiguration.getHosts().toTypedArray())
-    val proxyTextField = JBTextField()
     val socketTimeoutTextField = JBTextField()
     val modelComboBox = ComboBox(clientConfiguration.getModelIds().toTypedArray())
     val temperatureTextField = JBTextField()
     val verifyLabel = JBLabel()
 
     open fun create() = panel {
         nameRow()
-        hostRow()
-        timeoutRow()
         modelIdRow()
         temperatureRow()
         verifyRow()
@@ -42,41 +40,26 @@ abstract class LLMClientPanel(
         }
     }
 
-    open fun Panel.hostRow() {
+    open fun Panel.hostRow(property: MutableProperty<String?>) {
         row {
             label(message("settings.llmClient.host"))
                 .widthGroup("label")
             cell(hostComboBox)
                 .applyToComponent {
                     isEditable = true
                 }
-                .bindItem(clientConfiguration::host.toNullableProperty())
+                .bindItem(property)
                 .widthGroup("input")
                 .onApply { clientConfiguration.addHost(hostComboBox.item) }
         }
     }
 
-    open fun Panel.proxyRow() {
-        row {
-            label(message("settings.llmClient.proxy"))
-                .widthGroup("label")
-            cell(proxyTextField)
-                .applyToComponent { minimumWidth = 400 }
-                .bindText(clientConfiguration::proxyUrl.toNonNullableProperty(""))
-                .resizableColumn()
-                .widthGroup("input")
-        }
-        row {
-            comment(message("settings.llmClient.proxy.comment"))
-        }
-    }
-
-    open fun Panel.timeoutRow() {
+    open fun Panel.timeoutRow(property: KMutableProperty0<Int>) {
         row {
             label(message("settings.llmClient.timeout")).widthGroup("label")
             cell(socketTimeoutTextField)
                 .applyToComponent { minimumWidth = 400 }
-                .bindIntText(clientConfiguration::timeout)
+                .bindIntText(property)
                 .resizableColumn()
                 .widthGroup("input")
                 .validationOnInput { isInt(it.text) }

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.gemini.GeminiClientConfiguration
 import com.github.blarc.ai.commits.intellij.plugin.settings.clients.ollama.OllamaClientConfiguration
 import com.github.blarc.ai.commits.intellij.plugin.settings.clients.openAi.OpenAiClientConfiguration
 import com.github.blarc.ai.commits.intellij.plugin.settings.clients.qianfan.QianfanClientConfiguration
@@ -48,8 +49,8 @@ class LLMClientTable {
     private fun createTableModel(): ListTableModel<LLMClientConfiguration> = ListTableModel(
         arrayOf(
             createColumn<LLMClientConfiguration>(message("settings.llmClient.name")) { llmClient -> llmClient.name },
-            createColumn(message("settings.llmClient.host")) { llmClient -> llmClient.host },
-            createColumn(message("settings.llmClient.modelId")) { llmClient -> llmClient.modelId }
+            createColumn(message("settings.llmClient.modelId")) { llmClient -> llmClient.modelId },
+            createColumn(message("settings.llmClient.temperature")) { llmClient -> llmClient.temperature }
         ),
         llmClients.toList()
     )
@@ -136,7 +137,8 @@ class LLMClientTable {
                 listOf(
                     OpenAiClientConfiguration(),
                     OllamaClientConfiguration(),
-                    QianfanClientConfiguration()
+                    QianfanClientConfiguration(),
+                    GeminiClientConfiguration()
                 )
             } else {
                 listOf(newLLMClientConfiguration)

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

@@ -6,17 +6,20 @@ import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientSha
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.ComboBox
 import com.intellij.openapi.vcs.ui.CommitMessage
+import com.intellij.util.xmlb.annotations.Attribute
 import javax.swing.Icon
 
 class OllamaClientConfiguration : LLMClientConfiguration(
     "Ollama",
-    "http://localhost:11434/",
-    null,
-    30,
     "llama3",
     "0.7"
 ) {
 
+    @Attribute
+    var host: String = "http://localhost:11434/"
+    @Attribute
+    var timeout: Int = 30
+
     companion object {
         const val CLIENT_NAME = "Ollama"
     }
@@ -46,7 +49,6 @@ class OllamaClientConfiguration : LLMClientConfiguration(
         copy.id = id
         copy.name = name
         copy.host = host
-        copy.proxyUrl = proxyUrl
         copy.timeout = timeout
         copy.modelId = modelId
         copy.temperature = temperature

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

@@ -1,6 +1,8 @@
 package com.github.blarc.ai.commits.intellij.plugin.settings.clients.ollama
 
 import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientPanel
+import com.intellij.ui.dsl.builder.panel
+import com.intellij.ui.dsl.builder.toNullableProperty
 
 class OllamaClientPanel private constructor(
     private val clientConfiguration: OllamaClientConfiguration,
@@ -9,6 +11,15 @@ class OllamaClientPanel private constructor(
 
     constructor(configuration: OllamaClientConfiguration): this(configuration, OllamaClientService.getInstance())
 
+    override fun create() = panel {
+        nameRow()
+        hostRow(clientConfiguration::host.toNullableProperty())
+        timeoutRow(clientConfiguration::timeout)
+        modelIdRow()
+        temperatureRow()
+        verifyRow()
+    }
+
     override fun verifyConfiguration() {
         // Configuration passed to panel is already a copy of the original or a new configuration
         clientConfiguration.host = hostComboBox.item

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

@@ -4,18 +4,25 @@ import com.github.blarc.ai.commits.intellij.plugin.Icons
 import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientConfiguration
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vcs.ui.CommitMessage
+import com.intellij.util.xmlb.annotations.Attribute
 import com.intellij.util.xmlb.annotations.Transient
 import javax.swing.Icon
 
 class OpenAiClientConfiguration : LLMClientConfiguration(
     "OpenAI",
-    "https://api.openai.com/v1",
-    null,
-    30,
     "gpt-3.5-turbo",
     "0.7"
 ) {
+
+    @Attribute
+    var host: String = "https://api.openai.com/v1"
+    @Attribute
+    var timeout: Int = 30
+    @Attribute
+    var proxyUrl: String? = null
+    @Attribute
     var organizationId: String? = null
+    @Attribute
     var tokenIsStored: Boolean = false
     @Transient
     var token: String? = null

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

@@ -4,50 +4,63 @@ 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.settings.clients.LLMClientPanel
 import com.intellij.ui.components.JBPasswordField
-import com.intellij.ui.dsl.builder.AlignX
-import com.intellij.ui.dsl.builder.bindText
-import com.intellij.ui.dsl.builder.panel
-import com.intellij.ui.dsl.builder.toNonNullableProperty
+import com.intellij.ui.components.JBTextField
+import com.intellij.ui.dsl.builder.*
+import com.intellij.ui.util.minimumWidth
 
 class OpenAiClientPanel(private val clientConfiguration: OpenAiClientConfiguration) : LLMClientPanel(clientConfiguration) {
-
+    private val proxyTextField = JBTextField()
     private val tokenPasswordField = JBPasswordField()
 
     override fun create() = panel {
         nameRow()
-        hostRow()
+        hostRow(clientConfiguration::host.toNullableProperty())
         proxyRow()
-        timeoutRow()
+        timeoutRow(clientConfiguration::timeout)
+        tokenRow()
+        modelIdRow()
+        organizationIdRow()
+        temperatureRow()
+        verifyRow()
+
+    }
+
+    private fun Panel.proxyRow() {
+        row {
+            label(message("settings.llmClient.proxy"))
+                .widthGroup("label")
+            cell(proxyTextField)
+                .applyToComponent { minimumWidth = 400 }
+                .bindText(clientConfiguration::proxyUrl.toNonNullableProperty(""))
+                .resizableColumn()
+                .widthGroup("input")
+                .comment(message("settings.llmClient.proxy.comment"))
+        }
+    }
 
+    private fun Panel.tokenRow() {
         row {
             label(message("settings.llmClient.token"))
                 .widthGroup("label")
             cell(tokenPasswordField)
-                .bindText(getter = {""}, setter = {
+                .bindText(getter = { "" }, setter = {
                     OpenAiClientService.getInstance().saveToken(clientConfiguration, it)
                 })
                 .emptyText(if (clientConfiguration.tokenIsStored) message("settings.openAI.token.stored") else message("settings.openAI.token.example"))
                 .resizableColumn()
                 .widthGroup("input")
+                .comment(message("settings.openAi.token.comment"))
         }
-        row {
-            comment(message("settings.openAi.token.comment"))
-                .align(AlignX.LEFT)
-        }
-
-        modelIdRow()
+    }
 
+    private fun Panel.organizationIdRow() {
         row {
             label(message("settings.openAi.organizationId"))
                 .widthGroup("label")
             textField()
                 .bindText(clientConfiguration::organizationId.toNonNullableProperty(""))
                 .widthGroup("input")
         }
-
-        temperatureRow()
-        verifyRow()
-
     }
 
     override fun verifyConfiguration() {

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

@@ -12,13 +12,14 @@ import javax.swing.Icon
 
 class QianfanClientConfiguration : LLMClientConfiguration(
     "Qianfan",
-    "https://aip.baidubce.com",
-    null,
-    30,
     QianfanChatModelNameEnum.ERNIE_SPEED_128K.modelName,
     "0.7"
 ) {
+    @Attribute
+    var host: String = "https://aip.baidubce.com"
+    @Attribute
     var apiKeyIsStored : Boolean = false
+    @Attribute
     var secretKeyIsStored: Boolean = false
     @Transient
     var apiKey: String = ""
@@ -64,8 +65,6 @@ class QianfanClientConfiguration : LLMClientConfiguration(
         copy.apiKeyId = apiKeyId
         copy.name = name
         copy.host = host
-        copy.proxyUrl = proxyUrl
-        copy.timeout = timeout
         copy.modelId = modelId
         copy.temperature = temperature
         copy.apiKeyIsStored = apiKeyIsStored

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

@@ -5,6 +5,7 @@ import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientPan
 import com.intellij.ui.components.JBPasswordField
 import com.intellij.ui.dsl.builder.bindText
 import com.intellij.ui.dsl.builder.panel
+import com.intellij.ui.dsl.builder.toNullableProperty
 
 class QianfanClientPanel(private val clientConfiguration: QianfanClientConfiguration) : LLMClientPanel(clientConfiguration) {
 
@@ -13,7 +14,7 @@ class QianfanClientPanel(private val clientConfiguration: QianfanClientConfigura
 
     override fun create() = panel {
         nameRow()
-        hostRow()
+        hostRow(clientConfiguration::host.toNullableProperty())
         modelIdRow()
 
         row {
@@ -46,8 +47,6 @@ class QianfanClientPanel(private val clientConfiguration: QianfanClientConfigura
     override fun verifyConfiguration() {
 
         clientConfiguration.host = hostComboBox.item
-//        clientConfiguration.proxyUrl = proxyTextField.text
-//        clientConfiguration.timeout = socketTimeoutTextField.text.toInt()
         clientConfiguration.modelId = modelComboBox.item
         clientConfiguration.temperature = temperatureTextField.text
         clientConfiguration.apiKey = String(apiKeyField.password)