refactor(clients): split llm client service to state and behaviour services

Blarc · Blarc · commit 6ab4c11df435 · 2024-06-08T15:24:28.000+02:00
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
@@ -6,10 +6,13 @@ import com.github.blarc.ai.commits.intellij.plugin.notifications.sendNotificatio
 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.OpenAiClientService
+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.openapi.application.ApplicationManager
-import com.intellij.openapi.components.*
+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.Converter
 import com.intellij.util.xmlb.XmlSerializerUtil
 import com.intellij.util.xmlb.annotations.OptionTag
@@ -92,8 +95,8 @@ class AppSettings2 : PersistentStateComponent<AppSettings2> {
             AICommitsUtils.retrieveToken(appSettings.openAITokenTitle)?.let { token = it }
         }
 
-        service<OpenAiClientService>().hosts.addAll(appSettings.openAIHosts)
-        service<OpenAiClientService>().modelIds.addAll(appSettings.openAIModelIds)
+        OpenAiClientSharedState.getInstance().hosts.addAll(appSettings.openAIHosts)
+        OpenAiClientSharedState.getInstance().modelIds.addAll(appSettings.openAIModelIds)
     }
 
     fun recordHit() {
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/LLMClientConfiguration.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/LLMClientConfiguration.kt
@@ -26,9 +26,23 @@ abstract class LLMClientConfiguration(
 
     abstract fun getIcon(): Icon
 
-    abstract fun getHosts(): Set<String>
+    abstract fun getSharedState(): LLMClientSharedState
 
-    abstract fun getModelIds(): Set<String>
+    fun getHosts(): Set<String> {
+        return getSharedState().hosts
+    }
+
+    fun getModelIds(): Set<String> {
+        return getSharedState().modelIds
+    }
+
+    fun addHost(host: String) {
+        getSharedState().hosts.add(host)
+    }
+
+    fun addModelId(modelId: String) {
+        getSharedState().modelIds.add(modelId)
+    }
 
     abstract fun generateCommitMessage(prompt: String, commitMessage: CommitMessage)
 
@@ -49,4 +63,5 @@ abstract class LLMClientConfiguration(
     override fun compareTo(other: LLMClientConfiguration): Int {
         return displayName.compareTo(other.displayName)
     }
+
 }
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/LLMClientPanel.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/LLMClientPanel.kt
@@ -2,22 +2,22 @@ package com.github.blarc.ai.commits.intellij.plugin.settings.clients
 
 import com.github.blarc.ai.commits.intellij.plugin.AICommitsBundle.message
 import com.github.blarc.ai.commits.intellij.plugin.isInt
-import com.github.blarc.ai.commits.intellij.plugin.settings.clients.ollama.OllamaClientService
 import com.github.blarc.ai.commits.intellij.plugin.temperatureValid
-import com.intellij.openapi.components.service
 import com.intellij.openapi.ui.ComboBox
 import com.intellij.ui.components.JBLabel
 import com.intellij.ui.components.JBTextField
 import com.intellij.ui.dsl.builder.*
 import com.intellij.ui.util.minimumWidth
 
 
-abstract class LLMClientPanel(private val client: LLMClientConfiguration) {
+abstract class LLMClientPanel(
+    private val clientConfiguration: LLMClientConfiguration,
+) {
 
-    val hostComboBox = ComboBox(client.getHosts().toTypedArray())
+    val hostComboBox = ComboBox(clientConfiguration.getHosts().toTypedArray())
     val proxyTextField = JBTextField()
     val socketTimeoutTextField = JBTextField()
-    val modelComboBox = ComboBox(client.getModelIds().toTypedArray())
+    val modelComboBox = ComboBox(clientConfiguration.getModelIds().toTypedArray())
     val temperatureTextField = JBTextField()
     val verifyLabel = JBLabel()
 
@@ -37,8 +37,9 @@ abstract class LLMClientPanel(private val client: LLMClientConfiguration) {
                 .applyToComponent {
                     isEditable = true
                 }
-                .bindItem(client::host.toNullableProperty())
+                .bindItem(clientConfiguration::host.toNullableProperty())
                 .widthGroup("input")
+                .onApply { clientConfiguration.addHost(hostComboBox.item) }
         }
     }
 
@@ -48,7 +49,7 @@ abstract class LLMClientPanel(private val client: LLMClientConfiguration) {
                 .widthGroup("label")
             cell(proxyTextField)
                 .applyToComponent { minimumWidth = 400 }
-                .bindText(client::proxyUrl.toNonNullableProperty(""))
+                .bindText(clientConfiguration::proxyUrl.toNonNullableProperty(""))
                 .resizableColumn()
                 .widthGroup("input")
         }
@@ -62,7 +63,7 @@ abstract class LLMClientPanel(private val client: LLMClientConfiguration) {
             label(message("settings.llmClient.timeout")).widthGroup("label")
             cell(socketTimeoutTextField)
                 .applyToComponent { minimumWidth = 400 }
-                .bindIntText(client::timeout)
+                .bindIntText(clientConfiguration::timeout)
                 .resizableColumn()
                 .widthGroup("input")
                 .validationOnInput { isInt(it.text) }
@@ -78,16 +79,16 @@ abstract class LLMClientPanel(private val client: LLMClientConfiguration) {
                 .applyToComponent {
                     isEditable = true
                 }
-                .bindItem({ client.modelId }, {
+                .bindItem({ clientConfiguration.modelId }, {
                     if (it != null) {
-                        client.modelId = it
+                        clientConfiguration.modelId = it
                     }
                 })
                 .widthGroup("input")
                 .resizableColumn()
-                .onApply { service<OllamaClientService>().modelIds.add(modelComboBox.item) }
+                .onApply { clientConfiguration.addModelId(modelComboBox.item) }
 
-            client.getRefreshModelsFunction()?.let { f ->
+            clientConfiguration.getRefreshModelsFunction()?.let { f ->
                 button(message("settings.refreshModels")) {
                     f.invoke(modelComboBox)
                 }
@@ -103,7 +104,7 @@ abstract class LLMClientPanel(private val client: LLMClientConfiguration) {
                 .widthGroup("label")
 
             cell(temperatureTextField)
-                .bindText(client::temperature)
+                .bindText(clientConfiguration::temperature)
                 .applyToComponent { minimumWidth = 400 }
                 .resizableColumn()
                 .widthGroup("input")
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/LLMClientService.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/LLMClientService.kt
@@ -15,7 +15,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-abstract class LLMClientService<T : LLMClientConfiguration>(private val cs: CoroutineScope?) {
+abstract class LLMClientService <T: LLMClientConfiguration>(private val cs: CoroutineScope) {
+
     abstract fun buildChatModel(client: T): ChatLanguageModel
 
     fun generateCommitMessage(client: T, prompt: String, commitMessage: CommitMessage) {
@@ -63,7 +64,7 @@ abstract class LLMClientService<T : LLMClientConfiguration>(private val cs: Coro
 //    data class OpenAiErrorWrapper(val error: OpenAiError)
 
     private fun sendRequest(model: ChatLanguageModel, text: String, onResponse: suspend (r: Response<AiMessage>) -> Unit ) {
-        cs!!.launch(Dispatchers.Default) {
+        cs.launch(Dispatchers.Default) {
             val response = withContext(Dispatchers.IO) {
                 model.generate(
                     listOf(
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/LLMClientSharedState.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/LLMClientSharedState.kt
@@ -0,0 +1,8 @@
+package com.github.blarc.ai.commits.intellij.plugin.settings.clients
+
+interface LLMClientSharedState {
+
+    val hosts: MutableSet<String>
+
+    val modelIds: MutableSet<String>
+}
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/ollama/OllamaClientConfiguration.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/ollama/OllamaClientConfiguration.kt
@@ -2,6 +2,7 @@ package com.github.blarc.ai.commits.intellij.plugin.settings.clients.ollama
 
 import com.github.blarc.ai.commits.intellij.plugin.Icons
 import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientConfiguration
+import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientSharedState
 import com.intellij.openapi.ui.ComboBox
 import com.intellij.openapi.vcs.ui.CommitMessage
 import javax.swing.Icon
@@ -18,13 +19,8 @@ class OllamaClientConfiguration(displayName: String = "Ollama") : LLMClientConfi
         return Icons.OLLAMA
     }
 
-    override fun getHosts(): Set<String> {
-        return OllamaClientService.getInstance().hosts
-    }
-
-    override fun getModelIds(): Set<String> {
-        return OllamaClientService.getInstance().modelIds
-
+    override fun getSharedState(): LLMClientSharedState {
+        return OllamaClientSharedState.getInstance()
     }
 
     override fun generateCommitMessage(prompt: String, commitMessage: CommitMessage) {
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/ollama/OllamaClientPanel.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/ollama/OllamaClientPanel.kt
@@ -1,9 +1,14 @@
 package com.github.blarc.ai.commits.intellij.plugin.settings.clients.ollama
 
-import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientConfiguration
 import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientPanel
 
-class OllamaClientPanel(client: LLMClientConfiguration) : LLMClientPanel(client) {
+class OllamaClientPanel private constructor(
+    configuration: OllamaClientConfiguration,
+    val service: OllamaClientService
+): LLMClientPanel(configuration) {
+
+    constructor(configuration: OllamaClientConfiguration): this(configuration, OllamaClientService.getInstance())
+
     override fun verifyConfiguration() {
 
         val newConfiguration = OllamaClientConfiguration()
@@ -12,6 +17,6 @@ class OllamaClientPanel(client: LLMClientConfiguration) : LLMClientPanel(client)
         newConfiguration.modelId = modelComboBox.item
         newConfiguration.temperature = temperatureTextField.text
 
-        OllamaClientService.getInstance().verifyConfiguration(newConfiguration, verifyLabel)
+        service.verifyConfiguration(newConfiguration, verifyLabel)
     }
 }
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/ollama/OllamaClientService.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/ollama/OllamaClientService.kt
@@ -2,11 +2,10 @@ package com.github.blarc.ai.commits.intellij.plugin.settings.clients.ollama
 
 import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientService
 import com.intellij.openapi.application.EDT
-import com.intellij.openapi.components.*
+import com.intellij.openapi.components.Service
+import com.intellij.openapi.components.service
 import com.intellij.openapi.ui.ComboBox
 import com.intellij.openapi.ui.naturalSorted
-import com.intellij.util.xmlb.XmlSerializerUtil
-import com.intellij.util.xmlb.annotations.XCollection
 import dev.langchain4j.model.chat.ChatLanguageModel
 import dev.langchain4j.model.ollama.OllamaChatModel
 import dev.langchain4j.model.ollama.OllamaModels
@@ -18,41 +17,25 @@ import java.time.Duration
 import javax.swing.DefaultComboBoxModel
 
 @Service(Service.Level.APP)
-@State(name = "OllamaClientService", storages = [Storage("AICommitsOllama.xml")])
-class OllamaClientService(
-    @Transient private val cs: CoroutineScope?
-):
-    PersistentStateComponent<OllamaClientService>,
-    LLMClientService<OllamaClientConfiguration>(cs) {
+class OllamaClientService(private val cs: CoroutineScope) : LLMClientService<OllamaClientConfiguration>(cs) {
 
     companion object {
         @JvmStatic
         fun getInstance(): OllamaClientService = service()
     }
 
-    @XCollection(style = XCollection.Style.v2)
-    val hosts = mutableSetOf("http://localhost:11434/")
-
-    @XCollection(style = XCollection.Style.v2)
-    val modelIds: MutableSet<String> = mutableSetOf("llama3")
-
-    override fun getState(): OllamaClientService = this
-
-    override fun loadState(state: OllamaClientService) {
-        XmlSerializerUtil.copyBean(state, this)
-    }
-
     fun refreshModels(client: OllamaClientConfiguration, comboBox: ComboBox<String>) {
         val ollamaModels = OllamaModels.builder()
             .timeout(Duration.ofSeconds(client.timeout.toLong()))
             .baseUrl(client.host)
             .build()
 
-        cs!!.launch(Dispatchers.Default) {
+        cs.launch(Dispatchers.Default) {
             val availableModels = withContext(Dispatchers.IO) {
                 ollamaModels.availableModels()
             }
-            modelIds.addAll(availableModels.content()
+
+            OllamaClientSharedState.getInstance().modelIds.addAll(availableModels.content()
                 .map { it.name }
             )
             withContext(Dispatchers.EDT) {
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/ollama/OllamaClientSharedState.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/ollama/OllamaClientSharedState.kt
@@ -0,0 +1,28 @@
+package com.github.blarc.ai.commits.intellij.plugin.settings.clients.ollama
+
+import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientSharedState
+import com.intellij.openapi.components.*
+import com.intellij.util.xmlb.XmlSerializerUtil
+import com.intellij.util.xmlb.annotations.XCollection
+
+@Service(Service.Level.APP)
+@State(name = "OllamaClientSharedState", storages = [Storage("AICommitsOllama.xml")])
+class OllamaClientSharedState : PersistentStateComponent<OllamaClientSharedState>, LLMClientSharedState {
+
+    companion object {
+        @JvmStatic
+        fun getInstance(): OllamaClientSharedState = service()
+    }
+
+    @XCollection(style = XCollection.Style.v2)
+    override val hosts = mutableSetOf("http://localhost:11434/")
+
+    @XCollection(style = XCollection.Style.v2)
+    override val modelIds: MutableSet<String> = mutableSetOf("llama3")
+
+    override fun getState(): OllamaClientSharedState = this
+
+    override fun loadState(state: OllamaClientSharedState) {
+        XmlSerializerUtil.copyBean(state, this)
+    }
+}
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/openAi/OpenAiClientConfiguration.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/openAi/OpenAiClientConfiguration.kt
@@ -2,7 +2,7 @@ package com.github.blarc.ai.commits.intellij.plugin.settings.clients.openAi
 
 import com.github.blarc.ai.commits.intellij.plugin.Icons
 import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientConfiguration
-import com.intellij.openapi.components.service
+import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientSharedState
 import com.intellij.openapi.vcs.ui.CommitMessage
 import javax.swing.Icon
 
@@ -18,12 +18,8 @@ class OpenAiClientConfiguration(displayName: String = "OpenAI") : LLMClientConfi
         return Icons.OPEN_AI
     }
 
-    override fun getHosts(): Set<String> {
-        return service<OpenAiClientService>().hosts
-    }
-
-    override fun getModelIds(): Set<String> {
-        return service<OpenAiClientService>().modelIds
+    override fun getSharedState(): LLMClientSharedState {
+        return OpenAiClientSharedState.getInstance()
     }
 
     override fun generateCommitMessage(prompt: String, commitMessage: CommitMessage) {
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/openAi/OpenAiClientService.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/openAi/OpenAiClientService.kt
@@ -1,44 +1,24 @@
 package com.github.blarc.ai.commits.intellij.plugin.settings.clients.openAi
 
 import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientService
-import com.intellij.openapi.components.*
-import com.intellij.util.xmlb.XmlSerializerUtil
-import com.intellij.util.xmlb.annotations.XCollection
+import com.intellij.openapi.components.Service
+import com.intellij.openapi.components.service
 import dev.langchain4j.model.chat.ChatLanguageModel
 import dev.langchain4j.model.openai.OpenAiChatModel
-import dev.langchain4j.model.openai.OpenAiChatModelName
 import kotlinx.coroutines.CoroutineScope
 import java.net.InetSocketAddress
 import java.net.Proxy
 import java.net.URI
 import java.time.Duration
 
 @Service(Service.Level.APP)
-@State(name = "OpenAiClientService", storages = [Storage("AICommitsOpenAi.xml")])
-class OpenAiClientService(@Transient private val cs: CoroutineScope?) :
-    PersistentStateComponent<OpenAiClientService>,
-    LLMClientService<OpenAiClientConfiguration>(cs) {
+class OpenAiClientService(cs: CoroutineScope) : LLMClientService<OpenAiClientConfiguration>(cs) {
 
     companion object {
         @JvmStatic
         fun getInstance(): OpenAiClientService = service()
     }
 
-    @XCollection(style = XCollection.Style.v2)
-    val hosts = mutableSetOf("https://api.openai.com/v1")
-
-    @XCollection(style = XCollection.Style.v2)
-    val modelIds = OpenAiChatModelName.entries.stream()
-        .map { it.toString() }
-        .toList()
-        .toMutableSet()
-
-    override fun getState(): OpenAiClientService = this
-
-    override fun loadState(state: OpenAiClientService) {
-        XmlSerializerUtil.copyBean(state, this)
-    }
-
     override fun buildChatModel(client: OpenAiClientConfiguration): ChatLanguageModel {
         val builder = OpenAiChatModel.builder()
             .apiKey(client.token)
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/openAi/OpenAiClientSharedState.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/openAi/OpenAiClientSharedState.kt
