Skip to content

fix: handle None text in message content sanitization #1920

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.

Sign up for GitHub

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

Open
yoppi wants to merge 1 commit into
base: main
Choose a base branch
from
+30 −8
Open

fix: handle None text in message content sanitization #1920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 12 additions & 8 deletions src/strands/event_loop/streaming.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,17 @@ def _normalize_messages(messages: Messages) -> Messages:
replaced_tool_names = True

if has_tool_use:
# Remove blank 'text' items for assistant messages
# Remove blank or None 'text' items for assistant messages
before_len = len(content)
content[:] = [item for item in content if "text" not in item or item["text"].strip()]
content[:] = [
item for item in content if "text" not in item or (item["text"] is not None and item["text"].strip())
]
if not removed_blank_message_content_text and before_len != len(content):
removed_blank_message_content_text = True
else:
# Replace blank 'text' with '[blank text]' for assistant messages
# Replace blank or None 'text' with '[blank text]' for assistant messages
for item in content:
if "text" in item and not item["text"].strip():
if "text" in item and (item["text"] is None or not item["text"].strip()):
replaced_blank_message_content_text = True
item["text"] = "[blank text]"

Expand Down Expand Up @@ -136,15 +138,17 @@ def remove_blank_messages_content_text(messages: Messages) -> Messages:
continue

if has_tool_use:
# Remove blank 'text' items for assistant messages
# Remove blank or None 'text' items for assistant messages
before_len = len(content)
content[:] = [item for item in content if "text" not in item or item["text"].strip()]
content[:] = [
item for item in content if "text" not in item or (item["text"] is not None and item["text"].strip())
]
if not removed_blank_message_content_text and before_len != len(content):
removed_blank_message_content_text = True
else:
# Replace blank 'text' with '[blank text]' for assistant messages
# Replace blank or None 'text' with '[blank text]' for assistant messages
for item in content:
if "text" in item and not item["text"].strip():
if "text" in item and (item["text"] is None or not item["text"].strip()):
replaced_blank_message_content_text = True
item["text"] = "[blank text]"

Expand Down
18 changes: 18 additions & 0 deletions tests/strands/event_loop/test_streaming.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,24 @@ def test_remove_blank_messages_content_text(messages, exp_result):
],
id="missing tool name",
),
pytest.param(
[
{"role": "assistant", "content": [{"text": None}, {"toolUse": {"name": "a_name"}}]},
],
[
{"role": "assistant", "content": [{"toolUse": {"name": "a_name"}}]},
],
id="none text with tool use",
),
pytest.param(
[
{"role": "assistant", "content": [{"text": None}]},
],
[
{"role": "assistant", "content": [{"text": "[blank text]"}]},
],
id="none text without tool use",
),
],
)
def test_normalize_blank_messages_content_text(messages, exp_result):
Expand Down