llama-index-llms-bedrock-converse 0.12.5__py3-none-any.whl → 0.12.7__py3-none-any.whl

llama_index/llms/bedrock_converse/utils.py

@@ -6,35 +6,36 @@ from typing import (
     Callable,
     Dict,
     List,
+    Literal,
     Optional,
     Sequence,
     Tuple,
-    Literal,
     Union,
 )
-from typing_extensions import TypedDict
-from tenacity import (
-    before_sleep_log,
-    retry,
-    retry_if_exception_type,
-    stop_after_attempt,
-    wait_exponential,
-)
 
+from botocore.exceptions import ClientError
 from llama_index.core.base.llms.types import (
+    AudioBlock,
+    CachePoint,
     ChatMessage,
     ChatResponse,
-    MessageRole,
-    ImageBlock,
-    TextBlock,
     ContentBlock,
-    AudioBlock,
     DocumentBlock,
-    CachePoint,
+    ImageBlock,
+    MessageRole,
+    TextBlock,
     ThinkingBlock,
     ToolCallBlock,
 )
-
+from tenacity import (
+    before_sleep_log,
+    retry,
+    retry_if_exception,
+    retry_if_exception_type,
+    stop_after_attempt,
+    wait_exponential,
+)
+from typing_extensions import TypedDict
 
 logger = logging.getLogger(__name__)
 
@@ -63,6 +64,7 @@ BEDROCK_MODELS = {
     "anthropic.claude-opus-4-20250514-v1:0": 200000,
     "anthropic.claude-opus-4-1-20250805-v1:0": 200000,
     "anthropic.claude-opus-4-5-20251101-v1:0": 200000,
+    "anthropic.claude-opus-4-6-v1": 200000,
     "anthropic.claude-sonnet-4-20250514-v1:0": 200000,
     "anthropic.claude-sonnet-4-5-20250929-v1:0": 200000,
     "anthropic.claude-haiku-4-5-20251001-v1:0": 200000,
@@ -112,6 +114,7 @@ BEDROCK_FUNCTION_CALLING_MODELS = (
     "anthropic.claude-opus-4-20250514-v1:0",
     "anthropic.claude-opus-4-1-20250805-v1:0",
     "anthropic.claude-opus-4-5-20251101-v1:0",
+    "anthropic.claude-opus-4-6-v1",
     "anthropic.claude-sonnet-4-20250514-v1:0",
     "anthropic.claude-sonnet-4-5-20250929-v1:0",
     "anthropic.claude-haiku-4-5-20251001-v1:0",
@@ -145,6 +148,7 @@ BEDROCK_INFERENCE_PROFILE_SUPPORTED_MODELS = (
     "anthropic.claude-opus-4-20250514-v1:0",
     "anthropic.claude-opus-4-1-20250805-v1:0",
     "anthropic.claude-opus-4-5-20251101-v1:0",
+    "anthropic.claude-opus-4-6-v1",
     "anthropic.claude-sonnet-4-20250514-v1:0",
     "anthropic.claude-sonnet-4-5-20250929-v1:0",
     "anthropic.claude-haiku-4-5-20251001-v1:0",
@@ -166,6 +170,7 @@ BEDROCK_PROMPT_CACHING_SUPPORTED_MODELS = (
     "anthropic.claude-opus-4-20250514-v1:0",
     "anthropic.claude-opus-4-1-20250805-v1:0",
     "anthropic.claude-opus-4-5-20251101-v1:0",
+    "anthropic.claude-opus-4-6-v1",
     "anthropic.claude-sonnet-4-20250514-v1:0",
     "anthropic.claude-sonnet-4-5-20250929-v1:0",
     "anthropic.claude-haiku-4-5-20251001-v1:0",
@@ -180,6 +185,7 @@ BEDROCK_REASONING_MODELS = (
     "anthropic.claude-opus-4-20250514-v1:0",
     "anthropic.claude-opus-4-1-20250805-v1:0",
     "anthropic.claude-opus-4-5-20251101-v1:0",
+    "anthropic.claude-opus-4-6-v1",
     "anthropic.claude-sonnet-4-20250514-v1:0",
     "anthropic.claude-sonnet-4-5-20250929-v1:0",
     "anthropic.claude-haiku-4-5-20251001-v1:0",
@@ -566,11 +572,38 @@ def _create_retry_decorator(client: Any, max_retries: int) -> Callable[[Any], An
         reraise=True,
         stop=stop_after_attempt(max_retries),
         wait=wait_exponential(multiplier=1, min=min_seconds, max=max_seconds),
-        retry=(retry_if_exception_type(client.exceptions.ThrottlingException)),
+        retry=(
+            retry_if_exception_type(
+                (
+                    client.exceptions.ThrottlingException,
+                    client.exceptions.InternalServerException,
+                    client.exceptions.ServiceUnavailableException,
+                    client.exceptions.ModelTimeoutException,
+                )
+            )
+        ),
         before_sleep=before_sleep_log(logger, logging.WARNING),
     )
 
 
+RETRYABLE_ERROR_CODES = frozenset(
+    {
+        "ThrottlingException",
+        "InternalServerException",
+        "ServiceUnavailableException",
+        "ModelTimeoutException",
+    }
+)
+
+
+def _is_retryable_client_error(exception: BaseException) -> bool:
+    """Check if an exception is a retryable ClientError from botocore."""
+    if isinstance(exception, ClientError):
+        error_code = exception.response.get("Error", {}).get("Code", "")
+        return error_code in RETRYABLE_ERROR_CODES
+    return False
+
+
 def _create_retry_decorator_async(max_retries: int) -> Callable[[Any], Any]:
     min_seconds = 4
     max_seconds = 10
@@ -588,9 +621,7 @@ def _create_retry_decorator_async(max_retries: int) -> Callable[[Any], Any]:
         reraise=True,
         stop=stop_after_attempt(max_retries),
         wait=wait_exponential(multiplier=1, min=min_seconds, max=max_seconds),
-        retry=(
-            retry_if_exception_type()
-        ),  # TODO: Add throttling exception in async version
+        retry=retry_if_exception(_is_retryable_client_error),
         before_sleep=before_sleep_log(logger, logging.WARNING),
     )
 

{llama_index_llms_bedrock_converse-0.12.5.dist-info → llama_index_llms_bedrock_converse-0.12.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llama-index-llms-bedrock-converse
-Version: 0.12.5
+Version: 0.12.7
 Summary: llama-index llms bedrock converse integration
 Author-email: Your Name <you@example.com>
 License-Expression: MIT

llama_index_llms_bedrock_converse-0.12.7.dist-info/RECORD

@@ -0,0 +1,7 @@
+llama_index/llms/bedrock_converse/__init__.py,sha256=xE3ZHLXqFr7TTTgQlYH9bLLPRZAV3dJyiz_iUFXBfak,98
+llama_index/llms/bedrock_converse/base.py,sha256=uQ2pD0SwSqbjLdDB9A5O0REky5y6LL3E3UWNIHvKVu8,46074
+llama_index/llms/bedrock_converse/utils.py,sha256=cIc_CCuamDgQoDmZIkROibqvB58j-DXZT9a97DVk7v8,31082
+llama_index_llms_bedrock_converse-0.12.7.dist-info/METADATA,sha256=DK_5XDVUlZ5ko1xAjIba_b9iVftTQMt7l7Bl-AbvUPM,7834
+llama_index_llms_bedrock_converse-0.12.7.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+llama_index_llms_bedrock_converse-0.12.7.dist-info/licenses/LICENSE,sha256=JPQLUZD9rKvCTdu192Nk0V5PAwklIg6jANii3UmTyMs,1065
+llama_index_llms_bedrock_converse-0.12.7.dist-info/RECORD,,

llama_index_llms_bedrock_converse-0.12.5.dist-info/RECORD

@@ -1,7 +0,0 @@
-llama_index/llms/bedrock_converse/__init__.py,sha256=xE3ZHLXqFr7TTTgQlYH9bLLPRZAV3dJyiz_iUFXBfak,98
-llama_index/llms/bedrock_converse/base.py,sha256=uQ2pD0SwSqbjLdDB9A5O0REky5y6LL3E3UWNIHvKVu8,46074
-llama_index/llms/bedrock_converse/utils.py,sha256=FLmQH9k5vYdAW9VzE3fyIh29edBYxQHhx2ovgUoEO7w,30082
-llama_index_llms_bedrock_converse-0.12.5.dist-info/METADATA,sha256=ndWUOdGz6co5YzGLUs_rMFz8peUdB-7LsyHJBqP6UUQ,7834
-llama_index_llms_bedrock_converse-0.12.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-llama_index_llms_bedrock_converse-0.12.5.dist-info/licenses/LICENSE,sha256=JPQLUZD9rKvCTdu192Nk0V5PAwklIg6jANii3UmTyMs,1065
-llama_index_llms_bedrock_converse-0.12.5.dist-info/RECORD,,