Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

anthropic[minor]: Implement actual anthropic tool call streaming #6056

Merged
merged 18 commits into from
Jul 16, 2024
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions langchain-core/src/messages/base.ts
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ignore this file, this is merged from #6057

Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,13 @@ export function mergeContent(
}
// If both are arrays
} else if (Array.isArray(secondContent)) {
return [...firstContent, ...secondContent];
// find and merge all objects with the same "index" and "type" fields.
return (
_mergeLists(firstContent, secondContent) ?? [
...firstContent,
...secondContent,
]
);
// If the first content is a list and second is a string
} else {
// Otherwise, add the second content as a new element of the list
Expand Down Expand Up @@ -259,8 +265,12 @@ export function _mergeDicts(
`field[${key}] already exists in the message chunk, but with a different type.`
);
} else if (typeof merged[key] === "string") {
merged[key] = (merged[key] as string) + value;
} else if (!Array.isArray(merged[key]) && typeof merged[key] === "object") {
if (key === "type") {
// Do not merge 'type' fields
continue;
}
merged[key] += value;
} else if (typeof merged[key] === "object" && !Array.isArray(merged[key])) {
merged[key] = _mergeDicts(merged[key], value);
} else if (Array.isArray(merged[key])) {
merged[key] = _mergeLists(merged[key], value);
Expand Down Expand Up @@ -297,6 +307,12 @@ export function _mergeLists(left?: any[], right?: any[]) {
} else {
merged.push(item);
}
} else if (
typeof item === "object" &&
"text" in item &&
item.text === ""
) {
// Skip empty text blocks
} else {
merged.push(item);
}
Expand Down
143 changes: 142 additions & 1 deletion langchain-core/src/messages/tests/base_message.test.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { test } from "@jest/globals";
import { test, describe, it, expect } from "@jest/globals";
import { ChatPromptTemplate } from "../../prompts/chat.js";
import {
HumanMessage,
AIMessage,
ToolMessage,
ToolMessageChunk,
AIMessageChunk,
} from "../index.js";
import { load } from "../../load/index.js";

Expand Down Expand Up @@ -193,3 +194,143 @@ test("Can concat artifact (object) of ToolMessageChunk", () => {
bar: "baz",
});
});

describe("Complex AIMessageChunk concat", () => {
it("concatenates content arrays of strings", () => {
expect(
new AIMessageChunk({
content: [{ type: "text", text: "I am" }],
id: "ai4",
}).concat(
new AIMessageChunk({ content: [{ type: "text", text: " indeed." }] })
)
).toEqual(
new AIMessageChunk({
id: "ai4",
content: [
{ type: "text", text: "I am" },
{ type: "text", text: " indeed." },
],
})
);
});

it("concatenates mixed content arrays", () => {
expect(
new AIMessageChunk({
content: [{ index: 0, type: "text", text: "I am" }],
}).concat(
new AIMessageChunk({ content: [{ type: "text", text: " indeed." }] })
)
).toEqual(
new AIMessageChunk({
content: [
{ index: 0, type: "text", text: "I am" },
{ type: "text", text: " indeed." },
],
})
);
});

it("merges content arrays with same index", () => {
expect(
new AIMessageChunk({ content: [{ index: 0, text: "I am" }] }).concat(
new AIMessageChunk({ content: [{ index: 0, text: " indeed." }] })
)
).toEqual(
new AIMessageChunk({ content: [{ index: 0, text: "I am indeed." }] })
);
});

it("does not merge when one chunk is missing an index", () => {
expect(
new AIMessageChunk({ content: [{ index: 0, text: "I am" }] }).concat(
new AIMessageChunk({ content: [{ text: " indeed." }] })
)
).toEqual(
new AIMessageChunk({
content: [{ index: 0, text: "I am" }, { text: " indeed." }],
})
);
});

it("does not create a holey array when there's a gap between indexes", () => {
expect(
new AIMessageChunk({ content: [{ index: 0, text: "I am" }] }).concat(
new AIMessageChunk({ content: [{ index: 2, text: " indeed." }] })
)
).toEqual(
new AIMessageChunk({
content: [
{ index: 0, text: "I am" },
{ index: 2, text: " indeed." },
],
})
);
});

it("does not merge content arrays with separate indexes", () => {
expect(
new AIMessageChunk({ content: [{ index: 0, text: "I am" }] }).concat(
new AIMessageChunk({ content: [{ index: 1, text: " indeed." }] })
)
).toEqual(
new AIMessageChunk({
content: [
{ index: 0, text: "I am" },
{ index: 1, text: " indeed." },
],
})
);
});

it("merges content arrays with same index and type", () => {
expect(
new AIMessageChunk({
content: [{ index: 0, text: "I am", type: "text_block" }],
}).concat(
new AIMessageChunk({
content: [{ index: 0, text: " indeed.", type: "text_block" }],
})
)
).toEqual(
new AIMessageChunk({
content: [{ index: 0, text: "I am indeed.", type: "text_block" }],
})
);
});

it("merges content arrays with same index and different types without updating type", () => {
expect(
new AIMessageChunk({
content: [{ index: 0, text: "I am", type: "text_block" }],
}).concat(
new AIMessageChunk({
content: [{ index: 0, text: " indeed.", type: "text_block_delta" }],
})
)
).toEqual(
new AIMessageChunk({
content: [{ index: 0, text: "I am indeed.", type: "text_block" }],
})
);
});

it("concatenates empty string content and merges other fields", () => {
expect(
new AIMessageChunk({
content: [{ index: 0, type: "text", text: "I am" }],
}).concat(
new AIMessageChunk({
content: [{ type: "text", text: "" }],
response_metadata: { extra: "value" },
})
)
).toEqual(
new AIMessageChunk({
content: [{ index: 0, type: "text", text: "I am" }],
response_metadata: { extra: "value" },
})
);
});
});
Loading
Loading