Custom flag for validator log table

.env.test.example

@@ -10,8 +10,8 @@ API_BASE_URL=http://localhost:8000
 
 # Postgres
 POSTGRES_SERVER=localhost
+POSTGRES_DB=kaapi_guardrails_testing
 POSTGRES_PORT=5432
-POSTGRES_DB=kaapi-guardrails
 POSTGRES_USER=postgres
 POSTGRES_PASSWORD=postgres
 

backend/app/alembic/versions/001_added_request_log.py

@@ -14,9 +14,9 @@
 
 # revision identifiers, used by Alembic.
 revision: str = '001'
-down_revision: Union[str, Sequence[str], None] = None
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
+down_revision: str | None = None
+branch_labels = None
+depends_on = None
 
 
 def upgrade() -> None:

backend/app/alembic/versions/002_added_validator_log.py

@@ -14,9 +14,9 @@
 
 # revision identifiers, used by Alembic.
 revision: str = '002'
-down_revision: Union[str, Sequence[str], None] = '001'
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
+down_revision: str = '001'
+branch_labels = None
+depends_on = None
 
 
 def upgrade() -> None:

backend/app/alembic/versions/003_added_validator_config.py

@@ -0,0 +1,50 @@
+"""Added validator_config table
+
+Revision ID: 003
+Revises: 002
+Create Date: 2026-02-05 09:42:54.128852
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+from sqlalchemy.dialects import postgresql
+import sqlalchemy as sa
+
+# revision identifiers, used by Alembic.
+revision: str = '003'
+down_revision: str = '002'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.create_table('validator_config',
+        sa.Column('id', sa.Uuid(), nullable=False),
+        sa.Column('organization_id', sa.Integer(), nullable=False),
+        sa.Column('project_id', sa.Integer(), nullable=False),
+        sa.Column('type', sa.String(), nullable=False),
+        sa.Column('stage', sa.String(), nullable=False),
+        sa.Column('on_fail_action', sa.String(), nullable=False),
+        sa.Column(
+            "config",
+            postgresql.JSONB(astext_type=sa.Text()),
+            nullable=False,
+            server_default=sa.text("'{}'::jsonb"),
+        ),
+        sa.Column('is_enabled', sa.Boolean(), nullable=False, server_default=sa.true()),
+        sa.Column('created_at', sa.DateTime(), nullable=False),
+        sa.Column('updated_at', sa.DateTime(), nullable=False),
+
+        sa.PrimaryKeyConstraint('id'),
+        sa.UniqueConstraint('organization_id', 'project_id', 'type', 'stage', name='uq_validator_identity')
+    )
+
+    op.create_index("idx_validator_organization", "validator_config", ["organization_id"])
+    op.create_index("idx_validator_project", "validator_config", ["project_id"])
+    op.create_index("idx_validator_type", "validator_config", ["type"])
+    op.create_index("idx_validator_stage", "validator_config", ["stage"])
+
+
+def downgrade() -> None:
+    op.drop_table('validator_config')

backend/app/api/main.py

@@ -1,10 +1,11 @@
 from fastapi import APIRouter
 
-from app.api.routes import utils, guardrails
+from app.api.routes import utils, guardrails, validator_configs
 
 api_router = APIRouter()
 api_router.include_router(utils.router)
 api_router.include_router(guardrails.router)
+api_router.include_router(validator_configs.router)
 
 # if settings.ENVIRONMENT == "local":
 #     api_router.include_router(private.router)

backend/app/api/routes/guardrails.py

@@ -1,18 +1,18 @@
-import uuid
 from uuid import UUID
+import uuid
 
 from fastapi import APIRouter
 from guardrails.guard import Guard
-from guardrails.validators import FailResult
+from guardrails.validators import FailResult, PassResult
 
 from app.api.deps import AuthDep, SessionDep
 from app.core.constants import REPHRASE_ON_FAIL_PREFIX
 from app.core.guardrail_controller import build_guard, get_validator_config_models
 from app.crud.request_log import RequestLogCrud
 from app.crud.validator_log import ValidatorLogCrud
-from app.models.guardrail_config import GuardrailRequest, GuardrailResponse
-from app.models.logging.request import  RequestLogUpdate, RequestStatus
-from app.models.logging.validator import ValidatorLog, ValidatorOutcome
+from app.models.logging.request_log import  RequestLogUpdate, RequestStatus
+from app.models.logging.validator_log import ValidatorLog, ValidatorOutcome
+from app.schemas.guardrail_config import GuardrailRequest, GuardrailResponse
 from app.utils import APIResponse
 
 router = APIRouter(prefix="/guardrails", tags=["guardrails"])
@@ -25,6 +25,7 @@ async def run_guardrails(
     payload: GuardrailRequest,
     session: SessionDep,
     _: AuthDep,
+    include_all_validator_logs: bool = False,
 ):
     request_log_crud = RequestLogCrud(session=session)
     validator_log_crud = ValidatorLogCrud(session=session)
@@ -41,6 +42,7 @@ async def run_guardrails(
         request_log_crud,
         request_log.id,
         validator_log_crud,
+        include_all_validator_logs
     )
 
 @router.get("/")
@@ -73,6 +75,7 @@ async def _validate_with_guard(
     request_log_crud: RequestLogCrud,
     request_log_id: UUID,
     validator_log_crud: ValidatorLogCrud,
+    include_all_validator_logs: bool = False,
 ) -> APIResponse:
     """
     Runs Guardrails validation on input/output data, persists request & validator logs,
@@ -112,7 +115,7 @@ def _finalize(
         )
 
         if guard is not None:
-            add_validator_logs(guard, request_log_id, validator_log_crud)
+            add_validator_logs(guard, request_log_id, validator_log_crud, include_all_validator_logs)
 
         rephrase_needed = (
             validated_output is not None
@@ -157,7 +160,7 @@ def _finalize(
             error_message=str(exc),
         )
 
-def add_validator_logs(guard: Guard, request_log_id: UUID, validator_log_crud: ValidatorLogCrud):
+def add_validator_logs(guard: Guard, request_log_id: UUID, validator_log_crud: ValidatorLogCrud, include_all_validator_logs: bool = False):
     history = getattr(guard, "history", None)
     if not history:
         return
@@ -174,6 +177,9 @@ def add_validator_logs(guard: Guard, request_log_id: UUID, validator_log_crud: V
     for log in iteration.outputs.validator_logs:
         result = log.validation_result
 
+        if not include_all_validator_logs and isinstance(result, PassResult):
+            continue
+
         error_message = None
         if isinstance(result, FailResult):
             error_message = result.error_message

backend/app/api/routes/validator_configs.py

@@ -0,0 +1,94 @@
+from typing import Optional
+from uuid import UUID
+
+from fastapi import APIRouter
+
+from app.api.deps import AuthDep, SessionDep
+from app.core.enum import Stage, ValidatorType
+from app.schemas.validator_config import ValidatorCreate, ValidatorResponse, ValidatorUpdate
+from app.crud.validator_config import validator_config_crud
+from app.utils import APIResponse
+
+
+router = APIRouter(
+    prefix="/guardrails/validators/configs",
+    tags=["validator configs"],
+)
+
+
+@router.post(
+        "/",
+        response_model=APIResponse[ValidatorResponse]
+    )
+def create_validator(
+    payload: ValidatorCreate,
+    session: SessionDep,
+    organization_id: int,
+    project_id: int,
+    _: AuthDep,
+):
+    response_model = validator_config_crud.create(session, organization_id, project_id, payload)
+    return APIResponse.success_response(data=response_model)
+
+@router.get(
+        "/",
+        response_model=APIResponse[list[ValidatorResponse]]
+    )
+def list_validators(
+    organization_id: int,
+    project_id: int,
+    session: SessionDep,
+    _: AuthDep,
+    stage: Optional[Stage] = None,
+    type: Optional[ValidatorType] = None,
+):
+    response_model = validator_config_crud.list(session, organization_id, project_id, stage, type)
+    return APIResponse.success_response(data=response_model)
+
+
+@router.get(
+        "/{id}",
+        response_model=APIResponse[ValidatorResponse]
+    )
+def get_validator(
+    id: UUID,
+    organization_id: int,
+    project_id: int,
+    session: SessionDep,
+    _: AuthDep,
+):
+    obj = validator_config_crud.get(session, id, organization_id, project_id)
+    return APIResponse.success_response(data=validator_config_crud.flatten(obj))
+
+
+@router.patch(
+        "/{id}",
+        response_model=APIResponse[ValidatorResponse]
+    )
+def update_validator(
+    id: UUID,
+    organization_id: int,
+    project_id: int,
+    payload: ValidatorUpdate,
+    session: SessionDep,
+    _: AuthDep,
+):
+    obj = validator_config_crud.get(session, id, organization_id, project_id)
+    response_model = validator_config_crud.update(session, obj, payload.model_dump(exclude_unset=True))
+    return APIResponse.success_response(data=response_model)
+
+
+@router.delete(
+        "/{id}",
+        response_model=APIResponse[dict]
+    )
+def delete_validator(
+    id: UUID,
+    organization_id: int,
+    project_id: int,
+    session: SessionDep,
+    _: AuthDep,
+):
+    obj = validator_config_crud.get(session, id, organization_id, project_id)
+    validator_config_crud.delete(session, obj)
+    return APIResponse.success_response(data={"message": "Validator deleted successfully"})

backend/app/core/constants.py

@@ -6,3 +6,12 @@
 SCORE = "score"
 
 REPHRASE_ON_FAIL_PREFIX = "Please rephrase the query without unsafe content."
+
+VALIDATOR_CONFIG_SYSTEM_FIELDS = {
+    "organization_id",
+    "project_id",
+    "type",
+    "stage",
+    "on_fail_action",
+    "is_enabled",
+}

backend/app/core/enum.py

@@ -15,4 +15,14 @@ class BiasCategories(Enum):
 class GuardrailOnFail(Enum):
     Exception = "exception"
     Fix = "fix"
-    Rephrase = "rephrase"
+    Rephrase = "rephrase"
+
+class Stage(Enum):
+    Input = "input"
+    Output = "output"
+
+class ValidatorType(Enum):
+    LexicalSlur = "uli_slur_match"
+    PIIRemover = "pii_remover"
+    GenderAssumptionBias = "gender_assumption_bias"
+    BanList = "ban_list"

backend/app/core/guardrail_controller.py

@@ -2,7 +2,7 @@
 
 from guardrails import Guard
 
-from app.models.guardrail_config import ValidatorConfigItem
+from app.schemas.guardrail_config import ValidatorConfigItem
 
 def build_guard(validator_items):
     validators = [v_item.build() for v_item in validator_items]

backend/app/models/validators/ban_list_safety_validator_config.py → backend/app/core/validators/config/ban_list_safety_validator_config.py

@@ -2,7 +2,7 @@
 
 from guardrails.hub import BanList
 
-from app.models.base_validator_config import BaseValidatorConfig
+from app.core.validators.config.base_validator_config import BaseValidatorConfig
 
 class BanListSafetyValidatorConfig(BaseValidatorConfig):
     type: Literal["ban_list"]

backend/app/models/validators/gender_assumption_bias_safety_validator_config.py → backend/app/core/validators/config/gender_assumption_bias_safety_validator_config.py

@@ -1,8 +1,8 @@
 from typing import List, Literal, Optional
 
-from app.models.base_validator_config import BaseValidatorConfig
 from app.core.enum import BiasCategories
 from app.core.validators.gender_assumption_bias import GenderAssumptionBias
+from app.core.validators.config.base_validator_config import BaseValidatorConfig
 
 class GenderAssumptionBiasSafetyValidatorConfig(BaseValidatorConfig):
     type: Literal["gender_assumption_bias"]

backend/app/models/validators/lexical_slur_safety_validator_config.py → backend/app/core/validators/config/lexical_slur_safety_validator_config.py

@@ -2,7 +2,7 @@
 
 from app.core.enum import SlurSeverity
 from app.core.validators.lexical_slur import LexicalSlur
-from app.models.base_validator_config import BaseValidatorConfig
+from app.core.validators.config.base_validator_config import BaseValidatorConfig
 
 class LexicalSlurSafetyValidatorConfig(BaseValidatorConfig):
     type: Literal["uli_slur_match"]

backend/app/models/validators/pii_remover_safety_validator_config.py → backend/app/core/validators/config/pii_remover_safety_validator_config.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 from typing import List, Literal, Optional
 
-from app.models.base_validator_config import BaseValidatorConfig
 from app.core.validators.pii_remover import PIIRemover
+from app.core.validators.config.base_validator_config import BaseValidatorConfig
 
 class PIIRemoverSafetyValidatorConfig(BaseValidatorConfig):
     type: Literal["pii_remover"]

backend/app/crud/__init__.py

@@ -1 +1 @@
-from app.crud.request_log import RequestLogCrud
+from app.crud.request_log import RequestLogCrud

backend/app/crud/request_log.py

@@ -2,7 +2,7 @@
 
 from sqlmodel import Session
 
-from app.models.logging.request import RequestLog, RequestLogUpdate, RequestStatus
+from app.models.logging.request_log import RequestLog, RequestLogUpdate, RequestStatus
 from app.utils import now
 
 class RequestLogCrud: