From 012d82d85ddac98cb81931e100159968f1eb8e3d Mon Sep 17 00:00:00 2001
From: yucheng <yucheng@berri.ai>
Date: Sat, 19 Sep 2026 16:30:11 +0000
Subject: [PATCH] fix(llmguard): scan input and prompt even when messages is
 present

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
---
 .../enterprise_callbacks/llm_guard.py         |  2 --
 .../enterprise_callbacks/test_llm_guard.py    | 34 ++++++++++++++++++-
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/enterprise/litellm_enterprise/enterprise_callbacks/llm_guard.py b/enterprise/litellm_enterprise/enterprise_callbacks/llm_guard.py
index 7338352106a..1559fff291c 100644
--- a/enterprise/litellm_enterprise/enterprise_callbacks/llm_guard.py
+++ b/enterprise/litellm_enterprise/enterprise_callbacks/llm_guard.py
@@ -173,12 +173,10 @@ class _ENTERPRISE_LLMGuard(CustomLogger):
                     *(self._moderate_message(message) for message in messages)
                 )
             )
-            return data
 
         input_ = data.get("input")
         if input_ is not None:
             data["input"] = await self._moderate_text_or_list(input_)
-            return data
 
         prompt = data.get("prompt")
         if prompt is not None:
diff --git a/tests/test_litellm/enterprise/enterprise_callbacks/test_llm_guard.py b/tests/test_litellm/enterprise/enterprise_callbacks/test_llm_guard.py
index ef2aa96c36f..4bb663b3bf0 100644
--- a/tests/test_litellm/enterprise/enterprise_callbacks/test_llm_guard.py
+++ b/tests/test_litellm/enterprise/enterprise_callbacks/test_llm_guard.py
@@ -1,8 +1,8 @@
 from typing import Final, Literal
 
 import pytest
-from fastapi import HTTPException
 from litellm_enterprise.enterprise_callbacks.llm_guard import _ENTERPRISE_LLMGuard
+from starlette.exceptions import HTTPException
 
 import litellm
 from litellm.proxy._types import UserAPIKeyAuth
@@ -94,6 +94,38 @@ async def test_llm_guard_scans_list_prompt(
     assert data["prompt"] == ["[REDACTED]", "[REDACTED]", [1, 2, 3]]
 
 
+@pytest.mark.parametrize("call_type", ("aembedding", "atext_completion"))
+@pytest.mark.parametrize("is_valid", (True, False))
+@pytest.mark.asyncio
+async def test_llm_guard_scans_input_and_prompt_alongside_messages(
+    call_type: CallTypesLiteral, is_valid: bool, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    monkeypatch.setattr(litellm, "llm_guard_mode", "all")
+    llm_guard: Final = _ENTERPRISE_LLMGuard(
+        mock_testing=True,
+        mock_redacted_text={"sanitized_prompt": "[REDACTED]", "is_valid": is_valid},
+    )
+    data: Final = {
+        "messages": [],
+        "input": "email: person@example.com",
+        "prompt": ["say ok"],
+    }
+
+    if not is_valid:
+        with pytest.raises(HTTPException) as exc_info:
+            await llm_guard.async_moderation_hook(data=data, user_api_key_dict=UserAPIKeyAuth(), call_type=call_type)
+        assert exc_info.value.status_code == 400
+        return
+
+    result: Final = await llm_guard.async_moderation_hook(
+        data=data, user_api_key_dict=UserAPIKeyAuth(), call_type=call_type
+    )
+    assert result is data
+    assert data["messages"] == []
+    assert data["input"] == "[REDACTED]"
+    assert data["prompt"] == ["[REDACTED]"]
+
+
 @pytest.mark.parametrize(
     "call_type",
     (