chore(deps): bump dev.langchain4j:langchain4j-bom from 0.36.2 to 1.0.0

Blarc · Blarc · commit 1f6c78646b6f · 2025-05-19T07:29:49.000+02:00
Add dev.langchain4j:langchain4j-community-bom dependency, because dev.langchain4j:langchain4j-qianfan was moved to dev.langchain4j:langchain4j-community-qianfan.
Remove proxy configuration from OpenAI, because it was removed from langchain4j.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -100,11 +100,9 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1")
 
     // langchain4j integrations
-    implementation(platform("dev.langchain4j:langchain4j-bom:0.36.2"))
+    implementation(platform("dev.langchain4j:langchain4j-bom:1.0.0"))
     implementation("dev.langchain4j:langchain4j-open-ai")
     implementation("dev.langchain4j:langchain4j-ollama")
-    // The Baidu Qianfan Large Model Platform, including the ERNIE series, can be accessed at https://docs.langchain4j.dev/integrations/language-models/qianfan/.
-    implementation("dev.langchain4j:langchain4j-qianfan")
     implementation("dev.langchain4j:langchain4j-vertex-ai-gemini")
     implementation("dev.langchain4j:langchain4j-anthropic")
     implementation("dev.langchain4j:langchain4j-azure-open-ai")
@@ -113,6 +111,11 @@ dependencies {
     implementation("dev.langchain4j:langchain4j-google-ai-gemini")
     implementation("dev.langchain4j:langchain4j-github-models")
     implementation("dev.langchain4j:langchain4j-mistral-ai")
+
+    implementation(platform("dev.langchain4j:langchain4j-community-bom:1.0.0-beta5"))
+    // The Baidu Qianfan Large Model Platform, including the ERNIE series, can be accessed at https://docs.langchain4j.dev/integrations/language-models/qianfan/.
+    implementation("dev.langchain4j:langchain4j-community-qianfan")
+
     // tests
     testImplementation("org.junit.jupiter:junit-jupiter-params:5.12.2")
     testImplementation("org.junit.jupiter:junit-jupiter:5.12.2")
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
@@ -114,7 +114,6 @@ class AppSettings2 : PersistentStateComponent<AppSettings2> {
         openAiLlmClientConfiguration?.apply {
             host = appSettings.openAIHost
             appSettings.openAISocketTimeout.toIntOrNull()?.let { timeout = it }
-            proxyUrl = appSettings.proxyUrl
             modelId = appSettings.openAIModelId
             temperature = appSettings.openAITemperature
 
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
@@ -24,12 +24,11 @@ import com.intellij.platform.ide.progress.withBackgroundProgress
 import com.intellij.ui.components.JBLabel
 import com.intellij.vcs.commit.AbstractCommitWorkflowHandler
 import com.intellij.vcs.commit.isAmendCommitMode
-import dev.langchain4j.data.message.AiMessage
 import dev.langchain4j.data.message.UserMessage
-import dev.langchain4j.model.StreamingResponseHandler
-import dev.langchain4j.model.chat.ChatLanguageModel
-import dev.langchain4j.model.chat.StreamingChatLanguageModel
-import dev.langchain4j.model.output.Response
+import dev.langchain4j.model.chat.ChatModel
+import dev.langchain4j.model.chat.StreamingChatModel
+import dev.langchain4j.model.chat.response.ChatResponse
+import dev.langchain4j.model.chat.response.StreamingChatResponseHandler
 import git4idea.GitCommit
 import git4idea.history.GitHistoryUtils
 import git4idea.repo.GitRepositoryManager
@@ -45,9 +44,9 @@ abstract class LLMClientService<C : LLMClientConfiguration>(private val cs: Coro
         return listOf()
     }
 
-    abstract suspend fun buildChatModel(client: C): ChatLanguageModel
+    abstract suspend fun buildChatModel(client: C): ChatModel
 
-    abstract suspend fun buildStreamingChatModel(client: C): StreamingChatLanguageModel?
+    abstract suspend fun buildStreamingChatModel(client: C): StreamingChatModel?
 
     fun refreshModels(client: C, comboBox: ComboBox<String>, label: JBLabel) {
         label.text = message("settings.refreshModels.running")
@@ -155,33 +154,32 @@ abstract class LLMClientService<C : LLMClientConfiguration>(private val cs: Coro
         }, onError = onError)
     }
 
-    private suspend fun sendStreamingRequest(streamingModel: StreamingChatLanguageModel, text: String, onSuccess: suspend (r: String) -> Unit) {
+    private suspend fun sendStreamingRequest(streamingModel: StreamingChatModel, text: String, onSuccess: suspend (r: String) -> Unit) {
         var response = ""
         val completionDeferred = CompletableDeferred<String>()
 
         withContext(Dispatchers.IO) {
-            streamingModel.generate(
+            streamingModel.chat(
                 listOf(
                     UserMessage.from(
                         "user",
                         text
                     )
                 ),
-                object : StreamingResponseHandler<AiMessage> {
-                    override fun onNext(token: String?) {
-                        response += token
+                object : StreamingChatResponseHandler {
+                    override fun onPartialResponse(partialResponse: String?) {
+                        response += partialResponse
                         cs.launch {
                             onSuccess(response)
                         }
                     }
 
-                    override fun onError(error: Throwable) {
-                        completionDeferred.completeExceptionally(error)
+                    override fun onCompleteResponse(completeResponse: ChatResponse) {
+                        completionDeferred.complete(completeResponse.aiMessage().text())
                     }
 
-                    override fun onComplete(response: Response<AiMessage>) {
-                        super.onComplete(response)
-                        completionDeferred.complete(response.content().text())
+                    override fun onError(error: Throwable) {
+                        completionDeferred.completeExceptionally(error)
                     }
                 }
             )
@@ -194,14 +192,14 @@ abstract class LLMClientService<C : LLMClientConfiguration>(private val cs: Coro
     private suspend fun sendRequest(client: C, text: String, onSuccess: suspend (r: String) -> Unit) {
         val model = buildChatModel(client)
         val response = withContext(Dispatchers.IO) {
-            model.generate(
+            model.chat(
                 listOf(
                     UserMessage.from(
                         "user",
                         text
                     )
                 )
-            ).content().text()
+            ).aiMessage().text()
         }
         onSuccess(response)
     }
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/anthropic/AnthropicClientService.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/anthropic/AnthropicClientService.kt
@@ -11,8 +11,8 @@ import com.intellij.openapi.components.service
 import com.intellij.util.text.nullize
 import dev.langchain4j.model.anthropic.AnthropicChatModel
 import dev.langchain4j.model.anthropic.AnthropicStreamingChatModel
-import dev.langchain4j.model.chat.ChatLanguageModel
-import dev.langchain4j.model.chat.StreamingChatLanguageModel
+import dev.langchain4j.model.chat.ChatModel
+import dev.langchain4j.model.chat.StreamingChatModel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -26,7 +26,7 @@ class AnthropicClientService(private val cs: CoroutineScope) : LLMClientService<
         fun getInstance(): AnthropicClientService = service()
     }
 
-    override suspend fun buildChatModel(client: AnthropicClientConfiguration): ChatLanguageModel {
+    override suspend fun buildChatModel(client: AnthropicClientConfiguration): ChatModel {
         val token = client.token.nullize(true) ?: retrieveToken(client.id)?.toString(true)
         val builder = AnthropicChatModel.builder()
             .modelName(client.modelId)
@@ -49,7 +49,7 @@ class AnthropicClientService(private val cs: CoroutineScope) : LLMClientService<
 
     }
 
-    override suspend fun buildStreamingChatModel(client: AnthropicClientConfiguration): StreamingChatLanguageModel {
+    override suspend fun buildStreamingChatModel(client: AnthropicClientConfiguration): StreamingChatModel {
         val token = client.token.nullize(true) ?: retrieveToken(client.id)?.toString(true)
         val builder = AnthropicStreamingChatModel.builder()
             .modelName(client.modelId)
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/azureOpenAi/AzureOpenAiClientService.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/azureOpenAi/AzureOpenAiClientService.kt
@@ -11,8 +11,8 @@ import com.intellij.openapi.components.service
 import com.intellij.util.text.nullize
 import dev.langchain4j.model.azure.AzureOpenAiChatModel
 import dev.langchain4j.model.azure.AzureOpenAiStreamingChatModel
-import dev.langchain4j.model.chat.ChatLanguageModel
-import dev.langchain4j.model.chat.StreamingChatLanguageModel
+import dev.langchain4j.model.chat.ChatModel
+import dev.langchain4j.model.chat.StreamingChatModel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -27,7 +27,7 @@ class AzureOpenAiClientService(private val cs: CoroutineScope) : LLMClientServic
         fun getInstance(): AzureOpenAiClientService = service()
     }
 
-    override suspend fun buildChatModel(client: AzureOpenAiClientConfiguration): ChatLanguageModel {
+    override suspend fun buildChatModel(client: AzureOpenAiClientConfiguration): ChatModel {
         val token = client.token.nullize(true) ?: retrieveToken(client.id)?.toString(true)
         return AzureOpenAiChatModel.builder()
             .deploymentName(client.modelId)
@@ -39,7 +39,7 @@ class AzureOpenAiClientService(private val cs: CoroutineScope) : LLMClientServic
             .build()
     }
 
-    override suspend fun buildStreamingChatModel(client: AzureOpenAiClientConfiguration): StreamingChatLanguageModel {
+    override suspend fun buildStreamingChatModel(client: AzureOpenAiClientConfiguration): StreamingChatModel {
         val token = client.token.nullize(true) ?: retrieveToken(client.id)?.toString(true)
         return AzureOpenAiStreamingChatModel.builder()
             .deploymentName(client.modelId)
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/geminiGoogle/GeminiGoogleClientService.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/geminiGoogle/GeminiGoogleClientService.kt
@@ -9,8 +9,8 @@ import com.intellij.ide.passwordSafe.PasswordSafe
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.util.text.nullize
-import dev.langchain4j.model.chat.ChatLanguageModel
-import dev.langchain4j.model.chat.StreamingChatLanguageModel
+import dev.langchain4j.model.chat.ChatModel
+import dev.langchain4j.model.chat.StreamingChatModel
 import dev.langchain4j.model.googleai.GoogleAiGeminiChatModel
 import dev.langchain4j.model.googleai.GoogleAiGeminiStreamingChatModel
 import kotlinx.coroutines.CoroutineScope
@@ -25,7 +25,7 @@ class GeminiGoogleClientService(private val cs: CoroutineScope) : LLMClientServi
         fun getInstance(): GeminiGoogleClientService = service()
     }
 
-    override suspend fun buildChatModel(client: GeminiGoogleClientConfiguration): ChatLanguageModel {
+    override suspend fun buildChatModel(client: GeminiGoogleClientConfiguration): ChatModel {
         val token = client.token.nullize(true) ?: retrieveToken(client.id)?.toString(true)
         return GoogleAiGeminiChatModel.builder()
             .apiKey(token)
@@ -36,7 +36,7 @@ class GeminiGoogleClientService(private val cs: CoroutineScope) : LLMClientServi
             .build()
     }
 
-    override suspend fun buildStreamingChatModel(client: GeminiGoogleClientConfiguration) : StreamingChatLanguageModel {
+    override suspend fun buildStreamingChatModel(client: GeminiGoogleClientConfiguration) : StreamingChatModel {
         val token = client.token.nullize(true) ?: retrieveToken(client.id)?.toString(true)
         return GoogleAiGeminiStreamingChatModel.builder()
             .apiKey(token)
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/geminiVertex/GeminiVertexClientService.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/geminiVertex/GeminiVertexClientService.kt
@@ -3,8 +3,8 @@ package com.github.blarc.ai.commits.intellij.plugin.settings.clients.geminiVerte
 import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientService
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
-import dev.langchain4j.model.chat.ChatLanguageModel
-import dev.langchain4j.model.chat.StreamingChatLanguageModel
+import dev.langchain4j.model.chat.ChatModel
+import dev.langchain4j.model.chat.StreamingChatModel
 import dev.langchain4j.model.vertexai.VertexAiGeminiChatModel
 import dev.langchain4j.model.vertexai.VertexAiGeminiStreamingChatModel
 import kotlinx.coroutines.CoroutineScope
@@ -17,7 +17,7 @@ class GeminiVertexClientService(private val cs: CoroutineScope): LLMClientServic
         fun getInstance(): GeminiVertexClientService = service()
     }
 
-    override suspend fun buildChatModel(client: GeminiClientConfiguration): ChatLanguageModel {
+    override suspend fun buildChatModel(client: GeminiClientConfiguration): ChatModel {
         return VertexAiGeminiChatModel.builder()
             .project(client.projectId)
             .location(client.location)
@@ -28,7 +28,7 @@ class GeminiVertexClientService(private val cs: CoroutineScope): LLMClientServic
             .build()
     }
 
-    override suspend fun buildStreamingChatModel(client: GeminiClientConfiguration): StreamingChatLanguageModel {
+    override suspend fun buildStreamingChatModel(client: GeminiClientConfiguration): StreamingChatModel {
         return VertexAiGeminiStreamingChatModel.builder()
             .project(client.projectId)
             .location(client.location)
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/githubModels/GitHubModelsClientService.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/githubModels/GitHubModelsClientService.kt
@@ -9,8 +9,8 @@ import com.intellij.ide.passwordSafe.PasswordSafe
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.util.text.nullize
-import dev.langchain4j.model.chat.ChatLanguageModel
-import dev.langchain4j.model.chat.StreamingChatLanguageModel
+import dev.langchain4j.model.chat.ChatModel
+import dev.langchain4j.model.chat.StreamingChatModel
 import dev.langchain4j.model.github.GitHubModelsChatModel
 import dev.langchain4j.model.github.GitHubModelsStreamingChatModel
 import kotlinx.coroutines.CoroutineScope
@@ -26,7 +26,7 @@ class GitHubModelsClientService(private val cs: CoroutineScope) : LLMClientServi
         fun getInstance(): GitHubModelsClientService = service()
     }
 
-    override suspend fun buildChatModel(client: GitHubModelsClientConfiguration): ChatLanguageModel {
+    override suspend fun buildChatModel(client: GitHubModelsClientConfiguration): ChatModel {
         val token = client.token.nullize(true) ?: retrieveToken(client.id)?.toString(true)
         return GitHubModelsChatModel.builder()
             .gitHubToken(token)
@@ -37,7 +37,7 @@ class GitHubModelsClientService(private val cs: CoroutineScope) : LLMClientServi
             .build()
     }
 
-    override suspend fun buildStreamingChatModel(client: GitHubModelsClientConfiguration): StreamingChatLanguageModel? {
+    override suspend fun buildStreamingChatModel(client: GitHubModelsClientConfiguration): StreamingChatModel? {
         val token = client.token.nullize(true) ?: retrieveToken(client.id)?.toString(true)
         return GitHubModelsStreamingChatModel.builder()
             .gitHubToken(token)
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/huggingface/HuggingFaceClientService.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/huggingface/HuggingFaceClientService.kt
@@ -9,7 +9,7 @@ import com.intellij.ide.passwordSafe.PasswordSafe
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.util.text.nullize
-import dev.langchain4j.model.chat.ChatLanguageModel
+import dev.langchain4j.model.chat.ChatModel
 import dev.langchain4j.model.huggingface.HuggingFaceChatModel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -24,7 +24,7 @@ class HuggingFaceClientService(private val cs: CoroutineScope) : LLMClientServic
         fun getInstance(): HuggingFaceClientService = service()
     }
 
-    override suspend fun buildChatModel(client: HuggingFaceClientConfiguration): ChatLanguageModel {
+    override suspend fun buildChatModel(client: HuggingFaceClientConfiguration): ChatModel {
         val token = client.token.nullize(true) ?: retrieveToken(client.id)?.toString(true)
 
         return HuggingFaceChatModel.builder()
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/mistral/MistralAIClientService.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/mistral/MistralAIClientService.kt
@@ -9,8 +9,8 @@ import com.intellij.ide.passwordSafe.PasswordSafe
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.util.text.nullize
-import dev.langchain4j.model.chat.ChatLanguageModel
-import dev.langchain4j.model.chat.StreamingChatLanguageModel
+import dev.langchain4j.model.chat.ChatModel
+import dev.langchain4j.model.chat.StreamingChatModel
 import dev.langchain4j.model.mistralai.MistralAiChatModel
 import dev.langchain4j.model.mistralai.MistralAiModels
 import dev.langchain4j.model.mistralai.MistralAiStreamingChatModel
@@ -39,7 +39,7 @@ class MistralAIClientService(private val cs: CoroutineScope) : LLMClientService<
         return availableModels.map { it.id }
     }
 
-    override suspend fun buildChatModel(client: MistralAIClientConfiguration): ChatLanguageModel {
+    override suspend fun buildChatModel(client: MistralAIClientConfiguration): ChatModel {
         val token = client.token.nullize(true) ?: retrieveToken(client.id)?.toString(true)
         return MistralAiChatModel.builder()
             .modelName(client.modelId)
@@ -50,7 +50,7 @@ class MistralAIClientService(private val cs: CoroutineScope) : LLMClientService<
             .build()
     }
 
-    override suspend fun buildStreamingChatModel(client: MistralAIClientConfiguration): StreamingChatLanguageModel? {
+    override suspend fun buildStreamingChatModel(client: MistralAIClientConfiguration): StreamingChatModel? {
         val token = client.token.nullize(true) ?: retrieveToken(client.id)?.toString(true)
         return MistralAiStreamingChatModel.builder()
             .modelName(client.modelId)
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
@@ -5,8 +5,8 @@ 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 dev.langchain4j.model.chat.ChatLanguageModel
-import dev.langchain4j.model.chat.StreamingChatLanguageModel
+import dev.langchain4j.model.chat.ChatModel
+import dev.langchain4j.model.chat.StreamingChatModel
 import dev.langchain4j.model.ollama.OllamaChatModel
 import dev.langchain4j.model.ollama.OllamaModels
 import dev.langchain4j.model.ollama.OllamaStreamingChatModel
@@ -47,7 +47,7 @@ class OllamaClientService(private val cs: CoroutineScope) : LLMClientService<Oll
         }
     }
 
-    override suspend fun buildChatModel(client: OllamaClientConfiguration): ChatLanguageModel {
+    override suspend fun buildChatModel(client: OllamaClientConfiguration): ChatModel {
         return OllamaChatModel.builder()
             .modelName(client.modelId)
             .temperature(client.temperature.toDouble())
@@ -60,7 +60,7 @@ class OllamaClientService(private val cs: CoroutineScope) : LLMClientService<Oll
             .build()
     }
 
-    override suspend fun buildStreamingChatModel(client: OllamaClientConfiguration): StreamingChatLanguageModel {
+    override suspend fun buildStreamingChatModel(client: OllamaClientConfiguration): StreamingChatModel {
         return OllamaStreamingChatModel.builder()
             .modelName(client.modelId)
             .temperature(client.temperature.toDouble())
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
@@ -21,8 +21,6 @@ class OpenAiClientConfiguration : LLMClientConfiguration(
     @Attribute
     var timeout: Int = 30
     @Attribute
-    var proxyUrl: String? = null
-    @Attribute
     var organizationId: String? = null
     @Attribute
     var tokenIsStored: Boolean = false
@@ -60,7 +58,6 @@ class OpenAiClientConfiguration : LLMClientConfiguration(
         copy.id = id
         copy.name = name
         copy.host = host
-        copy.proxyUrl = proxyUrl
         copy.timeout = timeout
         copy.modelId = modelId
         copy.organizationId = organizationId
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/openAi/OpenAiClientPanel.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/openAi/OpenAiClientPanel.kt
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
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/qianfan/QianfanClientConfiguration.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/qianfan/QianfanClientConfiguration.kt
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/qianfan/QianfanClientService.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/qianfan/QianfanClientService.kt
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/qianfan/QianfanClientSharedState.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/qianfan/QianfanClientSharedState.kt
