llama-index-llms-bedrock-converse 0.10.7__tar.gz → 0.11.1__tar.gz

{llama_index_llms_bedrock_converse-0.10.7 → llama_index_llms_bedrock_converse-0.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llama-index-llms-bedrock-converse
-Version: 0.10.7
+Version: 0.11.1
 Summary: llama-index llms bedrock converse integration
 Author-email: Your Name <you@example.com>
 License-Expression: MIT
@@ -8,7 +8,7 @@ License-File: LICENSE
 Requires-Python: <4.0,>=3.9
 Requires-Dist: aioboto3<16,>=15.0.0
 Requires-Dist: boto3<2,>=1.38.27
-Requires-Dist: llama-index-core<0.15,>=0.14.3
+Requires-Dist: llama-index-core<0.15,>=0.14.5
 Description-Content-Type: text/markdown
 
 # LlamaIndex Llms Integration: Bedrock Converse

{llama_index_llms_bedrock_converse-0.10.7 → llama_index_llms_bedrock_converse-0.11.1}/llama_index/llms/bedrock_converse/base.py

@@ -24,6 +24,7 @@ from llama_index.core.base.llms.types import (
     MessageRole,
     TextBlock,
     ThinkingBlock,
+    ToolCallBlock,
 )
 from llama_index.core.bridge.pydantic import Field, PrivateAttr
 from llama_index.core.callbacks import CallbackManager
@@ -365,7 +366,7 @@ class BedrockConverse(FunctionCallingLLM):
     def _get_content_and_tool_calls(
         self, response: Optional[Dict[str, Any]] = None, content: Dict[str, Any] = None
     ) -> Tuple[
-        List[Union[TextBlock, ThinkingBlock]], Dict[str, Any], List[str], List[str]
+        List[Union[TextBlock, ThinkingBlock, ToolCallBlock]], List[str], List[str]
     ]:
         assert response is not None or content is not None, (
             f"Either response or content must be provided. Got response: {response}, content: {content}"
@@ -373,10 +374,9 @@ class BedrockConverse(FunctionCallingLLM):
         assert response is None or content is None, (
             f"Only one of response or content should be provided. Got response: {response}, content: {content}"
         )
-        tool_calls = []
         tool_call_ids = []
         status = []
-        blocks = []
+        blocks: List[TextBlock | ThinkingBlock | ToolCallBlock] = []
         if content is not None:
             content_list = [content]
         else:
@@ -401,7 +401,13 @@ class BedrockConverse(FunctionCallingLLM):
                     tool_usage["toolUseId"] = content_block["toolUseId"]
                 if "name" not in tool_usage:
                     tool_usage["name"] = content_block["name"]
-                tool_calls.append(tool_usage)
+                blocks.append(
+                    ToolCallBlock(
+                        tool_name=tool_usage.get("name", ""),
+                        tool_call_id=tool_usage.get("toolUseId"),
+                        tool_kwargs=tool_usage.get("input", {}),
+                    )
+                )
             if tool_result := content_block.get("toolResult", None):
                 for tool_result_content in tool_result["content"]:
                     if text := tool_result_content.get("text", None):
@@ -409,7 +415,7 @@ class BedrockConverse(FunctionCallingLLM):
                 tool_call_ids.append(tool_result_content.get("toolUseId", ""))
                 status.append(tool_result.get("status", ""))
 
-        return blocks, tool_calls, tool_call_ids, status
+        return blocks, tool_call_ids, status
 
     @llm_chat_callback()
     def chat(self, messages: Sequence[ChatMessage], **kwargs: Any) -> ChatResponse:
@@ -436,16 +442,13 @@ class BedrockConverse(FunctionCallingLLM):
             **all_kwargs,
         )
 
-        blocks, tool_calls, tool_call_ids, status = self._get_content_and_tool_calls(
-            response
-        )
+        blocks, tool_call_ids, status = self._get_content_and_tool_calls(response)
 
         return ChatResponse(
             message=ChatMessage(
                 role=MessageRole.ASSISTANT,
                 blocks=blocks,
                 additional_kwargs={
-                    "tool_calls": tool_calls,
                     "tool_call_id": tool_call_ids,
                     "status": status,
                 },
@@ -540,7 +543,7 @@ class BedrockConverse(FunctionCallingLLM):
                                     current_tool_call, tool_use_delta
                                 )
 
-                    blocks: List[Union[TextBlock, ThinkingBlock]] = [
+                    blocks: List[Union[TextBlock, ThinkingBlock, ToolCallBlock]] = [
                         TextBlock(text=content.get("text", ""))
                     ]
                     if thinking != "":
@@ -553,13 +556,21 @@ class BedrockConverse(FunctionCallingLLM):
                                 },
                             ),
                         )
+                    if tool_calls:
+                        for tool_call in tool_calls:
+                            blocks.append(
+                                ToolCallBlock(
+                                    tool_kwargs=tool_call.get("input", {}),
+                                    tool_name=tool_call.get("name", ""),
+                                    tool_call_id=tool_call.get("toolUseId"),
+                                )
+                            )
 
                     yield ChatResponse(
                         message=ChatMessage(
                             role=role,
                             blocks=blocks,
                             additional_kwargs={
-                                "tool_calls": tool_calls,
                                 "tool_call_id": [
                                     tc.get("toolUseId", "") for tc in tool_calls
                                 ],
@@ -579,7 +590,7 @@ class BedrockConverse(FunctionCallingLLM):
                         # Add to our list of tool calls
                         tool_calls.append(current_tool_call)
 
-                    blocks: List[Union[TextBlock, ThinkingBlock]] = [
+                    blocks: List[Union[TextBlock, ThinkingBlock, ToolCallBlock]] = [
                         TextBlock(text=content.get("text", ""))
                     ]
                     if thinking != "":
@@ -593,12 +604,21 @@ class BedrockConverse(FunctionCallingLLM):
                             ),
                         )
 
+                    if tool_calls:
+                        for tool_call in tool_calls:
+                            blocks.append(
+                                ToolCallBlock(
+                                    tool_kwargs=tool_call.get("input", {}),
+                                    tool_name=tool_call.get("name", ""),
+                                    tool_call_id=tool_call.get("toolUseId"),
+                                )
+                            )
+
                     yield ChatResponse(
                         message=ChatMessage(
                             role=role,
                             blocks=blocks,
                             additional_kwargs={
-                                "tool_calls": tool_calls,
                                 "tool_call_id": [
                                     tc.get("toolUseId", "") for tc in tool_calls
                                 ],
@@ -615,7 +635,7 @@ class BedrockConverse(FunctionCallingLLM):
                     # Handle metadata event - this contains the final token usage
                     if usage := metadata.get("usage"):
                         # Yield a final response with correct token usage
-                        blocks: List[Union[TextBlock, ThinkingBlock]] = [
+                        blocks: List[Union[TextBlock, ThinkingBlock, ToolCallBlock]] = [
                             TextBlock(text=content.get("text", ""))
                         ]
                         if thinking != "":
@@ -628,13 +648,21 @@ class BedrockConverse(FunctionCallingLLM):
                                     },
                                 ),
                             )
+                        if tool_calls:
+                            for tool_call in tool_calls:
+                                blocks.append(
+                                    ToolCallBlock(
+                                        tool_kwargs=tool_call.get("input", {}),
+                                        tool_name=tool_call.get("name", ""),
+                                        tool_call_id=tool_call.get("toolUseId"),
+                                    )
+                                )
 
                         yield ChatResponse(
                             message=ChatMessage(
                                 role=role,
                                 blocks=blocks,
                                 additional_kwargs={
-                                    "tool_calls": tool_calls,
                                     "tool_call_id": [
                                         tc.get("toolUseId", "") for tc in tool_calls
                                     ],
@@ -685,16 +713,13 @@ class BedrockConverse(FunctionCallingLLM):
             **all_kwargs,
         )
 
-        blocks, tool_calls, tool_call_ids, status = self._get_content_and_tool_calls(
-            response
-        )
+        blocks, tool_call_ids, status = self._get_content_and_tool_calls(response)
 
         return ChatResponse(
             message=ChatMessage(
                 role=MessageRole.ASSISTANT,
                 blocks=blocks,
                 additional_kwargs={
-                    "tool_calls": tool_calls,
                     "tool_call_id": tool_call_ids,
                     "status": status,
                 },
@@ -789,7 +814,7 @@ class BedrockConverse(FunctionCallingLLM):
                                 current_tool_call = join_two_dicts(
                                     current_tool_call, tool_use_delta
                                 )
-                    blocks: List[Union[TextBlock, ThinkingBlock]] = [
+                    blocks: List[Union[TextBlock, ThinkingBlock, ToolCallBlock]] = [
                         TextBlock(text=content.get("text", ""))
                     ]
                     if thinking != "":
@@ -803,12 +828,21 @@ class BedrockConverse(FunctionCallingLLM):
                             ),
                         )
 
+                    if tool_calls:
+                        for tool_call in tool_calls:
+                            blocks.append(
+                                ToolCallBlock(
+                                    tool_kwargs=tool_call.get("input", {}),
+                                    tool_name=tool_call.get("name", ""),
+                                    tool_call_id=tool_call.get("toolUseId"),
+                                )
+                            )
+
                     yield ChatResponse(
                         message=ChatMessage(
                             role=role,
                             blocks=blocks,
                             additional_kwargs={
-                                "tool_calls": tool_calls,
                                 "tool_call_id": [
                                     tc.get("toolUseId", "") for tc in tool_calls
                                 ],
@@ -828,7 +862,7 @@ class BedrockConverse(FunctionCallingLLM):
                         # Add to our list of tool calls
                         tool_calls.append(current_tool_call)
 
-                    blocks: List[Union[TextBlock, ThinkingBlock]] = [
+                    blocks: List[Union[TextBlock, ThinkingBlock, ToolCallBlock]] = [
                         TextBlock(text=content.get("text", ""))
                     ]
                     if thinking != "":
@@ -842,12 +876,21 @@ class BedrockConverse(FunctionCallingLLM):
                             ),
                         )
 
+                    if tool_calls:
+                        for tool_call in tool_calls:
+                            blocks.append(
+                                ToolCallBlock(
+                                    tool_kwargs=tool_call.get("input", {}),
+                                    tool_name=tool_call.get("name", ""),
+                                    tool_call_id=tool_call.get("toolUseId"),
+                                )
+                            )
+
                     yield ChatResponse(
                         message=ChatMessage(
                             role=role,
                             blocks=blocks,
                             additional_kwargs={
-                                "tool_calls": tool_calls,
                                 "tool_call_id": [
                                     tc.get("toolUseId", "") for tc in tool_calls
                                 ],
@@ -864,7 +907,7 @@ class BedrockConverse(FunctionCallingLLM):
                     # Handle metadata event - this contains the final token usage
                     if usage := metadata.get("usage"):
                         # Yield a final response with correct token usage
-                        blocks: List[Union[TextBlock, ThinkingBlock]] = [
+                        blocks: List[Union[TextBlock, ThinkingBlock, ToolCallBlock]] = [
                             TextBlock(text=content.get("text", ""))
                         ]
                         if thinking != "":
@@ -878,12 +921,21 @@ class BedrockConverse(FunctionCallingLLM):
                                 ),
                             )
 
+                        if tool_calls:
+                            for tool_call in tool_calls:
+                                blocks.append(
+                                    ToolCallBlock(
+                                        tool_kwargs=tool_call.get("input", {}),
+                                        tool_name=tool_call.get("name", ""),
+                                        tool_call_id=tool_call.get("toolUseId"),
+                                    )
+                                )
+
                         yield ChatResponse(
                             message=ChatMessage(
                                 role=role,
                                 blocks=blocks,
                                 additional_kwargs={
-                                    "tool_calls": tool_calls,
                                     "tool_call_id": [
                                         tc.get("toolUseId", "") for tc in tool_calls
                                     ],
@@ -960,7 +1012,11 @@ class BedrockConverse(FunctionCallingLLM):
         **kwargs: Any,
     ) -> List[ToolSelection]:
         """Predict and call the tool."""
-        tool_calls = response.message.additional_kwargs.get("tool_calls", [])
+        tool_calls = [
+            block
+            for block in response.message.blocks
+            if isinstance(block, ToolCallBlock)
+        ]
 
         if len(tool_calls) < 1:
             if error_on_no_tool_call:
@@ -972,26 +1028,23 @@ class BedrockConverse(FunctionCallingLLM):
 
         tool_selections = []
         for tool_call in tool_calls:
-            if "toolUseId" not in tool_call or "name" not in tool_call:
-                raise ValueError("Invalid tool call.")
-
             # handle empty inputs
             argument_dict = {}
-            if "input" in tool_call and isinstance(tool_call["input"], str):
+            if isinstance(tool_call.tool_kwargs, str):
                 # TODO parse_partial_json is not perfect
                 try:
-                    argument_dict = parse_partial_json(tool_call["input"])
+                    argument_dict = parse_partial_json(tool_call.tool_kwargs)
                 except ValueError:
                     argument_dict = {}
-            elif "input" in tool_call and isinstance(tool_call["input"], dict):
-                argument_dict = tool_call["input"]
+            elif isinstance(tool_call.tool_kwargs, dict):
+                argument_dict = tool_call.tool_kwargs
             else:
                 continue
 
             tool_selections.append(
                 ToolSelection(
-                    tool_id=tool_call["toolUseId"],
-                    tool_name=tool_call["name"],
+                    tool_id=tool_call.tool_call_id or "",
+                    tool_name=tool_call.tool_name,
                     tool_kwargs=argument_dict,
                 )
             )

{llama_index_llms_bedrock_converse-0.10.7 → llama_index_llms_bedrock_converse-0.11.1}/llama_index/llms/bedrock_converse/utils.py

@@ -32,6 +32,7 @@ from llama_index.core.base.llms.types import (
     DocumentBlock,
     CachePoint,
     ThinkingBlock,
+    ToolCallBlock,
 )
 
 
@@ -188,8 +189,8 @@ def is_reasoning(model_name: str) -> bool:
 
 def get_model_name(model_name: str) -> str:
     """Extract base model name from region-prefixed model identifier."""
-    # Check for region prefixes (us, eu, apac, global)
-    REGION_PREFIXES = ["us.", "eu.", "apac.", "global."]
+    # Check for region prefixes (us, eu, apac, jp, global)
+    REGION_PREFIXES = ["us.", "eu.", "apac.", "jp.", "global."]
 
     # If no region prefix, return the original model name
     if not any(prefix in model_name for prefix in REGION_PREFIXES):
@@ -303,6 +304,23 @@ def _content_block_to_bedrock_format(
     elif isinstance(block, AudioBlock):
         logger.warning("Audio blocks are not supported in Bedrock Converse API.")
         return None
+    elif isinstance(block, ToolCallBlock):
+        if isinstance(block.tool_kwargs, str):
+            try:
+                tool_input = json.loads(block.tool_kwargs or "{}")
+            except json.JSONDecodeError:
+                tool_input = {}
+        else:
+            tool_input = block.tool_kwargs
+
+        return {
+            "toolUse": {
+                "input": tool_input,
+                "toolUseId": block.tool_call_id or "",
+                "name": block.tool_name,
+            }
+        }
+
     else:
         logger.warning(f"Unsupported block type: {type(block)}")
         return None
@@ -345,7 +363,9 @@ def messages_to_converse_messages(
     converse_messages = []
     system_prompt = []
     current_system_prompt = ""
+
     for message in messages:
+        unique_tool_calls = []
         if message.role == MessageRole.SYSTEM:
             # we iterate over blocks, if content was used, the blocks are added anyway
             for block in message.blocks:
@@ -402,6 +422,13 @@ def messages_to_converse_messages(
                 )
                 if bedrock_format_block:
                     content.append(bedrock_format_block)
+                    if "toolUse" in bedrock_format_block:
+                        unique_tool_calls.append(
+                            (
+                                bedrock_format_block["toolUse"]["toolUseId"],
+                                bedrock_format_block["toolUse"]["name"],
+                            )
+                        )
 
             if content:
                 converse_messages.append(
@@ -411,6 +438,7 @@ def messages_to_converse_messages(
                     }
                 )
 
+        # keep this code here for compatibility with older chat histories
         # convert tool calls to the AWS Bedrock Converse format
         # NOTE tool calls might show up within any message,
         # e.g. within assistant message or in consecutive tool calls,
@@ -418,25 +446,28 @@ def messages_to_converse_messages(
         tool_calls = message.additional_kwargs.get("tool_calls", [])
         content = []
         for tool_call in tool_calls:
-            assert "toolUseId" in tool_call, f"`toolUseId` not found in {tool_call}"
-            assert "input" in tool_call, f"`input` not found in {tool_call}"
-            assert "name" in tool_call, f"`name` not found in {tool_call}"
-            tool_input = tool_call["input"] if tool_call["input"] else {}
-            if isinstance(tool_input, str):
-                try:
-                    tool_input = json.loads(tool_input or "{}")
-                except json.JSONDecodeError:
-                    tool_input = {}
-
-            content.append(
-                {
-                    "toolUse": {
-                        "input": tool_input,
-                        "toolUseId": tool_call["toolUseId"],
-                        "name": tool_call["name"],
-                    }
-                }
-            )
+            try:
+                assert "toolUseId" in tool_call
+                assert "input" in tool_call
+                assert "name" in tool_call
+                if (tool_call["toolUseId"], tool_call["name"]) not in unique_tool_calls:
+                    tool_input = tool_call["input"] if tool_call["input"] else {}
+                    if isinstance(tool_input, str):
+                        try:
+                            tool_input = json.loads(tool_input or "{}")
+                        except json.JSONDecodeError:
+                            tool_input = {}
+                    content.append(
+                        {
+                            "toolUse": {
+                                "input": tool_input,
+                                "toolUseId": tool_call["toolUseId"],
+                                "name": tool_call["name"],
+                            }
+                        }
+                    )
+            except AssertionError:
+                continue
         if len(content) > 0:
             converse_messages.append(
                 {
@@ -499,9 +530,15 @@ def tools_to_converse_tools(
 
 
 def force_single_tool_call(response: ChatResponse) -> None:
-    tool_calls = response.message.additional_kwargs.get("tool_calls", [])
+    tool_calls = [
+        block for block in response.message.blocks if isinstance(block, ToolCallBlock)
+    ]
     if len(tool_calls) > 1:
-        response.message.additional_kwargs["tool_calls"] = [tool_calls[0]]
+        response.message.blocks = [
+            block
+            for block in response.message.blocks
+            if not isinstance(block, ToolCallBlock)
+        ] + [tool_calls[0]]
 
 
 def _create_retry_decorator(client: Any, max_retries: int) -> Callable[[Any], Any]:

{llama_index_llms_bedrock_converse-0.10.7 → llama_index_llms_bedrock_converse-0.11.1}/pyproject.toml

@@ -29,7 +29,7 @@ dev = [
 
 [project]
 name = "llama-index-llms-bedrock-converse"
-version = "0.10.7"
+version = "0.11.1"
 description = "llama-index llms bedrock converse integration"
 authors = [{name = "Your Name", email = "you@example.com"}]
 requires-python = ">=3.9,<4.0"
@@ -38,7 +38,7 @@ license = "MIT"
 dependencies = [
     "boto3>=1.38.27,<2",
     "aioboto3>=15.0.0,<16",
-    "llama-index-core>=0.14.3,<0.15",
+    "llama-index-core>=0.14.5,<0.15",
 ]
 
 [tool.codespell]
@@ -65,4 +65,4 @@ BedrockConverse = "AndreCNF"
 disallow_untyped_defs = true
 exclude = ["_static", "build", "examples", "notebooks", "venv"]
 ignore_missing_imports = true
-python_version = "3.8"
+python_version = "3.10"