fix(prompts): project specific option does not work

Closes #229

Author: Blarc

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Fixed
+
+- Setting LLM client configuration or prompt as project specific does not work.
+
 ## [2.4.0] - 2024-09-13
 
 ### Added

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

@@ -2,17 +2,20 @@ package com.github.blarc.ai.commits.intellij.plugin
 
 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.AppSettings2
+import com.github.blarc.ai.commits.intellij.plugin.settings.ProjectSettings
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.components.service
 import com.intellij.openapi.project.DumbAware
 import com.intellij.openapi.vcs.VcsDataKeys
 import com.intellij.openapi.vcs.ui.CommitMessage
 import com.intellij.vcs.commit.AbstractCommitWorkflowHandler
 
 class AICommitAction : AnAction(), DumbAware {
     override fun actionPerformed(e: AnActionEvent) {
-        val llmClient = AppSettings2.instance.getActiveLLMClientConfiguration()
+        val project = e.project ?: return
+
+        val llmClient = project.service<ProjectSettings>().getActiveLLMClientConfiguration()
         if (llmClient == null) {
             sendNotification(Notification.clientNotSet())
             return
@@ -30,7 +33,6 @@ class AICommitAction : AnAction(), DumbAware {
             return
         }
 
-        val project = e.project ?: return
         llmClient.generateCommitMessage(commitWorkflowHandler, commitMessage, project)
     }
 }

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

@@ -68,7 +68,7 @@ class AppSettings2 : PersistentStateComponent<AppSettings2> {
 
     @XMap
     var prompts = DefaultPrompts.toPromptsMap()
-    var activePrompt = prompts["basic"]!!
+    var activePrompt = DefaultPrompts.BASIC.prompt
 
     var appExclusions: Set<String> = setOf()
 

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

@@ -20,6 +20,7 @@ import java.util.*
 // Most of the settings are global, but we use project configurable to set isProjectSpecificLLMClient property
 class AppSettingsConfigurable(val project: Project, cs: CoroutineScope) : BoundConfigurable(message("settings.general.group.title")) {
 
+    private val projectSettings = project.service<ProjectSettings>()
     private val llmClientTable = LLMClientTable()
     private lateinit var llmClientConfigurationComboBox: ComboBox<LLMClientConfiguration>
     private var isProjectSpecificLLMClientCheckBox = JBCheckBox(message("settings.llmClient.projectSpecific"))
@@ -34,7 +35,7 @@ class AppSettingsConfigurable(val project: Project, cs: CoroutineScope) : BoundC
         row {
             label(message("settings.llmClient")).widthGroup("labelPrompt")
             llmClientConfigurationComboBox = comboBox(AppSettings2.instance.llmClientConfigurations, AICommitsListCellRenderer())
-                .bindItem(getter = { getActiveLLMClientConfiguration() }, setter = { setActiveLLMClientConfiguration(it) })
+                .bindItem(getter = { projectSettings.getActiveLLMClientConfiguration() }, setter = { setActiveLLMClientConfiguration(it) })
                 .widthGroup("input")
                 .component
             cell(isProjectSpecificLLMClientCheckBox)
@@ -79,15 +80,15 @@ class AppSettingsConfigurable(val project: Project, cs: CoroutineScope) : BoundC
                 AICommitsListCellRenderer()
             )
                 .widthGroup("input")
-                .bindItem(getter = { getActiveLocale() }, setter = { setActiveLocale(it)} )
+                .bindItem(getter = { projectSettings.locale }, setter = { setActiveLocale(it)} )
 
             browserLink(message("settings.more-prompts"), AICommitsBundle.URL_PROMPTS_DISCUSSION.toString())
                 .align(AlignX.RIGHT)
         }
         row {
             label(message("settings.prompt")).widthGroup("labelPrompt")
             promptComboBox = comboBox(AppSettings2.instance.prompts.values, AICommitsListCellRenderer())
-                .bindItem(getter = { getActivePrompt() }, { setActivePrompt(it) })
+                .bindItem(getter = { projectSettings.activePrompt }, { setActivePrompt(it) })
                 .widthGroup("input")
                 .component
             cell(isProjectSpecificPromptCheckBox)
@@ -137,14 +138,6 @@ class AppSettingsConfigurable(val project: Project, cs: CoroutineScope) : BoundC
         }
     }
 
-    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) {
@@ -155,38 +148,22 @@ class AppSettingsConfigurable(val project: Project, cs: CoroutineScope) : BoundC
         }
     }
 
-    private fun getActivePrompt(): Prompt? {
-        return if (isProjectSpecificPromptCheckBox.isSelected) {
-            project.service<ProjectSettings>().activePrompt
-        } else {
-            AppSettings2.instance.activePrompt
-        }
-    }
-
     private fun setActivePrompt(prompt: Prompt?) {
         prompt?.let {
             if (isProjectSpecificPromptCheckBox.isSelected) {
-                project.service<ProjectSettings>().activePrompt = prompt
+                project.service<ProjectSettings>().activePrompt = it
             } else {
-                AppSettings2.instance.activePrompt = prompt
+                AppSettings2.instance.activePrompt = it
             }
         }
     }
 
-    private fun getActiveLocale(): Locale {
-        return if (isProjectSpecificPromptCheckBox.isSelected) {
-            project.service<ProjectSettings>().locale
-        } else {
-            AppSettings2.instance.locale
-        }
-    }
-
     private fun setActiveLocale(locale: Locale?) {
         locale?.let {
             if (isProjectSpecificPromptCheckBox.isSelected) {
-                project.service<ProjectSettings>().locale = locale
+                project.service<ProjectSettings>().locale = it
             } else {
-                AppSettings2.instance.locale = locale
+                AppSettings2.instance.locale = it
             }
         }
     }

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

@@ -3,6 +3,7 @@ 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.AppSettings2.LocaleConverter
 import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientConfiguration
+import com.github.blarc.ai.commits.intellij.plugin.settings.prompts.DefaultPrompts
 import com.github.blarc.ai.commits.intellij.plugin.settings.prompts.Prompt
 import com.intellij.openapi.components.PersistentStateComponent
 import com.intellij.openapi.components.Service
@@ -31,9 +32,12 @@ class ProjectSettings : PersistentStateComponent<ProjectSettings?> {
     @Attribute
     var isProjectSpecificLLMClient: Boolean = false
 
-    var activePrompt: Prompt? = null
+    var activePrompt = DefaultPrompts.BASIC.prompt
+        get() = getActivePrompt(field)
+
     @OptionTag(converter = LocaleConverter::class)
     var locale: Locale = Locale.ENGLISH
+        get() = getActiveLocale(field)
     @Attribute
     var isProjectSpecificPrompt: Boolean = false
 
@@ -48,7 +52,26 @@ class ProjectSettings : PersistentStateComponent<ProjectSettings?> {
     }
 
     fun getActiveLLMClientConfiguration(): LLMClientConfiguration? {
-        return AppSettings2.instance.getActiveLLMClientConfiguration(activeLlmClientId)
+        return if (isProjectSpecificLLMClient) {
+            AppSettings2.instance.getActiveLLMClientConfiguration(activeLlmClientId)
+        } else {
+            AppSettings2.instance.getActiveLLMClientConfiguration()
+        }
+    }
+
+    private fun getActivePrompt(activePrompt: Prompt): Prompt {
+        return if (isProjectSpecificPrompt) {
+            activePrompt
+        } else {
+            AppSettings2.instance.activePrompt
+        }
     }
 
+    private fun getActiveLocale(locale: Locale): Locale {
+        return if (isProjectSpecificPrompt) {
+            locale
+        } else {
+            AppSettings2.instance.locale
+        }
+    }
 }

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

@@ -7,11 +7,13 @@ import com.github.blarc.ai.commits.intellij.plugin.AICommitsUtils.constructPromp
 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.AppSettings2
+import com.github.blarc.ai.commits.intellij.plugin.settings.ProjectSettings
 import com.github.blarc.ai.commits.intellij.plugin.wrap
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.application.EDT
 import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.application.asContextElement
+import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vcs.changes.Change
 import com.intellij.openapi.vcs.ui.CommitMessage
@@ -54,7 +56,7 @@ abstract class LLMClientService<C : LLMClientConfiguration>(private val cs: Coro
                 }
 
                 val branch = commonBranch(includedChanges, project)
-                val prompt = constructPrompt(AppSettings2.instance.activePrompt.content, diff, branch, commitMessage.text, project)
+                val prompt = constructPrompt(project.service<ProjectSettings>().activePrompt.content, diff, branch, commitMessage.text, project)
 
                 sendRequest(clientConfiguration, prompt, onSuccess = {
                     withContext(Dispatchers.EDT) {