Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
10 changes: 10 additions & 0 deletions src/claude_agent_sdk/_internal/message_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,11 @@ def parse_message(data: dict[str, Any]) -> Message | None:
raise MessageParseError(
f"Missing required field in user message: {e}", data
) from e
except (TypeError, AttributeError) as e:
# e.g. data["message"] is not a dict, so indexing into it fails
raise MessageParseError(
f"Malformed user message: {e}", data
) from e

case "assistant":
try:
Expand Down Expand Up @@ -222,6 +227,11 @@ def parse_message(data: dict[str, Any]) -> Message | None:
raise MessageParseError(
f"Missing required field in assistant message: {e}", data
) from e
except (TypeError, AttributeError) as e:
# e.g. data["message"] is not a dict, so indexing into it fails
raise MessageParseError(
f"Malformed assistant message: {e}", data
) from e

case "system":
try:
Expand Down
7 changes: 7 additions & 0 deletions tests/test_message_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -976,6 +976,13 @@ def test_parse_invalid_data_type(self):
assert "Invalid message data type" in str(exc_info.value)
assert "expected dict, got str" in str(exc_info.value)

def test_parse_non_dict_message_field(self):
"""A non-dict 'message' field raises MessageParseError, not a bare TypeError."""
for message_type in ("user", "assistant"):
with pytest.raises(MessageParseError) as exc_info:
parse_message({"type": message_type, "message": "not a dict"})
assert f"Malformed {message_type} message" in str(exc_info.value)

def test_parse_missing_type_field(self):
"""Test that missing 'type' field raises MessageParseError."""
with pytest.raises(MessageParseError) as exc_info:
Expand Down