Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
"""Assessment submissions table, submission/result-file pointers, provider error file id

Revision ID: 083
Revises: 082
Create Date: 2026-09-09 00:00:00.000000

Assessment submissions leave `evaluation_dataset`, whose type-agnostic name uniqueness
let an eval dataset block an assessment one. Multi-MB payloads leave Postgres too:
`submission_input` and `result_files` hold s3:// urls, and `provider_error_file_id`
"""

import sqlalchemy as sa
from alembic import op
from sqlalchemy.dialects import postgresql

revision = "083"
down_revision = "082"
branch_labels = None
depends_on = None

RESULT_FILES_CHECK = "ck_assessment_result_files_is_object"


def upgrade() -> None:
op.create_table(
"assessment_submission",
sa.Column(
"id",
postgresql.UUID(as_uuid=True),
primary_key=True,
comment="Unique identifier for the submission",
),
sa.Column(
"name",
sa.String(),
nullable=False,
comment="Sanitized name; the object key is derived from it",
),
sa.Column(
"description", sa.String(), nullable=True, comment="Optional description"
),
sa.Column(
"object_store_url",
sa.String(),
nullable=False,
comment="Object-store url of the uploaded file; its suffix gives the format",
),
sa.Column(
"total_items",
sa.Integer(),
nullable=False,
server_default="0",
comment="Row count, excluding the header",
),
sa.Column(
"organization_id",
sa.Integer(),
sa.ForeignKey("organization.id", ondelete="CASCADE"),
nullable=False,
),
sa.Column(
"project_id",
sa.Integer(),
sa.ForeignKey("project.id", ondelete="CASCADE"),
nullable=False,
),
sa.Column("inserted_at", sa.DateTime(), nullable=False),
sa.Column("updated_at", sa.DateTime(), nullable=False),
sa.UniqueConstraint(
"name",
"organization_id",
"project_id",
name="uq_assessment_submission_name_org_project",
),
)
op.create_index("ix_assessment_submission_name", "assessment_submission", ["name"])

op.add_column(
"assessment",
sa.Column(
"result_files",
postgresql.JSONB(astext_type=sa.Text()),
nullable=False,
server_default=sa.text("'{}'::jsonb"),
comment=(
"Result-file kind (results / errors / <stage>_results) to "
"{object_store_url} for every provider batch dump held; raw s3:// in the "
"column, presigned per delivery in the BATCH callback"
),
),
)
op.add_column(
"assessment",
sa.Column(
"submission_input",
sa.String(),
nullable=True,
comment=(
"Object-store url of the API-client BATCH submission rows "
"(submission.jsonl); the rows are never stored in this table"
),
),
)
op.drop_column("assessment", "dataset_id")
op.add_column(
"assessment",
sa.Column(
"submission_id",
postgresql.UUID(as_uuid=True),
sa.ForeignKey("assessment_submission.id", ondelete="SET NULL"),
nullable=True,
comment=(
"Uploaded submission the rows came from; set by RUN and by a BATCH "
"submitted with `submission_doc_id`. NULL when BATCH sent rows inline"
),
),
)
op.create_index("ix_assessment_submission_id", "assessment", ["submission_id"])

op.add_column(
"batch_job",
sa.Column(
"provider_error_file_id",
sa.String(),
nullable=True,
comment=(
"Provider's error file ID (OpenAI only; Anthropic and Gemini report "
"per-item errors inline)"
),
),
)
op.create_check_constraint(
RESULT_FILES_CHECK,
"assessment",
"jsonb_typeof(result_files) = 'object'",
)


def downgrade() -> None:
op.drop_constraint(RESULT_FILES_CHECK, "assessment", type_="check")
op.drop_column("batch_job", "provider_error_file_id")

op.drop_index("ix_assessment_submission_id", table_name="assessment")
op.drop_column("assessment", "submission_id")
op.add_column(
"assessment",
sa.Column(
"dataset_id",
sa.Integer(),
sa.ForeignKey("evaluation_dataset.id", ondelete="SET NULL"),
nullable=True,
comment="External dataset (RUN); binding lives in `input`",
),
)

op.drop_column("assessment", "submission_input")
op.drop_column("assessment", "result_files")

op.drop_index("ix_assessment_submission_name", table_name="assessment_submission")
op.drop_table("assessment_submission")
12 changes: 6 additions & 6 deletions backend/app/api/routes/assessment/assessments.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Parent-assessment endpoints (LEGACY RUN pipeline).

Serves dataset-based RUN assessments only. The new API-client BATCH path
Serves submission-based RUN assessments only. The new API-client BATCH path
(`api.py`) delivers results by webhook and never surfaces here.
"""

Expand Down Expand Up @@ -28,7 +28,7 @@
AssessmentPublic,
AssessmentResponse,
)
from app.models.evaluation import EvaluationDataset
from app.models.assessment import AssessmentSubmission
from app.services.assessment.service import retry_assessment as retry_assessment_service
from app.services.assessment.utils import build_assessment_results_response
from app.utils import APIResponse, load_description
Expand All @@ -47,12 +47,12 @@ def _build_assessment_public(
session=session, assessment_id=assessment.id
)
counts = compute_run_counts(runs)
dataset = session.get(EvaluationDataset, assessment.dataset_id)
submission = session.get(AssessmentSubmission, assessment.submission_id)
return AssessmentPublic(
id=assessment.id,
experiment_name=assessment.experiment_name,
dataset_id=assessment.dataset_id,
dataset_name=dataset.name if dataset else None,
submission_id=assessment.submission_id,
submission_name=submission.name if submission else None,
status=assessment.status,
counts=counts,
run_stats=build_run_stats(runs),
Expand All @@ -76,7 +76,7 @@ def retry_assessment(
session: SessionDep,
auth_context: AuthContextDep,
) -> APIResponse[AssessmentResponse]:
"""Retry a parent assessment using the same dataset/config inputs."""
"""Retry a parent assessment using the same submission/config inputs."""
assessment = get_assessment_by_id(
session=session,
assessment_id=assessment_id,
Expand Down
Loading
Loading