From 2eb40edc280d482af7d0c7fa9bd0a01cba02f119 Mon Sep 17 00:00:00 2001
From: albertbausili <albert.bausili@neuraltrust.ai>
Date: Fri, 16 Oct 2026 10:14:37 +0200
Subject: [PATCH] fix(guardrails): preserve typed logging and native
 configuration discovery

---
 .../neuraltrust/neuraltrust.py                | 41 ++++++++++++++-----
 litellm/types/guardrails.py                   |  4 +-
 .../guardrails/guardrail_hooks/neuraltrust.py |  7 +++-
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/litellm/proxy/guardrails/guardrail_hooks/neuraltrust/neuraltrust.py b/litellm/proxy/guardrails/guardrail_hooks/neuraltrust/neuraltrust.py
index 9b258201dfd..aa23d8eb100 100644
--- a/litellm/proxy/guardrails/guardrail_hooks/neuraltrust/neuraltrust.py
+++ b/litellm/proxy/guardrails/guardrail_hooks/neuraltrust/neuraltrust.py
@@ -9,14 +9,15 @@ import os
 from collections.abc import Callable, Mapping, Sequence
 from itertools import chain, product
 from types import MappingProxyType
-from typing import TYPE_CHECKING, Final, Literal, Protocol
+from typing import TYPE_CHECKING, Final, Literal, ParamSpec, Protocol, TypeAlias, TypeVar, runtime_checkable
 
 import httpx
 from fastapi import HTTPException
-from pydantic import TypeAdapter, ValidationError
+from pydantic import BaseModel, ConfigDict, TypeAdapter, ValidationError
 
 from litellm._logging import verbose_proxy_logger
 from litellm.exceptions import Timeout
+from litellm.integrations import custom_guardrail
 from litellm.integrations.custom_guardrail import (
     CustomGuardrail,
     get_session_id_from_request_data,
@@ -55,6 +56,29 @@ UNREACHABLE_HTTP_STATUSES: Final = frozenset({502, 504})
 TRANSFORM_MISSING: Final = "TrustGuard transform missing payload"
 
 
+_Parameters = ParamSpec("_Parameters")
+_Result = TypeVar("_Result")
+
+
+@runtime_checkable
+class _LoggingDecorator(Protocol):
+    def __call__(self, function: Callable[_Parameters, _Result]) -> Callable[_Parameters, _Result]: ...
+
+
+_DECORATOR_ADAPTER: Final[TypeAdapter[_LoggingDecorator]] = TypeAdapter(
+    _LoggingDecorator, config=ConfigDict(arbitrary_types_allowed=True)
+)
+log_guardrail_information: Final = _DECORATOR_ADAPTER.validate_python(
+    getattr(custom_guardrail, "log_guardrail_information")
+)
+
+
+_GuardrailInitializer: TypeAlias = Callable[
+    [str | None, list[GuardrailEventHooks], GuardrailEventHooks | Mode | str | Sequence[str] | None, bool],
+    None,
+]
+
+
 class _TrustGuardClient(Protocol):
     async def post(
         self,
@@ -203,7 +227,7 @@ class NeuralTrustGuardrail(CustomGuardrail):
     """LiteLLM hook that evaluates prompts and completions with TrustGuard."""
 
     @staticmethod
-    def get_config_model() -> type[NeuralTrustGuardrailConfigModel]:
+    def get_config_model() -> type[NeuralTrustGuardrailConfigModel[BaseModel]]:
         return NeuralTrustGuardrailConfigModel
 
     @classmethod
@@ -246,14 +270,11 @@ class NeuralTrustGuardrail(CustomGuardrail):
         self.streaming_transform_mode: Literal["block_only", "incremental_diff"] = (
             streaming_transform_mode or "block_only"
         )
-        super().__init__(
-            guardrail_name=guardrail_name,
-            supported_event_hooks=self.get_supported_event_hooks(),
-            # LitellmParams.mode is str | list[str] | Mode, which CustomGuardrail narrows to the enum
-            event_hook=event_hook,  # pyright: ignore[reportArgumentType]  # config supplies the raw mode string
-            default_on=bool(default_on),
-        )
+        initializer_adapter: Final[TypeAdapter[_GuardrailInitializer]] = TypeAdapter(_GuardrailInitializer)
+        initialize: Final = initializer_adapter.validate_python(getattr(super(), "__init__"))
+        initialize(guardrail_name, self.get_supported_event_hooks(), event_hook, bool(default_on))
 
+    @log_guardrail_information
     async def apply_guardrail(
         self,
         inputs: GenericGuardrailAPIInputs,
diff --git a/litellm/types/guardrails.py b/litellm/types/guardrails.py
index 7afc8b5cfdb..e28a620abf3 100644
--- a/litellm/types/guardrails.py
+++ b/litellm/types/guardrails.py
@@ -4,7 +4,7 @@ from enum import Enum
 from types import MappingProxyType
 from typing import Final, Literal, cast
 
-from pydantic import ConfigDict, Field, field_validator, model_validator
+from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
 from typing_extensions import ReadOnly, Required, TypedDict
 
 from litellm._logging import verbose_logger
@@ -1362,7 +1362,7 @@ class LitellmParams(  # pyright: ignore[reportIncompatibleVariableOverride]  # o
     QualifireGuardrailConfigModel,
     BlockCodeExecutionGuardrailConfigModel,
     HiddenlayerGuardrailConfigModel,
-    NeuralTrustGuardrailConfigModel,
+    NeuralTrustGuardrailConfigModel[BaseModel],
     QostodianNexusConfigModel,
     VigilGuardGuardrailConfigModel,
     SingulrGuardrailConfigModel,
diff --git a/litellm/types/proxy/guardrails/guardrail_hooks/neuraltrust.py b/litellm/types/proxy/guardrails/guardrail_hooks/neuraltrust.py
index 42e6d221d8e..7acac1d7ecc 100644
--- a/litellm/types/proxy/guardrails/guardrail_hooks/neuraltrust.py
+++ b/litellm/types/proxy/guardrails/guardrail_hooks/neuraltrust.py
@@ -1,4 +1,4 @@
-from typing import Final, Literal
+from typing import Final, Literal, TypeVar
 
 from pydantic import BaseModel, Field
 
@@ -8,7 +8,10 @@ DEFAULT_API_BASE: Final = "https://trustguard.neuraltrust.ai"
 DEFAULT_TIMEOUT: Final = 5.0
 
 
-class NeuralTrustGuardrailConfigModel(GuardrailConfigModel[BaseModel]):
+_Config = TypeVar("_Config", bound=BaseModel)
+
+
+class NeuralTrustGuardrailConfigModel(GuardrailConfigModel[_Config]):
     """Config for the NeuralTrust TrustGuard native LiteLLM hook."""
 
     api_key: str | None = Field(