Skip to content

🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.

fix(annotation-queues): return not found when deleting a missing queue (#17671)

Max Deichmann66f488015cd4
diff --git a/web/src/__tests__/server/annotation-queue-items-trpc.servertest.ts b/web/src/__tests__/server/annotation-queue-items-trpc.servertest.ts
index 41ae19a29d..fd4eb1ccad 100644
--- a/web/src/__tests__/server/annotation-queue-items-trpc.servertest.ts
+++ b/web/src/__tests__/server/annotation-queue-items-trpc.servertest.ts
@@ -272,4 +272,47 @@ describe("annotation queues trpc", () => {
).rejects.toMatchObject({ code: "NOT_FOUND" });
});
});
+
+ describe("annotationQueues.delete", () => {
+ it("returns not found when the queue does not exist in the project", async () => {
+ const setup = await createOrgProjectAndApiKey();
+ orgIds.push(setup.org.id);
+ const { caller } = createCallerForProjectRole(setup);
+
+ await expect(
+ caller.annotationQueues.delete({
+ projectId: setup.project.id,
+ queueId: uuidv4(),
+ }),
+ ).rejects.toMatchObject({
+ code: "NOT_FOUND",
+ message: "Queue not found in project",
+ });
+ });
+
+ it("deletes an existing queue", async () => {
+ const setup = await createOrgProjectAndApiKey();
+ orgIds.push(setup.org.id);
+ const { caller } = createCallerForProjectRole(setup);
+ const scoreConfig = await createScoreConfig(setup.project.id);
+
+ const queue = await caller.annotationQueues.create({
+ projectId: setup.project.id,
+ name: "queue-to-delete",
+ scoreConfigIds: [scoreConfig.id],
+ });
+
+ await expect(
+ caller.annotationQueues.delete({
+ projectId: setup.project.id,
+ queueId: queue.id,
+ }),
+ ).resolves.toMatchObject({ id: queue.id });
+
+ const remaining = await prisma.annotationQueue.findUnique({
+ where: { id: queue.id },
+ });
+ expect(remaining).toBeNull();
+ });
+ });
});
diff --git a/web/src/features/annotation-queues/server/annotationQueuesRouter.ts b/web/src/features/annotation-queues/server/annotationQueuesRouter.ts
index 22016ed8d2..a298a5d243 100644
--- a/web/src/features/annotation-queues/server/annotationQueuesRouter.ts
+++ b/web/src/features/annotation-queues/server/annotationQueuesRouter.ts
@@ -1,4 +1,5 @@
import { env } from "@/src/env.mjs";
+import { isPrismaRecordNotFoundError } from "@/src/features/analytics-integrations/server/isPrismaRecordNotFoundError";
import { auditLog } from "@/src/features/audit-logs/server";
import { throwIfNoProjectAccess } from "@/src/features/rbac";
import {
@@ -507,10 +508,15 @@ export const queueRouter = createTRPCRouter({
return queue;
} catch (error) {
- logger.error(error);
- if (error instanceof TRPCError) {
+ if (error instanceof TRPCError || isBaseError(error)) {
throw error;
}
+
+ if (isPrismaRecordNotFoundError(error)) {
+ throw new LangfuseNotFoundError("Queue not found in project");
+ }
+
+ logger.error(error);
throw new TRPCError({
code: "INTERNAL_SERVER_ERROR",
message: "Deleting annotation queue failed.",