feat(clients): properly open edit dialog

Author: Blarc

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

@@ -139,15 +139,6 @@ object AICommitsUtils {
 //        return encoding.countTokens(prompt) > modelType.maxContextLength
 //    }
 
-    // TODO @Blarc: Slow operations are prohibited on EDT
-    fun saveToken(title: String, token: String) {
-        try {
-            PasswordSafe.instance.setPassword(getCredentialAttributes(title), token)
-        } catch (e: Exception) {
-            sendNotification(Notification.unableToSaveToken(e.message))
-        }
-    }
-
     suspend fun retrieveToken(title: String): OneTimeString? {
         val credentialAttributes = getCredentialAttributes(title)
         val credentials = withContext(Dispatchers.IO) {

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

@@ -2,14 +2,14 @@ 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.AICommitsUtils.getCredentialAttributes
-import com.github.blarc.ai.commits.intellij.plugin.AICommitsUtils.saveToken
 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.LLMClientConfiguration
 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.openAi.OpenAiClientSharedState
 import com.github.blarc.ai.commits.intellij.plugin.settings.prompts.DefaultPrompts
+import com.intellij.credentialStore.CredentialAttributes
 import com.intellij.ide.passwordSafe.PasswordSafe
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.PersistentStateComponent
@@ -98,19 +98,27 @@ class AppSettings2 : PersistentStateComponent<AppSettings2> {
             temperature = appSettings.openAITemperature
 
             val credentialAttributes = getCredentialAttributes(appSettings.openAITokenTitle)
-            PasswordSafe.instance.getAsync(credentialAttributes)
-                .onSuccess {
-                    it?.password?.let { token ->
-                        saveToken(id, token.toString(false))
-                        tokenIsStored = true
-                    }
-                }
+            migrateToken(credentialAttributes)
         }
 
         OpenAiClientSharedState.getInstance().hosts.addAll(appSettings.openAIHosts)
         OpenAiClientSharedState.getInstance().modelIds.addAll(appSettings.openAIModelIds)
     }
 
+    private fun OpenAiClientConfiguration.migrateToken(credentialAttributes: CredentialAttributes) {
+        PasswordSafe.instance.getAsync(credentialAttributes)
+            .onSuccess {
+                it?.password?.let { token ->
+                    try {
+                        PasswordSafe.instance.setPassword(getCredentialAttributes(id), token.toString(false))
+                    } catch (e: Exception) {
+                        sendNotification(Notification.unableToSaveToken(e.message))
+                    }
+                    tokenIsStored = true
+                }
+            }
+    }
+
     fun recordHit() {
         hits++
         if (requestSupport && (hits == 50 || hits % 100 == 0)) {

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

@@ -52,11 +52,11 @@ abstract class LLMClientConfiguration(
         return name.compareTo(other.name)
     }
 
-    override fun equals(other: Any?): Boolean {
-        return other is LLMClientConfiguration && other.id == id
-    }
-
-    override fun hashCode(): Int {
-        return id.hashCode()
-    }
+//    override fun equals(other: Any?): Boolean {
+//        return other is LLMClientConfiguration && other.id == id
+//    }
+//
+//    override fun hashCode(): Int {
+//        return id.hashCode()
+//    }
 }

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

@@ -4,6 +4,7 @@ import com.github.blarc.ai.commits.intellij.plugin.AICommitsBundle.message
 import com.github.blarc.ai.commits.intellij.plugin.settings.AppSettings2
 import com.github.blarc.ai.commits.intellij.plugin.wrap
 import com.intellij.icons.AllIcons
+import com.intellij.openapi.application.EDT
 import com.intellij.openapi.vcs.ui.CommitMessage
 import com.intellij.ui.components.JBLabel
 import dev.langchain4j.data.message.UserMessage
@@ -20,22 +21,28 @@ abstract class LLMClientService<T : LLMClientConfiguration>(private val cs: Coro
     fun generateCommitMessage(client: T, prompt: String, commitMessage: CommitMessage) {
         cs.launch(Dispatchers.Default) {
             sendRequest(client, prompt, onSuccess = {
-                commitMessage.setCommitMessage(it)
+                withContext(Dispatchers.EDT) {
+                    commitMessage.setCommitMessage(it)
+                }
                 AppSettings2.instance.recordHit()
             }, onError = {
-                commitMessage.setCommitMessage(it)
+                withContext(Dispatchers.EDT) {
+                    commitMessage.setCommitMessage(it)
+                }
             })
         }
     }
 
     fun verifyConfiguration(client: T, label: JBLabel) {
-        // TODO @Blarc: Can you make this better?
+        // TODO @Blarc: Can you make this better? with notifications?
         label.text = "Verifying configuration..."
         cs.launch(Dispatchers.Default) {
             sendRequest(client, "test", onSuccess = {
+                // This can't be called from EDT thread, because dialog blocks the EDT thread
                 label.text = message("settings.verify.valid")
                 label.icon = AllIcons.General.InspectionsOK
             }, onError = {
+                // This can't be called from EDT thread, because dialog blocks the EDT thread
                 label.text = it.wrap(80)
                 label.icon = AllIcons.General.InspectionsError
             })

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

@@ -3,20 +3,19 @@ package com.github.blarc.ai.commits.intellij.plugin.settings.clients.ollama
 import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientPanel
 
 class OllamaClientPanel private constructor(
-    configuration: OllamaClientConfiguration,
+    private val clientConfiguration: OllamaClientConfiguration,
     val service: OllamaClientService
-): LLMClientPanel(configuration) {
+): LLMClientPanel(clientConfiguration) {
 
     constructor(configuration: OllamaClientConfiguration): this(configuration, OllamaClientService.getInstance())
 
     override fun verifyConfiguration() {
+        // Configuration passed to panel is already a copy of the original or a new configuration
+        clientConfiguration.host = hostComboBox.item
+        clientConfiguration.timeout = socketTimeoutTextField.text.toInt()
+        clientConfiguration.modelId = modelComboBox.item
+        clientConfiguration.temperature = temperatureTextField.text
 
-        val newConfiguration = OllamaClientConfiguration()
-        newConfiguration.host = hostComboBox.item
-        newConfiguration.timeout = socketTimeoutTextField.text.toInt()
-        newConfiguration.modelId = modelComboBox.item
-        newConfiguration.temperature = temperatureTextField.text
-
-        service.verifyConfiguration(newConfiguration, verifyLabel)
+        service.verifyConfiguration(clientConfiguration, verifyLabel)
     }
 }

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

@@ -1,7 +1,6 @@
 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.AICommitsUtils.saveToken
 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
@@ -25,11 +24,10 @@ class OpenAiClientPanel(private val clientConfiguration: OpenAiClientConfigurati
                 .widthGroup("label")
             cell(tokenPasswordField)
                 .bindText(getter = {""}, setter = {
-                    saveToken(clientConfiguration.id, it)
+                    OpenAiClientService.getInstance().saveToken(clientConfiguration, it)
                 })
                 .emptyText(if (clientConfiguration.tokenIsStored) message("settings.openAI.token.stored") else message("settings.openAI.token.example"))
                 .resizableColumn()
-                .focused()
                 .widthGroup("input")
         }
         row {
@@ -54,14 +52,13 @@ class OpenAiClientPanel(private val clientConfiguration: OpenAiClientConfigurati
 
     override fun verifyConfiguration() {
 
-        val newConfiguration = OpenAiClientConfiguration()
-        newConfiguration.host = hostComboBox.item
-        newConfiguration.proxyUrl = proxyTextField.text
-        newConfiguration.timeout = socketTimeoutTextField.text.toInt()
-        newConfiguration.modelId = modelComboBox.item
-        newConfiguration.temperature = temperatureTextField.text
-        newConfiguration.token = String(tokenPasswordField.password)
+        clientConfiguration.host = hostComboBox.item
+        clientConfiguration.proxyUrl = proxyTextField.text
+        clientConfiguration.timeout = socketTimeoutTextField.text.toInt()
+        clientConfiguration.modelId = modelComboBox.item
+        clientConfiguration.temperature = temperatureTextField.text
+        clientConfiguration.token = String(tokenPasswordField.password)
 
-        OpenAiClientService.getInstance().verifyConfiguration(newConfiguration, verifyLabel)
+        OpenAiClientService.getInstance().verifyConfiguration(clientConfiguration, verifyLabel)
     }
 }

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

@@ -1,20 +1,26 @@
 package com.github.blarc.ai.commits.intellij.plugin.settings.clients.openAi
 
+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.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientService
+import com.intellij.ide.passwordSafe.PasswordSafe
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.util.text.nullize
 import dev.langchain4j.model.chat.ChatLanguageModel
 import dev.langchain4j.model.openai.OpenAiChatModel
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import java.net.InetSocketAddress
 import java.net.Proxy
 import java.net.URI
 import java.time.Duration
 
 @Service(Service.Level.APP)
-class OpenAiClientService(cs: CoroutineScope) : LLMClientService<OpenAiClientConfiguration>(cs) {
+class OpenAiClientService(private val cs: CoroutineScope) : LLMClientService<OpenAiClientConfiguration>(cs) {
 
     companion object {
         @JvmStatic
@@ -42,5 +48,15 @@ class OpenAiClientService(cs: CoroutineScope) : LLMClientService<OpenAiClientCon
         return builder.build()
     }
 
+    fun saveToken(client: OpenAiClientConfiguration, token: String) {
+        cs.launch(Dispatchers.Default) {
+            try {
+                PasswordSafe.instance.setPassword(getCredentialAttributes(client.id), token)
+                client.tokenIsStored = true
+            } catch (e: Exception) {
+                sendNotification(Notification.unableToSaveToken(e.message))
+            }
+        }
+    }
 
 }