Merge branch 'main' into feat/add-count-filtering-to-OpenSearchDocumentStore

Author: davidsbatista

integrations/amazon_bedrock/src/haystack_integrations/components/generators/amazon_bedrock/chat/chat_generator.py

@@ -423,27 +423,31 @@ def _prepare_request_params(
 
     def _resolve_flattened_generation_kwargs(self, generation_kwargs: dict[str, Any]) -> dict[str, Any]:
         generation_kwargs = generation_kwargs.copy()
-        if "disable_parallel_tool_use" in generation_kwargs:
-            disable_parallel_tool_use = generation_kwargs.pop("disable_parallel_tool_use")
-            tool_choice = generation_kwargs.setdefault("tool_choice", {})
-            tool_choice["disable_parallel_tool_use"] = disable_parallel_tool_use
 
-        if "parallel_tool_use" in generation_kwargs:
-            parallel_tool_use = generation_kwargs.pop("parallel_tool_use")
+        disable_parallel_tool_use = generation_kwargs.pop("disable_parallel_tool_use", None)
+        parallel_tool_use = generation_kwargs.pop("parallel_tool_use", None)
+
+        if disable_parallel_tool_use is not None and parallel_tool_use is not None:
+            msg = "Cannot set both disable_parallel_tool_use and parallel_tool_use"
+            raise ValueError(msg)
+        elif parallel_tool_use is not None:
             disable_parallel_tool_use = not parallel_tool_use
+
+        if disable_parallel_tool_use is not None:
             tool_choice = generation_kwargs.setdefault("tool_choice", {})
             tool_choice["disable_parallel_tool_use"] = disable_parallel_tool_use
+            tool_choice.setdefault("type", "auto")  # default value
 
-        if "tool_choice_type" in generation_kwargs:
-            tool_choice_type = generation_kwargs.pop("tool_choice_type")
+        tool_choice_type = generation_kwargs.pop("tool_choice_type", None)
+        if tool_choice_type is not None:
             tool_choice = generation_kwargs.setdefault("tool_choice", {})
             tool_choice["type"] = tool_choice_type
 
-        if "thinking_budget_tokens" in generation_kwargs:
-            thinking_budget_tokens = generation_kwargs.pop("thinking_budget_tokens")
+        thinking_budget_tokens = generation_kwargs.pop("thinking_budget_tokens", None)
+        if thinking_budget_tokens is not None:
             thinking = generation_kwargs.setdefault("thinking", {})
             thinking["budget_tokens"] = thinking_budget_tokens
-            thinking["type"] = "enabled"
+            thinking.setdefault("type", "enabled")
 
         return generation_kwargs
 

integrations/amazon_bedrock/tests/test_chat_generator.py

@@ -409,21 +409,68 @@ def tool_fn(city: str) -> str:
             ]
         }
 
-    def test_prepare_request_params_with_flattened_generation_kwargs(self, mock_boto3_session, set_env_variables):
+    @pytest.mark.parametrize(
+        "generation_kwargs,additional_model_request_fields",
+        [
+            (
+                {
+                    "parallel_tool_use": False,
+                    "tool_choice_type": "any",
+                    "thinking_budget_tokens": 1024,
+                },
+                {
+                    "tool_choice": {"disable_parallel_tool_use": True, "type": "any"},
+                    "thinking": {"budget_tokens": 1024, "type": "enabled"},
+                },
+            ),
+            (
+                {
+                    "parallel_tool_use": True,
+                    "tool_choice_type": "all",
+                },
+                {
+                    "tool_choice": {"disable_parallel_tool_use": False, "type": "all"},
+                },
+            ),
+            (
+                {
+                    "parallel_tool_use": True,
+                },
+                {
+                    "tool_choice": {"disable_parallel_tool_use": False, "type": "auto"},
+                },
+            ),
+            (
+                {
+                    "disable_parallel_tool_use": True,
+                },
+                {
+                    "tool_choice": {"disable_parallel_tool_use": True, "type": "auto"},
+                },
+            ),
+            (
+                {
+                    "thinking_budget_tokens": None,
+                    "parallel_tool_use": None,
+                    "tool_choice_type": None,
+                },
+                {},
+            ),
+        ],
+    )
+    def test_prepare_request_params_with_flattened_generation_kwargs(
+        self, mock_boto3_session, set_env_variables, generation_kwargs, additional_model_request_fields
+    ):
         generator = AmazonBedrockChatGenerator(model="anthropic.claude-3-5-sonnet-20240620-v1:0")
         request_params, _ = generator._prepare_request_params(
             messages=[ChatMessage.from_user("What's the capital of France?")],
-            generation_kwargs={
-                "parallel_tool_use": False,
-                "tool_choice_type": "any",
-                "thinking_budget_tokens": 1024,
-            },
+            generation_kwargs=generation_kwargs,
         )
 
-        assert request_params["additionalModelRequestFields"] == {
-            "tool_choice": {"disable_parallel_tool_use": True, "type": "any"},
-            "thinking": {"budget_tokens": 1024, "type": "enabled"},
-        }
+        if not additional_model_request_fields:
+            assert "additionalModelRequestFields" not in request_params
+        else:
+            assert request_params["additionalModelRequestFields"] == additional_model_request_fields
 
 
 # In the CI, those tests are skipped if AWS Authentication fails

integrations/anthropic/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [integrations/anthropic-v5.1.1] - 2026-01-15
+
+### 🐛 Bug Fixes
+
+- None value handling of flattened generation kwargs for AnthropicChatGenerator (#2753)
+
+
 ## [integrations/anthropic-v5.1.0] - 2026-01-13
 
 ### 🚀 Features

integrations/anthropic/src/haystack_integrations/components/generators/anthropic/chat/chat_generator.py

@@ -279,27 +279,31 @@ def _prepare_request_params(
 
     def _resolve_flattened_generation_kwargs(self, generation_kwargs: dict[str, Any]) -> dict[str, Any]:
         generation_kwargs = generation_kwargs.copy()
-        if "disable_parallel_tool_use" in generation_kwargs:
-            disable_parallel_tool_use = generation_kwargs.pop("disable_parallel_tool_use")
-            tool_choice = generation_kwargs.setdefault("tool_choice", {})
-            tool_choice["disable_parallel_tool_use"] = disable_parallel_tool_use
 
-        if "parallel_tool_use" in generation_kwargs:
-            parallel_tool_use = generation_kwargs.pop("parallel_tool_use")
+        disable_parallel_tool_use = generation_kwargs.pop("disable_parallel_tool_use", None)
+        parallel_tool_use = generation_kwargs.pop("parallel_tool_use", None)
+
+        if disable_parallel_tool_use is not None and parallel_tool_use is not None:
+            msg = "Cannot set both disable_parallel_tool_use and parallel_tool_use"
+            raise ValueError(msg)
+        elif parallel_tool_use is not None:
             disable_parallel_tool_use = not parallel_tool_use
+
+        if disable_parallel_tool_use is not None:
             tool_choice = generation_kwargs.setdefault("tool_choice", {})
             tool_choice["disable_parallel_tool_use"] = disable_parallel_tool_use
+            tool_choice.setdefault("type", "auto")  # default value
 
-        if "tool_choice_type" in generation_kwargs:
-            tool_choice_type = generation_kwargs.pop("tool_choice_type")
+        tool_choice_type = generation_kwargs.pop("tool_choice_type", None)
+        if tool_choice_type is not None:
             tool_choice = generation_kwargs.setdefault("tool_choice", {})
             tool_choice["type"] = tool_choice_type
 
-        if "thinking_budget_tokens" in generation_kwargs:
-            thinking_budget_tokens = generation_kwargs.pop("thinking_budget_tokens")
+        thinking_budget_tokens = generation_kwargs.pop("thinking_budget_tokens", None)
+        if thinking_budget_tokens is not None:
             thinking = generation_kwargs.setdefault("thinking", {})
             thinking["budget_tokens"] = thinking_budget_tokens
-            thinking["type"] = "enabled"
+            thinking.setdefault("type", "enabled")
 
         return generation_kwargs
 

integrations/anthropic/tests/test_chat_generator.py

@@ -344,26 +344,71 @@ def test_run_with_params(self, chat_messages, mock_anthropic_completion):
         assert response["replies"][0].meta["model"] == "claude-sonnet-4-5"
         assert response["replies"][0].meta["finish_reason"] == "stop"
 
-    def test_run_with_flattened_generation_kwargs(self, chat_messages, mock_anthropic_completion):
+    @pytest.mark.parametrize(
+        "generation_kwargs,expected_kwargs",
+        [
+            (
+                {
+                    "parallel_tool_use": False,
+                    "tool_choice_type": "any",
+                    "thinking_budget_tokens": 1024,
+                },
+                {
+                    "tool_choice": {"disable_parallel_tool_use": True, "type": "any"},
+                    "thinking": {"budget_tokens": 1024, "type": "enabled"},
+                },
+            ),
+            (
+                {
+                    "parallel_tool_use": True,
+                    "tool_choice_type": "all",
+                },
+                {
+                    "tool_choice": {"disable_parallel_tool_use": False, "type": "all"},
+                },
+            ),
+            (
+                {
+                    "parallel_tool_use": True,
+                },
+                {
+                    "tool_choice": {"disable_parallel_tool_use": False, "type": "auto"},
+                },
+            ),
+            (
+                {
+                    "disable_parallel_tool_use": True,
+                },
+                {
+                    "tool_choice": {"disable_parallel_tool_use": True, "type": "auto"},
+                },
+            ),
+            (
+                {
+                    "thinking_budget_tokens": None,
+                    "parallel_tool_use": None,
+                    "tool_choice_type": None,
+                },
+                {},
+            ),
+        ],
+    )
+    def test_run_with_flattened_generation_kwargs(
+        self, chat_messages, mock_anthropic_completion, generation_kwargs, expected_kwargs
+    ):
         """
         Test that the AnthropicChatGenerator component can run with parameters.
         """
         component = AnthropicChatGenerator(
             api_key=Secret.from_token("test-api-key"),
-            generation_kwargs={
-                "max_tokens": 10,
-                "thinking_budget_tokens": 1024,
-                "parallel_tool_use": False,
-                "tool_choice_type": "any",
-            },
+            generation_kwargs=generation_kwargs,
         )
         component.run(chat_messages)
 
         # Check that the component calls the Anthropic API with the correct parameters
-        _, kwargs = mock_anthropic_completion.call_args
-        assert kwargs["max_tokens"] == 10
-        assert kwargs["thinking"] == {"budget_tokens": 1024, "type": "enabled"}
-        assert kwargs["tool_choice"] == {"disable_parallel_tool_use": True, "type": "any"}
+        actual_kwargs = mock_anthropic_completion.call_args.kwargs
+        assert actual_kwargs.get("tool_choice") == expected_kwargs.get("tool_choice")
+        assert actual_kwargs.get("thinking") == expected_kwargs.get("thinking")
 
     def test_check_duplicate_tool_names(self, tools):
         """Test that the AnthropicChatGenerator component fails to initialize with duplicate tool names."""