resolved comments

Author: rkritika1508

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

@@ -23,6 +23,8 @@ def upgrade() -> None:
     op.create_table(
         "request_log",
         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("request_id", sa.Uuid(), nullable=False),
         sa.Column("response_id", sa.Uuid(), nullable=True),
         sa.Column(

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

@@ -23,6 +23,8 @@ def upgrade() -> None:
     op.create_table(
         "validator_log",
         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("request_id", sa.Uuid(), nullable=False),
         sa.Column("name", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
         sa.Column("input", sqlmodel.sql.sqltypes.AutoString(), nullable=False),

backend/app/alembic/versions/004_added_log_indexes.py

@@ -21,6 +21,10 @@ def upgrade() -> None:
     op.create_index("idx_request_log_request_id", "request_log", ["request_id"])
     op.create_index("idx_request_log_status", "request_log", ["status"])
     op.create_index("idx_request_log_inserted_at", "request_log", ["inserted_at"])
+    op.create_index(
+        "ix_request_log_organization_id", "request_log", ["organization_id"]
+    )
+    op.create_index("ix_request_log_project_id", "request_log", ["project_id"])
 
     op.create_index("idx_validator_log_request_id", "validator_log", ["request_id"])
     op.create_index("idx_validator_log_inserted_at", "validator_log", ["inserted_at"])
@@ -37,3 +41,5 @@ def downgrade() -> None:
     op.drop_index("idx_request_log_inserted_at", table_name="request_log")
     op.drop_index("idx_request_log_status", table_name="request_log")
     op.drop_index("idx_request_log_request_id", table_name="request_log")
+    op.drop_index("idx_request_log_organization_id", table_name="request_log")
+    op.drop_index("idx_request_log_project_id", table_name="request_log")

…bic/versions/004_added_banlist_config.py …bic/versions/005_added_banlist_config.pybackend/app/alembic/versions/004_added_banlist_config.py renamed to backend/app/alembic/versions/005_added_banlist_config.py backend/app/alembic/versions/004_added_banlist_config.py renamed to backend/app/alembic/versions/005_added_banlist_config.py

@@ -1,7 +1,7 @@
 """Added ban_list table
 
-Revision ID: 004
-Revises: 003
+Revision ID: 005
+Revises: 004
 Create Date: 2026-02-05 09:42:54.128852
 
 """
@@ -12,8 +12,8 @@
 import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
-revision: str = '004'
-down_revision = '003'
+revision: str = "005"
+down_revision = "004"
 branch_labels = None
 depends_on = None
 

backend/app/api/routes/guardrails.py

@@ -37,10 +37,9 @@ def run_guardrails(
     except ValueError:
         return APIResponse.failure_response(error="Invalid request_id")
 
-    request_log = request_log_crud.create(request_id, input_text=payload.input)
+    request_log = request_log_crud.create(request_id, payload)
     return _validate_with_guard(
-        payload.input,
-        payload.validators,
+        payload,
         request_log_crud,
         request_log.id,
         validator_log_crud,
@@ -79,8 +78,7 @@ def list_validators(_: AuthDep):
 
 
 def _validate_with_guard(
-    data: str,
-    validators: list,
+    payload: GuardrailRequest,
     request_log_crud: RequestLogCrud,
     request_log_id: UUID,
     validator_log_crud: ValidatorLogCrud,
@@ -94,6 +92,8 @@ def _validate_with_guard(
     while still safely handling unexpected runtime errors.
     """
     response_id = uuid.uuid4()
+    data = payload.input
+    validators = payload.validators
     guard: Guard | None = None
 
     def _finalize(
@@ -125,7 +125,7 @@ def _finalize(
 
         if guard is not None:
             add_validator_logs(
-                guard, request_log_id, validator_log_crud, suppress_pass_logs
+                guard, request_log_id, validator_log_crud, payload, suppress_pass_logs
             )
 
         rephrase_needed = validated_output is not None and validated_output.startswith(
@@ -175,6 +175,7 @@ def add_validator_logs(
     guard: Guard,
     request_log_id: UUID,
     validator_log_crud: ValidatorLogCrud,
+    payload: GuardrailRequest,
     suppress_pass_logs: bool = False,
 ):
     history = getattr(guard, "history", None)
@@ -202,6 +203,8 @@ def add_validator_logs(
 
         validator_log = ValidatorLog(
             request_id=request_log_id,
+            organization_id=payload.organization_id,
+            project_id=payload.project_id,
             name=log.validator_name,
             input=str(log.value_before_validation),
             output=log.value_after_validation,

backend/app/crud/request_log.py

@@ -3,17 +3,20 @@
 from sqlmodel import Session
 
 from app.models.logging.request_log import RequestLog, RequestLogUpdate, RequestStatus
+from app.schemas.guardrail_config import GuardrailRequest, GuardrailResponse
 from app.utils import now
 
 
 class RequestLogCrud:
     def __init__(self, session: Session):
         self.session = session
 
-    def create(self, request_id: UUID, input_text: str) -> RequestLog:
+    def create(self, request_id: UUID, payload: GuardrailRequest) -> RequestLog:
         create_request_log = RequestLog(
             request_id=request_id,
-            request_text=input_text,
+            request_text=payload.input,
+            organization_id=payload.organization_id,
+            project_id=payload.project_id,
         )
         self.session.add(create_request_log)
         self.session.commit()

backend/app/models/logging/request_log.py

@@ -24,6 +24,16 @@ class RequestLog(SQLModel, table=True):
         sa_column_kwargs={"comment": "Unique identifier for the request log entry"},
     )
 
+    organization_id: int = Field(
+        index=True,
+        sa_column_kwargs={"comment": "Identifier for the organization"},
+    )
+
+    project_id: int = Field(
+        nullable=False,
+        sa_column_kwargs={"comment": "Identifier for the project"},
+    )
+
     request_id: UUID = Field(
         nullable=False,
         sa_column_kwargs={"comment": "Identifier for the request"},

backend/app/models/logging/validator_log.py

@@ -21,6 +21,16 @@ class ValidatorLog(SQLModel, table=True):
         sa_column_kwargs={"comment": "Unique identifier for the validator log entry"},
     )
 
+    organization_id: int = Field(
+        index=True,
+        sa_column_kwargs={"comment": "Identifier for the organization"},
+    )
+
+    project_id: int = Field(
+        nullable=False,
+        sa_column_kwargs={"comment": "Identifier for the project"},
+    )
+
     request_id: UUID = Field(
         foreign_key="request_log.id",
         nullable=False,

backend/app/schemas/guardrail_config.py

@@ -34,6 +34,8 @@
 class GuardrailRequest(SQLModel):
     model_config = ConfigDict(extra="forbid")
     request_id: str
+    organization_id: int
+    project_id: int
     input: str
     validators: List[ValidatorConfigItem]
 

backend/app/tests/test_guardrails_api.py

@@ -3,12 +3,18 @@
 import pytest
 
 from app.tests.guardrails_mocks import MockResult
+from app.tests.seed_data import (
+    VALIDATOR_TEST_ORGANIZATION_ID,
+    VALIDATOR_TEST_PROJECT_ID,
+)
 from app.tests.utils.constants import SAFE_TEXT_FIELD, VALIDATE_API_PATH
 
 build_guard_path = "app.api.routes.guardrails.build_guard"
 crud_path = "app.api.routes.guardrails.RequestLogCrud"
 
 request_id = "123e4567-e89b-12d3-a456-426614174000"
+organization_id = VALIDATOR_TEST_ORGANIZATION_ID
+project_id = VALIDATOR_TEST_PROJECT_ID
 
 
 @pytest.fixture
@@ -34,6 +40,8 @@ def validate(self, data):
             VALIDATE_API_PATH,
             json={
                 "request_id": request_id,
+                "organization_id": organization_id,
+                "project_id": project_id,
                 "input": "hello world",
                 "validators": [],
             },
@@ -57,6 +65,8 @@ def validate(self, data):
             VALIDATE_API_PATH,
             json={
                 "request_id": request_id,
+                "organization_id": organization_id,
+                "project_id": project_id,
                 "input": "my phone is 999999",
                 "validators": [],
             },
@@ -76,6 +86,8 @@ def test_guardrails_internal_error(client, mock_crud):
             VALIDATE_API_PATH,
             json={
                 "request_id": request_id,
+                "organization_id": organization_id,
+                "project_id": project_id,
                 "input": "text",
                 "validators": [],
             },