Skip to content

Commit 5c79e15

Browse files
committed
refactor(clients): rename Ernie to Quinfan
1 parent ea060da commit 5c79e15

File tree

10 files changed

+37
-38
lines changed

10 files changed

+37
-38
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ object Icons {
66
val AI_COMMITS = IconLoader.getIcon("/icons/aiCommits15.svg", javaClass)
77
val OPEN_AI = IconLoader.getIcon("/icons/openai.svg", javaClass)
88
val OLLAMA = IconLoader.getIcon("/icons/ollama15.svg", javaClass)
9-
val ERNIE = IconLoader.getIcon("/icons/ernie.svg", javaClass)
9+
val QIANFAN = IconLoader.getIcon("/icons/qianfan.png", javaClass)
1010
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.github.blarc.ai.commits.intellij.plugin.AICommitsUtils.getCredentialA
55
import com.github.blarc.ai.commits.intellij.plugin.notifications.Notification
66
import com.github.blarc.ai.commits.intellij.plugin.notifications.sendNotification
77
import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientConfiguration
8-
import com.github.blarc.ai.commits.intellij.plugin.settings.clients.ernie.ErnieClientConfiguration
8+
import com.github.blarc.ai.commits.intellij.plugin.settings.clients.qianfan.QianfanClientConfiguration
99
import com.github.blarc.ai.commits.intellij.plugin.settings.clients.ollama.OllamaClientConfiguration
1010
import com.github.blarc.ai.commits.intellij.plugin.settings.clients.openAi.OpenAiClientConfiguration
1111
import com.github.blarc.ai.commits.intellij.plugin.settings.clients.openAi.OpenAiClientSharedState
@@ -51,7 +51,7 @@ class AppSettings2 : PersistentStateComponent<AppSettings2> {
5151
elementTypes = [
5252
OpenAiClientConfiguration::class,
5353
OllamaClientConfiguration::class,
54-
ErnieClientConfiguration::class
54+
QianfanClientConfiguration::class
5555
],
5656
style = XCollection.Style.v2
5757
)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.github.blarc.ai.commits.intellij.plugin.createColumn
55
import com.github.blarc.ai.commits.intellij.plugin.settings.AppSettings2
66
import com.github.blarc.ai.commits.intellij.plugin.settings.clients.ollama.OllamaClientConfiguration
77
import com.github.blarc.ai.commits.intellij.plugin.settings.clients.openAi.OpenAiClientConfiguration
8-
import com.github.blarc.ai.commits.intellij.plugin.settings.clients.ernie.ErnieClientConfiguration
8+
import com.github.blarc.ai.commits.intellij.plugin.settings.clients.qianfan.QianfanClientConfiguration
99
import com.intellij.openapi.ui.DialogPanel
1010
import com.intellij.openapi.ui.DialogWrapper
1111
import com.intellij.openapi.ui.Splitter
@@ -136,7 +136,7 @@ class LLMClientTable {
136136
listOf(
137137
OpenAiClientConfiguration(),
138138
OllamaClientConfiguration(),
139-
ErnieClientConfiguration()
139+
QianfanClientConfiguration()
140140
)
141141
} else {
142142
listOf(newLLMClientConfiguration)
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
package com.github.blarc.ai.commits.intellij.plugin.settings.clients.ernie
1+
package com.github.blarc.ai.commits.intellij.plugin.settings.clients.qianfan
22

33
import com.github.blarc.ai.commits.intellij.plugin.Icons
44
import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientConfiguration
55
import com.intellij.openapi.project.Project
66
import com.intellij.openapi.vcs.ui.CommitMessage
77
import com.intellij.util.xmlb.annotations.Attribute
88
import com.intellij.util.xmlb.annotations.Transient
9+
import dev.langchain4j.model.qianfan.QianfanChatModelNameEnum
910
import java.util.*
1011
import javax.swing.Icon
11-
import dev.langchain4j.model.qianfan.QianfanChatModelNameEnum
1212

13-
class ErnieClientConfiguration : LLMClientConfiguration(
14-
"Ernie",
13+
class QianfanClientConfiguration : LLMClientConfiguration(
14+
"Qianfan",
1515
"https://aip.baidubce.com",
1616
null,
1717
30,
@@ -33,30 +33,30 @@ class ErnieClientConfiguration : LLMClientConfiguration(
3333
var secretKeyId: String = UUID.randomUUID().toString()
3434

3535
companion object {
36-
const val CLIENT_NAME = "Ernie"
36+
const val CLIENT_NAME = "Qianfan"
3737
}
3838

3939
override fun getClientName(): String {
4040
return CLIENT_NAME
4141
}
4242

4343
override fun getClientIcon(): Icon {
44-
return Icons.ERNIE
44+
return Icons.QIANFAN
4545
}
4646

47-
override fun getSharedState(): ErnieClientSharedState {
48-
return ErnieClientSharedState.getInstance()
47+
override fun getSharedState(): QianfanClientSharedState {
48+
return QianfanClientSharedState.getInstance()
4949
}
5050

5151
override fun generateCommitMessage(prompt: String, project: Project, commitMessage: CommitMessage) {
52-
return ErnieClientService.getInstance().generateCommitMessage(this, prompt, project, commitMessage)
52+
return QianfanClientService.getInstance().generateCommitMessage(this, prompt, project, commitMessage)
5353
}
5454

5555
// Model names are retrieved from Enum and do not need to be refreshed.
5656
override fun getRefreshModelsFunction() = null
5757

5858
override fun clone(): LLMClientConfiguration {
59-
val copy = ErnieClientConfiguration()
59+
val copy = QianfanClientConfiguration()
6060
copy.id = id
6161
copy.apiKey = apiKey
6262
copy.secretKey = secretKey
@@ -73,5 +73,5 @@ class ErnieClientConfiguration : LLMClientConfiguration(
7373
return copy
7474
}
7575

76-
override fun panel() = ErnieClientPanel(this)
76+
override fun panel() = QianfanClientPanel(this)
7777
}
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.github.blarc.ai.commits.intellij.plugin.settings.clients.ernie
1+
package com.github.blarc.ai.commits.intellij.plugin.settings.clients.qianfan
22
import com.github.blarc.ai.commits.intellij.plugin.AICommitsBundle.message
33
import com.github.blarc.ai.commits.intellij.plugin.emptyText
44
import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientPanel
55
import com.intellij.ui.components.JBPasswordField
66
import com.intellij.ui.dsl.builder.bindText
77
import com.intellij.ui.dsl.builder.panel
88

9-
class ErnieClientPanel(private val clientConfiguration: ErnieClientConfiguration) : LLMClientPanel(clientConfiguration) {
9+
class QianfanClientPanel(private val clientConfiguration: QianfanClientConfiguration) : LLMClientPanel(clientConfiguration) {
1010

1111
private val apiKeyField = JBPasswordField()
1212
private val secretKeyField = JBPasswordField()
@@ -17,22 +17,22 @@ class ErnieClientPanel(private val clientConfiguration: ErnieClientConfiguration
1717
modelIdRow()
1818

1919
row {
20-
label(message("settings.ernie.apiKey"))
20+
label(message("settings.qianfan.apiKey"))
2121
.widthGroup("label")
2222
cell(apiKeyField)
2323
.bindText(getter = {""}, setter = {
24-
ErnieClientService.getInstance().saveApiKey(clientConfiguration, it)
24+
QianfanClientService.getInstance().saveApiKey(clientConfiguration, it)
2525
})
2626
.emptyText(if (clientConfiguration.apiKeyIsStored) message("settings.openAI.token.stored") else "")
2727
.resizableColumn()
2828
.widthGroup("input")
2929
}
3030
row {
31-
label(message("settings.ernie.secretKey"))
31+
label(message("settings.qianfan.secretKey"))
3232
.widthGroup("label")
3333
cell(secretKeyField)
3434
.bindText(getter = {""}, setter = {
35-
ErnieClientService.getInstance().saveSecretKey(clientConfiguration, it)
35+
QianfanClientService.getInstance().saveSecretKey(clientConfiguration, it)
3636
})
3737
.emptyText(if (clientConfiguration.secretKeyIsStored) message("settings.openAI.token.stored") else "")
3838
.resizableColumn()
@@ -53,6 +53,6 @@ class ErnieClientPanel(private val clientConfiguration: ErnieClientConfiguration
5353
clientConfiguration.apiKey = String(apiKeyField.password)
5454
clientConfiguration.secretKey = String(secretKeyField.password)
5555

56-
ErnieClientService.getInstance().verifyConfiguration(clientConfiguration, verifyLabel)
56+
QianfanClientService.getInstance().verifyConfiguration(clientConfiguration, verifyLabel)
5757
}
5858
}
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.blarc.ai.commits.intellij.plugin.settings.clients.ernie
1+
package com.github.blarc.ai.commits.intellij.plugin.settings.clients.qianfan
22

33
import com.github.blarc.ai.commits.intellij.plugin.AICommitsUtils.getCredentialAttributes
44
import com.github.blarc.ai.commits.intellij.plugin.AICommitsUtils.retrieveToken
@@ -17,14 +17,14 @@ import kotlinx.coroutines.Dispatchers
1717
import kotlinx.coroutines.launch
1818

1919
@Service(Service.Level.APP)
20-
class ErnieClientService(private val cs: CoroutineScope) : LLMClientService<ErnieClientConfiguration>(cs) {
20+
class QianfanClientService(private val cs: CoroutineScope) : LLMClientService<QianfanClientConfiguration>(cs) {
2121

2222
companion object {
2323
@JvmStatic
24-
fun getInstance(): ErnieClientService = service()
24+
fun getInstance(): QianfanClientService = service()
2525
}
2626

27-
override suspend fun buildChatModel(client: ErnieClientConfiguration): ChatLanguageModel {
27+
override suspend fun buildChatModel(client: QianfanClientConfiguration): ChatLanguageModel {
2828
val apiKey = client.apiKey.nullize(true) ?: retrieveToken(client.apiKeyId)?.toString(true)
2929
val secretKey = client.secretKey.nullize(true) ?: retrieveToken(client.secretKeyId)?.toString(true)
3030

@@ -51,11 +51,11 @@ class ErnieClientService(private val cs: CoroutineScope) : LLMClientService<Erni
5151
}
5252
}
5353
}
54-
fun saveApiKey(client: ErnieClientConfiguration, apiKey: String) {
54+
fun saveApiKey(client: QianfanClientConfiguration, apiKey: String) {
5555
saveToken(apiKey, client.apiKeyId)
5656
client.apiKeyIsStored = true
5757
}
58-
fun saveSecretKey(client: ErnieClientConfiguration, secretKey: String) {
58+
fun saveSecretKey(client: QianfanClientConfiguration, secretKey: String) {
5959
saveToken(secretKey, client.secretKeyId)
6060
client.secretKeyIsStored = true
6161
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.blarc.ai.commits.intellij.plugin.settings.clients.ernie
1+
package com.github.blarc.ai.commits.intellij.plugin.settings.clients.qianfan
22

33
import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientSharedState
44
import com.intellij.openapi.components.*
@@ -7,12 +7,12 @@ import com.intellij.util.xmlb.annotations.XCollection
77
import dev.langchain4j.model.qianfan.QianfanChatModelNameEnum
88

99
@Service(Service.Level.APP)
10-
@State(name = "ErnieClientSharedState", storages = [Storage("AICommitsOpenAi.xml")])
11-
class ErnieClientSharedState : PersistentStateComponent<ErnieClientSharedState>, LLMClientSharedState {
10+
@State(name = "QianfanClientSharedState", storages = [Storage("AICommitsOpenAi.xml")])
11+
class QianfanClientSharedState : PersistentStateComponent<QianfanClientSharedState>, LLMClientSharedState {
1212

1313
companion object {
1414
@JvmStatic
15-
fun getInstance(): ErnieClientSharedState = service()
15+
fun getInstance(): QianfanClientSharedState = service()
1616
}
1717

1818
@XCollection(style = XCollection.Style.v2)
@@ -24,9 +24,9 @@ class ErnieClientSharedState : PersistentStateComponent<ErnieClientSharedState>,
2424
.toList()
2525
.toMutableSet()
2626

27-
override fun getState(): ErnieClientSharedState = this
27+
override fun getState(): QianfanClientSharedState = this
2828

29-
override fun loadState(state: ErnieClientSharedState) {
29+
override fun loadState(state: QianfanClientSharedState) {
3030
XmlSerializerUtil.copyBean(state, this)
3131
}
3232
}

src/main/resources/icons/ernie.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.
1.05 KB
Loading

src/main/resources/messages/AiCommitsBundle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,6 @@ settings.openAI.token.stored=<hidden>
7676
settings.openAi.token.comment=\
7777
<p>You can get your token <a href="https://platform.openai.com/account/api-keys">here.</a/></p>
7878
settings.openAi.organizationId=Organization ID
79-
settings.ernie.apiKey=API key
80-
settings.ernie.secretKey=Secret key
79+
settings.qianfan.apiKey=API key
80+
settings.qianfan.secretKey=Secret key
8181
notifications.client-not-set=LLM client is not set.

0 commit comments

Comments
 (0)