From 499f5d6d6b367920b8944ce18349227b8bb48672 Mon Sep 17 00:00:00 2001
From: mubashir1osmani <mubashir.osmani777@gmail.com>
Date: Mon, 20 Apr 2026 09:13:22 -0400
Subject: [PATCH 1/2] prevent post call guardrail called twice

---
 litellm/proxy/common_request_processing.py    |  6 +++
 .../test_deferred_guardrail_logging.py        | 54 +++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/litellm/proxy/common_request_processing.py b/litellm/proxy/common_request_processing.py
index 97801baaf0c..86a7b2dfa9b 100644
--- a/litellm/proxy/common_request_processing.py
+++ b/litellm/proxy/common_request_processing.py
@@ -1507,6 +1507,12 @@ class ProxyBaseLLMRequestProcessing:
                         # here would duplicate the guardrail API call
                         # (e.g. double OpenAI Moderation charges).
                         continue
+                    if "async_post_call_streaming_iterator_hook" in type(cb).__dict__:
+                        # Skip — the guardrail already scanned the assembled
+                        # response via its own streaming iterator hook in the
+                        # streaming pipeline. re running this function async_post_call_success_hook
+                        # here would duplicate the scan and can spuriously block the guardrail that already passed / failed.
+                        continue
                     else:
                         guardrail_result = await cb.async_post_call_success_hook(
                             user_api_key_dict=captured_user_api_key_dict,
diff --git a/tests/test_litellm/proxy/guardrails/test_deferred_guardrail_logging.py b/tests/test_litellm/proxy/guardrails/test_deferred_guardrail_logging.py
index 160d621e60c..ee37b5e598c 100644
--- a/tests/test_litellm/proxy/guardrails/test_deferred_guardrail_logging.py
+++ b/tests/test_litellm/proxy/guardrails/test_deferred_guardrail_logging.py
@@ -683,6 +683,60 @@ class TestDeferredStreamingClosure:
             apply_guardrail_called is False
         ), "apply_guardrail guardrails must be SKIPPED in deferred path"
 
+    @pytest.mark.asyncio
+    async def test_streaming_iterator_hook_skipped_in_deferred_path(self):
+        """regression test: guardrails that define async_post_call_streaming_iterator_hook must be SKIPPED in _run_deferred_stream_guardrails.
+        The iterator hook already scanned the assembled response in the streaming
+        pipeline"""
+        success_hook_called = False
+
+        class IteratorHookGuardrail(CustomGuardrail):
+            def __init__(self):
+                super().__init__(
+                    guardrail_name="iterator-hook",
+                    default_on=True,
+                    event_hook=GuardrailEventHooks.post_call,
+                )
+
+            async def async_post_call_streaming_iterator_hook(
+                self, user_api_key_dict, response, request_data
+            ):
+                async for chunk in response:
+                    yield chunk
+
+            async def async_post_call_success_hook(
+                self, data: dict, user_api_key_dict: UserAPIKeyAuth, response: Any
+            ) -> Any:
+                nonlocal success_hook_called
+                success_hook_called = True
+                return response
+
+        mock_logging_obj = MagicMock()
+        mock_logging_obj.model_call_details = {"metadata": {}}
+
+        async def track_async_success(*args, **kwargs):
+            pass
+
+        mock_logging_obj.async_success_handler = track_async_success
+
+        guardrail = IteratorHookGuardrail()
+
+        with patch("litellm.callbacks", [guardrail]):
+            await ProxyBaseLLMRequestProcessing._run_deferred_stream_guardrails(
+                captured_data={"model": "gpt-4", "metadata": {}},
+                captured_user_api_key_dict=UserAPIKeyAuth(api_key="test"),
+                captured_logging_obj=mock_logging_obj,
+                assembled_response=MagicMock(),
+                cache_hit=False,
+            )
+
+        await asyncio.sleep(0)
+
+        assert success_hook_called is False, (
+            "Guardrails that implement async_post_call_streaming_iterator_hook "
+            "must be SKIPPED in deferred path — the iterator hook already ran"
+        )
+ 
     @pytest.mark.asyncio
     async def test_hooks_receive_merged_guardrail_data(self):
         """Hooks must receive guardrail_data (the merged dict from

From a1fd150b989f5931d2895c210087ed03780798a7 Mon Sep 17 00:00:00 2001
From: Ryan Crabbe <ryan@berri.ai>
Date: Fri, 1 May 2026 14:28:20 -0700
Subject: [PATCH 2/2] style: black format test_deferred_guardrail_logging.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Strip a trailing-whitespace line introduced by PR #26109. Black-only
change, no behavior impact — unblocks the lint check on this branch.
---
 .../proxy/guardrails/test_deferred_guardrail_logging.py         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_litellm/proxy/guardrails/test_deferred_guardrail_logging.py b/tests/test_litellm/proxy/guardrails/test_deferred_guardrail_logging.py
index 30ef896d8f7..e10258c0829 100644
--- a/tests/test_litellm/proxy/guardrails/test_deferred_guardrail_logging.py
+++ b/tests/test_litellm/proxy/guardrails/test_deferred_guardrail_logging.py
@@ -811,7 +811,7 @@ class TestDeferredStreamingClosure:
             "Guardrails that implement async_post_call_streaming_iterator_hook "
             "must be SKIPPED in deferred path — the iterator hook already ran"
         )
- 
+
     @pytest.mark.asyncio
     async def test_hooks_receive_merged_guardrail_data(self):
         """Hooks must receive guardrail_data (the merged dict from