Fix/fix anthropic payload handler (#724)

Author: cosminacho

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "uipath-langchain"
-version = "0.9.5"
+version = "0.9.6"
 description = "Python SDK that enables developers to build and deploy LangGraph agents to the UiPath Cloud Platform"
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.11"

src/uipath_langchain/chat/handlers/bedrock.py

@@ -86,9 +86,9 @@ def get_tool_binding_kwargs(
         parallel_tool_calls: bool = True,
         strict_mode: bool = False,
     ) -> dict[str, Any]:
+        _thinking = (getattr(self.model, "model_kwargs", None) or {}).get("thinking")
         thinking_enabled = (
-            getattr(self.model, "model_kwargs", {}).get("thinking", {}).get("type")
-            == "enabled"
+            isinstance(_thinking, dict) and _thinking.get("type") == "enabled"
         )
         # Anthropic models via Invoke API don't support forced tool use with extended thinking
         if thinking_enabled and tool_choice == "any":
@@ -142,11 +142,11 @@ def get_tool_binding_kwargs(
         parallel_tool_calls: bool = True,
         strict_mode: bool = False,
     ) -> dict[str, Any]:
+        _thinking = (
+            getattr(self.model, "additional_model_request_fields", None) or {}
+        ).get("thinking")
         thinking_enabled = (
-            getattr(self.model, "additional_model_request_fields", {})
-            .get("thinking", {})
-            .get("type")
-            == "enabled"
+            isinstance(_thinking, dict) and _thinking.get("type") == "enabled"
         )
         # Anthropic models via Converse API don't support forced tool use with extended thinking
         if thinking_enabled and tool_choice == "any":

tests/chat/test_bedrock_payload_handler.py

@@ -231,3 +231,70 @@ def test_invoke_snake_case_key_ignored(self) -> None:
         """Converse handler must not react to stop_reason (snake_case)."""
         msg = AIMessage(content="", response_metadata={"stop_reason": "max_tokens"})
         self.handler.check_stop_reason(msg)  # should not raise
+
+
+# ---------------------------------------------------------------------------
+# Null-safety: thinking_enabled detection
+# ---------------------------------------------------------------------------
+
+
+class TestBedrockInvokeThinkingNullSafety:
+    """model_kwargs or its nested values may be None — must not raise."""
+
+    def test_model_kwargs_is_none(self) -> None:
+        model = type("FakeChatBedrock", (), {})()
+        model.model_kwargs = None
+        handler = BedrockInvokePayloadHandler(model)
+        result = handler.get_tool_binding_kwargs([], "any")
+        assert result["tool_choice"] == "any"
+
+    def test_thinking_value_is_none(self) -> None:
+        model = type("FakeChatBedrock", (), {})()
+        model.model_kwargs = {"thinking": None}
+        handler = BedrockInvokePayloadHandler(model)
+        result = handler.get_tool_binding_kwargs([], "any")
+        assert result["tool_choice"] == "any"
+
+    def test_model_kwargs_attribute_missing(self) -> None:
+        model = type("FakeChatBedrock", (), {})()
+        handler = BedrockInvokePayloadHandler(model)
+        result = handler.get_tool_binding_kwargs([], "any")
+        assert result["tool_choice"] == "any"
+
+    def test_thinking_value_is_non_dict_truthy(self) -> None:
+        model = type("FakeChatBedrock", (), {})()
+        model.model_kwargs = {"thinking": "enabled"}
+        handler = BedrockInvokePayloadHandler(model)
+        result = handler.get_tool_binding_kwargs([], "any")
+        assert result["tool_choice"] == "any"
+
+
+class TestBedrockConverseThinkingNullSafety:
+    """additional_model_request_fields or its nested values may be None — must not raise."""
+
+    def test_additional_fields_is_none(self) -> None:
+        model = type("FakeChatBedrockConverse", (), {})()
+        model.additional_model_request_fields = None
+        handler = BedrockConversePayloadHandler(model)
+        result = handler.get_tool_binding_kwargs([], "any")
+        assert result["tool_choice"] == "any"
+
+    def test_thinking_value_is_none(self) -> None:
+        model = type("FakeChatBedrockConverse", (), {})()
+        model.additional_model_request_fields = {"thinking": None}
+        handler = BedrockConversePayloadHandler(model)
+        result = handler.get_tool_binding_kwargs([], "any")
+        assert result["tool_choice"] == "any"
+
+    def test_thinking_value_is_non_dict_truthy(self) -> None:
+        model = type("FakeChatBedrockConverse", (), {})()
+        model.additional_model_request_fields = {"thinking": "enabled"}
+        handler = BedrockConversePayloadHandler(model)
+        result = handler.get_tool_binding_kwargs([], "any")
+        assert result["tool_choice"] == "any"
+
+    def test_additional_fields_attribute_missing(self) -> None:
+        model = type("FakeChatBedrockConverse", (), {})()
+        handler = BedrockConversePayloadHandler(model)
+        result = handler.get_tool_binding_kwargs([], "any")
+        assert result["tool_choice"] == "any"