feat(openAi): properly save hosts and model ids, remove refresh models, LLMClient implements comparable

Author: Blarc

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

@@ -31,6 +31,7 @@ class AICommitAction : AnAction(), DumbAware {
         val includedChanges = commitWorkflowHandler.ui.getIncludedChanges()
         val commitMessage = VcsDataKeys.COMMIT_MESSAGE_CONTROL.getData(e.dataContext) as CommitMessage?
 
+        // FIXME @Blarc: Use coroutine with Dispatchers.IO!!!!!!!!!!!
         runBackgroundableTask(message("action.background"), project) {
             val diff = computeDiff(includedChanges, false, project)
             if (diff.isBlank()) {

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

@@ -16,7 +16,7 @@ abstract class LLMClient(
     @Attribute var timeout: Int,
     @Attribute var modelId: String,
     @Attribute var temperature: String,
-) : Cloneable {
+) : Cloneable, Comparable<LLMClient> {
     @get:Transient
     var token: String
         get() = retrieveToken(displayName) ?: ""
@@ -52,4 +52,8 @@ abstract class LLMClient(
             sendNotification(Notification.unableToSaveToken(e.message))
         }
     }
+
+    override fun compareTo(other: LLMClient): Int {
+        return displayName.compareTo(other.displayName)
+    }
 }

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

@@ -1,7 +1,6 @@
 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.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClient
 import com.intellij.openapi.components.service
 import dev.langchain4j.data.message.UserMessage
@@ -40,7 +39,7 @@ class OpenAiClient(displayName: String = "OpenAI") : LLMClient(
             .modelName(modelId)
             .temperature(temperature.toDouble())
             .timeout(Duration.ofSeconds(timeout.toLong()))
-            .baseUrl(AppSettings.instance.openAIHost)
+            .baseUrl(host)
             .build()
 
         val response = openAI.generate(
@@ -54,10 +53,8 @@ class OpenAiClient(displayName: String = "OpenAI") : LLMClient(
         return response.content().text()
     }
 
-    override fun getRefreshModelFunction(): (suspend () -> Unit)? {
-        // Model names are retrieved from Enum and do not need to be refreshed.
-        return null
-    }
+    // Model names are retrieved from Enum and do not need to be refreshed.
+    override fun getRefreshModelFunction() = null
 
     override fun clone(): LLMClient {
         val copy = OpenAiClient(displayName)

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

@@ -9,17 +9,18 @@ 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
 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 dev.ai4j.openai4j.OpenAiHttpException
-import kotlinx.coroutines.*
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
-import javax.swing.DefaultComboBoxModel
 
 class OpenAiClientPanel(private val client: OpenAiClient) : LLMClientPanel {
 
@@ -95,20 +96,6 @@ class OpenAiClientPanel(private val client: OpenAiClient) : LLMClientPanel {
                 .widthGroup("input")
                 .resizableColumn()
                 .onApply { service<OpenAiClientService>().modelIds.add(modelComboBox.item) }
-
-            client.getRefreshModelFunction()?.let { f ->
-                button(message("settings.refreshModels")) {
-                    runBackgroundableTask(message("settings.loadingModels")) {
-                        runBlocking(Dispatchers.IO) {
-                            f.invoke()
-                            modelComboBox.model = DefaultComboBoxModel(client.getModelIds().naturalSorted().toTypedArray())
-                            modelComboBox.item = client.modelId
-                        }
-                    }
-                }
-                    .align(AlignX.RIGHT)
-                    .widthGroup("button")
-            }
         }
 
         row {

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

@@ -5,13 +5,16 @@ 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 com.intellij.util.xmlb.annotations.XCollection
 import dev.langchain4j.model.openai.OpenAiChatModelName
 
-@Service
+@Service(Service.Level.APP)
 @State(name = "OpenAiClientService", storages = [Storage("AICommitsOpenAi.xml")])
 class OpenAiClientService : PersistentStateComponent<OpenAiClientService> {
-
+    @XCollection(style = XCollection.Style.v2)
     val hosts = mutableSetOf("https://api.openai.com/v1")
+
+    @XCollection(style = XCollection.Style.v2)
     val modelIds = OpenAiChatModelName.entries.stream()
         .map { it.toString() }
         .toList()