feat(amazon-bedrock): add Amazon Bedrock client

Blarc · Blarc · commit de3371e689bc · 2025-06-17T19:06:06.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Added
+
+- Support Amazon Bedrock client.
+
 ## [2.12.0] - 2025-06-05
 
 ### Added
diff --git a/README.md b/README.md
@@ -37,6 +37,7 @@ plugin and configure a LLM API client in plugin's settings: <kbd>Settings</kbd>
 
 ## Supported models
 
+- Amazon Bedrock
 - Anthropic
 - Azure Open AI
 - Gemini Google AI
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -111,6 +111,7 @@ dependencies {
     implementation("dev.langchain4j:langchain4j-google-ai-gemini")
     implementation("dev.langchain4j:langchain4j-github-models")
     implementation("dev.langchain4j:langchain4j-mistral-ai")
+    implementation("dev.langchain4j:langchain4j-bedrock")
 
     implementation(platform("dev.langchain4j:langchain4j-community-bom:1.0.1-beta6"))
     // The Baidu Qianfan Large Model Platform, including the ERNIE series, can be accessed at https://docs.langchain4j.dev/integrations/language-models/qianfan/.
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/Icons.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/Icons.kt
@@ -28,6 +28,7 @@ object Icons {
     val HUGGING_FACE = AICommitsIcon("/icons/huggingface.svg", null)
     val GITHUB = AICommitsIcon("/icons/github15bright.svg", "/icons/github15dark.svg")
     val MISTRAL = AICommitsIcon("/icons/mistral.svg", null)
+    val AMAZON_BEDROCK = AICommitsIcon("/icons/amazonBedrock15.svg", "/icons/amazonBedrock15.svg")
 
     object Process {
         val STOP = AICommitsIcon("/icons/stop.svg", "/icons/stop_dark.svg")
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
@@ -5,6 +5,7 @@ import com.github.blarc.ai.commits.intellij.plugin.AICommitsUtils.getCredentialA
 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.clients.LLMClientConfiguration
+import com.github.blarc.ai.commits.intellij.plugin.settings.clients.amazonBedrock.AmazonBedrockClientConfiguration
 import com.github.blarc.ai.commits.intellij.plugin.settings.clients.anthropic.AnthropicClientConfiguration
 import com.github.blarc.ai.commits.intellij.plugin.settings.clients.azureOpenAi.AzureOpenAiClientConfiguration
 import com.github.blarc.ai.commits.intellij.plugin.settings.clients.geminiGoogle.GeminiGoogleClientConfiguration
@@ -65,7 +66,8 @@ class AppSettings2 : PersistentStateComponent<AppSettings2> {
             AzureOpenAiClientConfiguration::class,
             HuggingFaceClientConfiguration::class,
             GitHubModelsClientConfiguration::class,
-            MistralAIClientConfiguration::class
+            MistralAIClientConfiguration::class,
+            AmazonBedrockClientConfiguration::class
         ],
         style = XCollection.Style.v2
     )
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
@@ -62,7 +62,7 @@ abstract class LLMClientPanel(
         }
     }
 
-    open fun Panel.modelIdRow(labelKey: String = "settings.llmClient.modelId") {
+    open fun Panel.modelIdRow(labelKey: String = "settings.llmClient.modelId", commentKey: String? = null) {
         row {
             label(message(labelKey))
                 .widthGroup("label")
@@ -79,6 +79,7 @@ abstract class LLMClientPanel(
                 })
                 .align(Align.FILL)
                 .resizableColumn()
+                .apply { commentKey?.let { comment(message(commentKey)) } }
 
             getRefreshModelsFunction()?.let { f ->
                 button(message("settings.refreshModels")) {
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/LLMClientTable.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/LLMClientTable.kt
@@ -3,6 +3,7 @@ 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.createColumn
 import com.github.blarc.ai.commits.intellij.plugin.settings.AppSettings2
+import com.github.blarc.ai.commits.intellij.plugin.settings.clients.amazonBedrock.AmazonBedrockClientConfiguration
 import com.github.blarc.ai.commits.intellij.plugin.settings.clients.anthropic.AnthropicClientConfiguration
 import com.github.blarc.ai.commits.intellij.plugin.settings.clients.azureOpenAi.AzureOpenAiClientConfiguration
 import com.github.blarc.ai.commits.intellij.plugin.settings.clients.geminiGoogle.GeminiGoogleClientConfiguration
@@ -157,7 +158,8 @@ class LLMClientTable {
                     AzureOpenAiClientConfiguration(),
                     HuggingFaceClientConfiguration(),
                     GitHubModelsClientConfiguration(),
-                    MistralAIClientConfiguration()
+                    MistralAIClientConfiguration(),
+                    AmazonBedrockClientConfiguration()
                 ).sortedBy { it.getClientName() }
             } else {
                 listOf(newLLMClientConfiguration)
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/amazonBedrock/AmazonBedrockClientConfiguration.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/amazonBedrock/AmazonBedrockClientConfiguration.kt
@@ -0,0 +1,92 @@
+package com.github.blarc.ai.commits.intellij.plugin.settings.clients.amazonBedrock;
+
+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.project.Project
+import com.intellij.util.xmlb.Converter
+import com.intellij.util.xmlb.annotations.Attribute
+import com.intellij.util.xmlb.annotations.OptionTag
+import com.intellij.util.xmlb.annotations.Transient
+import com.intellij.vcs.commit.AbstractCommitWorkflowHandler
+import kotlinx.coroutines.Job
+import software.amazon.awssdk.regions.Region
+import javax.swing.Icon
+
+class AmazonBedrockClientConfiguration : LLMClientConfiguration(
+    "Amazon Bedrock",
+    "us.amazon.nova-lite-v1:0",
+    "0.7"
+) {
+
+    @Attribute
+    var accessKeyId: String? = null
+    @Attribute
+    var accessKeyIsStored: Boolean = false
+    @Transient
+    var accessKey: String? = null
+    @Attribute
+    var timeout: Int = 30
+    @Attribute
+    var topP: Double? = null
+    @Attribute
+    var topK: Int? = null
+    @Attribute
+    var maxOutputTokens: Int? = null
+    @OptionTag(converter = RegionConverter::class)
+    var region: Region = Region.EU_CENTRAL_1
+
+    companion object {
+        const val CLIENT_NAME = "Amazon Bedrock"
+    }
+
+    override fun getClientName(): String {
+        return CLIENT_NAME
+    }
+
+    override fun getClientIcon(): Icon {
+        return Icons.AMAZON_BEDROCK.getThemeBasedIcon()
+    }
+
+    override fun getSharedState(): LLMClientSharedState {
+        return AmazonBedrockClientSharedState.getInstance()
+    }
+
+    override fun generateCommitMessage(commitWorkflowHandler: AbstractCommitWorkflowHandler<*, *>, project: Project) {
+        return AmazonBedrockClientService.getInstance().generateCommitMessage(this, commitWorkflowHandler, project)
+    }
+
+    override fun getGenerateCommitMessageJob(): Job? {
+        return AmazonBedrockClientService.getInstance().generateCommitMessageJob
+    }
+
+    override fun clone(): LLMClientConfiguration {
+        val copy = AmazonBedrockClientConfiguration()
+        copy.id = id
+        copy.name = name
+        copy.modelId = modelId
+        copy.temperature = temperature
+        copy.accessKeyId = accessKeyId
+        copy.accessKeyIsStored = accessKeyIsStored
+        copy.accessKey = accessKey
+        copy.timeout = timeout
+        copy.topP = topP
+        copy.topK = topK
+        copy.maxOutputTokens = maxOutputTokens
+        copy.region = region
+
+        return copy
+    }
+
+    override fun panel() = AmazonBedrockClientPanel(this)
+
+    class RegionConverter : Converter<Region>() {
+        override fun toString(value: Region): String? {
+            return value.toString()
+        }
+
+        override fun fromString(value: String): Region? {
+            return Region.regions().find { it.id() == value }
+        }
+    }
+}
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/amazonBedrock/AmazonBedrockClientPanel.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/amazonBedrock/AmazonBedrockClientPanel.kt
@@ -0,0 +1,108 @@
+package com.github.blarc.ai.commits.intellij.plugin.settings.clients.amazonBedrock;
+
+import com.github.blarc.ai.commits.intellij.plugin.AICommitsBundle.message
+import com.github.blarc.ai.commits.intellij.plugin.emptyText
+import com.github.blarc.ai.commits.intellij.plugin.isInt
+import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientPanel
+import com.intellij.openapi.ui.ComboBox
+import com.intellij.ui.components.JBPasswordField
+import com.intellij.ui.components.JBTextField
+import com.intellij.ui.dsl.builder.*
+import software.amazon.awssdk.regions.Region
+
+class AmazonBedrockClientPanel private constructor(
+    private val clientConfiguration: AmazonBedrockClientConfiguration,
+    val service: AmazonBedrockClientService
+) : LLMClientPanel(clientConfiguration) {
+
+    private val accessKeyIdField = JBTextField()
+    private val accessKeyPasswordField = JBPasswordField()
+    private val regionComboBox = ComboBox(Region.regions().toTypedArray())
+    private val maxOutputTokensTextField = JBTextField()
+    private val topPTextField = JBTextField()
+    private val topKTextField = JBTextField()
+
+    constructor(configuration: AmazonBedrockClientConfiguration) : this(configuration, AmazonBedrockClientService.getInstance())
+
+    override fun create() = panel {
+        nameRow()
+        modelIdRow(commentKey = "settings.amazonBedrock.modelId.comment")
+        temperatureRow()
+        timeoutRow(clientConfiguration::timeout)
+        accessKeyIdRow()
+        accessKeyRow()
+        regionRow()
+        maxTokens()
+        topPDoubleRow(topPTextField, clientConfiguration::topP.toNullableProperty())
+        topKRow(topKTextField, clientConfiguration::topK.toNullableProperty())
+        verifyRow()
+    }
+
+    private fun Panel.accessKeyIdRow() {
+        row {
+            label(message("settings.amazonBedrock.accessKeyId"))
+                .widthGroup("label")
+            cell(accessKeyIdField)
+                .bindText(clientConfiguration::accessKeyId.toNonNullableProperty(""))
+                .emptyText(message("settings.amazonBedrock.accessKeyId.example"))
+                .resizableColumn()
+                .align(Align.FILL)
+        }
+    }
+
+    private fun Panel.accessKeyRow() {
+        row {
+            label(message("settings.amazonBedrock.accessKey"))
+                .widthGroup("label")
+            cell(accessKeyPasswordField)
+                .bindText(getter = { "" }, setter = {
+                    AmazonBedrockClientService.getInstance().saveToken(clientConfiguration, it)
+                })
+                .emptyText(if (clientConfiguration.accessKeyIsStored) message("settings.llmClient.token.stored") else message("settings.amazonBedrock.accessKey.example"))
+                .resizableColumn()
+                .align(Align.FILL)
+                // maxLineLength was eye-balled, but prevents the dialog getting wider
+                .comment(message("settings.amazonBedrock.accessKey.comment"), 50)
+        }
+    }
+
+    private fun Panel.regionRow() {
+        row {
+            label(message("settings.amazonBedrock.region"))
+                .widthGroup("label")
+            cell(regionComboBox)
+                .applyToComponent {
+                    isEditable = true
+                }
+                .bindItem(clientConfiguration::region.toNullableProperty())
+                .align(Align.FILL)
+
+        }
+    }
+
+    private fun Panel.maxTokens() {
+        row {
+            label(message("settings.amazonBedrock.maxOutputTokens"))
+                .widthGroup("label")
+            cell(maxOutputTokensTextField)
+                .bindText({ clientConfiguration.maxOutputTokens?.toString() ?: "" }, { s -> clientConfiguration::maxOutputTokens.set(s.toInt()) })
+                .align(Align.FILL)
+                .validationOnInput { isInt(it.text) }
+                .resizableColumn()
+        }
+    }
+
+    override fun verifyConfiguration() {
+        // Configuration passed to panel is already a copy of the original or a new configuration
+        clientConfiguration.modelId = modelComboBox.item
+        clientConfiguration.temperature = temperatureTextField.text
+        clientConfiguration.accessKeyId = accessKeyIdField.text
+        clientConfiguration.accessKey = String(accessKeyPasswordField.password)
+        clientConfiguration.timeout = socketTimeoutTextField.text.toInt()
+        clientConfiguration.topP = topPTextField.text.toDoubleOrNull()
+        clientConfiguration.topK = topKTextField.text.toIntOrNull()
+        clientConfiguration.maxOutputTokens = maxOutputTokensTextField.text.toIntOrNull()
+        clientConfiguration.region = regionComboBox.selectedItem as Region
+        service.verifyConfiguration(clientConfiguration, verifyLabel)
+    }
+}
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/amazonBedrock/AmazonBedrockClientService.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/amazonBedrock/AmazonBedrockClientService.kt
@@ -0,0 +1,95 @@
+package com.github.blarc.ai.commits.intellij.plugin.settings.clients.amazonBedrock;
+
+import com.github.blarc.ai.commits.intellij.plugin.AICommitsUtils.getCredentialAttributes
+import com.github.blarc.ai.commits.intellij.plugin.AICommitsUtils.retrieveToken
+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.clients.LLMClientService
+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.bedrock.BedrockChatModel
+import dev.langchain4j.model.bedrock.BedrockChatRequestParameters
+import dev.langchain4j.model.bedrock.BedrockStreamingChatModel
+import dev.langchain4j.model.chat.ChatModel
+import dev.langchain4j.model.chat.StreamingChatModel
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider
+import software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeAsyncClient
+import software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeClient
+import java.time.Duration
+
+@Service(Service.Level.APP)
+class AmazonBedrockClientService(private val cs: CoroutineScope) : LLMClientService<AmazonBedrockClientConfiguration>(cs) {
+
+    companion object {
+        @JvmStatic
+        fun getInstance(): AmazonBedrockClientService = service()
+    }
+
+    override suspend fun buildChatModel(client: AmazonBedrockClientConfiguration): ChatModel {
+        val accessKey = client.accessKeyId.nullize(true) ?: retrieveToken(client.id)?.toString(true)
+        val credentials = AwsBasicCredentials.builder()
+            .accessKeyId(client.accessKeyId)
+            .secretAccessKey(accessKey)
+            .build()
+
+        return BedrockChatModel.builder()
+            .modelId(client.modelId)
+            .region(client.region)
+            .timeout(Duration.ofSeconds(client.timeout.toLong()))
+            .client(BedrockRuntimeClient.builder()
+                .region(client.region)
+                .credentialsProvider(StaticCredentialsProvider.create(credentials)).build())
+            .defaultRequestParameters(
+                BedrockChatRequestParameters.builder()
+                    .topP(client.topP)
+                    .topK(client.topK)
+                    .temperature(client.temperature.toDouble())
+                    .maxOutputTokens(client.maxOutputTokens)
+                    .build()
+            )
+            .build()
+    }
+
+    override suspend fun buildStreamingChatModel(client: AmazonBedrockClientConfiguration): StreamingChatModel? {
+        val accessKey = client.accessKeyId.nullize(true) ?: retrieveToken(client.id)?.toString(true)
+        val credentials = AwsBasicCredentials.builder()
+            .accessKeyId(client.accessKeyId)
+            .secretAccessKey(accessKey)
+            .build()
+
+        return BedrockStreamingChatModel.builder()
+            .modelId(client.modelId)
+            .region(client.region)
+            .timeout(Duration.ofSeconds(client.timeout.toLong()))
+            .client(
+                BedrockRuntimeAsyncClient.builder()
+                .region(client.region)
+                .credentialsProvider(StaticCredentialsProvider.create(credentials)).build())
+            .defaultRequestParameters(
+                BedrockChatRequestParameters.builder()
+                    .topP(client.topP)
+                    .topK(client.topK)
+                    .temperature(client.temperature.toDouble())
+                    .maxOutputTokens(client.maxOutputTokens)
+                    .build()
+            )
+            .build()
+    }
+
+    fun saveToken(client: AmazonBedrockClientConfiguration, token: String) {
+        cs.launch(Dispatchers.Default) {
+            try {
+                PasswordSafe.instance.setPassword(getCredentialAttributes(client.id), token)
+                client.accessKeyIsStored = true
+            } catch (e: Exception) {
+                sendNotification(Notification.unableToSaveToken(e.message))
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/amazonBedrock/AmazonBedrockClientSharedState.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/amazonBedrock/AmazonBedrockClientSharedState.kt
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
diff --git a/src/main/resources/icons/amazonBedrock15.svg b/src/main/resources/icons/amazonBedrock15.svg
diff --git a/src/main/resources/messages/AiCommitsBundle.properties b/src/main/resources/messages/AiCommitsBundle.properties

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ abstract class LLMClientPanel(`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`65`		`- open fun Panel.modelIdRow(labelKey: String = "settings.llmClient.modelId") {`
	`65`	`+ open fun Panel.modelIdRow(labelKey: String = "settings.llmClient.modelId", commentKey: String? = null) {`
`66`	`66`	`row {`
`67`	`67`	`label(message(labelKey))`
`68`	`68`	`.widthGroup("label")`
`@@ -79,6 +79,7 @@ abstract class LLMClientPanel(`
`79`	`79`	`})`
`80`	`80`	`.align(Align.FILL)`
`81`	`81`	`.resizableColumn()`
	`82`	`+ .apply { commentKey?.let { comment(message(commentKey)) } }`
`82`	`83`
`83`	`84`	`getRefreshModelsFunction()?.let { f ->`
`84`	`85`	`button(message("settings.refreshModels")) {`