fix(qianfan): api and secret keys are not properly saved

Author: Blarc

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

@@ -7,7 +7,6 @@ import com.intellij.openapi.vcs.ui.CommitMessage
 import com.intellij.util.xmlb.annotations.Attribute
 import com.intellij.util.xmlb.annotations.Transient
 import dev.langchain4j.model.qianfan.QianfanChatModelNameEnum
-import java.util.*
 import javax.swing.Icon
 
 class QianfanClientConfiguration : LLMClientConfiguration(
@@ -23,16 +22,9 @@ class QianfanClientConfiguration : LLMClientConfiguration(
     var secretKeyIsStored: Boolean = false
     @Transient
     var apiKey: String = ""
-
     @Transient
     var secretKey: String = ""
 
-    @Attribute
-    var apiKeyId: String = UUID.randomUUID().toString()
-
-    @Attribute
-    var secretKeyId: String = UUID.randomUUID().toString()
-
     companion object {
         const val CLIENT_NAME = "Qianfan"
     }
@@ -61,8 +53,6 @@ class QianfanClientConfiguration : LLMClientConfiguration(
         copy.id = id
         copy.apiKey = apiKey
         copy.secretKey = secretKey
-        copy.secretKeyId = secretKeyId
-        copy.apiKeyId = apiKeyId
         copy.name = name
         copy.host = host
         copy.modelId = modelId

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

@@ -24,7 +24,7 @@ class QianfanClientPanel(private val clientConfiguration: QianfanClientConfigura
                 .bindText(getter = {""}, setter = {
                     QianfanClientService.getInstance().saveApiKey(clientConfiguration, it)
                 })
-                .emptyText(if (clientConfiguration.apiKeyIsStored) message("settings.openAI.token.stored") else "")
+                .emptyText(if (clientConfiguration.apiKeyIsStored) message("settings.openAI.token.stored") else "JzRxxxxxxxxxxxxxxxxxxxxx")
                 .resizableColumn()
                 .widthGroup("input")
         }
@@ -35,7 +35,7 @@ class QianfanClientPanel(private val clientConfiguration: QianfanClientConfigura
                 .bindText(getter = {""}, setter = {
                     QianfanClientService.getInstance().saveSecretKey(clientConfiguration, it)
                 })
-                .emptyText(if (clientConfiguration.secretKeyIsStored) message("settings.openAI.token.stored") else "")
+                .emptyText(if (clientConfiguration.secretKeyIsStored) message("settings.openAI.token.stored") else "kSlxxxxxxxxxxxxxxxxxxxxxxxxxxxxx")
                 .resizableColumn()
                 .widthGroup("input")
         }

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

@@ -25,8 +25,8 @@ class QianfanClientService(private val cs: CoroutineScope) : LLMClientService<Qi
     }
 
     override suspend fun buildChatModel(client: QianfanClientConfiguration): ChatLanguageModel {
-        val apiKey = client.apiKey.nullize(true) ?: retrieveToken(client.apiKeyId)?.toString(true)
-        val secretKey = client.secretKey.nullize(true) ?: retrieveToken(client.secretKeyId)?.toString(true)
+        val apiKey = client.apiKey.nullize(true) ?: retrieveToken(client.id + "apiKey")?.toString(true)
+        val secretKey = client.secretKey.nullize(true) ?: retrieveToken(client.id + "secretKey")?.toString(true)
 
         val builder = QianfanChatModel.builder()
             .baseUrl(client.host)
@@ -35,28 +35,32 @@ class QianfanClientService(private val cs: CoroutineScope) : LLMClientService<Qi
             .modelName(client.modelId)
             .temperature(client.temperature.toDouble())
         // Fix https://github.com/langchain4j/langchain4j/pull/1426. Remove this 'if' statement when langchain4j releases a new version that resolves this issue.
-        if (client.modelId == QianfanChatModelNameEnum.ERNIE_SPEED_128K.modelName){
+        if (client.modelId == QianfanChatModelNameEnum.ERNIE_SPEED_128K.modelName) {
             builder.endpoint("ernie-speed-128k")
         }
 
         return builder.build()
     }
 
-    private fun saveToken(token: String, title: String) {
+    fun saveApiKey(client: QianfanClientConfiguration, key: String) {
         cs.launch(Dispatchers.Default) {
             try {
-                PasswordSafe.instance.setPassword(getCredentialAttributes(title), token)
+                PasswordSafe.instance.setPassword(getCredentialAttributes(client.id + "apiKey"), key)
+                client.apiKeyIsStored = true
             } catch (e: Exception) {
                 sendNotification(Notification.unableToSaveToken(e.message))
             }
         }
     }
-    fun saveApiKey(client: QianfanClientConfiguration, apiKey: String) {
-        saveToken(apiKey, client.apiKeyId)
-        client.apiKeyIsStored = true
-    }
-    fun saveSecretKey(client: QianfanClientConfiguration, secretKey: String) {
-        saveToken(secretKey, client.secretKeyId)
-        client.secretKeyIsStored = true
+
+    fun saveSecretKey(client: QianfanClientConfiguration, key: String) {
+        cs.launch(Dispatchers.Default) {
+            try {
+                PasswordSafe.instance.setPassword(getCredentialAttributes(client.id + "secretKey"), key)
+                client.secretKeyIsStored = true
+            } catch (e: Exception) {
+                sendNotification(Notification.unableToSaveToken(e.message))
+            }
+        }
     }
 }