Change code to follow some feedbacks

lmnr-ai · Nov 6, 2024 · 8a0fdb3 · 8a0fdb3
1 parent 0ffea34
commit 8a0fdb3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 24 deletions.
diff --git a/frontend/app/api/projects/[projectId]/evaluations/[evaluationId]/route.ts b/frontend/app/api/projects/[projectId]/evaluations/[evaluationId]/route.ts
@@ -3,12 +3,12 @@ import { authOptions } from '@/lib/auth';
 import { fetcher } from '@/lib/utils';
 import { isCurrentUserMemberOfProject } from '@/lib/db/utils';
 import { db } from '@/lib/db/drizzle';
+import { and, asc, eq, sql } from 'drizzle-orm';
 import {
   evaluationResults,
   evaluations,
   evaluationScores
-} from '@/lib/db/schema';
-import { and, asc, eq, sql } from 'drizzle-orm';
+} from '@/lib/db/migrations/schema';
 
 export async function GET(
   req: Request,
@@ -24,21 +24,21 @@ export async function GET(
     );
   }
 
-  const getEvaluation = db
-    .select()
-    .from(evaluations)
-    .where(
-      and(
-        eq(evaluations.id, evaluationId),
-        eq(evaluations.projectId, projectId)
-      )
-    );
+  const getEvaluation = db.query.evaluations.findFirst({
+    where: and(
+      eq(evaluations.id, evaluationId),
+      eq(evaluations.projectId, projectId)
+    )
+  });
 
   const subQueryScoreCte = db.$with('scores').as(
     db
       .select({
         resultId: evaluationScores.resultId,
-        scores: sql`jsonb_object_agg(${evaluationScores.name}, ${evaluationScores.score})`
+        cteScores:
+          sql`jsonb_object_agg(${evaluationScores.name}, ${evaluationScores.score})`.as(
+            'cte_scores'
+          )
       })
       .from(evaluationScores)
       .groupBy(evaluationScores.resultId)
@@ -52,7 +52,7 @@ export async function GET(
       data: evaluationResults.data,
       target: evaluationResults.target,
       executorOutput: evaluationResults.executorOutput,
-      scores: subQueryScoreCte.scores,
+      scores: subQueryScoreCte.cteScores,
       traceId: evaluationResults.traceId
     })
     .from(evaluationResults)
@@ -72,7 +72,7 @@ export async function GET(
   ]);
 
   const result = {
-    evaluation: evaluation[0],
+    evaluation: evaluation,
     results
   };
 

diff --git a/frontend/app/api/projects/[projectId]/evaluations/route.ts b/frontend/app/api/projects/[projectId]/evaluations/route.ts
@@ -3,15 +3,14 @@ import { evaluations } from '@/lib/db/migrations/schema';
 import { and, desc, eq, inArray } from 'drizzle-orm';
 import { isCurrentUserMemberOfProject, paginatedGet } from '@/lib/db/utils';
 import { Evaluation } from '@/lib/evaluation/types';
+import { NextRequest } from 'next/server';
 
 export async function GET(
-  req: Request,
+  req: NextRequest,
   { params }: { params: { projectId: string } }
 ): Promise<Response> {
   const projectId = params.projectId;
-
-  const { searchParams } = new URL(req.url);
-  const groupId = searchParams.get('groupId');
+  const groupId = req.nextUrl.searchParams.get('groupId');
 
   if (!(await isCurrentUserMemberOfProject(projectId))) {
     return new Response(
@@ -33,14 +32,10 @@ export async function GET(
 
     return Response.json(result);
   } else {
-    const baseQuery = db.$with('base').as(db.select().from(evaluations));
-
     const result = await paginatedGet<any, Evaluation>({
       table: evaluations,
-      baseFilters: [eq(sql`project_id`, projectId)],
-      filters: [],
-      baseQuery,
-      orderBy: desc(sql`created_at`)
+      filters: [eq(evaluations.projectId, projectId)],
+      orderBy: desc(evaluations.createdAt)
     });
 
     return Response.json(result);