feat(clients): option to configure LLM client configuration per project

Blarc · Blarc · commit cc68215813f7 · 2024-09-04T20:35:18.000+02:00
Should've implemented prompt per project, but implemented LLM client configuration per project... oh well.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Added
 
 - Variables `{taskId}`, `{taskSummary}` and `{taskDescription}` for prompt customization that are replaced with values from the active [task](https://www.jetbrains.com/help/idea/managing-tasks-and-context.html#work-with-tasks).
+- Option to configure LLM client configuration per project.
 
 ### Changed
 
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/AICommitAction.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/AICommitAction.kt
@@ -15,7 +15,7 @@ import com.intellij.vcs.commit.AbstractCommitWorkflowHandler
 
 class AICommitAction : AnAction(), DumbAware {
     override fun actionPerformed(e: AnActionEvent) {
-        val llmClient = AppSettings2.instance.getActiveLLMClient()
+        val llmClient = AppSettings2.instance.getActiveLLMClientConfiguration()
         if (llmClient == null) {
             Notification.clientNotSet()
             return
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/AppSettings2.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/AppSettings2.kt
@@ -136,8 +136,12 @@ class AppSettings2 : PersistentStateComponent<AppSettings2> {
         return AICommitsUtils.matchesGlobs(path, appExclusions)
     }
 
-    fun getActiveLLMClient(): LLMClientConfiguration? {
-        return llmClientConfigurations.find { it.id == activeLlmClientId }
+    fun getActiveLLMClientConfiguration(): LLMClientConfiguration? {
+        return getActiveLLMClientConfiguration(activeLlmClientId)
+    }
+
+    fun getActiveLLMClientConfiguration(activeLLMClientConfigurationId: String?): LLMClientConfiguration? {
+        return llmClientConfigurations.find { it.id == activeLLMClientConfigurationId }
             ?: llmClientConfigurations.firstOrNull()
     }
 
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/AppSettingsConfigurable.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/AppSettingsConfigurable.kt
@@ -6,18 +6,23 @@ import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientCon
 import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientTable
 import com.github.blarc.ai.commits.intellij.plugin.settings.prompts.Prompt
 import com.github.blarc.ai.commits.intellij.plugin.settings.prompts.PromptTable
+import com.intellij.openapi.components.service
 import com.intellij.openapi.options.BoundConfigurable
+import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.ComboBox
 import com.intellij.ui.CommonActionsPanel
 import com.intellij.ui.ToolbarDecorator
+import com.intellij.ui.components.JBCheckBox
 import com.intellij.ui.dsl.builder.*
 import java.util.*
 
-class AppSettingsConfigurable : BoundConfigurable(message("settings.general.group.title")) {
+// Most of the settings are global, but we use project configurable to set isProjectSpecificLLMClient property
+class AppSettingsConfigurable(val project: Project) : BoundConfigurable(message("settings.general.group.title")) {
 
     private val llmClientTable = LLMClientTable()
-    private lateinit var llmClientToolbarDecorator: ToolbarDecorator
     private lateinit var llmClientConfigurationComboBox: ComboBox<LLMClientConfiguration>
+    private var isProjectSpecificLLMClientCheckBox = JBCheckBox(message("settings.llmClient.projectSpecific"))
+    private lateinit var llmClientToolbarDecorator: ToolbarDecorator
     private val promptTable = PromptTable()
     private lateinit var toolbarDecorator: ToolbarDecorator
     private lateinit var promptComboBox: ComboBox<Prompt>
@@ -27,12 +32,11 @@ class AppSettingsConfigurable : BoundConfigurable(message("settings.general.grou
         row {
             label(message("settings.llmClient")).widthGroup("labelPrompt")
             llmClientConfigurationComboBox = comboBox(AppSettings2.instance.llmClientConfigurations, AICommitsListCellRenderer())
-                .bindItem(getter = AppSettings2.instance::getActiveLLMClient) {
-                    it?.let {
-                        AppSettings2.instance.setActiveLlmClient(it.id)
-                    }
-                }.widthGroup("input")
+                .bindItem(getter = { getActiveLLMClientConfiguration() },  setter = { client: LLMClientConfiguration? -> setActiveLLMClientConfiguration(client) })
+                .widthGroup("input")
                 .component
+            cell(isProjectSpecificLLMClientCheckBox)
+                .bindSelected(project.service<ProjectSettings>()::isProjectSpecificLLMClient)
         }
         row {
             llmClientToolbarDecorator = ToolbarDecorator.createDecorator(llmClientTable.table)
@@ -125,6 +129,24 @@ class AppSettingsConfigurable : BoundConfigurable(message("settings.general.grou
         }
     }
 
+    private fun getActiveLLMClientConfiguration(): LLMClientConfiguration? {
+        return if (isProjectSpecificLLMClientCheckBox.isSelected) {
+            project.service<ProjectSettings>().getActiveLLMClientConfiguration()
+        } else {
+            AppSettings2.instance.getActiveLLMClientConfiguration()
+        }
+    }
+
+    private fun setActiveLLMClientConfiguration(llmClientConfiguration: LLMClientConfiguration?) {
+        llmClientConfiguration?.let {
+            if (isProjectSpecificLLMClientCheckBox.isSelected) {
+                project.service<ProjectSettings>().activeLlmClientId = it.id
+            } else {
+                AppSettings2.instance.activeLlmClientId = it.id
+            }
+        }
+    }
+
     private fun updateActionAvailability(action: CommonActionsPanel.Buttons) {
         val selectedRow = promptTable.table.selectedRow
         val selectedPrompt = promptTable.table.items[selectedRow]
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/ProjectSettings.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/ProjectSettings.kt
@@ -1,11 +1,13 @@
 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.settings.clients.LLMClientConfiguration
 import com.intellij.openapi.components.PersistentStateComponent
 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.Attribute
 
 @State(
         name = ProjectSettings.SERVICE_NAME,
@@ -20,6 +22,11 @@ class ProjectSettings : PersistentStateComponent<ProjectSettings?> {
 
     var projectExclusions: Set<String> = setOf()
 
+    @Attribute
+    var activeLlmClientId: String? = null
+    @Attribute
+    var isProjectSpecificLLMClient: Boolean = false
+
     override fun getState() = this
 
     override fun loadState(state: ProjectSettings) {
@@ -30,5 +37,8 @@ class ProjectSettings : PersistentStateComponent<ProjectSettings?> {
         return AICommitsUtils.matchesGlobs(path, projectExclusions)
     }
 
+    fun getActiveLLMClientConfiguration(): LLMClientConfiguration? {
+        return AppSettings2.instance.getActiveLLMClientConfiguration(activeLlmClientId)
+    }
 
 }
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -68,9 +68,10 @@
     <!-- Extension points defined by the plugin.
          Read more: https://plugins.jetbrains.com/docs/intellij/plugin-extension-points.html -->
     <extensions defaultExtensionNs="com.intellij">
-        <applicationConfigurable
+        <projectConfigurable
                 parentId="tools"
                 instance="com.github.blarc.ai.commits.intellij.plugin.settings.AppSettingsConfigurable"
+                id="com.github.blarc.ai.commits.intellij.plugin.settings.AppSettingsConfigurable"
                 key="name"
         />
 
diff --git a/src/main/resources/messages/AiCommitsBundle.properties b/src/main/resources/messages/AiCommitsBundle.properties
@@ -61,6 +61,7 @@ settings.exclusions.project.title=Project exclusions
 settings.prompt.hint=Hint
 settings.prompt.hint.comment=Note: This field is for testing purposes only. When generating the actual prompt, the {hint} variable will be replaced with content from the commit dialog.
 settings.llmClient=LLM Client
+settings.llmClient.projectSpecific=Project specific
 settings.llmClient.name=Name
 settings.llmClient.host=Host
 settings.llmClient.proxy=Proxy URL
@@ -71,7 +72,7 @@ settings.llmClient.modelId=Model
 settings.llmClient.timeout=Timeout
 settings.llmClient.temperature=Temperature
 settings.llmClient.temperature.comment=What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make \
-  the output more random,while lower values like 0.2 will make it more focused and deterministic.
+the output more random,while lower values like 0.2 will make it more focused and deterministic.
 
 settings.openAI.token.example=sk-ABCdefgHIjKlxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 settings.openAi.token.comment=You can get your token <a href="https://platform.openai.com/account/api-keys">here.</a>

Original file line number	Diff line number	Diff line change
`@@ -136,8 +136,12 @@ class AppSettings2 : PersistentStateComponent<AppSettings2> {`
`136`	`136`	`return AICommitsUtils.matchesGlobs(path, appExclusions)`
`137`	`137`	`}`
`138`	`138`
`139`		`- fun getActiveLLMClient(): LLMClientConfiguration? {`
`140`		`- return llmClientConfigurations.find { it.id == activeLlmClientId }`
	`139`	`+ fun getActiveLLMClientConfiguration(): LLMClientConfiguration? {`
	`140`	`+ return getActiveLLMClientConfiguration(activeLlmClientId)`
	`141`	`+ }`
	`142`	`+`
	`143`	`+ fun getActiveLLMClientConfiguration(activeLLMClientConfigurationId: String?): LLMClientConfiguration? {`
	`144`	`+ return llmClientConfigurations.find { it.id == activeLLMClientConfigurationId }`
`141`	`145`	`?: llmClientConfigurations.firstOrNull()`
`142`	`146`	`}`
`143`	`147`