anthropic[patch]: allow tool call mutation (#22130)

If tool_use blocks and tool_calls with overlapping IDs are present,
prefer the values of the tool_calls. Allows for mutating AIMessages just
via tool_calls.

libs/partners/anthropic/langchain_anthropic/chat_models.py

@@ -172,25 +172,29 @@ def _format_messages(messages: List[BaseMessage]) -> Tuple[Optional[str], List[D
             content = []
             for item in message.content:
                 if isinstance(item, str):
-                    content.append(
+                    content.append({"type": "text", "text": item})
-                        {
-                            "type": "text",
-                            "text": item,
-                        }
-                    )
                 elif isinstance(item, dict):
                     if "type" not in item:
                         raise ValueError("Dict content item must have a type key")
                     elif item["type"] == "image_url":
                         # convert format
                         source = _format_image(item["image_url"]["url"])
-                        content.append(
+                        content.append({"type": "image", "source": source})
-                            {
-                                "type": "image",
-                                "source": source,
-                            }
-                        )
                     elif item["type"] == "tool_use":
+                        # If a tool_call with the same id as a tool_use content block
+                        # exists, the tool_call is preferred.
+                        if isinstance(message, AIMessage) and item["id"] in [
+                            tc["id"] for tc in message.tool_calls
+                        ]:
+                            overlapping = [
+                                tc
+                                for tc in message.tool_calls
+                                if tc["id"] == item["id"]
+                            ]
+                            content.extend(
+                                _lc_tool_calls_to_anthropic_tool_use_blocks(overlapping)
+                            )
+                        else:
                             item.pop("text", None)
                             content.append(item)
                     elif item["type"] == "text":
@@ -199,23 +203,14 @@ def _format_messages(messages: List[BaseMessage]) -> Tuple[Optional[str], List[D
                         # accepted.
                         # https://github.com/anthropics/anthropic-sdk-python/issues/461
                         if text.strip():
-                            content.append(
+                            content.append({"type": "text", "text": text})
-                                {
-                                    "type": "text",
-                                    "text": text,
-                                }
-                            )
                     else:
                         content.append(item)
                 else:
                     raise ValueError(
                         f"Content items must be str or dict, instead was: {type(item)}"
                     )
-        elif (
+        elif isinstance(message, AIMessage) and message.tool_calls:
-            isinstance(message, AIMessage)
-            and not isinstance(message.content, list)
-            and message.tool_calls
-        ):
             content = (
                 []
                 if not message.content
@@ -228,12 +223,7 @@ def _format_messages(messages: List[BaseMessage]) -> Tuple[Optional[str], List[D
         else:
             content = message.content
 
-        formatted_messages.append(
+        formatted_messages.append({"role": role, "content": content})
-            {
-                "role": role,
-                "content": content,
-            }
-        )
     return system, formatted_messages
 
 

libs/partners/anthropic/tests/unit_tests/test_chat_models.py

@@ -352,10 +352,7 @@ def test__format_messages_with_str_content_and_tool_calls() -> None:
         "thought",
         tool_calls=[{"name": "bar", "id": "1", "args": {"baz": "buzz"}}],
     )
-    tool = ToolMessage(
+    tool = ToolMessage("blurb", tool_call_id="1")
-        "blurb",
-        tool_call_id="1",
-    )
     messages = [system, human, ai, tool]
     expected = (
         "fuzz",
@@ -364,10 +361,7 @@ def test__format_messages_with_str_content_and_tool_calls() -> None:
             {
                 "role": "assistant",
                 "content": [
-                    {
+                    {"type": "text", "text": "thought"},
-                        "type": "text",
-                        "text": "thought",
-                    },
                     {
                         "type": "tool_use",
                         "name": "bar",
@@ -394,12 +388,7 @@ def test__format_messages_with_list_content_and_tool_calls() -> None:
     # If content and tool_calls are specified and content is a list, then content is
     # preferred.
     ai = AIMessage(
-        [
+        [{"type": "text", "text": "thought"}],
-            {
-                "type": "text",
-                "text": "thought",
-            }
-        ],
         tool_calls=[{"name": "bar", "id": "1", "args": {"baz": "buzz"}}],
     )
     tool = ToolMessage(
@@ -413,11 +402,53 @@ def test__format_messages_with_list_content_and_tool_calls() -> None:
             {"role": "user", "content": "foo"},
             {
                 "role": "assistant",
-                "content": [
+                "content": [{"type": "text", "text": "thought"}],
+            },
             {
-                        "type": "text",
+                "role": "user",
-                        "text": "thought",
+                "content": [
-                    }
+                    {"type": "tool_result", "content": "blurb", "tool_use_id": "1"}
+                ],
+            },
+        ],
+    )
+    actual = _format_messages(messages)
+    assert expected == actual
+
+
+def test__format_messages_with_tool_use_blocks_and_tool_calls() -> None:
+    """Show that tool_calls are preferred to tool_use blocks when both have same id."""
+    system = SystemMessage("fuzz")
+    human = HumanMessage("foo")
+    # NOTE: tool_use block in contents and tool_calls have different arguments.
+    ai = AIMessage(
+        [
+            {"type": "text", "text": "thought"},
+            {
+                "type": "tool_use",
+                "name": "bar",
+                "id": "1",
+                "input": {"baz": "NOT_BUZZ"},
+            },
+        ],
+        tool_calls=[{"name": "bar", "id": "1", "args": {"baz": "BUZZ"}}],
+    )
+    tool = ToolMessage("blurb", tool_call_id="1")
+    messages = [system, human, ai, tool]
+    expected = (
+        "fuzz",
+        [
+            {"role": "user", "content": "foo"},
+            {
+                "role": "assistant",
+                "content": [
+                    {"type": "text", "text": "thought"},
+                    {
+                        "type": "tool_use",
+                        "name": "bar",
+                        "id": "1",
+                        "input": {"baz": "BUZZ"},  # tool_calls value preferred.
+                    },
                 ],
             },
             {