chore (backend): resolve the warning:

SAWarning: SELECT statement has a cartesian product between FROM element(s) 'evaluations' and FROM element 'human_evaluations'. Apply join condition(s) between each element to resolve.
Agenta-AI · Sep 26, 2024 · b786335 · b786335
1 parent f70f385
commit b786335
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/agenta-backend/agenta_backend/services/db_manager.py b/agenta-backend/agenta_backend/services/db_manager.py
@@ -2644,15 +2644,15 @@ async def fetch_evaluations_by_resource(
                 .join(HumanEvaluationVariantDB)
                 .filter(
                     HumanEvaluationVariantDB.variant_id.in_(ids),
-                    EvaluationDB.project_id == uuid.UUID(project_id),
+                    HumanEvaluationDB.project_id == uuid.UUID(project_id),
                 )
                 .options(load_only(HumanEvaluationDB.id))  # type: ignore
             )
             res_evaluations = result_evaluations.scalars().all()
             res_human_evaluations = result_human_evaluations.scalars().all()
             return res_evaluations + res_human_evaluations
 
-        if resource_type == "testset":
+        elif resource_type == "testset":
             result_evaluations = await session.execute(
                 select(EvaluationDB)
                 .filter(
@@ -2665,15 +2665,16 @@ async def fetch_evaluations_by_resource(
                 select(HumanEvaluationDB)
                 .filter(
                     HumanEvaluationDB.testset_id.in_(ids),
-                    EvaluationDB.project_id == uuid.UUID(project_id),
+                    HumanEvaluationDB.project_id
+                    == uuid.UUID(project_id),  # Fixed to match HumanEvaluationDB
                 )
                 .options(load_only(HumanEvaluationDB.id))  # type: ignore
             )
             res_evaluations = result_evaluations.scalars().all()
             res_human_evaluations = result_human_evaluations.scalars().all()
             return res_evaluations + res_human_evaluations
 
-        if resource_type == "evaluator_config":
+        elif resource_type == "evaluator_config":
             query = (
                 select(EvaluationDB)
                 .join(EvaluationDB.evaluator_configs)