fix: use only DecisionType for AgentSentry V3 moderation decisions

Author: yuweihong.666

tests/test_agentsentry_v3_transport.py

@@ -43,17 +43,18 @@ def client(mod):
 
 
 @pytest.mark.parametrize(
-    "result,blocked",
+    "result,expected",
     [
-        ({"Degraded": False, "Decision": {"DecisionType": 1}}, False),
-        ({"Degraded": False, "Decision": {"DecisionType": 2}}, True),
-        ({"Degraded": True, "Decision": {"DecisionType": 1}}, True),
-        ({"Decision": {"DecisionType": 1}}, True),
-        ({"Degraded": False, "Decision": {"DecisionType": 4}}, True),
-        ({"Degraded": False, "Decision": {"DecisionType": True}}, True),
+        ({"Degraded": False, "Decision": {"DecisionType": 1}}, None),
+        ({"Degraded": False, "Decision": {"DecisionType": 2}}, "BLOCK"),
+        ({"Decision": {"DecisionType": 1}}, None),
+        ({"Degraded": "false", "Decision": {"DecisionType": 1}}, None),
+        ({"Degraded": False, "Decision": {"DecisionType": 4}}, "UNAVAILABLE"),
+        ({"Degraded": False, "Decision": {"DecisionType": True}}, "UNAVAILABLE"),
+        ({"Degraded": True}, "UNAVAILABLE"),
     ],
 )
-def test_decisions(mod, result, blocked):
+def test_decisions(mod, result, expected):
     response = SimpleNamespace(status_code=200, json=lambda: {"Result": result})
     with patch.object(mod.requests, "post", return_value=response) as post:
         value = client(mod).moderate(
@@ -63,7 +64,7 @@ def test_decisions(mod, result, blocked):
             session_info={"SessionID": "session", "RunID": "run"},
             tool_calls=[{"ID": "call"}],
         )
-        assert bool(value) == blocked
+        assert value == (getattr(mod, expected) if expected else None)
         request = post.call_args
         body = json.loads(request.kwargs["data"])
         assert body["SessionID"] == "session"
@@ -75,6 +76,31 @@ def test_decisions(mod, result, blocked):
         assert request.kwargs["allow_redirects"] is False
 
 
+@pytest.mark.parametrize(
+    "action,decision,expected",
+    [
+        ("pass_and_writeback", 1, None),
+        ("pass_and_writeback", 2, "BLOCK"),
+        ("block_and_writeback", 1, None),
+        ("block_and_writeback", 2, "BLOCK"),
+        (None, 1, None),
+        ("unknown", 1, None),
+        ("pass_and_writeback", 4, "UNAVAILABLE"),
+    ],
+)
+def test_decision_takes_precedence_over_degraded_action(mod, action, decision, expected):
+    result = {
+        "Decision": {"DecisionType": decision},
+        "Degraded": True,
+    }
+    if action is not None:
+        result["DegradeAction"] = action
+    response = SimpleNamespace(status_code=200, json=lambda: {"Result": result})
+    with patch.object(mod.requests, "post", return_value=response):
+        value = client(mod).moderate("hello", role="user", hook_name="before_dispatch")
+    assert value == (getattr(mod, expected) if expected else None)
+
+
 def test_missing_plan_and_wrong_hook(mod):
     with patch.object(mod.requests, "post") as post:
         assert (

veadk/tools/builtin_tools/agentsentry_v3.py

@@ -152,18 +152,19 @@ def moderate(self, text, *, role, hook_name, session_info=None, tool_calls=None)
                 return UNAVAILABLE
             data = response.json()
             result = data.get("Result") or {}
+            metadata = data.get("ResponseMetadata") or {}
+            request_id = metadata.get("RequestId")
+            if metadata.get("Error"):
+                logger.warning("AgentSentry V3 API error request_id=%s", request_id)
+                return UNAVAILABLE
+            decision = (result.get("Decision") or {}).get("DecisionType")
             logger.info(
                 "AgentSentry V3 hook=%s request_id=%s decision=%s degraded=%s",
                 hook_name,
-                (data.get("ResponseMetadata") or {}).get("RequestId"),
-                (result.get("Decision") or {}).get("DecisionType"),
+                request_id,
+                decision,
                 result.get("Degraded"),
             )
-            if (data.get("ResponseMetadata") or {}).get("Error"):
-                return UNAVAILABLE
-            if result.get("Degraded") is not False:
-                return UNAVAILABLE
-            decision = (result.get("Decision") or {}).get("DecisionType")
             if type(decision) is int and decision == 1:
                 return None
             if type(decision) is int and decision == 2: