From bf3936bd061b2a423d39e501c5e7cea111e452c9 Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Tue, 29 Jul 2025 16:11:29 -0600
Subject: [PATCH 01/39] add constant with endpoint for batch annotation

---
 apps/opik-frontend/src/api/api.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/opik-frontend/src/api/api.ts b/apps/opik-frontend/src/api/api.ts
index 5b9e145ad91..7c3d7451ce8 100644
--- a/apps/opik-frontend/src/api/api.ts
+++ b/apps/opik-frontend/src/api/api.ts
@@ -17,6 +17,7 @@ export const EXPERIMENTS_REST_ENDPOINT = "/v1/private/experiments/";
 export const FEEDBACK_DEFINITIONS_REST_ENDPOINT =
   "/v1/private/feedback-definitions/";
 export const TRACES_REST_ENDPOINT = "/v1/private/traces/";
+export const TRACES_BATCH_FEEDBACK_SCORES_ENDPOINT = "/v1/private/traces/feedback-scores";
 export const SPANS_REST_ENDPOINT = "/v1/private/spans/";
 export const PROMPTS_REST_ENDPOINT = "/v1/private/prompts/";
 export const PROVIDER_KEYS_REST_ENDPOINT = "/v1/private/llm-provider-key/";

From 1e7d14362b581cdca0a64bd4eb720eccd77a68d4 Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Tue, 29 Jul 2025 16:22:52 -0600
Subject: [PATCH 02/39] add mutation for batch annotation

---
 .../useTracesBatchFeedbackScoresMutation.ts   | 98 +++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 apps/opik-frontend/src/api/traces/useTracesBatchFeedbackScoresMutation.ts

diff --git a/apps/opik-frontend/src/api/traces/useTracesBatchFeedbackScoresMutation.ts b/apps/opik-frontend/src/api/traces/useTracesBatchFeedbackScoresMutation.ts
new file mode 100644
index 00000000000..458e2d2ff97
--- /dev/null
+++ b/apps/opik-frontend/src/api/traces/useTracesBatchFeedbackScoresMutation.ts
@@ -0,0 +1,98 @@
+import api, {
+    COMPARE_EXPERIMENTS_KEY,
+    TRACE_KEY,
+    TRACES_BATCH_FEEDBACK_SCORES_ENDPOINT,
+    TRACES_KEY,
+} from "@/api/api";
+import { useToast } from "@/components/ui/use-toast";
+import {
+    generateUpdateMutation,
+    setExperimentsCompareCache,
+    setTraceCache,
+    setTracesCache,
+} from "@/lib/feedback-scores";
+import { FEEDBACK_SCORE_TYPE } from "@/types/traces";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { AxiosError } from "axios";
+import get from "lodash/get";
+
+type UseTracesBatchFeedbackScoresParams = {
+    projectId: string;
+    traceIds: string[];
+    name: string;
+    value: number;
+    categoryName?: string;
+    reason?: string;
+};
+
+const useTracesBatchFeedbackScoresMutation = () => {
+    const queryClient = useQueryClient();
+    const { toast } = useToast();
+
+    return useMutation({
+        mutationFn: async ({
+            projectId,
+            traceIds,
+            name,
+            value,
+            categoryName,
+            reason,
+        }: UseTracesBatchFeedbackScoresParams) => {
+            const body = {
+                scores: traceIds.map((id) => ({
+                    trace_id: id,
+                    project_id: projectId,
+                    name,
+                    value,
+                    ...(categoryName && { category_name: categoryName }),
+                    ...(reason && { reason }),
+                    source: FEEDBACK_SCORE_TYPE.ui,
+                })),
+            };
+
+            const { data } = await api.put(TRACES_BATCH_FEEDBACK_SCORES_ENDPOINT, body);
+            return data;
+        },
+        onError: (error: AxiosError) => {
+            const message = get(error, ["response", "data", "message"], error.message);
+            toast({
+                title: "Error",
+                description: message,
+                variant: "destructive",
+            });
+        },
+        onSuccess: (data, vars) => {
+            toast({
+                title: "Success",
+                description: `Annotated ${vars.traceIds.length} traces`,
+            });
+        },
+        onMutate: async (params: UseTracesBatchFeedbackScoresParams) => {
+            const updateMutation = generateUpdateMutation({
+                name: params.name,
+                category_name: params.categoryName,
+                value: params.value,
+                source: FEEDBACK_SCORE_TYPE.ui,
+                reason: params.reason,
+            });
+
+            await Promise.all(
+                params.traceIds.map(async (traceId) => {
+                    const traceParams = { traceId };
+                    await setExperimentsCompareCache(queryClient, traceParams, updateMutation);
+                    await setTracesCache(queryClient, traceParams, updateMutation);
+                    await setTraceCache(queryClient, traceParams, updateMutation);
+                }),
+            );
+        },
+        onSettled: async () => {
+            await queryClient.invalidateQueries({ queryKey: [TRACES_KEY] });
+            await queryClient.invalidateQueries({ queryKey: ["traces-columns"] });
+            await queryClient.invalidateQueries({ queryKey: ["traces-statistic"] });
+            await queryClient.invalidateQueries({ queryKey: [TRACE_KEY] });
+            await queryClient.invalidateQueries({ queryKey: [COMPARE_EXPERIMENTS_KEY] });
+        },
+    });
+};
+
+export default useTracesBatchFeedbackScoresMutation; 
\ No newline at end of file

From e50abe28359644306559158c70d23d3cc6fe0566 Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Tue, 29 Jul 2025 16:31:21 -0600
Subject: [PATCH 03/39] add modal window component

---
 .../useTracesBatchFeedbackScoresMutation.ts   |   2 +-
 .../BatchAnnotateDialog.tsx                   | 127 ++++++++++++++++++
 2 files changed, 128 insertions(+), 1 deletion(-)
 create mode 100644 apps/opik-frontend/src/components/pages-shared/traces/BatchAnnotateDialog/BatchAnnotateDialog.tsx

diff --git a/apps/opik-frontend/src/api/traces/useTracesBatchFeedbackScoresMutation.ts b/apps/opik-frontend/src/api/traces/useTracesBatchFeedbackScoresMutation.ts
index 458e2d2ff97..a2364aef7ee 100644
--- a/apps/opik-frontend/src/api/traces/useTracesBatchFeedbackScoresMutation.ts
+++ b/apps/opik-frontend/src/api/traces/useTracesBatchFeedbackScoresMutation.ts
@@ -61,7 +61,7 @@ const useTracesBatchFeedbackScoresMutation = () => {
                 variant: "destructive",
             });
         },
-        onSuccess: (data, vars) => {
+        onSuccess: (_, vars) => {
             toast({
                 title: "Success",
                 description: `Annotated ${vars.traceIds.length} traces`,
diff --git a/apps/opik-frontend/src/components/pages-shared/traces/BatchAnnotateDialog/BatchAnnotateDialog.tsx b/apps/opik-frontend/src/components/pages-shared/traces/BatchAnnotateDialog/BatchAnnotateDialog.tsx
new file mode 100644
index 00000000000..11802ec435b
--- /dev/null
+++ b/apps/opik-frontend/src/components/pages-shared/traces/BatchAnnotateDialog/BatchAnnotateDialog.tsx
@@ -0,0 +1,127 @@
+import useTracesBatchFeedbackScoresMutation from "@/api/traces/useTracesBatchFeedbackScoresMutation";
+import { Button } from "@/components/ui/button";
+import {
+    Dialog,
+    DialogContent,
+    DialogFooter,
+    DialogHeader,
+    DialogTitle,
+} from "@/components/ui/dialog";
+import { Input } from "@/components/ui/input";
+import { Textarea } from "@/components/ui/textarea";
+import { useToast } from "@/components/ui/use-toast";
+import { Trace } from "@/types/traces";
+import React, { useState } from "react";
+
+type BatchAnnotateDialogProps = {
+    rows: Trace[];
+    open: boolean | number;
+    setOpen: (o: boolean | number) => void;
+    projectId: string;
+    onSuccess?: () => void;
+};
+
+const MAX_ENTITIES = 10;
+
+const BatchAnnotateDialog: React.FunctionComponent<BatchAnnotateDialogProps> = ({
+    rows,
+    open,
+    setOpen,
+    projectId,
+    onSuccess,
+}) => {
+    const { toast } = useToast();
+    const [scoreName, setScoreName] = useState<string>("");
+    const [value, setValue] = useState<number | "">("");
+    const [categoryName, setCategoryName] = useState<string>("");
+    const [reason, setReason] = useState<string>("");
+
+    const batchMutation = useTracesBatchFeedbackScoresMutation();
+
+    const handleClose = () => {
+        setOpen(false);
+        setScoreName("");
+        setValue("");
+        setCategoryName("");
+        setReason("");
+    };
+
+    const disabled =
+        !scoreName || value === "" || rows.length > MAX_ENTITIES || batchMutation.isPending;
+
+    const handleAnnotate = async () => {
+        try {
+            await batchMutation.mutateAsync({
+                projectId,
+                traceIds: rows.map((r) => r.id),
+                name: scoreName,
+                value: typeof value === "string" ? Number(value) : value,
+                categoryName: categoryName || undefined,
+                reason: reason || undefined,
+            });
+            if (onSuccess) onSuccess();
+            handleClose();
+        } catch (e) {
+            toast({
+                title: "Error",
+                description: "Failed to annotate traces",
+                variant: "destructive",
+            });
+        }
+    };
+
+    return (
+        <Dialog open={Boolean(open)} onOpenChange={handleClose}>
+            <DialogContent className="sm:max-w-[500px]">
+                <DialogHeader>
+                    <DialogTitle>Annotate {rows.length} traces</DialogTitle>
+                </DialogHeader>
+                {rows.length > MAX_ENTITIES && (
+                    <div className="mb-2 text-sm text-red-500">
+                        You can annotate up to {MAX_ENTITIES} traces at a time. Please reduce your selection.
+                    </div>
+                )}
+                <div className="grid gap-4 py-4">
+                    <Input
+                        placeholder="Score name"
+                        value={scoreName}
+                        onChange={(e) => setScoreName(e.target.value)}
+                        disabled={rows.length > MAX_ENTITIES}
+                    />
+                    <Input
+                        placeholder="Value"
+                        type="number"
+                        value={value}
+                        onChange={(e) => {
+                            const v = e.target.value;
+                            setValue(v === "" ? "" : Number(v));
+                        }}
+                        disabled={rows.length > MAX_ENTITIES}
+                    />
+                    <Input
+                        placeholder="Category name (optional)"
+                        value={categoryName}
+                        onChange={(e) => setCategoryName(e.target.value)}
+                        disabled={rows.length > MAX_ENTITIES}
+                    />
+                    <Textarea
+                        placeholder="Reason (optional)"
+                        value={reason}
+                        onChange={(e) => setReason(e.target.value)}
+                        disabled={rows.length > MAX_ENTITIES}
+                    />
+                </div>
+                <DialogFooter>
+                    <Button variant="outline" onClick={handleClose} disabled={batchMutation.isPending}>
+                        Cancel
+                    </Button>
+                    <Button onClick={handleAnnotate} disabled={disabled}>
+                        Annotate
+                    </Button>
+                </DialogFooter>
+            </DialogContent>
+        </Dialog>
+    );
+};
+
+export default BatchAnnotateDialog; 
\ No newline at end of file

From c077e6c1920504f516c8b520b5c2d12f8918a67e Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Tue, 29 Jul 2025 16:38:48 -0600
Subject: [PATCH 04/39] add button for batch annotation

---
 .../TracesSpansTab/TracesActionsPanel.tsx     | 46 ++++++++++++++-----
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/apps/opik-frontend/src/components/pages/TracesPage/TracesSpansTab/TracesActionsPanel.tsx b/apps/opik-frontend/src/components/pages/TracesPage/TracesSpansTab/TracesActionsPanel.tsx
index 08707653c68..f0fa979f89c 100644
--- a/apps/opik-frontend/src/components/pages/TracesPage/TracesSpansTab/TracesActionsPanel.tsx
+++ b/apps/opik-frontend/src/components/pages/TracesPage/TracesSpansTab/TracesActionsPanel.tsx
@@ -1,19 +1,20 @@
-import React, { useState, useRef, useCallback } from "react";
-import { Database, Tag, Trash } from "lucide-react";
 import first from "lodash/first";
 import get from "lodash/get";
+import { Database, PencilLine, Tag, Trash } from "lucide-react";
+import React, { useCallback, useRef, useState } from "react";
 import slugify from "slugify";
 
-import { Button } from "@/components/ui/button";
-import { Span, Trace } from "@/types/traces";
-import { COLUMN_FEEDBACK_SCORES_ID } from "@/types/shared";
-import { TRACE_DATA_TYPE } from "@/hooks/useTracesOrSpansList";
+import useTracesBatchDeleteMutation from "@/api/traces/useTraceBatchDeleteMutation";
+import AddTagDialog from "@/components/pages-shared/traces/AddTagDialog/AddTagDialog";
 import AddToDatasetDialog from "@/components/pages-shared/traces/AddToDatasetDialog/AddToDatasetDialog";
+import BatchAnnotateDialog from "@/components/pages-shared/traces/BatchAnnotateDialog/BatchAnnotateDialog";
 import ConfirmDialog from "@/components/shared/ConfirmDialog/ConfirmDialog";
-import useTracesBatchDeleteMutation from "@/api/traces/useTraceBatchDeleteMutation";
-import TooltipWrapper from "@/components/shared/TooltipWrapper/TooltipWrapper";
 import ExportToButton from "@/components/shared/ExportToButton/ExportToButton";
-import AddTagDialog from "@/components/pages-shared/traces/AddTagDialog/AddTagDialog";
+import TooltipWrapper from "@/components/shared/TooltipWrapper/TooltipWrapper";
+import { Button } from "@/components/ui/button";
+import { TRACE_DATA_TYPE } from "@/hooks/useTracesOrSpansList";
+import { COLUMN_FEEDBACK_SCORES_ID } from "@/types/shared";
+import { Span, Trace } from "@/types/traces";
 
 type TracesActionsPanelProps = {
   type: TRACE_DATA_TYPE;
@@ -74,9 +75,8 @@ const TracesActionsPanel: React.FunctionComponent<TracesActionsPanelProps> = ({
 
   const generateFileName = useCallback(
     (extension = "csv") => {
-      return `${slugify(projectName, { lower: true })}-${
-        type === TRACE_DATA_TYPE.traces ? "traces" : "llm-calls"
-      }.${extension}`;
+      return `${slugify(projectName, { lower: true })}-${type === TRACE_DATA_TYPE.traces ? "traces" : "llm-calls"
+        }.${extension}`;
     },
     [projectName, type],
   );
@@ -108,6 +108,14 @@ const TracesActionsPanel: React.FunctionComponent<TracesActionsPanelProps> = ({
         type={type}
         onSuccess={onClearSelection}
       />
+      <BatchAnnotateDialog
+        key={`annotate-${resetKeyRef.current}`}
+        rows={rows as Trace[]}
+        open={open === 4}
+        setOpen={setOpen}
+        projectId={projectId}
+        onSuccess={onClearSelection}
+      />
       <TooltipWrapper content="Add to dataset">
         <Button
           variant="outline"
@@ -136,6 +144,20 @@ const TracesActionsPanel: React.FunctionComponent<TracesActionsPanelProps> = ({
           Add tags
         </Button>
       </TooltipWrapper>
+      <TooltipWrapper content="Annotate">
+        <Button
+          variant="outline"
+          size="sm"
+          onClick={() => {
+            setOpen(4);
+            resetKeyRef.current = resetKeyRef.current + 1;
+          }}
+          disabled={disabled}
+        >
+          <PencilLine className="mr-2 size-4" />
+          Annotate
+        </Button>
+      </TooltipWrapper>
       <ExportToButton
         disabled={disabled || columnsToExport.length === 0}
         getData={mapRowData}

From ea2091de3cbea9debe3e9e1168b8284af182b15e Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Tue, 29 Jul 2025 18:18:50 -0600
Subject: [PATCH 05/39] fix bug that resulted in 422

---
 .../src/api/traces/useTracesBatchFeedbackScoresMutation.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opik-frontend/src/api/traces/useTracesBatchFeedbackScoresMutation.ts b/apps/opik-frontend/src/api/traces/useTracesBatchFeedbackScoresMutation.ts
index a2364aef7ee..89b153ae7da 100644
--- a/apps/opik-frontend/src/api/traces/useTracesBatchFeedbackScoresMutation.ts
+++ b/apps/opik-frontend/src/api/traces/useTracesBatchFeedbackScoresMutation.ts
@@ -40,7 +40,7 @@ const useTracesBatchFeedbackScoresMutation = () => {
         }: UseTracesBatchFeedbackScoresParams) => {
             const body = {
                 scores: traceIds.map((id) => ({
-                    trace_id: id,
+                    id,
                     project_id: projectId,
                     name,
                     value,

From e4c24b0a49cf75dfd4115661365037dc3e2c0feb Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Tue, 29 Jul 2025 19:29:33 -0600
Subject: [PATCH 06/39] revert order of imports

---
 .../TracesPage/TracesSpansTab/TracesActionsPanel.tsx   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/opik-frontend/src/components/pages/TracesPage/TracesSpansTab/TracesActionsPanel.tsx b/apps/opik-frontend/src/components/pages/TracesPage/TracesSpansTab/TracesActionsPanel.tsx
index f0fa979f89c..8a7a8949380 100644
--- a/apps/opik-frontend/src/components/pages/TracesPage/TracesSpansTab/TracesActionsPanel.tsx
+++ b/apps/opik-frontend/src/components/pages/TracesPage/TracesSpansTab/TracesActionsPanel.tsx
@@ -1,13 +1,12 @@
 import first from "lodash/first";
 import get from "lodash/get";
-import { Database, PencilLine, Tag, Trash } from "lucide-react";
+import { Database, Tag, Trash } from "lucide-react";
 import React, { useCallback, useRef, useState } from "react";
 import slugify from "slugify";
 
 import useTracesBatchDeleteMutation from "@/api/traces/useTraceBatchDeleteMutation";
 import AddTagDialog from "@/components/pages-shared/traces/AddTagDialog/AddTagDialog";
 import AddToDatasetDialog from "@/components/pages-shared/traces/AddToDatasetDialog/AddToDatasetDialog";
-import BatchAnnotateDialog from "@/components/pages-shared/traces/BatchAnnotateDialog/BatchAnnotateDialog";
 import ConfirmDialog from "@/components/shared/ConfirmDialog/ConfirmDialog";
 import ExportToButton from "@/components/shared/ExportToButton/ExportToButton";
 import TooltipWrapper from "@/components/shared/TooltipWrapper/TooltipWrapper";
@@ -16,6 +15,9 @@ import { TRACE_DATA_TYPE } from "@/hooks/useTracesOrSpansList";
 import { COLUMN_FEEDBACK_SCORES_ID } from "@/types/shared";
 import { Span, Trace } from "@/types/traces";
 
+import BatchAnnotateDialog from "@/components/pages-shared/traces/BatchAnnotateDialog/BatchAnnotateDialog";
+import { PencilLine } from "lucide-react";
+
 type TracesActionsPanelProps = {
   type: TRACE_DATA_TYPE;
   rows: Array<Trace | Span>;
@@ -44,13 +46,11 @@ const TracesActionsPanel: React.FunctionComponent<TracesActionsPanelProps> = ({
       projectId,
       ids: rows.map((row) => row.id),
     });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [projectId, rows]);
 
   const mapRowData = useCallback(() => {
     return rows.map((row) => {
       return columnsToExport.reduce<Record<string, unknown>>((acc, column) => {
-        // we need split by dot to parse feedback_scores into correct structure
         const keys = column.split(".");
         const keyPrefix = first(keys) as string;
 
@@ -182,4 +182,4 @@ const TracesActionsPanel: React.FunctionComponent<TracesActionsPanelProps> = ({
   );
 };
 
-export default TracesActionsPanel;
+export default TracesActionsPanel;
\ No newline at end of file

From 2bb8a8b3f92befc341503deff80c7c91aa471103 Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Tue, 29 Jul 2025 19:36:28 -0600
Subject: [PATCH 07/39] revert import ordering triggered by save

---
 .../TracesSpansTab/TracesActionsPanel.tsx     | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/apps/opik-frontend/src/components/pages/TracesPage/TracesSpansTab/TracesActionsPanel.tsx b/apps/opik-frontend/src/components/pages/TracesPage/TracesSpansTab/TracesActionsPanel.tsx
index 8a7a8949380..e84d5f1b802 100644
--- a/apps/opik-frontend/src/components/pages/TracesPage/TracesSpansTab/TracesActionsPanel.tsx
+++ b/apps/opik-frontend/src/components/pages/TracesPage/TracesSpansTab/TracesActionsPanel.tsx
@@ -1,22 +1,22 @@
+import React, { useState, useRef, useCallback } from "react";
+import { Database, Tag, Trash } from "lucide-react";
 import first from "lodash/first";
 import get from "lodash/get";
-import { Database, Tag, Trash } from "lucide-react";
-import React, { useCallback, useRef, useState } from "react";
 import slugify from "slugify";
 
-import useTracesBatchDeleteMutation from "@/api/traces/useTraceBatchDeleteMutation";
-import AddTagDialog from "@/components/pages-shared/traces/AddTagDialog/AddTagDialog";
+import { Button } from "@/components/ui/button";
+import { Span, Trace } from "@/types/traces";
+import { COLUMN_FEEDBACK_SCORES_ID } from "@/types/shared";
+import { TRACE_DATA_TYPE } from "@/hooks/useTracesOrSpansList";
 import AddToDatasetDialog from "@/components/pages-shared/traces/AddToDatasetDialog/AddToDatasetDialog";
 import ConfirmDialog from "@/components/shared/ConfirmDialog/ConfirmDialog";
-import ExportToButton from "@/components/shared/ExportToButton/ExportToButton";
+import useTracesBatchDeleteMutation from "@/api/traces/useTraceBatchDeleteMutation";
 import TooltipWrapper from "@/components/shared/TooltipWrapper/TooltipWrapper";
-import { Button } from "@/components/ui/button";
-import { TRACE_DATA_TYPE } from "@/hooks/useTracesOrSpansList";
-import { COLUMN_FEEDBACK_SCORES_ID } from "@/types/shared";
-import { Span, Trace } from "@/types/traces";
+import ExportToButton from "@/components/shared/ExportToButton/ExportToButton";
+import AddTagDialog from "@/components/pages-shared/traces/AddTagDialog/AddTagDialog";
 
-import BatchAnnotateDialog from "@/components/pages-shared/traces/BatchAnnotateDialog/BatchAnnotateDialog";
 import { PencilLine } from "lucide-react";
+import BatchAnnotateDialog from "@/components/pages-shared/traces/BatchAnnotateDialog/BatchAnnotateDialog";
 
 type TracesActionsPanelProps = {
   type: TRACE_DATA_TYPE;
@@ -75,8 +75,9 @@ const TracesActionsPanel: React.FunctionComponent<TracesActionsPanelProps> = ({
 
   const generateFileName = useCallback(
     (extension = "csv") => {
-      return `${slugify(projectName, { lower: true })}-${type === TRACE_DATA_TYPE.traces ? "traces" : "llm-calls"
-        }.${extension}`;
+      return `${slugify(projectName, { lower: true })}-${
+        type === TRACE_DATA_TYPE.traces ? "traces" : "llm-calls"
+      }.${extension}`;
     },
     [projectName, type],
   );

From 2711d115e96e712161ddb170549e0438a5ca8ac3 Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Tue, 29 Jul 2025 20:34:46 -0600
Subject: [PATCH 08/39] revert import ordering triggered by save

---
 .../BatchCommentDialog/BatchCommentDialog.tsx | 122 ++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 apps/opik-frontend/src/components/pages-shared/traces/BatchCommentDialog/BatchCommentDialog.tsx

diff --git a/apps/opik-frontend/src/components/pages-shared/traces/BatchCommentDialog/BatchCommentDialog.tsx b/apps/opik-frontend/src/components/pages-shared/traces/BatchCommentDialog/BatchCommentDialog.tsx
new file mode 100644
index 00000000000..5dc1b6e8d9e
--- /dev/null
+++ b/apps/opik-frontend/src/components/pages-shared/traces/BatchCommentDialog/BatchCommentDialog.tsx
@@ -0,0 +1,122 @@
+import React, { useState } from "react";
+
+import { Button } from "@/components/ui/button";
+import {
+  Dialog,
+  DialogContent,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
+import { Textarea } from "@/components/ui/textarea";
+import { useToast } from "@/components/ui/use-toast";
+
+import useCreateTraceCommentMutation from "@/api/traces/useCreateTraceCommentMutation";
+import useCreateSpanCommentMutation from "@/api/traces/useCreateSpanCommentMutation";
+import { TRACE_DATA_TYPE } from "@/hooks/useTracesOrSpansList";
+import { Trace, Span } from "@/types/traces";
+
+type BatchCommentDialogProps = {
+  rows: Array<Trace | Span>;
+  type: TRACE_DATA_TYPE;
+  projectId: string;
+  open: boolean | number;
+  setOpen: (o: boolean | number) => void;
+  onSuccess?: () => void;
+};
+
+const MAX_ENTITIES = 10;
+
+const BatchCommentDialog: React.FunctionComponent<BatchCommentDialogProps> = ({
+  rows,
+  type,
+  projectId,
+  open,
+  setOpen,
+  onSuccess,
+}) => {
+  const { toast } = useToast();
+
+  const createTraceComment = useCreateTraceCommentMutation();
+  const createSpanComment = useCreateSpanCommentMutation();
+
+  const [commentText, setCommentText] = useState<string>("");
+
+  const handleClose = () => {
+    setOpen(false);
+    setCommentText("");
+  };
+
+  const handleAddComments = async () => {
+    try {
+      const promises = rows.map((r) =>
+        type === TRACE_DATA_TYPE.traces
+          ? createTraceComment.mutateAsync({ text: commentText, traceId: r.id })
+          : createSpanComment.mutateAsync({
+              text: commentText,
+              spanId: r.id,
+              projectId,
+            }),
+      );
+
+      await Promise.all(promises);
+
+      if (onSuccess) onSuccess();
+
+      handleClose();
+    } catch {
+      toast({
+        title: "Error",
+        description: "Failed to add comments",
+        variant: "destructive",
+      });
+    }
+  };
+
+  const disabled =
+    !commentText.trim() ||
+    rows.length > MAX_ENTITIES ||
+    createTraceComment.isPending ||
+    createSpanComment.isPending;
+
+  return (
+    <Dialog open={Boolean(open)} onOpenChange={handleClose}>
+      <DialogContent className="sm:max-w-[500px]">
+        <DialogHeader>
+          <DialogTitle>
+            Add comment to {rows.length} {type === TRACE_DATA_TYPE.traces ? "traces" : "spans"}
+          </DialogTitle>
+        </DialogHeader>
+
+        {rows.length > MAX_ENTITIES && (
+          <div className="mb-2 text-sm text-red-500">
+            You can comment on up to {MAX_ENTITIES} items at a time.
+          </div>
+        )}
+
+        <Textarea
+          placeholder="Comment text"
+          value={commentText}
+          onChange={(e) => setCommentText(e.target.value)}
+          disabled={rows.length > MAX_ENTITIES}
+        />
+
+        <DialogFooter>
+          <Button
+            variant="outline"
+            onClick={handleClose}
+            disabled={createTraceComment.isPending || createSpanComment.isPending}
+          >
+            Cancel
+          </Button>
+          <Button onClick={handleAddComments} disabled={disabled}>
+            Add comments
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+};
+
+export default BatchCommentDialog;
+

From 568a530a78858866f3bcfaf3e07d47b58aad92db Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Tue, 29 Jul 2025 20:38:06 -0600
Subject: [PATCH 09/39] link batch comment dialog window with button

---
 .../TracesSpansTab/TracesActionsPanel.tsx     | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/apps/opik-frontend/src/components/pages/TracesPage/TracesSpansTab/TracesActionsPanel.tsx b/apps/opik-frontend/src/components/pages/TracesPage/TracesSpansTab/TracesActionsPanel.tsx
index e84d5f1b802..34bda7cce72 100644
--- a/apps/opik-frontend/src/components/pages/TracesPage/TracesSpansTab/TracesActionsPanel.tsx
+++ b/apps/opik-frontend/src/components/pages/TracesPage/TracesSpansTab/TracesActionsPanel.tsx
@@ -16,7 +16,9 @@ import ExportToButton from "@/components/shared/ExportToButton/ExportToButton";
 import AddTagDialog from "@/components/pages-shared/traces/AddTagDialog/AddTagDialog";
 
 import { PencilLine } from "lucide-react";
+import { MessageSquarePlus } from "lucide-react";
 import BatchAnnotateDialog from "@/components/pages-shared/traces/BatchAnnotateDialog/BatchAnnotateDialog";
+import BatchCommentDialog from "@/components/pages-shared/traces/BatchCommentDialog/BatchCommentDialog";
 
 type TracesActionsPanelProps = {
   type: TRACE_DATA_TYPE;
@@ -117,6 +119,15 @@ const TracesActionsPanel: React.FunctionComponent<TracesActionsPanelProps> = ({
         projectId={projectId}
         onSuccess={onClearSelection}
       />
+      <BatchCommentDialog
+        key={`comment-${resetKeyRef.current}`}
+        rows={rows}
+        type={type}
+        projectId={projectId}
+        open={open === 5}
+        setOpen={setOpen}
+        onSuccess={onClearSelection}
+      />
       <TooltipWrapper content="Add to dataset">
         <Button
           variant="outline"
@@ -159,6 +170,21 @@ const TracesActionsPanel: React.FunctionComponent<TracesActionsPanelProps> = ({
           Annotate
         </Button>
       </TooltipWrapper>
+
+      <TooltipWrapper content="Comment">
+        <Button
+          variant="outline"
+          size="sm"
+          onClick={() => {
+            setOpen(5);
+            resetKeyRef.current = resetKeyRef.current + 1;
+          }}
+          disabled={disabled}
+        >
+          <MessageSquarePlus className="mr-2 size-4" />
+          Comment
+        </Button>
+      </TooltipWrapper>
       <ExportToButton
         disabled={disabled || columnsToExport.length === 0}
         getData={mapRowData}

From 9b1533bc8b301a16b41b6e56d5d33f9be75522a0 Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 13 Aug 2025 18:47:52 -0600
Subject: [PATCH 10/39] add scaffolding for BE support for batch comments

---
 .../comet/opik/api/CommentsBatchCreate.java   | 19 +++++++
 .../com/comet/opik/domain/CommentDAO.java     | 50 ++++++++++++++++++
 .../com/comet/opik/domain/CommentService.java | 52 +++++++++++++++++++
 3 files changed, 121 insertions(+)
 create mode 100644 apps/opik-backend/src/main/java/com/comet/opik/api/CommentsBatchCreate.java

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/api/CommentsBatchCreate.java b/apps/opik-backend/src/main/java/com/comet/opik/api/CommentsBatchCreate.java
new file mode 100644
index 00000000000..c34746192f6
--- /dev/null
+++ b/apps/opik-backend/src/main/java/com/comet/opik/api/CommentsBatchCreate.java
@@ -0,0 +1,19 @@
+package com.comet.opik.api;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+
+import java.util.List;
+import java.util.UUID;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public record CommentsBatchCreate(
+		@Schema(description = "IDs of entities to comment on") @NotEmpty List<UUID> ids,
+		@Schema(description = "Comment text to apply to all entities") @NotBlank String text
+) {}
+
diff --git a/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentDAO.java b/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentDAO.java
index a6dd2dea32d..97ca79ac7d4 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentDAO.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentDAO.java
@@ -39,6 +39,8 @@ enum EntityType {
 
     Mono<Long> addComment(UUID commentId, UUID entityId, EntityType entityType, UUID projectId, Comment comment);
 
+    Mono<Long> addCommentsBatch(EntityType entityType, Set<UUID> entityIds, UUID projectId, Comment comment);
+
     Mono<Comment> findById(UUID entityId, UUID commentId);
 
     Mono<Void> updateComment(UUID commentId, Comment comment);
@@ -80,6 +82,30 @@ INSERT INTO comments(
             ;
             """;
 
+    private static final String INSERT_COMMENTS_BATCH = """
+            INSERT INTO comments(
+                id,
+                entity_id,
+                entity_type,
+                project_id,
+                workspace_id,
+                text,
+                created_by,
+                last_updated_by
+            ) VALUES
+                <items:{item | (
+                    :id<item.index>,
+                    :entity_id<item.index>,
+                    :entity_type,
+                    :project_id,
+                    :workspace_id,
+                    :text,
+                    :user_name,
+                    :user_name
+                )<if(item.hasNext)>,<endif>}>
+            ;
+            """;
+
     private static final String SELECT_COMMENT_BY_ID = """
             SELECT
                 *
@@ -145,6 +171,30 @@ public Mono<Long> addComment(@NonNull UUID commentId, @NonNull UUID entityId, @N
         });
     }
 
+    @Override
+    public Mono<Long> addCommentsBatch(@NonNull EntityType entityType, @NonNull Set<UUID> entityIds,
+            @NonNull UUID projectId, @NonNull Comment comment) {
+        return asyncTemplate.nonTransaction(connection -> makeMonoContextAware((userName, workspaceId) -> {
+            var items = com.comet.opik.utils.TemplateUtils.getQueryItemPlaceHolder(entityIds.size());
+            var template = new org.stringtemplate.v4.ST(INSERT_COMMENTS_BATCH).add("items", items);
+
+            var statement = connection.createStatement(template.render())
+                    .bind("entity_type", entityType.getType())
+                    .bind("project_id", projectId)
+                    .bind("text", comment.text());
+
+            int i = 0;
+            for (UUID entityId : entityIds) {
+                statement.bind("id" + i, java.util.UUID.randomUUID())
+                        .bind("entity_id" + i, entityId);
+                i++;
+            }
+
+            return makeMonoContextAware(bindUserNameAndWorkspaceContext(statement))
+                    .flatMap(result -> Mono.from(result.getRowsUpdated()));
+        }));
+    }
+
     @Override
     public Mono<Comment> findById(UUID entityId, @NonNull UUID commentId) {
         return asyncTemplate.nonTransaction(connection -> {
diff --git a/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java b/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java
index f0f761e4bdd..b9640ebdc29 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java
@@ -28,6 +28,10 @@ public interface CommentService {
     Mono<Void> delete(BatchDelete batchDelete);
 
     Mono<Long> deleteByEntityIds(CommentDAO.EntityType entityType, Set<UUID> entityIds);
+
+    Mono<Long> createBatchForTraces(Set<UUID> traceIds, String text);
+
+    Mono<Long> createBatchForSpans(Set<UUID> spanIds, String text);
 }
 
 @Slf4j
@@ -82,4 +86,52 @@ public Mono<Long> deleteByEntityIds(CommentDAO.EntityType entityType, Set<UUID>
         }
         return commentDAO.deleteByEntityIds(entityType, entityIds);
     }
+
+    @Override
+    public Mono<Long> createBatchForTraces(@NonNull Set<UUID> traceIds, @NonNull String text) {
+        if (traceIds.isEmpty()) {
+            return Mono.just(0L);
+        }
+
+        return traceDAO.getTraceWorkspace(traceIds, null)
+                .switchIfEmpty(Mono.just(java.util.List.of()))
+                .flatMap(list -> {
+                    java.util.Set<String> workspaces = list.stream().map(WorkspaceAndResourceId::workspaceId).collect(java.util.stream.Collectors.toSet());
+                    if (workspaces.size() > 1) {
+                        return Mono.error(new IllegalArgumentException("All entities must belong to the same workspace"));
+                    }
+                    java.util.Set<UUID> ids = list.stream().map(WorkspaceAndResourceId::resourceId).collect(java.util.stream.Collectors.toSet());
+                    if (ids.isEmpty()) {
+                        return Mono.just(0L);
+                    }
+                    return traceDAO.getProjectIdFromTrace(ids.iterator().next())
+                            .switchIfEmpty(Mono.error(failWithNotFound("Trace", ids.iterator().next())))
+                            .flatMap(projectId -> commentDAO.addCommentsBatch(CommentDAO.EntityType.TRACE, ids, projectId,
+                                    Comment.builder().text(text).build()));
+                });
+    }
+
+    @Override
+    public Mono<Long> createBatchForSpans(@NonNull Set<UUID> spanIds, @NonNull String text) {
+        if (spanIds.isEmpty()) {
+            return Mono.just(0L);
+        }
+
+        return spanDAO.getSpanWorkspace(spanIds)
+                .switchIfEmpty(Mono.just(java.util.List.of()))
+                .flatMap(list -> {
+                    java.util.Set<String> workspaces = list.stream().map(WorkspaceAndResourceId::workspaceId).collect(java.util.stream.Collectors.toSet());
+                    if (workspaces.size() > 1) {
+                        return Mono.error(new IllegalArgumentException("All entities must belong to the same workspace"));
+                    }
+                    java.util.Set<UUID> ids = list.stream().map(WorkspaceAndResourceId::resourceId).collect(java.util.stream.Collectors.toSet());
+                    if (ids.isEmpty()) {
+                        return Mono.just(0L);
+                    }
+                    return spanDAO.getProjectIdFromSpan(ids.iterator().next())
+                            .switchIfEmpty(Mono.error(failWithNotFound("Span", ids.iterator().next())))
+                            .flatMap(projectId -> commentDAO.addCommentsBatch(CommentDAO.EntityType.SPAN, ids, projectId,
+                                    Comment.builder().text(text).build()));
+                });
+    }
 }

From 0650f4fda7b3d3fb0e6316c207ad19cf5f43b037 Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 13 Aug 2025 18:55:23 -0600
Subject: [PATCH 11/39] update the frotend to use batch comment hook, wiring to
 EP for batch commenting

---
 .../api/resources/v1/priv/TracesResource.java | 24 ++++++++
 .../useTraceCommentsBatchCreateMutation.ts    | 59 +++++++++++++++++++
 .../BatchCommentDialog/BatchCommentDialog.tsx | 38 ++++--------
 3 files changed, 96 insertions(+), 25 deletions(-)
 create mode 100644 apps/opik-frontend/src/api/traces/useTraceCommentsBatchCreateMutation.ts

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java b/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java
index ac7ac926178..ba45465103b 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java
@@ -4,6 +4,7 @@
 import com.comet.opik.api.BatchDelete;
 import com.comet.opik.api.BatchDeleteByProject;
 import com.comet.opik.api.Comment;
+import com.comet.opik.api.CommentsBatchCreate;
 import com.comet.opik.api.DeleteFeedbackScore;
 import com.comet.opik.api.DeleteThreadFeedbackScores;
 import com.comet.opik.api.DeleteTraceThreads;
@@ -544,6 +545,29 @@ public Response deleteTraceComments(
         return Response.noContent().build();
     }
 
+    @POST
+    @Path("/comments/batch")
+    @Operation(operationId = "createTraceCommentsBatch", summary = "Create comments for multiple traces", description = "Create the same comment text for multiple trace IDs", responses = {
+            @ApiResponse(responseCode = "204", description = "No Content"),
+            @ApiResponse(responseCode = "400", description = "Bad Request"),
+            @ApiResponse(responseCode = "404", description = "Not found")})
+    @RateLimited
+    public Response createTraceCommentsBatch(
+            @RequestBody(content = @Content(schema = @Schema(implementation = CommentsBatchCreate.class))) @NotNull @Valid CommentsBatchCreate payload) {
+
+        String workspaceId = requestContext.get().getWorkspaceId();
+
+        log.info("Creating trace comments batch with ids '{}' on workspaceId '{}'", payload.ids(), workspaceId);
+
+        commentService.createBatchForTraces(Set.copyOf(payload.ids()), payload.text())
+                .contextWrite(ctx -> setRequestContext(ctx, requestContext))
+                .block();
+
+        log.info("Created trace comments batch with ids '{}' on workspaceId '{}'", payload.ids(), workspaceId);
+
+        return Response.noContent().build();
+    }
+
     // Trace Threads
     @GET
     @Path("/threads")
diff --git a/apps/opik-frontend/src/api/traces/useTraceCommentsBatchCreateMutation.ts b/apps/opik-frontend/src/api/traces/useTraceCommentsBatchCreateMutation.ts
new file mode 100644
index 00000000000..4f58975827c
--- /dev/null
+++ b/apps/opik-frontend/src/api/traces/useTraceCommentsBatchCreateMutation.ts
@@ -0,0 +1,59 @@
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import get from "lodash/get";
+import api, {
+  COMPARE_EXPERIMENTS_KEY,
+  TRACE_KEY,
+  TRACES_KEY,
+  TRACES_REST_ENDPOINT,
+} from "@/api/api";
+import { useToast } from "@/components/ui/use-toast";
+
+type UseTraceCommentsBatchCreateParams = {
+  ids: string[];
+  traceId: string;
+  text: string;
+};
+
+const useTraceCommentsBatchCreateMutation = () => {
+  const queryClient = useQueryClient();
+  const { toast } = useToast();
+
+  return useMutation({
+    mutationFn: async ({ ids, text }: UseTraceCommentsBatchCreateParams) => {
+      const { data } = await api.post(
+        `${TRACES_REST_ENDPOINT}comments/batch`,
+        {
+          ids,
+          text,
+        },
+      );
+      return data;
+    },
+    onError: (error) => {
+      const message = get(
+        error,
+        ["response", "data", "message"],
+        error.message,
+      );
+
+      toast({
+        title: "Error",
+        description: message,
+        variant: "destructive",
+      });
+    },
+    onSettled: (data, error, variables) => {
+      const { traceId } = variables;
+      queryClient.invalidateQueries({
+        queryKey: [TRACE_KEY, { traceId }],
+      });
+      queryClient.invalidateQueries({ queryKey: [TRACES_KEY] });
+      queryClient.invalidateQueries({
+        queryKey: [COMPARE_EXPERIMENTS_KEY],
+      });
+    },
+  });
+};
+
+export default useTraceCommentsBatchCreateMutation;
+
diff --git a/apps/opik-frontend/src/components/pages-shared/traces/BatchCommentDialog/BatchCommentDialog.tsx b/apps/opik-frontend/src/components/pages-shared/traces/BatchCommentDialog/BatchCommentDialog.tsx
index 5dc1b6e8d9e..78e11789946 100644
--- a/apps/opik-frontend/src/components/pages-shared/traces/BatchCommentDialog/BatchCommentDialog.tsx
+++ b/apps/opik-frontend/src/components/pages-shared/traces/BatchCommentDialog/BatchCommentDialog.tsx
@@ -11,8 +11,7 @@ import {
 import { Textarea } from "@/components/ui/textarea";
 import { useToast } from "@/components/ui/use-toast";
 
-import useCreateTraceCommentMutation from "@/api/traces/useCreateTraceCommentMutation";
-import useCreateSpanCommentMutation from "@/api/traces/useCreateSpanCommentMutation";
+import useTraceCommentsBatchCreateMutation from "@/api/traces/useTraceCommentsBatchCreateMutation";
 import { TRACE_DATA_TYPE } from "@/hooks/useTracesOrSpansList";
 import { Trace, Span } from "@/types/traces";
 
@@ -37,8 +36,7 @@ const BatchCommentDialog: React.FunctionComponent<BatchCommentDialogProps> = ({
 }) => {
   const { toast } = useToast();
 
-  const createTraceComment = useCreateTraceCommentMutation();
-  const createSpanComment = useCreateSpanCommentMutation();
+  const batchCreateTraceComments = useTraceCommentsBatchCreateMutation();
 
   const [commentText, setCommentText] = useState<string>("");
 
@@ -49,17 +47,14 @@ const BatchCommentDialog: React.FunctionComponent<BatchCommentDialogProps> = ({
 
   const handleAddComments = async () => {
     try {
-      const promises = rows.map((r) =>
-        type === TRACE_DATA_TYPE.traces
-          ? createTraceComment.mutateAsync({ text: commentText, traceId: r.id })
-          : createSpanComment.mutateAsync({
-              text: commentText,
-              spanId: r.id,
-              projectId,
-            }),
-      );
-
-      await Promise.all(promises);
+      if (type !== TRACE_DATA_TYPE.traces) {
+        throw new Error("Batch comments are only supported for traces.");
+      }
+
+      const ids = rows.map((r) => r.id);
+      const traceId = rows[0]?.id;
+
+      await batchCreateTraceComments.mutateAsync({ ids, text: commentText, traceId });
 
       if (onSuccess) onSuccess();
 
@@ -76,16 +71,13 @@ const BatchCommentDialog: React.FunctionComponent<BatchCommentDialogProps> = ({
   const disabled =
     !commentText.trim() ||
     rows.length > MAX_ENTITIES ||
-    createTraceComment.isPending ||
-    createSpanComment.isPending;
+    batchCreateTraceComments.isPending;
 
   return (
     <Dialog open={Boolean(open)} onOpenChange={handleClose}>
       <DialogContent className="sm:max-w-[500px]">
         <DialogHeader>
-          <DialogTitle>
-            Add comment to {rows.length} {type === TRACE_DATA_TYPE.traces ? "traces" : "spans"}
-          </DialogTitle>
+          <DialogTitle>Add comment to {rows.length} traces</DialogTitle>
         </DialogHeader>
 
         {rows.length > MAX_ENTITIES && (
@@ -102,11 +94,7 @@ const BatchCommentDialog: React.FunctionComponent<BatchCommentDialogProps> = ({
         />
 
         <DialogFooter>
-          <Button
-            variant="outline"
-            onClick={handleClose}
-            disabled={createTraceComment.isPending || createSpanComment.isPending}
-          >
+          <Button variant="outline" onClick={handleClose} disabled={batchCreateTraceComments.isPending}>
             Cancel
           </Button>
           <Button onClick={handleAddComments} disabled={disabled}>

From ccf9dc026ad673d9c845dea7f7bb476626c9c333 Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 13 Aug 2025 19:01:08 -0600
Subject: [PATCH 12/39] add forgotten backend input validation, and also
 mention that batch commenting is only possible for traces

---
 .../api/resources/v1/priv/TracesResource.java    | 16 ++++++++++++++++
 .../TracesSpansTab/TracesActionsPanel.tsx        |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java b/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java
index ba45465103b..e3501084c46 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java
@@ -559,6 +559,22 @@ public Response createTraceCommentsBatch(
 
         log.info("Creating trace comments batch with ids '{}' on workspaceId '{}'", payload.ids(), workspaceId);
 
+        if (payload.ids() == null || payload.ids().isEmpty()) {
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ErrorMessage(Response.Status.BAD_REQUEST.getStatusCode(), "'ids' must not be empty"))
+                    .build();
+        }
+        if (payload.text() == null || payload.text().trim().isEmpty()) {
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ErrorMessage(Response.Status.BAD_REQUEST.getStatusCode(), "'text' must not be blank"))
+                    .build();
+        }
+        if (payload.ids().size() > 10) {
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ErrorMessage(Response.Status.BAD_REQUEST.getStatusCode(), "Batch size limit exceeded (max 10)"))
+                    .build();
+        }
+
         commentService.createBatchForTraces(Set.copyOf(payload.ids()), payload.text())
                 .contextWrite(ctx -> setRequestContext(ctx, requestContext))
                 .block();
diff --git a/apps/opik-frontend/src/components/pages/TracesPage/TracesSpansTab/TracesActionsPanel.tsx b/apps/opik-frontend/src/components/pages/TracesPage/TracesSpansTab/TracesActionsPanel.tsx
index 34bda7cce72..3d32785fc60 100644
--- a/apps/opik-frontend/src/components/pages/TracesPage/TracesSpansTab/TracesActionsPanel.tsx
+++ b/apps/opik-frontend/src/components/pages/TracesPage/TracesSpansTab/TracesActionsPanel.tsx
@@ -171,7 +171,7 @@ const TracesActionsPanel: React.FunctionComponent<TracesActionsPanelProps> = ({
         </Button>
       </TooltipWrapper>
 
-      <TooltipWrapper content="Comment">
+      <TooltipWrapper content={type === TRACE_DATA_TYPE.traces ? "Comment" : "Batch comments supported for traces only"}>
         <Button
           variant="outline"
           size="sm"
@@ -179,7 +179,7 @@ const TracesActionsPanel: React.FunctionComponent<TracesActionsPanelProps> = ({
             setOpen(5);
             resetKeyRef.current = resetKeyRef.current + 1;
           }}
-          disabled={disabled}
+          disabled={disabled || type !== TRACE_DATA_TYPE.traces}
         >
           <MessageSquarePlus className="mr-2 size-4" />
           Comment

From 0681a17c4cb2707b62be5f7d24e4561808d9dd1e Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 13 Aug 2025 19:17:48 -0600
Subject: [PATCH 13/39] add BE tests

---
 .../utils/resources/TraceResourceClient.java  | 11 +++++++++
 .../resources/v1/priv/TracesResourceTest.java | 23 ++++++++++++++++++-
 .../useTraceCommentsBatchCreateMutation.ts    |  8 +++----
 .../BatchCommentDialog/BatchCommentDialog.tsx |  4 +---
 4 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/TraceResourceClient.java b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/TraceResourceClient.java
index 19de140aef9..73485949dd3 100644
--- a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/TraceResourceClient.java
+++ b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/TraceResourceClient.java
@@ -15,6 +15,7 @@
 import com.comet.opik.api.TraceThreadSearchStreamRequest;
 import com.comet.opik.api.TraceThreadUpdate;
 import com.comet.opik.api.TraceUpdate;
+import com.comet.opik.api.CommentsBatchCreate;
 import com.comet.opik.api.filter.TraceFilter;
 import com.comet.opik.api.filter.TraceThreadFilter;
 import com.comet.opik.api.resources.utils.TestUtils;
@@ -167,6 +168,16 @@ public Response callBatchCreateTraces(List<Trace> traces, String apiKey, String
                 .post(Entity.json(TraceBatch.builder().traces(traces).build()));
     }
 
+    public Response callTraceCommentsBatchCreate(List<UUID> ids, String text, String apiKey, String workspaceName) {
+        return client.target(RESOURCE_PATH.formatted(baseURI))
+                .path("comments")
+                .path("batch")
+                .request()
+                .header(HttpHeaders.AUTHORIZATION, apiKey)
+                .header(WORKSPACE_HEADER, workspaceName)
+                .post(Entity.json(new CommentsBatchCreate(ids, text)));
+    }
+
     public Trace getById(UUID id, String workspaceName, String apiKey) {
         var response = client.target(RESOURCE_PATH.formatted(baseURI))
                 .path(id.toString())
diff --git a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/TracesResourceTest.java b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/TracesResourceTest.java
index 8045e0842e5..2f7754f0fd0 100644
--- a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/TracesResourceTest.java
+++ b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/TracesResourceTest.java
@@ -5040,7 +5040,28 @@ void whenFilterByStatus__thenReturnThreadsWithMatchingStatus(boolean stream, Tra
             }
         }
 
-        @Test
+    @Test
+    void createTraceCommentsBatch_Success() {
+        var traces = PodamFactoryUtils.manufacturePojoList(factory, Trace.class);
+        traceResourceClient.batchCreateTraces(traces, API_KEY, TEST_WORKSPACE);
+
+        var ids = traces.stream().limit(3).map(Trace::id).toList();
+        var response = traceResourceClient.callTraceCommentsBatchCreate(ids, "hello", API_KEY, TEST_WORKSPACE);
+        assertThat(response.getStatus()).isEqualTo(org.apache.http.HttpStatus.SC_NO_CONTENT);
+    }
+
+    @Test
+    void createTraceCommentsBatch_ValidationErrors() {
+        var traces = PodamFactoryUtils.manufacturePojoList(factory, Trace.class);
+        traceResourceClient.batchCreateTraces(traces, API_KEY, TEST_WORKSPACE);
+
+        var responseEmptyIds = traceResourceClient.callTraceCommentsBatchCreate(java.util.List.of(), "x", API_KEY, TEST_WORKSPACE);
+        assertThat(responseEmptyIds.getStatus()).isEqualTo(org.apache.http.HttpStatus.SC_BAD_REQUEST);
+
+        var ids = traces.stream().limit(1).map(Trace::id).toList();
+        var responseBlankText = traceResourceClient.callTraceCommentsBatchCreate(ids, "  ", API_KEY, TEST_WORKSPACE);
+        assertThat(responseBlankText.getStatus()).isEqualTo(org.apache.http.HttpStatus.SC_BAD_REQUEST);
+    }
         @DisplayName("When filtering by thread tag, should return only threads with matching tags")
         void whenFilterByTags__thenReturnThreadsWithMatchingTags() {
 
diff --git a/apps/opik-frontend/src/api/traces/useTraceCommentsBatchCreateMutation.ts b/apps/opik-frontend/src/api/traces/useTraceCommentsBatchCreateMutation.ts
index 4f58975827c..65ba334a3be 100644
--- a/apps/opik-frontend/src/api/traces/useTraceCommentsBatchCreateMutation.ts
+++ b/apps/opik-frontend/src/api/traces/useTraceCommentsBatchCreateMutation.ts
@@ -10,7 +10,6 @@ import { useToast } from "@/components/ui/use-toast";
 
 type UseTraceCommentsBatchCreateParams = {
   ids: string[];
-  traceId: string;
   text: string;
 };
 
@@ -43,9 +42,10 @@ const useTraceCommentsBatchCreateMutation = () => {
       });
     },
     onSettled: (data, error, variables) => {
-      const { traceId } = variables;
-      queryClient.invalidateQueries({
-        queryKey: [TRACE_KEY, { traceId }],
+      variables.ids.forEach((traceId) => {
+        queryClient.invalidateQueries({
+          queryKey: [TRACE_KEY, { traceId }],
+        });
       });
       queryClient.invalidateQueries({ queryKey: [TRACES_KEY] });
       queryClient.invalidateQueries({
diff --git a/apps/opik-frontend/src/components/pages-shared/traces/BatchCommentDialog/BatchCommentDialog.tsx b/apps/opik-frontend/src/components/pages-shared/traces/BatchCommentDialog/BatchCommentDialog.tsx
index 78e11789946..d58bca9ceba 100644
--- a/apps/opik-frontend/src/components/pages-shared/traces/BatchCommentDialog/BatchCommentDialog.tsx
+++ b/apps/opik-frontend/src/components/pages-shared/traces/BatchCommentDialog/BatchCommentDialog.tsx
@@ -52,9 +52,7 @@ const BatchCommentDialog: React.FunctionComponent<BatchCommentDialogProps> = ({
       }
 
       const ids = rows.map((r) => r.id);
-      const traceId = rows[0]?.id;
-
-      await batchCreateTraceComments.mutateAsync({ ids, text: commentText, traceId });
+      await batchCreateTraceComments.mutateAsync({ ids, text: commentText });
 
       if (onSuccess) onSuccess();
 

From 30c9097de9270c9bcbf240b46cbd2ca4de77be95 Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 13 Aug 2025 19:23:36 -0600
Subject: [PATCH 14/39] add another BE edge case test

---
 .../opik/api/resources/v1/priv/TracesResourceTest.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/TracesResourceTest.java b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/TracesResourceTest.java
index 2f7754f0fd0..ae334c7e3ce 100644
--- a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/TracesResourceTest.java
+++ b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/TracesResourceTest.java
@@ -5062,6 +5062,16 @@ void createTraceCommentsBatch_ValidationErrors() {
         var responseBlankText = traceResourceClient.callTraceCommentsBatchCreate(ids, "  ", API_KEY, TEST_WORKSPACE);
         assertThat(responseBlankText.getStatus()).isEqualTo(org.apache.http.HttpStatus.SC_BAD_REQUEST);
     }
+
+    @Test
+    void createTraceCommentsBatch_OverLimit() {
+        var traces = PodamFactoryUtils.manufacturePojoList(factory, Trace.class);
+        traceResourceClient.batchCreateTraces(traces, API_KEY, TEST_WORKSPACE);
+
+        var ids = traces.stream().limit(11).map(Trace::id).toList();
+        var response = traceResourceClient.callTraceCommentsBatchCreate(ids, "hello", API_KEY, TEST_WORKSPACE);
+        assertThat(response.getStatus()).isEqualTo(org.apache.http.HttpStatus.SC_BAD_REQUEST);
+    }
         @DisplayName("When filtering by thread tag, should return only threads with matching tags")
         void whenFilterByTags__thenReturnThreadsWithMatchingTags() {
 

From 49779132f30d5528d0f48795d0b5ce64b2badfd6 Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 13 Aug 2025 19:27:10 -0600
Subject: [PATCH 15/39] add e2e FE test for traces batch comment, while keeping
 it disabled for spans as there is no EP for it

---
 .../tests/traces/traces-batch-comment.spec.ts | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 apps/opik-frontend/e2e/tests/traces/traces-batch-comment.spec.ts

diff --git a/apps/opik-frontend/e2e/tests/traces/traces-batch-comment.spec.ts b/apps/opik-frontend/e2e/tests/traces/traces-batch-comment.spec.ts
new file mode 100644
index 00000000000..d2438eca0b1
--- /dev/null
+++ b/apps/opik-frontend/e2e/tests/traces/traces-batch-comment.spec.ts
@@ -0,0 +1,34 @@
+import { expect, test } from "@e2e/fixtures";
+
+test.describe("Traces batch comment", () => {
+  test("Add batch comment to traces", async ({ project, trace1, trace2, tracesPage }) => {
+    await tracesPage.goto(project.id);
+
+    await tracesPage.table.getRowLocatorByCellText(trace1.name).locator('input[type="checkbox"]').check();
+    await tracesPage.table.getRowLocatorByCellText(trace2.name).locator('input[type="checkbox"]').check();
+
+    await tracesPage.page.getByRole("button", { name: "Comment" }).click();
+    await tracesPage.page.getByPlaceholder("Comment text").fill("batch-comment");
+    await tracesPage.page.getByRole("button", { name: "Add comments" }).click();
+
+    await tracesPage.table.openRowActionsByCellText(trace1.name);
+    await tracesPage.page.getByRole("menuitem", { name: "Open" }).click();
+    await tracesPage.selectSidebarTab("Comments");
+    await expect(tracesPage.sidePanel.container.getByText("batch-comment")).toBeVisible();
+
+    await tracesPage.page.getByRole("button", { name: "Close" }).click();
+
+    await tracesPage.table.openRowActionsByCellText(trace2.name);
+    await tracesPage.page.getByRole("menuitem", { name: "Open" }).click();
+    await tracesPage.selectSidebarTab("Comments");
+    await expect(tracesPage.sidePanel.container.getByText("batch-comment")).toBeVisible();
+  });
+
+  test("Disabled for spans", async ({ project, trace1, span, tracesPage }) => {
+    await tracesPage.goto(project.id);
+    await tracesPage.switchToLLMCalls();
+    await tracesPage.table.getRowLocatorByCellText(span.name).locator('input[type="checkbox"]').check();
+    await expect(tracesPage.page.getByRole("button", { name: "Comment" })).toBeDisabled();
+  });
+});
+

From 73441bdd2622c11e290d8a4d4dd944fca8b773ad Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 13 Aug 2025 19:43:05 -0600
Subject: [PATCH 16/39] map wrong argument to a 400 status code

---
 .../opik/api/resources/v1/priv/TracesResource.java   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java b/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java
index e3501084c46..53e60ed412a 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java
@@ -575,9 +575,15 @@ public Response createTraceCommentsBatch(
                     .build();
         }
 
-        commentService.createBatchForTraces(Set.copyOf(payload.ids()), payload.text())
-                .contextWrite(ctx -> setRequestContext(ctx, requestContext))
-                .block();
+        try {
+            commentService.createBatchForTraces(Set.copyOf(payload.ids()), payload.text())
+                    .contextWrite(ctx -> setRequestContext(ctx, requestContext))
+                    .block();
+        } catch (IllegalArgumentException e) {
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ErrorMessage(Response.Status.BAD_REQUEST.getStatusCode(), e.getMessage()))
+                    .build();
+        }
 
         log.info("Created trace comments batch with ids '{}' on workspaceId '{}'", payload.ids(), workspaceId);
 

From 4bc90af2daf895d98830c56e0f6249193dcede8e Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 13 Aug 2025 19:44:53 -0600
Subject: [PATCH 17/39] test the previous mapping

---
 .../resources/v1/priv/TracesResourceTest.java   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/TracesResourceTest.java b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/TracesResourceTest.java
index ae334c7e3ce..9e52c0f8b4c 100644
--- a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/TracesResourceTest.java
+++ b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/TracesResourceTest.java
@@ -5072,6 +5072,23 @@ void createTraceCommentsBatch_OverLimit() {
         var response = traceResourceClient.callTraceCommentsBatchCreate(ids, "hello", API_KEY, TEST_WORKSPACE);
         assertThat(response.getStatus()).isEqualTo(org.apache.http.HttpStatus.SC_BAD_REQUEST);
     }
+
+    @Test
+    void createTraceCommentsBatch_MixedWorkspace_BadRequest() {
+        var trace1 = factory.manufacturePojo(Trace.class);
+        var trace2 = factory.manufacturePojo(Trace.class);
+
+        traceResourceClient.createTrace(trace1, API_KEY, TEST_WORKSPACE);
+
+        String otherWorkspaceName = java.util.UUID.randomUUID().toString();
+        String otherWorkspaceId = java.util.UUID.randomUUID().toString();
+        mockTargetWorkspace(API_KEY, otherWorkspaceName, otherWorkspaceId);
+        traceResourceClient.createTrace(trace2, API_KEY, otherWorkspaceName);
+
+        var ids = java.util.List.of(trace1.id(), trace2.id());
+        var response = traceResourceClient.callTraceCommentsBatchCreate(ids, "hello", API_KEY, TEST_WORKSPACE);
+        assertThat(response.getStatus()).isEqualTo(org.apache.http.HttpStatus.SC_BAD_REQUEST);
+    }
         @DisplayName("When filtering by thread tag, should return only threads with matching tags")
         void whenFilterByTags__thenReturnThreadsWithMatchingTags() {
 

From 8e8ab14f71ee968be81b49cbc3a7253d291c8847 Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 13 Aug 2025 19:50:22 -0600
Subject: [PATCH 18/39] make status codes more human friendly

---
 .../comet/opik/api/resources/v1/priv/TracesResource.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java b/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java
index 53e60ed412a..9fcff67f014 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java
@@ -547,10 +547,10 @@ public Response deleteTraceComments(
 
     @POST
     @Path("/comments/batch")
-    @Operation(operationId = "createTraceCommentsBatch", summary = "Create comments for multiple traces", description = "Create the same comment text for multiple trace IDs", responses = {
+    @Operation(operationId = "createTraceCommentsBatch", summary = "Create comments for multiple traces", description = "Create the same comment text for multiple trace IDs (max 10 per request)", responses = {
             @ApiResponse(responseCode = "204", description = "No Content"),
-            @ApiResponse(responseCode = "400", description = "Bad Request"),
-            @ApiResponse(responseCode = "404", description = "Not found")})
+            @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(schema = @Schema(implementation = ErrorMessage.class))),
+            @ApiResponse(responseCode = "404", description = "Not found", content = @Content(schema = @Schema(implementation = ErrorMessage.class)))})
     @RateLimited
     public Response createTraceCommentsBatch(
             @RequestBody(content = @Content(schema = @Schema(implementation = CommentsBatchCreate.class))) @NotNull @Valid CommentsBatchCreate payload) {

From ba3529e90e69e2966b9a48a0599cad5bc4c4995e Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 13 Aug 2025 19:53:19 -0600
Subject: [PATCH 19/39] add test for blocked blank text and blocked < 10
 comments

---
 .../tests/traces/traces-batch-comment.spec.ts | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/apps/opik-frontend/e2e/tests/traces/traces-batch-comment.spec.ts b/apps/opik-frontend/e2e/tests/traces/traces-batch-comment.spec.ts
index d2438eca0b1..8fd2741a1ca 100644
--- a/apps/opik-frontend/e2e/tests/traces/traces-batch-comment.spec.ts
+++ b/apps/opik-frontend/e2e/tests/traces/traces-batch-comment.spec.ts
@@ -30,5 +30,33 @@ test.describe("Traces batch comment", () => {
     await tracesPage.table.getRowLocatorByCellText(span.name).locator('input[type="checkbox"]').check();
     await expect(tracesPage.page.getByRole("button", { name: "Comment" })).toBeDisabled();
   });
+
+  test("Blank text is blocked", async ({ project, trace1, tracesPage }) => {
+    await tracesPage.goto(project.id);
+    await tracesPage.table.getRowLocatorByCellText(trace1.name).locator('input[type="checkbox"]').check();
+    await tracesPage.page.getByRole("button", { name: "Comment" }).click();
+    await tracesPage.page.getByPlaceholder("Comment text").fill("   ");
+    await expect(tracesPage.page.getByRole("button", { name: "Add comments" })).toBeDisabled();
+  });
+
+  test("Selecting over 10 traces is blocked", async ({ project, tracesPage }) => {
+    await tracesPage.goto(project.id);
+
+    for (let i = 0; i < 11; i++) {
+      await tracesPage.page.getByRole("button", { name: "Add trace" }).click();
+      await tracesPage.page.getByPlaceholder("Name").fill(`t-${i}`);
+      await tracesPage.page.getByRole("button", { name: "Create" }).click();
+    }
+
+    const rows = await tracesPage.table.tBody.locator('tr').all();
+    for (let i = 0; i < 11; i++) {
+      await rows[i].locator('input[type="checkbox"]').check();
+    }
+
+    await tracesPage.page.getByRole("button", { name: "Comment" }).click();
+    await tracesPage.page.getByPlaceholder("Comment text").fill("over-limit");
+    await expect(tracesPage.page.getByRole("button", { name: "Add comments" })).toBeDisabled();
+    await expect(tracesPage.page.getByText("You can comment on up to 10 items at a time.")).toBeVisible();
+  });
 });
 

From 4d9850f596c3260f91d4884d96bcce7a6bd3591f Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 13 Aug 2025 19:59:31 -0600
Subject: [PATCH 20/39] update number state by using undefined instead of empty
 string

---
 .../BatchAnnotateDialog/BatchAnnotateDialog.tsx | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/apps/opik-frontend/src/components/pages-shared/traces/BatchAnnotateDialog/BatchAnnotateDialog.tsx b/apps/opik-frontend/src/components/pages-shared/traces/BatchAnnotateDialog/BatchAnnotateDialog.tsx
index 11802ec435b..fde03b72de3 100644
--- a/apps/opik-frontend/src/components/pages-shared/traces/BatchAnnotateDialog/BatchAnnotateDialog.tsx
+++ b/apps/opik-frontend/src/components/pages-shared/traces/BatchAnnotateDialog/BatchAnnotateDialog.tsx
@@ -32,7 +32,7 @@ const BatchAnnotateDialog: React.FunctionComponent<BatchAnnotateDialogProps> = (
 }) => {
     const { toast } = useToast();
     const [scoreName, setScoreName] = useState<string>("");
-    const [value, setValue] = useState<number | "">("");
+    const [value, setValue] = useState<number | undefined>(undefined);
     const [categoryName, setCategoryName] = useState<string>("");
     const [reason, setReason] = useState<string>("");
 
@@ -41,13 +41,13 @@ const BatchAnnotateDialog: React.FunctionComponent<BatchAnnotateDialogProps> = (
     const handleClose = () => {
         setOpen(false);
         setScoreName("");
-        setValue("");
+        setValue(undefined);
         setCategoryName("");
         setReason("");
     };
 
     const disabled =
-        !scoreName || value === "" || rows.length > MAX_ENTITIES || batchMutation.isPending;
+        !scoreName || value === undefined || rows.length > MAX_ENTITIES || batchMutation.isPending;
 
     const handleAnnotate = async () => {
         try {
@@ -55,7 +55,7 @@ const BatchAnnotateDialog: React.FunctionComponent<BatchAnnotateDialogProps> = (
                 projectId,
                 traceIds: rows.map((r) => r.id),
                 name: scoreName,
-                value: typeof value === "string" ? Number(value) : value,
+                value: value as number,
                 categoryName: categoryName || undefined,
                 reason: reason || undefined,
             });
@@ -91,10 +91,15 @@ const BatchAnnotateDialog: React.FunctionComponent<BatchAnnotateDialogProps> = (
                     <Input
                         placeholder="Value"
                         type="number"
-                        value={value}
+                        value={value ?? ""}
                         onChange={(e) => {
                             const v = e.target.value;
-                            setValue(v === "" ? "" : Number(v));
+                            if (v === "") {
+                                setValue(undefined);
+                                return;
+                            }
+                            const parsed = Number(v);
+                            setValue(Number.isNaN(parsed) ? undefined : parsed);
                         }}
                         disabled={rows.length > MAX_ENTITIES}
                     />

From e30feee09e29d55964563f5999c2c108167c0983 Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 13 Aug 2025 18:41:16 -0600
Subject: [PATCH 21/39] add temporary dev settings

---
 apps/opik-frontend/.env.development                    | 2 +-
 deployment/docker-compose/docker-compose.override.yaml | 2 +-
 deployment/docker-compose/docker-compose.yaml          | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/opik-frontend/.env.development b/apps/opik-frontend/.env.development
index 0ed5235aae4..57e9628b758 100644
--- a/apps/opik-frontend/.env.development
+++ b/apps/opik-frontend/.env.development
@@ -1,2 +1,2 @@
 VITE_BASE_URL=/
-VITE_BASE_API_URL=/api
\ No newline at end of file
+VITE_BASE_API_URL=http://localhost:8080
diff --git a/deployment/docker-compose/docker-compose.override.yaml b/deployment/docker-compose/docker-compose.override.yaml
index 8d156416842..cf916dbdc06 100644
--- a/deployment/docker-compose/docker-compose.override.yaml
+++ b/deployment/docker-compose/docker-compose.override.yaml
@@ -28,7 +28,7 @@ services:
 
   python-backend:
     ports:
-      - "8000:8000" # Exposing Python backend HTTP port to host
+      - "8001:8000" # Exposing Python backend HTTP port to host on 8001 to avoid conflicts
 
   frontend:
     ports:
diff --git a/deployment/docker-compose/docker-compose.yaml b/deployment/docker-compose/docker-compose.yaml
index 96521ac3ddf..39c3c78aa00 100644
--- a/deployment/docker-compose/docker-compose.yaml
+++ b/deployment/docker-compose/docker-compose.yaml
@@ -147,6 +147,7 @@ services:
       OTEL_EXPERIMENTAL_RESOURCE_DISABLED_KEYS: process.command_args
       OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE: delta
       OPIK_USAGE_REPORT_ENABLED: ${OPIK_USAGE_REPORT_ENABLED:-true}
+      CORS: true
       AWS_ACCESS_KEY_ID: ${MINIO_ROOT_USER:-THAAIOSFODNN7EXAMPLE}
       AWS_SECRET_ACCESS_KEY: ${MINIO_ROOT_PASSWORD:-LESlrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY}
       PYTHON_EVALUATOR_URL: http://python-backend:8000

From 2b0b8591a54e9192d12b7f19de8f0efdd1a2855f Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Thu, 14 Aug 2025 01:53:01 -0600
Subject: [PATCH 22/39] fix bug in batch commenting EP

---
 .../src/main/java/com/comet/opik/domain/CommentService.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java b/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java
index b9640ebdc29..dcda55326f4 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java
@@ -10,6 +10,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Mono;
+import com.comet.opik.infrastructure.db.TransactionTemplateAsync;
 
 import java.util.Set;
 import java.util.UUID;
@@ -44,6 +45,7 @@ class CommentServiceImpl implements CommentService {
     private final @NonNull SpanDAO spanDAO;
     private final @NonNull TraceThreadDAO traceThreadDAO;
     private final @NonNull IdGenerator idGenerator;
+    private final @NonNull TransactionTemplateAsync transactionTemplateAsync;
 
     @Override
     public Mono<UUID> create(@NonNull UUID entityId, @NonNull Comment comment, CommentDAO.EntityType entityType) {
@@ -93,7 +95,8 @@ public Mono<Long> createBatchForTraces(@NonNull Set<UUID> traceIds, @NonNull Str
             return Mono.just(0L);
         }
 
-        return traceDAO.getTraceWorkspace(traceIds, null)
+        return transactionTemplateAsync
+                .nonTransaction(connection -> traceDAO.getTraceWorkspace(traceIds, connection))
                 .switchIfEmpty(Mono.just(java.util.List.of()))
                 .flatMap(list -> {
                     java.util.Set<String> workspaces = list.stream().map(WorkspaceAndResourceId::workspaceId).collect(java.util.stream.Collectors.toSet());

From bfb80d80df93e8fc92fe69418d578cc9ba19f624 Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 17 Sep 2025 16:21:02 -0600
Subject: [PATCH 23/39] add Builder true convention

---
 .../src/main/java/com/comet/opik/api/CommentsBatchCreate.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/api/CommentsBatchCreate.java b/apps/opik-backend/src/main/java/com/comet/opik/api/CommentsBatchCreate.java
index c34746192f6..0b4a9c4d940 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/api/CommentsBatchCreate.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/api/CommentsBatchCreate.java
@@ -6,12 +6,14 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
+import lombok.Builder;
 
 import java.util.List;
 import java.util.UUID;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+@Builder(toBuilder = true)
 public record CommentsBatchCreate(
 		@Schema(description = "IDs of entities to comment on") @NotEmpty List<UUID> ids,
 		@Schema(description = "Comment text to apply to all entities") @NotBlank String text

From 8c8c623c9d34aae6d43274614ca305a37666aaed Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 17 Sep 2025 16:34:08 -0600
Subject: [PATCH 24/39] switch to uniform UUIDs, add validation for them

---
 .../main/java/com/comet/opik/api/CommentsBatchCreate.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/api/CommentsBatchCreate.java b/apps/opik-backend/src/main/java/com/comet/opik/api/CommentsBatchCreate.java
index 0b4a9c4d940..17ebba7f9f5 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/api/CommentsBatchCreate.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/api/CommentsBatchCreate.java
@@ -6,16 +6,19 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Builder;
 
 import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 @Builder(toBuilder = true)
 public record CommentsBatchCreate(
-		@Schema(description = "IDs of entities to comment on") @NotEmpty List<UUID> ids,
+		@Schema(description = "IDs of entities to comment on") @NotNull @Size(min = 1, max = 1000) Set<@NotNull UUID> ids,
 		@Schema(description = "Comment text to apply to all entities") @NotBlank String text
 ) {}
 

From 824e2dafecc41391fbf8e646a1a2836e4abe04de Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 17 Sep 2025 16:38:56 -0600
Subject: [PATCH 25/39] add further validators

---
 .../src/main/java/com/comet/opik/api/CommentsBatchCreate.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/api/CommentsBatchCreate.java b/apps/opik-backend/src/main/java/com/comet/opik/api/CommentsBatchCreate.java
index 17ebba7f9f5..583150b81f9 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/api/CommentsBatchCreate.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/api/CommentsBatchCreate.java
@@ -18,7 +18,7 @@
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 @Builder(toBuilder = true)
 public record CommentsBatchCreate(
-		@Schema(description = "IDs of entities to comment on") @NotNull @Size(min = 1, max = 1000) Set<@NotNull UUID> ids,
+		@Schema(description = "IDs of entities to comment on (max 1K)") @NotNull @Size(min = 1, max = 1000) Set<@NotNull UUID> ids,
 		@Schema(description = "Comment text to apply to all entities") @NotBlank String text
 ) {}
 

From 5077078e65f05cec828532839165571df11cfd23 Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 17 Sep 2025 16:43:05 -0600
Subject: [PATCH 26/39] make logs more concise

---
 .../opik/api/resources/v1/priv/TracesResource.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java b/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java
index 9fcff67f014..714a8545d23 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java
@@ -534,13 +534,13 @@ public Response deleteTraceComments(
 
         String workspaceId = requestContext.get().getWorkspaceId();
 
-        log.info("Delete trace comments with ids '{}' on workspaceId '{}'", batchDelete.ids(), workspaceId);
+        log.info("Delete trace comments with size '{}' on workspaceId '{}'", batchDelete.ids().size(), workspaceId);
 
         commentService.delete(batchDelete)
                 .contextWrite(ctx -> setRequestContext(ctx, requestContext))
                 .block();
 
-        log.info("Deleted trace comments with ids '{}' on workspaceId '{}'", batchDelete.ids(), workspaceId);
+        log.info("Deleted trace comments with size '{}' on workspaceId '{}'", batchDelete.ids().size(), workspaceId);
 
         return Response.noContent().build();
     }
@@ -557,7 +557,7 @@ public Response createTraceCommentsBatch(
 
         String workspaceId = requestContext.get().getWorkspaceId();
 
-        log.info("Creating trace comments batch with ids '{}' on workspaceId '{}'", payload.ids(), workspaceId);
+        log.info("Creating trace comments batch with size '{}' on workspaceId '{}'", payload.ids().size(), workspaceId);
 
         if (payload.ids() == null || payload.ids().isEmpty()) {
             return Response.status(Response.Status.BAD_REQUEST)
@@ -585,7 +585,7 @@ public Response createTraceCommentsBatch(
                     .build();
         }
 
-        log.info("Created trace comments batch with ids '{}' on workspaceId '{}'", payload.ids(), workspaceId);
+        log.info("Created trace comments batch with size '{}' on workspaceId '{}'", payload.ids().size(), workspaceId);
 
         return Response.noContent().build();
     }
@@ -740,7 +740,7 @@ public Response deleteTraceThreads(
                 .contextWrite(ctx -> setRequestContext(ctx, requestContext))
                 .block();
 
-        log.info("Deleted trace threads with ids '{}' on workspaceId '{}'", traceThreads.threadIds(), workspaceId);
+        log.info("Deleted trace threads with size '{}' on workspaceId '{}'", traceThreads.threadIds().size(), workspaceId);
 
         return Response.noContent().build();
     }
@@ -964,13 +964,13 @@ public Response deleteThreadComments(
 
         String workspaceId = requestContext.get().getWorkspaceId();
 
-        log.info("Delete thread comments with ids '{}' on workspaceId '{}'", batchDelete.ids(), workspaceId);
+        log.info("Delete thread comments with size '{}' on workspaceId '{}'", batchDelete.ids().size(), workspaceId);
 
         commentService.delete(batchDelete)
                 .contextWrite(ctx -> setRequestContext(ctx, requestContext))
                 .block();
 
-        log.info("Deleted thread comments with ids '{}' on workspaceId '{}'", batchDelete.ids(), workspaceId);
+        log.info("Deleted thread comments with size '{}' on workspaceId '{}'", batchDelete.ids().size(), workspaceId);
 
         return Response.noContent().build();
     }

From cda84114b52f11644bc453a8a5c3bd2fc624afde Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 17 Sep 2025 16:47:28 -0600
Subject: [PATCH 27/39] remove manual validations, switch it to annotations

---
 .../api/resources/v1/priv/TracesResource.java  | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java b/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java
index 714a8545d23..745929026ed 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java
@@ -559,24 +559,8 @@ public Response createTraceCommentsBatch(
 
         log.info("Creating trace comments batch with size '{}' on workspaceId '{}'", payload.ids().size(), workspaceId);
 
-        if (payload.ids() == null || payload.ids().isEmpty()) {
-            return Response.status(Response.Status.BAD_REQUEST)
-                    .entity(new ErrorMessage(Response.Status.BAD_REQUEST.getStatusCode(), "'ids' must not be empty"))
-                    .build();
-        }
-        if (payload.text() == null || payload.text().trim().isEmpty()) {
-            return Response.status(Response.Status.BAD_REQUEST)
-                    .entity(new ErrorMessage(Response.Status.BAD_REQUEST.getStatusCode(), "'text' must not be blank"))
-                    .build();
-        }
-        if (payload.ids().size() > 10) {
-            return Response.status(Response.Status.BAD_REQUEST)
-                    .entity(new ErrorMessage(Response.Status.BAD_REQUEST.getStatusCode(), "Batch size limit exceeded (max 10)"))
-                    .build();
-        }
-
         try {
-            commentService.createBatchForTraces(Set.copyOf(payload.ids()), payload.text())
+            commentService.createBatchForTraces(payload.ids(), payload.text())
                     .contextWrite(ctx -> setRequestContext(ctx, requestContext))
                     .block();
         } catch (IllegalArgumentException e) {

From 1ed5e01191c3adb636614cd713db2a41209c6627 Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 17 Sep 2025 16:54:29 -0600
Subject: [PATCH 28/39] remove try-catch block to respect good practices

---
 .../opik/api/resources/v1/priv/TracesResource.java   | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java b/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java
index 745929026ed..4d0c7fce513 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/TracesResource.java
@@ -559,15 +559,9 @@ public Response createTraceCommentsBatch(
 
         log.info("Creating trace comments batch with size '{}' on workspaceId '{}'", payload.ids().size(), workspaceId);
 
-        try {
-            commentService.createBatchForTraces(payload.ids(), payload.text())
-                    .contextWrite(ctx -> setRequestContext(ctx, requestContext))
-                    .block();
-        } catch (IllegalArgumentException e) {
-            return Response.status(Response.Status.BAD_REQUEST)
-                    .entity(new ErrorMessage(Response.Status.BAD_REQUEST.getStatusCode(), e.getMessage()))
-                    .build();
-        }
+        commentService.createBatchForTraces(payload.ids(), payload.text())
+                .contextWrite(ctx -> setRequestContext(ctx, requestContext))
+                .block();
 
         log.info("Created trace comments batch with size '{}' on workspaceId '{}'", payload.ids().size(), workspaceId);
 

From fd11e8f6c87edf6a10d6a82b42d8f4da5f54a1fd Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 17 Sep 2025 17:01:15 -0600
Subject: [PATCH 29/39] align with import convention

---
 .../src/main/java/com/comet/opik/domain/CommentDAO.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentDAO.java b/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentDAO.java
index 97ca79ac7d4..3aada32f3a0 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentDAO.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentDAO.java
@@ -1,6 +1,7 @@
 package com.comet.opik.domain;
 
 import com.comet.opik.api.Comment;
+import com.comet.opik.utils.TemplateUtils;
 import com.comet.opik.infrastructure.db.TransactionTemplateAsync;
 import com.google.inject.ImplementedBy;
 import io.r2dbc.spi.Result;
@@ -175,8 +176,8 @@ public Mono<Long> addComment(@NonNull UUID commentId, @NonNull UUID entityId, @N
     public Mono<Long> addCommentsBatch(@NonNull EntityType entityType, @NonNull Set<UUID> entityIds,
             @NonNull UUID projectId, @NonNull Comment comment) {
         return asyncTemplate.nonTransaction(connection -> makeMonoContextAware((userName, workspaceId) -> {
-            var items = com.comet.opik.utils.TemplateUtils.getQueryItemPlaceHolder(entityIds.size());
-            var template = new org.stringtemplate.v4.ST(INSERT_COMMENTS_BATCH).add("items", items);
+            var items = TemplateUtils.getQueryItemPlaceHolder(entityIds.size());
+            var template = new ST(INSERT_COMMENTS_BATCH).add("items", items);
 
             var statement = connection.createStatement(template.render())
                     .bind("entity_type", entityType.getType())
@@ -185,7 +186,7 @@ public Mono<Long> addCommentsBatch(@NonNull EntityType entityType, @NonNull Set<
 
             int i = 0;
             for (UUID entityId : entityIds) {
-                statement.bind("id" + i, java.util.UUID.randomUUID())
+                statement.bind("id" + i, UUID.randomUUID())
                         .bind("entity_id" + i, entityId);
                 i++;
             }

From d834986de837d4d7ff92506843362596009d9806 Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 17 Sep 2025 17:07:02 -0600
Subject: [PATCH 30/39] migrate to UUID - v7

---
 .../com/comet/opik/domain/CommentDAO.java     | 15 +++++------
 .../com/comet/opik/domain/CommentService.java | 26 ++++++++++++-------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentDAO.java b/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentDAO.java
index 3aada32f3a0..f390461ae35 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentDAO.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentDAO.java
@@ -15,6 +15,7 @@
 import org.stringtemplate.v4.ST;
 import reactor.core.publisher.Mono;
 
+import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
@@ -40,7 +41,7 @@ enum EntityType {
 
     Mono<Long> addComment(UUID commentId, UUID entityId, EntityType entityType, UUID projectId, Comment comment);
 
-    Mono<Long> addCommentsBatch(EntityType entityType, Set<UUID> entityIds, UUID projectId, Comment comment);
+    Mono<Long> addCommentsBatch(EntityType entityType, List<UUID> entityIds, List<UUID> commentIds, UUID projectId, Comment comment);
 
     Mono<Comment> findById(UUID entityId, UUID commentId);
 
@@ -173,8 +174,8 @@ public Mono<Long> addComment(@NonNull UUID commentId, @NonNull UUID entityId, @N
     }
 
     @Override
-    public Mono<Long> addCommentsBatch(@NonNull EntityType entityType, @NonNull Set<UUID> entityIds,
-            @NonNull UUID projectId, @NonNull Comment comment) {
+    public Mono<Long> addCommentsBatch(@NonNull EntityType entityType, @NonNull List<UUID> entityIds,
+            @NonNull List<UUID> commentIds, @NonNull UUID projectId, @NonNull Comment comment) {
         return asyncTemplate.nonTransaction(connection -> makeMonoContextAware((userName, workspaceId) -> {
             var items = TemplateUtils.getQueryItemPlaceHolder(entityIds.size());
             var template = new ST(INSERT_COMMENTS_BATCH).add("items", items);
@@ -184,11 +185,9 @@ public Mono<Long> addCommentsBatch(@NonNull EntityType entityType, @NonNull Set<
                     .bind("project_id", projectId)
                     .bind("text", comment.text());
 
-            int i = 0;
-            for (UUID entityId : entityIds) {
-                statement.bind("id" + i, UUID.randomUUID())
-                        .bind("entity_id" + i, entityId);
-                i++;
+            for (int i = 0; i < entityIds.size(); i++) {
+                statement.bind("id" + i, commentIds.get(i))
+                        .bind("entity_id" + i, entityIds.get(i));
             }
 
             return makeMonoContextAware(bindUserNameAndWorkspaceContext(statement))
diff --git a/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java b/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java
index dcda55326f4..7b4553907a9 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java
@@ -103,14 +103,17 @@ public Mono<Long> createBatchForTraces(@NonNull Set<UUID> traceIds, @NonNull Str
                     if (workspaces.size() > 1) {
                         return Mono.error(new IllegalArgumentException("All entities must belong to the same workspace"));
                     }
-                    java.util.Set<UUID> ids = list.stream().map(WorkspaceAndResourceId::resourceId).collect(java.util.stream.Collectors.toSet());
+                    java.util.List<UUID> ids = list.stream().map(WorkspaceAndResourceId::resourceId).toList();
                     if (ids.isEmpty()) {
                         return Mono.just(0L);
                     }
-                    return traceDAO.getProjectIdFromTrace(ids.iterator().next())
-                            .switchIfEmpty(Mono.error(failWithNotFound("Trace", ids.iterator().next())))
-                            .flatMap(projectId -> commentDAO.addCommentsBatch(CommentDAO.EntityType.TRACE, ids, projectId,
-                                    Comment.builder().text(text).build()));
+                    return traceDAO.getProjectIdFromTrace(ids.get(0))
+                            .switchIfEmpty(Mono.error(failWithNotFound("Trace", ids.get(0))))
+                            .flatMap(projectId -> {
+                                java.util.List<UUID> generatedIds = ids.stream().map(__ -> idGenerator.generateId()).toList();
+                                return commentDAO.addCommentsBatch(CommentDAO.EntityType.TRACE, ids, generatedIds, projectId,
+                                        Comment.builder().text(text).build());
+                            });
                 });
     }
 
@@ -127,14 +130,17 @@ public Mono<Long> createBatchForSpans(@NonNull Set<UUID> spanIds, @NonNull Strin
                     if (workspaces.size() > 1) {
                         return Mono.error(new IllegalArgumentException("All entities must belong to the same workspace"));
                     }
-                    java.util.Set<UUID> ids = list.stream().map(WorkspaceAndResourceId::resourceId).collect(java.util.stream.Collectors.toSet());
+                    java.util.List<UUID> ids = list.stream().map(WorkspaceAndResourceId::resourceId).toList();
                     if (ids.isEmpty()) {
                         return Mono.just(0L);
                     }
-                    return spanDAO.getProjectIdFromSpan(ids.iterator().next())
-                            .switchIfEmpty(Mono.error(failWithNotFound("Span", ids.iterator().next())))
-                            .flatMap(projectId -> commentDAO.addCommentsBatch(CommentDAO.EntityType.SPAN, ids, projectId,
-                                    Comment.builder().text(text).build()));
+                    return spanDAO.getProjectIdFromSpan(ids.get(0))
+                            .switchIfEmpty(Mono.error(failWithNotFound("Span", ids.get(0))))
+                            .flatMap(projectId -> {
+                                java.util.List<UUID> generatedIds = ids.stream().map(__ -> idGenerator.generateId()).toList();
+                                return commentDAO.addCommentsBatch(CommentDAO.EntityType.SPAN, ids, generatedIds, projectId,
+                                        Comment.builder().text(text).build());
+                            });
                 });
     }
 }

From 760d06a3f6eb1478ab860c93f07ebb382479f899 Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 17 Sep 2025 17:11:11 -0600
Subject: [PATCH 31/39] remove spurious validations

---
 .../com/comet/opik/domain/CommentService.java | 54 ++++++-------------
 1 file changed, 17 insertions(+), 37 deletions(-)

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java b/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java
index 7b4553907a9..6f3608fde45 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java
@@ -11,6 +11,7 @@
 import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Mono;
 import com.comet.opik.infrastructure.db.TransactionTemplateAsync;
+import java.util.List;
 
 import java.util.Set;
 import java.util.UUID;
@@ -95,25 +96,14 @@ public Mono<Long> createBatchForTraces(@NonNull Set<UUID> traceIds, @NonNull Str
             return Mono.just(0L);
         }
 
-        return transactionTemplateAsync
-                .nonTransaction(connection -> traceDAO.getTraceWorkspace(traceIds, connection))
-                .switchIfEmpty(Mono.just(java.util.List.of()))
-                .flatMap(list -> {
-                    java.util.Set<String> workspaces = list.stream().map(WorkspaceAndResourceId::workspaceId).collect(java.util.stream.Collectors.toSet());
-                    if (workspaces.size() > 1) {
-                        return Mono.error(new IllegalArgumentException("All entities must belong to the same workspace"));
-                    }
-                    java.util.List<UUID> ids = list.stream().map(WorkspaceAndResourceId::resourceId).toList();
-                    if (ids.isEmpty()) {
-                        return Mono.just(0L);
-                    }
-                    return traceDAO.getProjectIdFromTrace(ids.get(0))
-                            .switchIfEmpty(Mono.error(failWithNotFound("Trace", ids.get(0))))
-                            .flatMap(projectId -> {
-                                java.util.List<UUID> generatedIds = ids.stream().map(__ -> idGenerator.generateId()).toList();
-                                return commentDAO.addCommentsBatch(CommentDAO.EntityType.TRACE, ids, generatedIds, projectId,
-                                        Comment.builder().text(text).build());
-                            });
+        List<UUID> ids = traceIds.stream().toList();
+
+        return traceDAO.getProjectIdFromTrace(ids.get(0))
+                .switchIfEmpty(Mono.error(failWithNotFound("Trace", ids.get(0))))
+                .flatMap(projectId -> {
+                    List<UUID> generatedIds = ids.stream().map(__ -> idGenerator.generateId()).toList();
+                    return commentDAO.addCommentsBatch(CommentDAO.EntityType.TRACE, ids, generatedIds, projectId,
+                            Comment.builder().text(text).build());
                 });
     }
 
@@ -123,24 +113,14 @@ public Mono<Long> createBatchForSpans(@NonNull Set<UUID> spanIds, @NonNull Strin
             return Mono.just(0L);
         }
 
-        return spanDAO.getSpanWorkspace(spanIds)
-                .switchIfEmpty(Mono.just(java.util.List.of()))
-                .flatMap(list -> {
-                    java.util.Set<String> workspaces = list.stream().map(WorkspaceAndResourceId::workspaceId).collect(java.util.stream.Collectors.toSet());
-                    if (workspaces.size() > 1) {
-                        return Mono.error(new IllegalArgumentException("All entities must belong to the same workspace"));
-                    }
-                    java.util.List<UUID> ids = list.stream().map(WorkspaceAndResourceId::resourceId).toList();
-                    if (ids.isEmpty()) {
-                        return Mono.just(0L);
-                    }
-                    return spanDAO.getProjectIdFromSpan(ids.get(0))
-                            .switchIfEmpty(Mono.error(failWithNotFound("Span", ids.get(0))))
-                            .flatMap(projectId -> {
-                                java.util.List<UUID> generatedIds = ids.stream().map(__ -> idGenerator.generateId()).toList();
-                                return commentDAO.addCommentsBatch(CommentDAO.EntityType.SPAN, ids, generatedIds, projectId,
-                                        Comment.builder().text(text).build());
-                            });
+        List<UUID> ids = spanIds.stream().toList();
+
+        return spanDAO.getProjectIdFromSpan(ids.get(0))
+                .switchIfEmpty(Mono.error(failWithNotFound("Span", ids.get(0))))
+                .flatMap(projectId -> {
+                    List<UUID> generatedIds = ids.stream().map(__ -> idGenerator.generateId()).toList();
+                    return commentDAO.addCommentsBatch(CommentDAO.EntityType.SPAN, ids, generatedIds, projectId,
+                            Comment.builder().text(text).build());
                 });
     }
 }

From f07fc29d5ede3c06672cc1c410005f806468b41a Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 17 Sep 2025 17:53:29 -0600
Subject: [PATCH 32/39] improve performace, both for spans and traces

---
 .../com/comet/opik/domain/CommentDAO.java     | 10 +++---
 .../com/comet/opik/domain/CommentService.java | 23 ++++++++-----
 .../java/com/comet/opik/domain/SpanDAO.java   | 32 +++++++++++++++++++
 .../java/com/comet/opik/domain/TraceDAO.java  | 29 +++++++++++++++++
 4 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentDAO.java b/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentDAO.java
index f390461ae35..c025cb1d782 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentDAO.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentDAO.java
@@ -41,7 +41,7 @@ enum EntityType {
 
     Mono<Long> addComment(UUID commentId, UUID entityId, EntityType entityType, UUID projectId, Comment comment);
 
-    Mono<Long> addCommentsBatch(EntityType entityType, List<UUID> entityIds, List<UUID> commentIds, UUID projectId, Comment comment);
+    Mono<Long> addCommentsBatch(EntityType entityType, List<UUID> entityIds, List<UUID> commentIds, List<UUID> projectIds, Comment comment);
 
     Mono<Comment> findById(UUID entityId, UUID commentId);
 
@@ -99,7 +99,7 @@ INSERT INTO comments(
                     :id<item.index>,
                     :entity_id<item.index>,
                     :entity_type,
-                    :project_id,
+                    :project_id<item.index>,
                     :workspace_id,
                     :text,
                     :user_name,
@@ -175,19 +175,19 @@ public Mono<Long> addComment(@NonNull UUID commentId, @NonNull UUID entityId, @N
 
     @Override
     public Mono<Long> addCommentsBatch(@NonNull EntityType entityType, @NonNull List<UUID> entityIds,
-            @NonNull List<UUID> commentIds, @NonNull UUID projectId, @NonNull Comment comment) {
+            @NonNull List<UUID> commentIds, @NonNull List<UUID> projectIds, @NonNull Comment comment) {
         return asyncTemplate.nonTransaction(connection -> makeMonoContextAware((userName, workspaceId) -> {
             var items = TemplateUtils.getQueryItemPlaceHolder(entityIds.size());
             var template = new ST(INSERT_COMMENTS_BATCH).add("items", items);
 
             var statement = connection.createStatement(template.render())
                     .bind("entity_type", entityType.getType())
-                    .bind("project_id", projectId)
                     .bind("text", comment.text());
 
             for (int i = 0; i < entityIds.size(); i++) {
                 statement.bind("id" + i, commentIds.get(i))
-                        .bind("entity_id" + i, entityIds.get(i));
+                        .bind("entity_id" + i, entityIds.get(i))
+                        .bind("project_id" + i, projectIds.get(i));
             }
 
             return makeMonoContextAware(bindUserNameAndWorkspaceContext(statement))
diff --git a/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java b/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java
index 6f3608fde45..645b0628600 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java
@@ -98,11 +98,15 @@ public Mono<Long> createBatchForTraces(@NonNull Set<UUID> traceIds, @NonNull Str
 
         List<UUID> ids = traceIds.stream().toList();
 
-        return traceDAO.getProjectIdFromTrace(ids.get(0))
-                .switchIfEmpty(Mono.error(failWithNotFound("Trace", ids.get(0))))
-                .flatMap(projectId -> {
+        return transactionTemplateAsync
+                .nonTransaction(connection -> traceDAO.getProjectIdsByTraceIds(traceIds, connection))
+                .flatMap(map -> {
+                    if (map.size() != ids.size()) {
+                        return Mono.error(new jakarta.ws.rs.BadRequestException("Some traces were not found in the workspace"));
+                    }
+                    List<UUID> projectIds = ids.stream().map(map::get).toList();
                     List<UUID> generatedIds = ids.stream().map(__ -> idGenerator.generateId()).toList();
-                    return commentDAO.addCommentsBatch(CommentDAO.EntityType.TRACE, ids, generatedIds, projectId,
+                    return commentDAO.addCommentsBatch(CommentDAO.EntityType.TRACE, ids, generatedIds, projectIds,
                             Comment.builder().text(text).build());
                 });
     }
@@ -115,11 +119,14 @@ public Mono<Long> createBatchForSpans(@NonNull Set<UUID> spanIds, @NonNull Strin
 
         List<UUID> ids = spanIds.stream().toList();
 
-        return spanDAO.getProjectIdFromSpan(ids.get(0))
-                .switchIfEmpty(Mono.error(failWithNotFound("Span", ids.get(0))))
-                .flatMap(projectId -> {
+        return spanDAO.getProjectIdsBySpanIds(spanIds)
+                .flatMap(map -> {
+                    if (map.size() != ids.size()) {
+                        return Mono.error(new jakarta.ws.rs.BadRequestException("Some spans were not found in the workspace"));
+                    }
+                    List<UUID> projectIds = ids.stream().map(map::get).toList();
                     List<UUID> generatedIds = ids.stream().map(__ -> idGenerator.generateId()).toList();
-                    return commentDAO.addCommentsBatch(CommentDAO.EntityType.SPAN, ids, generatedIds, projectId,
+                    return commentDAO.addCommentsBatch(CommentDAO.EntityType.SPAN, ids, generatedIds, projectIds,
                             Comment.builder().text(text).build());
                 });
     }
diff --git a/apps/opik-backend/src/main/java/com/comet/opik/domain/SpanDAO.java b/apps/opik-backend/src/main/java/com/comet/opik/domain/SpanDAO.java
index f89c45f6cd4..366a393f793 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/domain/SpanDAO.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/domain/SpanDAO.java
@@ -34,6 +34,7 @@
 import org.stringtemplate.v4.ST;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import java.util.Map;
 
 import java.math.BigDecimal;
 import java.time.Instant;
@@ -1855,6 +1856,16 @@ public Mono<List<WorkspaceAndResourceId>> getSpanWorkspace(@NonNull Set<UUID> sp
                 .collectList();
     }
 
+    private static final String SELECT_SPAN_ID_AND_PROJECT = """
+            SELECT
+                id,
+                project_id
+            FROM spans
+            WHERE id IN :spanIds
+            AND workspace_id = :workspace_id
+            ;
+            """;
+
     @WithSpan
     public Mono<UUID> getProjectIdFromSpan(@NonNull UUID spanId) {
 
@@ -1870,6 +1881,27 @@ public Mono<UUID> getProjectIdFromSpan(@NonNull UUID spanId) {
                 .singleOrEmpty();
     }
 
+    @WithSpan
+    public Mono<Map<UUID, UUID>> getProjectIdsBySpanIds(@NonNull Set<UUID> spanIds) {
+        if (spanIds.isEmpty()) {
+            return Mono.just(Map.of());
+        }
+
+        return Mono.from(connectionFactory.create())
+                .flatMapMany(connection -> {
+
+                    var statement = connection.createStatement(SELECT_SPAN_ID_AND_PROJECT)
+                            .bind("spanIds", spanIds.toArray(UUID[]::new));
+
+                    return makeFluxContextAware(bindWorkspaceIdToFlux(statement));
+                })
+                .flatMap(result -> result.map((row, rowMetadata) -> Map.entry(
+                        row.get("id", UUID.class),
+                        row.get("project_id", UUID.class)
+                )))
+                .collectMap(Map.Entry::getKey, Map.Entry::getValue);
+    }
+
     @WithSpan
     public Mono<ProjectStats> getStats(@NonNull SpanSearchCriteria searchCriteria) {
 
diff --git a/apps/opik-backend/src/main/java/com/comet/opik/domain/TraceDAO.java b/apps/opik-backend/src/main/java/com/comet/opik/domain/TraceDAO.java
index 6aaf555d2a6..2b9dc79bd43 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/domain/TraceDAO.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/domain/TraceDAO.java
@@ -90,6 +90,8 @@ interface TraceDAO {
 
     Mono<List<WorkspaceAndResourceId>> getTraceWorkspace(Set<UUID> traceIds, Connection connection);
 
+    Mono<Map<UUID, UUID>> getProjectIdsByTraceIds(Set<UUID> traceIds, Connection connection);
+
     Mono<Long> batchInsert(List<Trace> traces, Connection connection);
 
     Flux<WorkspaceTraceCount> countTracesPerWorkspace(Connection connection);
@@ -921,6 +923,16 @@ ORDER BY (workspace_id, project_id, trace_id, parent_span_id, id) DESC, last_upd
             ;
             """;
 
+    private static final String SELECT_TRACE_ID_AND_PROJECT = """
+            SELECT
+                id,
+                project_id
+            FROM traces
+            WHERE id IN :traceIds
+            AND workspace_id = :workspace_id
+            ;
+            """;
+
     /**
      * This query is used when updates are processed before inserts, and the trace does not exist in the database.
      * <p>
@@ -2563,6 +2575,23 @@ public Mono<List<WorkspaceAndResourceId>> getTraceWorkspace(
                 .collectList();
     }
 
+    @Override
+    @WithSpan
+    public Mono<Map<UUID, UUID>> getProjectIdsByTraceIds(@NonNull Set<UUID> traceIds, @NonNull Connection connection) {
+
+        if (traceIds.isEmpty()) {
+            return Mono.just(Map.of());
+        }
+
+        var statement = connection.createStatement(SELECT_TRACE_ID_AND_PROJECT)
+                .bind("traceIds", traceIds.toArray(UUID[]::new));
+
+        return makeMonoContextAware(bindWorkspaceIdToMono(statement))
+                .flatMapMany(result -> result.map((row, rowMetadata) ->
+                        new java.util.AbstractMap.SimpleEntry<>(row.get("id", UUID.class), row.get("project_id", UUID.class))))
+                .collectMap(java.util.Map.Entry::getKey, java.util.Map.Entry::getValue);
+    }
+
     @Override
     @WithSpan
     public Mono<Long> batchInsert(@NonNull List<Trace> traces, @NonNull Connection connection) {

From 8bd2003f826321dfaf12b9f40e572a9b84b54f3d Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 17 Sep 2025 17:58:41 -0600
Subject: [PATCH 33/39] make comment service more lean

---
 .../com/comet/opik/domain/CommentService.java | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java b/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java
index 645b0628600..4b4b34b50c5 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java
@@ -12,9 +12,11 @@
 import reactor.core.publisher.Mono;
 import com.comet.opik.infrastructure.db.TransactionTemplateAsync;
 import java.util.List;
+import java.util.Map;
 
 import java.util.Set;
 import java.util.UUID;
+import jakarta.ws.rs.BadRequestException;
 
 import static com.comet.opik.utils.ErrorUtils.failWithNotFound;
 
@@ -92,42 +94,40 @@ public Mono<Long> deleteByEntityIds(CommentDAO.EntityType entityType, Set<UUID>
 
     @Override
     public Mono<Long> createBatchForTraces(@NonNull Set<UUID> traceIds, @NonNull String text) {
-        if (traceIds.isEmpty()) {
-            return Mono.just(0L);
-        }
-
-        List<UUID> ids = traceIds.stream().toList();
-
-        return transactionTemplateAsync
-                .nonTransaction(connection -> traceDAO.getProjectIdsByTraceIds(traceIds, connection))
-                .flatMap(map -> {
-                    if (map.size() != ids.size()) {
-                        return Mono.error(new jakarta.ws.rs.BadRequestException("Some traces were not found in the workspace"));
-                    }
-                    List<UUID> projectIds = ids.stream().map(map::get).toList();
-                    List<UUID> generatedIds = ids.stream().map(__ -> idGenerator.generateId()).toList();
-                    return commentDAO.addCommentsBatch(CommentDAO.EntityType.TRACE, ids, generatedIds, projectIds,
-                            Comment.builder().text(text).build());
-                });
+        return createBatch(
+                traceIds,
+                text,
+                transactionTemplateAsync.nonTransaction(connection -> traceDAO.getProjectIdsByTraceIds(traceIds, connection)),
+                CommentDAO.EntityType.TRACE);
     }
 
     @Override
     public Mono<Long> createBatchForSpans(@NonNull Set<UUID> spanIds, @NonNull String text) {
-        if (spanIds.isEmpty()) {
+        return createBatch(
+                spanIds,
+                text,
+                spanDAO.getProjectIdsBySpanIds(spanIds),
+                CommentDAO.EntityType.SPAN);
+    }
+
+    private Mono<Long> createBatch(Set<UUID> idsSet,
+                                   String text,
+                                   Mono<Map<UUID, UUID>> idsToProjectIds,
+                                   CommentDAO.EntityType entityType) {
+        if (idsSet.isEmpty()) {
             return Mono.just(0L);
         }
 
-        List<UUID> ids = spanIds.stream().toList();
-
-        return spanDAO.getProjectIdsBySpanIds(spanIds)
-                .flatMap(map -> {
-                    if (map.size() != ids.size()) {
-                        return Mono.error(new jakarta.ws.rs.BadRequestException("Some spans were not found in the workspace"));
-                    }
-                    List<UUID> projectIds = ids.stream().map(map::get).toList();
-                    List<UUID> generatedIds = ids.stream().map(__ -> idGenerator.generateId()).toList();
-                    return commentDAO.addCommentsBatch(CommentDAO.EntityType.SPAN, ids, generatedIds, projectIds,
-                            Comment.builder().text(text).build());
-                });
+        List<UUID> ids = idsSet.stream().toList();
+
+        return idsToProjectIds.flatMap(map -> {
+            if (map.size() != ids.size()) {
+                return Mono.error(new BadRequestException("Some entities were not found in the workspace"));
+            }
+            List<UUID> projectIds = ids.stream().map(map::get).toList();
+            List<UUID> generatedIds = ids.stream().map(__ -> idGenerator.generateId()).toList();
+            return commentDAO.addCommentsBatch(entityType, ids, generatedIds, projectIds,
+                    Comment.builder().text(text).build());
+        });
     }
 }

From 1f4e3d6767aa784b8048a7351ae99e8ce74a0e78 Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 17 Sep 2025 18:09:59 -0600
Subject: [PATCH 34/39] improve test

---
 .../utils/resources/TraceResourceClient.java         |  4 ++--
 .../api/resources/v1/priv/TracesResourceTest.java    | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/TraceResourceClient.java b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/TraceResourceClient.java
index 73485949dd3..e9774f05002 100644
--- a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/TraceResourceClient.java
+++ b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/TraceResourceClient.java
@@ -175,7 +175,7 @@ public Response callTraceCommentsBatchCreate(List<UUID> ids, String text, String
                 .request()
                 .header(HttpHeaders.AUTHORIZATION, apiKey)
                 .header(WORKSPACE_HEADER, workspaceName)
-                .post(Entity.json(new CommentsBatchCreate(ids, text)));
+                .post(Entity.json(CommentsBatchCreate.builder().ids(Set.copyOf(ids)).text(text).build()));
     }
 
     public Trace getById(UUID id, String workspaceName, String apiKey) {
@@ -624,6 +624,6 @@ public Response callBatchCreateTracesWithCookie(List<Trace> traces, String sessi
                 .accept(MediaType.APPLICATION_JSON_TYPE)
                 .cookie(RequestContext.SESSION_COOKIE, sessionToken)
                 .header(WORKSPACE_HEADER, workspaceName)
-                .post(Entity.json(new TraceBatch(traces)));
+                .post(Entity.json(TraceBatch.builder().traces(traces).build()));
     }
 }
diff --git a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/TracesResourceTest.java b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/TracesResourceTest.java
index 9e52c0f8b4c..c35e86455fe 100644
--- a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/TracesResourceTest.java
+++ b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/TracesResourceTest.java
@@ -5048,6 +5048,13 @@ void createTraceCommentsBatch_Success() {
         var ids = traces.stream().limit(3).map(Trace::id).toList();
         var response = traceResourceClient.callTraceCommentsBatchCreate(ids, "hello", API_KEY, TEST_WORKSPACE);
         assertThat(response.getStatus()).isEqualTo(org.apache.http.HttpStatus.SC_NO_CONTENT);
+
+        for (UUID id : ids) {
+            var trace = traceResourceClient.getById(id, TEST_WORKSPACE, API_KEY);
+            assertThat(trace.comments()).isNotNull();
+            assertThat(trace.comments().size()).isEqualTo(1);
+            assertThat(trace.comments().getFirst().text()).isEqualTo("hello");
+        }
     }
 
     @Test
@@ -5065,10 +5072,7 @@ void createTraceCommentsBatch_ValidationErrors() {
 
     @Test
     void createTraceCommentsBatch_OverLimit() {
-        var traces = PodamFactoryUtils.manufacturePojoList(factory, Trace.class);
-        traceResourceClient.batchCreateTraces(traces, API_KEY, TEST_WORKSPACE);
-
-        var ids = traces.stream().limit(11).map(Trace::id).toList();
+        var ids = java.util.stream.IntStream.range(0, 1001).mapToObj(i -> java.util.UUID.randomUUID()).toList();
         var response = traceResourceClient.callTraceCommentsBatchCreate(ids, "hello", API_KEY, TEST_WORKSPACE);
         assertThat(response.getStatus()).isEqualTo(org.apache.http.HttpStatus.SC_BAD_REQUEST);
     }

From d0ecbf31b4453b4b0c1b4d93111c198061098ee4 Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Wed, 17 Sep 2025 18:16:06 -0600
Subject: [PATCH 35/39] remove the tests now made useless by jakarta
 validations

---
 .../resources/v1/priv/TracesResourceTest.java | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/TracesResourceTest.java b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/TracesResourceTest.java
index c35e86455fe..66544f2cd4e 100644
--- a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/TracesResourceTest.java
+++ b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/TracesResourceTest.java
@@ -5057,26 +5057,6 @@ void createTraceCommentsBatch_Success() {
         }
     }
 
-    @Test
-    void createTraceCommentsBatch_ValidationErrors() {
-        var traces = PodamFactoryUtils.manufacturePojoList(factory, Trace.class);
-        traceResourceClient.batchCreateTraces(traces, API_KEY, TEST_WORKSPACE);
-
-        var responseEmptyIds = traceResourceClient.callTraceCommentsBatchCreate(java.util.List.of(), "x", API_KEY, TEST_WORKSPACE);
-        assertThat(responseEmptyIds.getStatus()).isEqualTo(org.apache.http.HttpStatus.SC_BAD_REQUEST);
-
-        var ids = traces.stream().limit(1).map(Trace::id).toList();
-        var responseBlankText = traceResourceClient.callTraceCommentsBatchCreate(ids, "  ", API_KEY, TEST_WORKSPACE);
-        assertThat(responseBlankText.getStatus()).isEqualTo(org.apache.http.HttpStatus.SC_BAD_REQUEST);
-    }
-
-    @Test
-    void createTraceCommentsBatch_OverLimit() {
-        var ids = java.util.stream.IntStream.range(0, 1001).mapToObj(i -> java.util.UUID.randomUUID()).toList();
-        var response = traceResourceClient.callTraceCommentsBatchCreate(ids, "hello", API_KEY, TEST_WORKSPACE);
-        assertThat(response.getStatus()).isEqualTo(org.apache.http.HttpStatus.SC_BAD_REQUEST);
-    }
-
     @Test
     void createTraceCommentsBatch_MixedWorkspace_BadRequest() {
         var trace1 = factory.manufacturePojo(Trace.class);

From a8c8f526c148cc61cd9732a4f88696b4eb88c2fc Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Fri, 19 Sep 2025 19:16:14 -0600
Subject: [PATCH 36/39] add batch commenting of spans EP

---
 .../api/resources/v1/priv/SpansResource.java  | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/SpansResource.java b/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/SpansResource.java
index 0d8e3053014..b3443547c6f 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/SpansResource.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/SpansResource.java
@@ -4,6 +4,7 @@
 import com.comet.opik.api.BatchDelete;
 import com.comet.opik.api.Comment;
 import com.comet.opik.api.DeleteFeedbackScore;
+import com.comet.opik.api.CommentsBatchCreate;
 import com.comet.opik.api.FeedbackDefinition;
 import com.comet.opik.api.FeedbackScore;
 import com.comet.opik.api.FeedbackScoreBatchContainer;
@@ -495,4 +496,27 @@ public Response deleteSpanComments(
 
         return Response.noContent().build();
     }
+
+    @POST
+    @Path("/comments/batch")
+    @Operation(operationId = "createSpanCommentsBatch", summary = "Create comments for multiple spans", description = "Create the same comment text for multiple span IDs (max 1K per request)", responses = {
+            @ApiResponse(responseCode = "204", description = "No Content"),
+            @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(schema = @Schema(implementation = ErrorMessage.class))),
+            @ApiResponse(responseCode = "404", description = "Not found", content = @Content(schema = @Schema(implementation = ErrorMessage.class)))})
+    @RateLimited
+    public Response createSpanCommentsBatch(
+            @RequestBody(content = @Content(schema = @Schema(implementation = CommentsBatchCreate.class))) @NotNull @Valid CommentsBatchCreate payload) {
+
+        String workspaceId = requestContext.get().getWorkspaceId();
+
+        log.info("Creating span comments batch with size '{}' on workspaceId '{}'", payload.ids().size(), workspaceId);
+
+        commentService.createBatchForSpans(payload.ids(), payload.text())
+                .contextWrite(ctx -> setRequestContext(ctx, requestContext))
+                .block();
+
+        log.info("Created span comments batch with size '{}' on workspaceId '{}'", payload.ids().size(), workspaceId);
+
+        return Response.noContent().build();
+    }
 }

From 184c4619d135eb947098cdcb994969b8bd610561 Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Fri, 19 Sep 2025 19:18:48 -0600
Subject: [PATCH 37/39] add tests for batch commenting feature

---
 .../utils/resources/SpanResourceClient.java     | 11 +++++++++++
 .../resources/v1/priv/SpansResourceTest.java    | 17 +++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/SpanResourceClient.java b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/SpanResourceClient.java
index 5ca8a853f0f..678331618c5 100644
--- a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/SpanResourceClient.java
+++ b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/SpanResourceClient.java
@@ -32,6 +32,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.Set;
 
 import static com.comet.opik.api.FeedbackScoreItem.FeedbackScoreBatchItem;
 import static com.comet.opik.api.resources.utils.TestUtils.getIdFromLocation;
@@ -165,6 +166,16 @@ public Span getById(UUID id, String workspaceName, String apiKey) {
         }
     }
 
+    public Response callSpanCommentsBatchCreate(java.util.List<UUID> ids, String text, String apiKey, String workspaceName) {
+        return client.target(RESOURCE_PATH.formatted(baseURI))
+                .path("comments")
+                .path("batch")
+                .request()
+                .header(HttpHeaders.AUTHORIZATION, apiKey)
+                .header(WORKSPACE_HEADER, workspaceName)
+                .post(Entity.json(CommentsBatchCreate.builder().ids(Set.copyOf(ids)).text(text).build()));
+    }
+
     public Response callGetSpanIdApi(UUID id, String workspaceName, String apiKey) {
         return client.target(RESOURCE_PATH.formatted(baseURI))
                 .path(id.toString())
diff --git a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/SpansResourceTest.java b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/SpansResourceTest.java
index fc326509a7c..984eda3dc28 100644
--- a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/SpansResourceTest.java
+++ b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/SpansResourceTest.java
@@ -216,6 +216,23 @@ class SpansResourceTest {
         EXCLUDE_FUNCTIONS.put(Span.SpanField.DURATION, it -> it.toBuilder().duration(null).build());
     }
 
+    @Test
+    void createSpanCommentsBatch_Success() {
+        var spans = PodamFactoryUtils.manufacturePojoList(factory, Span.class);
+        spanResourceClient.batchCreateSpans(spans, API_KEY, TEST_WORKSPACE);
+
+        var ids = spans.stream().limit(3).map(Span::id).toList();
+        var response = spanResourceClient.callSpanCommentsBatchCreate(ids, "hello", API_KEY, TEST_WORKSPACE);
+        assertThat(response.getStatus()).isEqualTo(org.apache.http.HttpStatus.SC_NO_CONTENT);
+
+        for (UUID id : ids) {
+            var span = spanResourceClient.getById(id, TEST_WORKSPACE, API_KEY);
+            assertThat(span.comments()).isNotNull();
+            assertThat(span.comments().size()).isEqualTo(1);
+            assertThat(span.comments().getFirst().text()).isEqualTo("hello");
+        }
+    }
+
     private final RedisContainer REDIS = RedisContainerUtils.newRedisContainer();
     private final MySQLContainer<?> MY_SQL_CONTAINER = MySQLContainerUtils.newMySQLContainer();
     private final GenericContainer<?> ZOOKEEPER_CONTAINER = ClickHouseContainerUtils.newZookeeperContainer();

From 747b89a09f59e4e104a9b488030d5155303381b4 Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Fri, 19 Sep 2025 19:24:50 -0600
Subject: [PATCH 38/39] improve logs by not printing long

---
 .../com/comet/opik/api/resources/v1/priv/SpansResource.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/SpansResource.java b/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/SpansResource.java
index b3443547c6f..0dec7f289bc 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/SpansResource.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/priv/SpansResource.java
@@ -486,13 +486,13 @@ public Response deleteSpanComments(
 
         String workspaceId = requestContext.get().getWorkspaceId();
 
-        log.info("Delete span comments with ids '{}' on workspaceId '{}'", batchDelete.ids(), workspaceId);
+        log.info("Delete span comments with size '{}' on workspaceId '{}'", batchDelete.ids().size(), workspaceId);
 
         commentService.delete(batchDelete)
                 .contextWrite(ctx -> setRequestContext(ctx, requestContext))
                 .block();
 
-        log.info("Deleted span comments with ids '{}' on workspaceId '{}'", batchDelete.ids(), workspaceId);
+        log.info("Deleted span comments with size '{}' on workspaceId '{}'", batchDelete.ids().size(), workspaceId);
 
         return Response.noContent().build();
     }

From 75103fb3287c79725d66252eb4a0ee5768a34d83 Mon Sep 17 00:00:00 2001
From: vladimirrotariu <rotariuvladimir@gmail.com>
Date: Fri, 19 Sep 2025 19:28:27 -0600
Subject: [PATCH 39/39] revert the configs to original values

---
 apps/opik-frontend/.env.development           |  2 +-
 .../docker-compose.override.yaml              |  2 +-
 deployment/docker-compose/docker-compose.yaml | 25 ++++++++++++++++---
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/apps/opik-frontend/.env.development b/apps/opik-frontend/.env.development
index 57e9628b758..0ed5235aae4 100644
--- a/apps/opik-frontend/.env.development
+++ b/apps/opik-frontend/.env.development
@@ -1,2 +1,2 @@
 VITE_BASE_URL=/
-VITE_BASE_API_URL=http://localhost:8080
+VITE_BASE_API_URL=/api
\ No newline at end of file
diff --git a/deployment/docker-compose/docker-compose.override.yaml b/deployment/docker-compose/docker-compose.override.yaml
index cf916dbdc06..8d156416842 100644
--- a/deployment/docker-compose/docker-compose.override.yaml
+++ b/deployment/docker-compose/docker-compose.override.yaml
@@ -28,7 +28,7 @@ services:
 
   python-backend:
     ports:
-      - "8001:8000" # Exposing Python backend HTTP port to host on 8001 to avoid conflicts
+      - "8000:8000" # Exposing Python backend HTTP port to host
 
   frontend:
     ports:
diff --git a/deployment/docker-compose/docker-compose.yaml b/deployment/docker-compose/docker-compose.yaml
index 39c3c78aa00..1864487fdf6 100644
--- a/deployment/docker-compose/docker-compose.yaml
+++ b/deployment/docker-compose/docker-compose.yaml
@@ -71,7 +71,7 @@ services:
         condition: service_completed_successfully
 
   zookeeper:
-    image: docker.io/bitnami/zookeeper:3.9.3-debian-12-r16
+    image: docker.io/bitnamilegacy/zookeeper:3.9.3-debian-12-r16
     hostname: zookeeper
     environment:
       ZOO_MY_ID: 1
@@ -113,6 +113,9 @@ services:
   backend:
     image: ghcr.io/comet-ml/opik/opik-backend:${OPIK_VERSION:-latest}
     pull_policy: always
+    profiles:
+      - backend
+      - opik
     build:
       context: ../../apps/opik-backend
       dockerfile: Dockerfile
@@ -123,6 +126,8 @@ services:
     environment:
       # WARNING: Do not set OPIK_VERSION as env var here. It's a multi-stage build, so build and runtime values can differ.
       DOCKER_BUILDKIT: 1
+      # Persistent anonymous installation ID passed from launcher script
+      OPIK_ANONYMOUS_ID: ${OPIK_ANONYMOUS_ID:-}
       STATE_DB_PROTOCOL: "jdbc:mysql://"
       STATE_DB_URL: "mysql:3306/opik?createDatabaseIfNotExist=true&rewriteBatchedStatements=true"
       STATE_DB_DATABASE_NAME: opik
@@ -147,7 +152,6 @@ services:
       OTEL_EXPERIMENTAL_RESOURCE_DISABLED_KEYS: process.command_args
       OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE: delta
       OPIK_USAGE_REPORT_ENABLED: ${OPIK_USAGE_REPORT_ENABLED:-true}
-      CORS: true
       AWS_ACCESS_KEY_ID: ${MINIO_ROOT_USER:-THAAIOSFODNN7EXAMPLE}
       AWS_SECRET_ACCESS_KEY: ${MINIO_ROOT_PASSWORD:-LESlrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY}
       PYTHON_EVALUATOR_URL: http://python-backend:8000
@@ -157,8 +161,8 @@ services:
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://localhost:8080/health-check" ]
       interval: 1s
-      timeout: 30s
-      retries: 30
+      timeout: 600s
+      retries: 600
       start_period: 1s
     depends_on:
       mysql:
@@ -173,6 +177,9 @@ services:
   python-backend:
     image: ghcr.io/comet-ml/opik/opik-python-backend:${OPIK_VERSION:-latest}
     pull_policy: always
+    profiles:
+      - backend
+      - opik
     build:
       context: ../../apps/opik-python-backend
       dockerfile: Dockerfile
@@ -214,6 +221,8 @@ services:
   demo-data-generator:
     image: ghcr.io/comet-ml/opik/opik-python-backend:${OPIK_VERSION:-latest}
     pull_policy: always
+    profiles:
+      - opik
     build:
       context: ../../apps/opik-python-backend
       dockerfile: Dockerfile
@@ -231,14 +240,18 @@ services:
   frontend:
     image: ghcr.io/comet-ml/opik/opik-frontend:${OPIK_VERSION:-latest}
     pull_policy: always
+    profiles:
+      - opik
     build:
       context: ../../apps/opik-frontend
       dockerfile: Dockerfile
     hostname: frontend
     ports:
       - "5173:5173" # Frontend server port
+      - "2020:2020" # Fluent Bit HTTP server (when enabled)
     volumes:
       - ./nginx_${OPIK_FRONTEND_FLAVOR:-default}_local.conf:/etc/nginx/conf.d/default.conf
+      - ./fluent-bit.conf:/etc/fluent-bit/fluent-bit.conf:ro
     depends_on:
       backend:
         condition: service_healthy
@@ -250,6 +263,10 @@ services:
       start_period: 1s
     environment:
       OPIK_VERSION: ${OPIK_VERSION:-latest}
+      # OTEL log shipping configuration (Fluent Bit integrated in frontend container)
+      ENABLE_OTEL_LOG_EXPORT: ${ENABLE_OTEL_LOG_EXPORT:-false}
+      OTEL_COLLECTOR_HOST: ${OTEL_COLLECTOR_HOST:-otel-collector}
+      OTEL_COLLECTOR_PORT: ${OTEL_COLLECTOR_PORT:-4317}
 
 networks:
   default: