From d855d4c0eb0aede3aa7cbc852562e828eb8ca766 Mon Sep 17 00:00:00 2001 From: Abram Date: Wed, 25 Sep 2024 16:18:21 +0100 Subject: [PATCH] refactor (backend): resolve failing evaluation run --- agenta-backend/agenta_backend/services/db_manager.py | 3 +-- .../agenta_backend/services/evaluation_service.py | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/agenta-backend/agenta_backend/services/db_manager.py b/agenta-backend/agenta_backend/services/db_manager.py index c6554dd6c..b23e2d30e 100644 --- a/agenta-backend/agenta_backend/services/db_manager.py +++ b/agenta-backend/agenta_backend/services/db_manager.py @@ -2683,7 +2683,7 @@ async def fetch_evaluations_by_resource( ) -async def delete_evaluations(evaluation_ids: List[str], project_id: str) -> None: +async def delete_evaluations(evaluation_ids: List[str]) -> None: """Delete evaluations based on the ids provided from the db. Args: @@ -2694,7 +2694,6 @@ async def delete_evaluations(evaluation_ids: List[str], project_id: str) -> None async with db_engine.get_session() as session: query = select(EvaluationDB).where( EvaluationDB.id.in_(evaluation_ids), - EvaluationDB.project_id == uuid.UUID(project_id), ) result = await session.execute(query) evaluations = result.scalars().all() diff --git a/agenta-backend/agenta_backend/services/evaluation_service.py b/agenta-backend/agenta_backend/services/evaluation_service.py index 70d2ee3da..43908791b 100644 --- a/agenta-backend/agenta_backend/services/evaluation_service.py +++ b/agenta-backend/agenta_backend/services/evaluation_service.py @@ -420,10 +420,8 @@ async def create_new_evaluation( Evaluation: The newly created evaluation. """ - app = await db_manager.fetch_app_by_id(app_id=app_id, project_id=project_id) - testset = await db_manager.fetch_testset_by_id( - testset_id=testset_id, project_id=project_id - ) + app = await db_manager.fetch_app_by_id(app_id=app_id) + testset = await db_manager.fetch_testset_by_id(testset_id=testset_id) variant_db = await db_manager.get_app_variant_instance_by_id( variant_id=variant_id, project_id=project_id ) @@ -460,7 +458,7 @@ async def retrieve_evaluation_results(evaluation_id: str) -> List[dict]: async def compare_evaluations_scenarios(evaluations_ids: List[str], project_id: str): - evaluation = await db_manager.fetch_evaluation_by_id(evaluations_ids[0], project_id) + evaluation = await db_manager.fetch_evaluation_by_id(evaluations_ids[0]) testset = evaluation.testset unique_testset_datapoints = remove_duplicates(testset.csvdata) formatted_inputs = extract_inputs_values_from_testset(unique_testset_datapoints)