From c3847fae6cf1e83252faf337911e42999d748701 Mon Sep 17 00:00:00 2001 From: jacoblee93 Date: Thu, 6 Feb 2025 11:26:15 -0800 Subject: [PATCH 1/5] Dedupe input (right-side) messages in add_messages --- libs/langgraph/langgraph/graph/message.py | 3 +++ libs/langgraph/tests/test_messages_state.py | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/libs/langgraph/langgraph/graph/message.py b/libs/langgraph/langgraph/graph/message.py index ed6322b5b..60810bc41 100644 --- a/libs/langgraph/langgraph/graph/message.py +++ b/libs/langgraph/langgraph/graph/message.py @@ -176,9 +176,12 @@ def add_messages( for m in left: if m.id is None: m.id = str(uuid.uuid4()) + dedupe_map = {} for m in right: if m.id is None: m.id = str(uuid.uuid4()) + dedupe_map[m.id] = m + right = list(dedupe_map.values()) # merge left_idx_by_id = {m.id: i for i, m in enumerate(left)} merged = left.copy() diff --git a/libs/langgraph/tests/test_messages_state.py b/libs/langgraph/tests/test_messages_state.py index 787774baf..461a8b336 100644 --- a/libs/langgraph/tests/test_messages_state.py +++ b/libs/langgraph/tests/test_messages_state.py @@ -66,6 +66,15 @@ def test_missing_ids(): assert all(isinstance(m.id, str) and UUID(m.id, version=4) for m in result) +def test_duplicates_in_input(): + left = [] + right = [AIMessage(id="1", content="Hi there!"), AIMessage(id="1", content="Hi there again!")] + result = add_messages(left, right) + assert len(result) == 1 + assert result[0].id == "1" + assert result[0].content == "Hi there again!" + + def test_remove_message(): left = [ HumanMessage(content="Hello", id="1"), From 028137a51a13f92f411accaf25bd64aca7920f8f Mon Sep 17 00:00:00 2001 From: jacoblee93 Date: Thu, 6 Feb 2025 11:28:10 -0800 Subject: [PATCH 2/5] Format --- libs/langgraph/tests/test_messages_state.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/langgraph/tests/test_messages_state.py b/libs/langgraph/tests/test_messages_state.py index 461a8b336..20e829f67 100644 --- a/libs/langgraph/tests/test_messages_state.py +++ b/libs/langgraph/tests/test_messages_state.py @@ -68,7 +68,10 @@ def test_missing_ids(): def test_duplicates_in_input(): left = [] - right = [AIMessage(id="1", content="Hi there!"), AIMessage(id="1", content="Hi there again!")] + right = [ + AIMessage(id="1", content="Hi there!"), + AIMessage(id="1", content="Hi there again!"), + ] result = add_messages(left, right) assert len(result) == 1 assert result[0].id == "1" From 6adaa6cf78c1227ad1d3f182421cf69f3909f508 Mon Sep 17 00:00:00 2001 From: Nuno Campos Date: Thu, 6 Feb 2025 11:33:54 -0800 Subject: [PATCH 3/5] Fix up --- libs/langgraph/langgraph/graph/message.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libs/langgraph/langgraph/graph/message.py b/libs/langgraph/langgraph/graph/message.py index 60810bc41..6bbbf252a 100644 --- a/libs/langgraph/langgraph/graph/message.py +++ b/libs/langgraph/langgraph/graph/message.py @@ -176,18 +176,15 @@ def add_messages( for m in left: if m.id is None: m.id = str(uuid.uuid4()) - dedupe_map = {} for m in right: if m.id is None: m.id = str(uuid.uuid4()) - dedupe_map[m.id] = m - right = list(dedupe_map.values()) # merge - left_idx_by_id = {m.id: i for i, m in enumerate(left)} merged = left.copy() + merged_by_id = {m.id: i for i, m in enumerate(merged)} ids_to_remove = set() for m in right: - if (existing_idx := left_idx_by_id.get(m.id)) is not None: + if (existing_idx := merged_by_id.get(m.id)) is not None: if isinstance(m, RemoveMessage): ids_to_remove.add(m.id) else: @@ -198,6 +195,7 @@ def add_messages( f"Attempting to delete a message with an ID that doesn't exist ('{m.id}')" ) + merged_by_id[m.id] = len(merged) merged.append(m) merged = [m for m in merged if m.id not in ids_to_remove] From 55a3352e9b13bb5a1266e94617378e973a45de68 Mon Sep 17 00:00:00 2001 From: Nuno Campos Date: Thu, 6 Feb 2025 11:34:45 -0800 Subject: [PATCH 4/5] One more --- libs/langgraph/langgraph/graph/message.py | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/langgraph/langgraph/graph/message.py b/libs/langgraph/langgraph/graph/message.py index 6bbbf252a..b6ed16131 100644 --- a/libs/langgraph/langgraph/graph/message.py +++ b/libs/langgraph/langgraph/graph/message.py @@ -188,6 +188,7 @@ def add_messages( if isinstance(m, RemoveMessage): ids_to_remove.add(m.id) else: + ids_to_remove.discard(m.id) merged[existing_idx] = m else: if isinstance(m, RemoveMessage): From 32aa87d4b2e1d6a01c2dd2ec5f2ce26b29aac6db Mon Sep 17 00:00:00 2001 From: jacoblee93 Date: Thu, 6 Feb 2025 11:52:13 -0800 Subject: [PATCH 5/5] Add test --- libs/langgraph/tests/test_messages_state.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libs/langgraph/tests/test_messages_state.py b/libs/langgraph/tests/test_messages_state.py index 20e829f67..97f38051c 100644 --- a/libs/langgraph/tests/test_messages_state.py +++ b/libs/langgraph/tests/test_messages_state.py @@ -78,6 +78,19 @@ def test_duplicates_in_input(): assert result[0].content == "Hi there again!" +def test_duplicates_in_input_with_remove(): + left = [AIMessage(id="1", content="Hello!")] + right = [ + RemoveMessage(id="1"), + AIMessage(id="1", content="Hi there!"), + AIMessage(id="1", content="Hi there again!"), + ] + result = add_messages(left, right) + assert len(result) == 1 + assert result[0].id == "1" + assert result[0].content == "Hi there again!" + + def test_remove_message(): left = [ HumanMessage(content="Hello", id="1"),