github/langchain
1
0
Fork 0
mirror of https://github.com/hwchase17/langchain.git synced 2025-07-19 11:08:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Bagatur 2024-05-24 08:18:14 -07:00 committed by GitHub
parent c838de5027
commit baa3c975cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 69 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
libs/partners/anthropic/langchain_anthropic/chat_models.py
View File

@ -172,50 +172,45 @@ def _format_messages(messages: List[BaseMessage]) -> Tuple[Optional[str], List[D
content = []
for item in message.content:
if isinstance(item, str):
content.append(
{
"type": "text",
"text": item,
}
)
content.append({"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(
{
"type": "image",
"source": source,
}
)
content.append({"type": "image", "source": source})
elif item["type"] == "tool_use":
item.pop("text", None)
content.append(item)
# 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":
text = item.get("text", "")
# Only add non-empty strings for now as empty ones are not
# accepted.
# https://github.com/anthropics/anthropic-sdk-python/issues/461
if text.strip():
content.append(
{
"type": "text",
"text": text,
}
)
content.append({"type": "text", "text": text})
else:
content.append(item)
else:
raise ValueError(
f"Content items must be str or dict, instead was: {type(item)}"
)
elif (
isinstance(message, AIMessage)
and not isinstance(message.content, list)
and message.tool_calls
):
elif isinstance(message, AIMessage) 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(
{
"role": role,
"content": content,
}
)
formatted_messages.append({"role": role, "content": content})
return system, formatted_messages

65
libs/partners/anthropic/tests/unit_tests/test_chat_models.py
View File

@ -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(
"blurb",
tool_call_id="1",
)
tool = ToolMessage("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": [{"type": "text", "text": "thought"}],
},
{
"role": "user",
"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": "text",
"text": "thought",
}
"type": "tool_use",
"name": "bar",
"id": "1",
"input": {"baz": "BUZZ"}, # tool_calls value preferred.
},
],
},
{