Refactor Bedrock model initialization to include inference profile prefixes with region support

Author: aozherelyeva

agents/agents-features/agents-features-memory/src/jvmMain/kotlin/ai/koog/agents/memory/storage/Aes256GCMStorageEncryptor.kt

@@ -1,7 +1,7 @@
 package ai.koog.agents.memory.storage
 
 import java.security.SecureRandom
-import java.util.*
+import java.util.Base64
 import javax.crypto.Cipher
 import javax.crypto.KeyGenerator
 import javax.crypto.SecretKey
@@ -75,8 +75,8 @@ public class Aes256GCMEncryptor(secretKey: String) : Encryption {
         return String(plaintext)
     }
 
-    override fun encrypt(text: String): String {
-        val (nonce, ciphertext) = encryptImpl(text)
+    override fun encrypt(value: String): String {
+        val (nonce, ciphertext) = encryptImpl(value)
         return Base64.getEncoder().encodeToString(nonce + ciphertext)
     }
 

examples/src/main/kotlin/ai/koog/agents/example/client/BedrockAgent.kt

@@ -8,6 +8,7 @@ import ai.koog.agents.example.simpleapi.Switch
 import ai.koog.agents.example.simpleapi.SwitchTools
 import ai.koog.prompt.executor.clients.bedrock.BedrockClientSettings
 import ai.koog.prompt.executor.clients.bedrock.BedrockModels
+import ai.koog.prompt.executor.clients.bedrock.BedrockRegions
 import ai.koog.prompt.executor.llms.all.simpleBedrockExecutor
 import kotlinx.coroutines.runBlocking
 
@@ -20,7 +21,7 @@ fun main(): Unit = runBlocking {
 
     // Create Bedrock client settings
     val bedrockSettings = BedrockClientSettings(
-        region = "us-east-1", // Change this to your preferred region
+        region = BedrockRegions.US_WEST_2.regionCode, // Change this to your preferred region
         maxRetries = 3
     )
 

integration-tests/src/jvmTest/kotlin/ai/koog/integration/tests/utils/RetryUtils.kt

@@ -1,6 +1,7 @@
 package ai.koog.integration.tests.utils
 
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.Assumptions
 
 /*
@@ -36,20 +37,18 @@ object RetryUtils {
             }
     }
 
-    suspend fun <T> withRetry(
+    fun <T> withRetry(
         times: Int = 3,
         delayMs: Long = 1000,
         testName: String = "test",
         action: suspend () -> T
-    ): T {
+    ): T = runBlocking {
         var lastException: Throwable? = null
 
         for (attempt in 1..times) {
             try {
-                println("[DEBUG_LOG] Test '$testName' - attempt $attempt of $times")
                 val result = action()
-                println("[DEBUG_LOG] Test '$testName' succeeded on attempt $attempt")
-                return result
+                return@runBlocking result
             } catch (throwable: Throwable) {
                 lastException = throwable
 
@@ -59,14 +58,10 @@ object RetryUtils {
                         false,
                         "Skipping test due to third-party service error: ${throwable.message}"
                     )
-                    return action()
+                    return@runBlocking action()
                 }
 
-                println("[DEBUG_LOG] Test '$testName' failed on attempt $attempt: ${throwable.message}")
-
                 if (attempt < times) {
-                    println("[DEBUG_LOG] Retrying test '$testName' (attempt ${attempt + 1} of $times)")
-
                     if (delayMs > 0) {
                         delay(delayMs)
                     }

prompt/prompt-executor/prompt-executor-clients/prompt-executor-anthropic-client/src/commonMain/kotlin/ai/koog/prompt/executor/clients/anthropic/AnthropicModels.kt

@@ -196,11 +196,11 @@ public object AnthropicModels : LLModelDefinitions {
 }
 
 internal val DEFAULT_ANTHROPIC_MODEL_VERSIONS_MAP: Map<LLModel, String> = mapOf(
-    AnthropicModels.Opus_3 to "claude-3-opus-20240229",
-    AnthropicModels.Haiku_3 to "claude-3-haiku-20240307",
-    AnthropicModels.Sonnet_3_5 to "claude-3-5-sonnet-20241022",
-    AnthropicModels.Haiku_3_5 to "claude-3-5-haiku-20241022",
-    AnthropicModels.Sonnet_3_7 to "claude-3-7-sonnet-20250219",
-    AnthropicModels.Sonnet_4 to "claude-sonnet-4-20250514",
-    AnthropicModels.Opus_4 to "claude-opus-4-20250514"
+    Opus_3 to "claude-3-opus-20240229",
+    Haiku_3 to "claude-3-haiku-20240307",
+    Sonnet_3_5 to "claude-3-5-sonnet-20241022",
+    Haiku_3_5 to "claude-3-5-haiku-20241022",
+    Sonnet_3_7 to "claude-3-7-sonnet-20250219",
+    Sonnet_4 to "claude-sonnet-4-20250514",
+    Opus_4 to "claude-opus-4-20250514"
 )

prompt/prompt-executor/prompt-executor-clients/prompt-executor-bedrock-client/src/jvmMain/kotlin/ai/koog/prompt/executor/clients/bedrock/BedrockLLMClient.kt

@@ -62,7 +62,7 @@ import kotlinx.serialization.json.Json
  * @property moderationGuardrailsSettings Optional settings of the AWS bedrock Guardrails (see [AWS documentation](https://docs.aws.amazon.com/bedrock/latest/userguide/guardrails-use-independent-api.html) ) that would be used for the [LLMClient.moderate] request
  */
 public class BedrockClientSettings(
-    internal val region: String = "us-west-2",
+    internal val region: String = BedrockRegions.US_WEST_2.regionCode,
     internal val timeoutConfig: ConnectionTimeoutConfig = ConnectionTimeoutConfig(),
     internal val endpointUrl: String? = null,
     internal val maxRetries: Int = 3,
@@ -124,7 +124,7 @@ public class BedrockLLMClient(
                 awsSessionToken?.let { this.sessionToken = it }
             }
 
-            // Configure custom endpoint if provided
+            // Configure a custom endpoint if provided
             settings.endpointUrl?.let { url ->
                 this.endpointUrl = Url.parse(url)
             }
@@ -147,10 +147,10 @@ public class BedrockLLMClient(
     internal fun getBedrockModelFamily(model: LLModel): BedrockModelFamilies {
         require(model.provider == LLMProvider.Bedrock) { "Model ${model.id} is not a Bedrock model" }
         return when {
-            model.id.startsWith("us.anthropic.claude") -> BedrockModelFamilies.AnthropicClaude
-            model.id.startsWith("us.amazon.nova") -> BedrockModelFamilies.AmazonNova
-            model.id.startsWith("us.ai21.jamba") -> BedrockModelFamilies.AI21Jamba
-            model.id.startsWith("us.meta.llama") -> BedrockModelFamilies.Meta
+            model.id.contains("anthropic.claude") -> BedrockModelFamilies.AnthropicClaude
+            model.id.contains("amazon.nova") -> BedrockModelFamilies.AmazonNova
+            model.id.contains("ai21.jamba") -> BedrockModelFamilies.AI21Jamba
+            model.id.contains("meta.llama") -> BedrockModelFamilies.Meta
             else -> throw IllegalArgumentException("Model ${model.id} is not a supported Bedrock model")
         }
     }
@@ -368,14 +368,14 @@ public class BedrockLLMClient(
         )
 
         val inputIsHarmful = inputGuardrailResponse.action is GuardrailAction.GuardrailIntervened
-        val outputputIsHarmful = inputGuardrailResponse.action is GuardrailAction.GuardrailIntervened
+        val outputIsHarmful = inputGuardrailResponse.action is GuardrailAction.GuardrailIntervened
 
         val categories = buildMap {
             fillCategoriesMap(inputGuardrailResponse)
             fillCategoriesMap(outputGuardrailResponse)
         }
 
-        return ModerationResult(inputIsHarmful || outputputIsHarmful, categories)
+        return ModerationResult(inputIsHarmful || outputIsHarmful, categories)
     }
 
     private fun MutableMap<ModerationCategory, ModerationCategoryResult>.fillCategoriesMap(