Merge branch 'main'

Author: dbschmigelski

src/strands/models/bedrock.py

@@ -278,13 +278,20 @@ def _format_bedrock_messages(self, messages: Messages) -> Messages:
             cleaned_content: list[ContentBlock] = []
 
             for content_block in message["content"]:
+                # DeepSeek models have issues with reasoningContent
+                # TODO: Replace with systematic model configuration registry (https://github.com/strands-agents/sdk-python/issues/780)
+                if "deepseek" in self.config["model_id"].lower() and "reasoningContent" in content_block:
+                    continue
+
                 if "toolResult" in content_block:
                     # Create a new content block with only the cleaned toolResult
                     tool_result: ToolResult = content_block["toolResult"]
 
                     # Keep only the required fields for Bedrock
                     cleaned_tool_result = ToolResult(
-                        content=tool_result["content"], toolUseId=tool_result["toolUseId"], status=tool_result["status"]
+                        content=tool_result["content"],
+                        toolUseId=tool_result["toolUseId"],
+                        status=tool_result["status"],
                     )
 
                     cleaned_block: ContentBlock = {"toolResult": cleaned_tool_result}
@@ -293,9 +300,10 @@ def _format_bedrock_messages(self, messages: Messages) -> Messages:
                     # Keep other content blocks as-is
                     cleaned_content.append(content_block)
 
-            # Create new message with cleaned content
-            cleaned_message: Message = Message(content=cleaned_content, role=message["role"])
-            cleaned_messages.append(cleaned_message)
+            # Create new message with cleaned content (skip if empty for DeepSeek)
+            if cleaned_content:
+                cleaned_message: Message = Message(content=cleaned_content, role=message["role"])
+                cleaned_messages.append(cleaned_message)
 
         return cleaned_messages
 
@@ -347,7 +355,8 @@ def _generate_redaction_events(self) -> list[StreamEvent]:
                 {
                     "redactContent": {
                         "redactAssistantContentMessage": self.config.get(
-                            "guardrail_redact_output_message", "[Assistant output redacted.]"
+                            "guardrail_redact_output_message",
+                            "[Assistant output redacted.]",
                         )
                     }
                 }
@@ -427,6 +436,7 @@ def _stream(
         try:
             logger.debug("formatting request")
             request = self.format_request(messages, tool_specs, system_prompt)
+
             logger.debug("request=<%s>", request)
 
             logger.debug("invoking model")
@@ -660,7 +670,11 @@ def _find_detected_and_blocked_policy(self, input: Any) -> bool:
 
     @override
     async def structured_output(
-        self, output_model: Type[T], prompt: Messages, system_prompt: Optional[str] = None, **kwargs: Any
+        self,
+        output_model: Type[T],
+        prompt: Messages,
+        system_prompt: Optional[str] = None,
+        **kwargs: Any,
     ) -> AsyncGenerator[dict[str, Union[T, Any]], None]:
         """Get structured output from the model.
 
@@ -675,7 +689,12 @@ async def structured_output(
         """
         tool_spec = convert_pydantic_to_tool_spec(output_model)
 
-        response = self.stream(messages=prompt, tool_specs=[tool_spec], system_prompt=system_prompt, **kwargs)
+        response = self.stream(
+            messages=prompt,
+            tool_specs=[tool_spec],
+            system_prompt=system_prompt,
+            **kwargs,
+        )
         async for event in streaming.process_stream(response):
             yield event
 

tests/strands/models/test_bedrock.py

@@ -1301,3 +1301,56 @@ def test_format_request_cleans_tool_result_content_blocks(model, model_id):
     assert tool_result == expected
     assert "extraField" not in tool_result
     assert "mcpMetadata" not in tool_result
+
+
+@pytest.mark.asyncio
+async def test_stream_deepseek_filters_reasoning_content(bedrock_client, alist):
+    """Test that DeepSeek models filter reasoningContent from messages during streaming."""
+    model = BedrockModel(model_id="us.deepseek.r1-v1:0")
+
+    messages = [
+        {"role": "user", "content": [{"text": "Hello"}]},
+        {
+            "role": "assistant",
+            "content": [
+                {"text": "Response"},
+                {"reasoningContent": {"reasoningText": {"text": "Thinking..."}}},
+            ],
+        },
+    ]
+
+    bedrock_client.converse_stream.return_value = {"stream": []}
+
+    await alist(model.stream(messages))
+
+    # Verify the request was made with filtered messages (no reasoningContent)
+    call_args = bedrock_client.converse_stream.call_args[1]
+    sent_messages = call_args["messages"]
+
+    assert len(sent_messages) == 2
+    assert sent_messages[0]["content"] == [{"text": "Hello"}]
+    assert sent_messages[1]["content"] == [{"text": "Response"}]
+
+
+@pytest.mark.asyncio
+async def test_stream_deepseek_skips_empty_messages(bedrock_client, alist):
+    """Test that DeepSeek models skip messages that would be empty after filtering reasoningContent."""
+    model = BedrockModel(model_id="us.deepseek.r1-v1:0")
+
+    messages = [
+        {"role": "user", "content": [{"text": "Hello"}]},
+        {"role": "assistant", "content": [{"reasoningContent": {"reasoningText": {"text": "Only reasoning..."}}}]},
+        {"role": "user", "content": [{"text": "Follow up"}]},
+    ]
+
+    bedrock_client.converse_stream.return_value = {"stream": []}
+
+    await alist(model.stream(messages))
+
+    # Verify the request was made with only non-empty messages
+    call_args = bedrock_client.converse_stream.call_args[1]
+    sent_messages = call_args["messages"]
+
+    assert len(sent_messages) == 2
+    assert sent_messages[0]["content"] == [{"text": "Hello"}]
+    assert sent_messages[1]["content"] == [{"text": "Follow up"}]