[feat]: annotation queues checkpoint 1

api/oss/src/core/annotations/service.py

@@ -34,6 +34,9 @@
     first_link,
     parse_simple_trace,
 )
+from oss.src.core.tracing.dtos import (
+    SimpleTraceReferences,
+)
 from oss.src.core.annotations.types import (
     AnnotationOrigin,
     AnnotationKind,
@@ -378,10 +381,6 @@ async def edit(
             is_evaluation=annotation.kind == AnnotationKind.EVAL,
         )
 
-        annotation_references = AnnotationReferences(
-            **annotation.references.model_dump(),
-        )
-
         annotation_link = await self._edit_annotation(
             organization_id=organization_id,
             project_id=project_id,
@@ -395,8 +394,8 @@ async def edit(
             #
             data=annotation_edit.data,
             #
-            references=annotation_references,
-            links=annotation.links,
+            references=annotation_edit.references,
+            links=annotation_edit.links,
         )
 
         if annotation_link is None:
@@ -466,13 +465,7 @@ async def query(
         annotation_tags = annotation.tags if annotation else None
         annotation_meta = annotation.meta if annotation else None
 
-        annotation_references = (
-            AnnotationReferences(
-                **annotation.references.model_dump(),
-            )
-            if annotation and annotation.references
-            else None
-        )
+        annotation_references = annotation.references if annotation else None
 
         _annotation_links = annotation.links if annotation else None
 
@@ -734,7 +727,7 @@ async def _query_annotation(
         tags: Optional[Tags] = None,
         meta: Optional[Meta] = None,
         #
-        references: Optional[AnnotationReferences] = None,
+        references: Optional[SimpleTraceReferences] = None,
         links: Optional[AnnotationLinks] = None,
         #
         annotation_links: Optional[List[Link]] = None,

api/oss/src/core/evaluations/service.py

@@ -3705,7 +3705,7 @@ def _parse_queue(
             description=queue.description,
             #
             created_at=queue.created_at,
-            updated_at=queue.updated_at,
+            updated_at=queue.updated_at or queue.created_at,
             deleted_at=queue.deleted_at,
             created_by_id=queue.created_by_id,
             updated_by_id=queue.updated_by_id,

api/oss/src/core/tracing/dtos.py

@@ -333,6 +333,8 @@ class SimpleTraceEdit(BaseModel):
     meta: Optional[Meta] = None
 
     data: Data
+    references: Optional[SimpleTraceReferences] = None
+    links: Optional[SimpleTraceLinks] = None
 
 
 class SimpleTraceQuery(BaseModel):

api/oss/src/dbs/postgres/evaluations/dao.py

@@ -286,6 +286,7 @@ async def edit_run(
                 return None
 
             run_flags = run_dbe.flags or {}
+            base_flags = EvaluationRunFlags(**run_flags)
 
             if run_flags.get("is_closed", False):
                 raise EvaluationClosedConflict(
@@ -294,7 +295,10 @@ async def edit_run(
 
             run_references = edit_run_references(run)
 
-            run.flags = edit_run_flags(run)
+            run.flags = edit_run_flags(
+                run,
+                base_flags=base_flags,
+            )
 
             run_dbe = edit_dbe_from_dto(
                 dbe=run_dbe,
@@ -348,6 +352,7 @@ async def edit_runs(
 
             for run_dbe in run_dbes:
                 run_flags = run_dbe.flags or {}
+                base_flags = EvaluationRunFlags(**run_flags)
 
                 if run_flags.get("is_closed", False):
                     raise EvaluationClosedConflict(
@@ -364,7 +369,10 @@ async def edit_runs(
 
                 run_references = edit_run_references(run)
 
-                run.flags = edit_run_flags(run)
+                run.flags = edit_run_flags(
+                    run,
+                    base_flags=base_flags,
+                )
 
                 run_dbe = edit_dbe_from_dto(
                     dbe=run_dbe,

api/oss/src/dbs/postgres/evaluations/utils.py

@@ -72,13 +72,24 @@ def query_run_references(
 
 def _make_run_flags(
     run: Optional[Union[EvaluationRun, EvaluationRunEdit]] = None,
+    *,
+    base_flags: Optional[EvaluationRunFlags] = None,
 ) -> Optional[EvaluationRunFlags]:
-    flags = EvaluationRunFlags()
+    if not run:
+        return base_flags.model_copy(deep=True) if base_flags else EvaluationRunFlags()
 
-    if not run or not run.data or not run.data.steps:
-        return flags
+    flags = base_flags.model_copy(deep=True) if base_flags else EvaluationRunFlags()
 
-    flags = run.flags or EvaluationRunFlags()
+    if run.flags:
+        explicit_updates = {
+            field_name: getattr(run.flags, field_name)
+            for field_name in run.flags.model_fields_set
+        }
+        if explicit_updates:
+            flags = flags.model_copy(update=explicit_updates)
+
+    if not run.data or not run.data.steps:
+        return flags
 
     flags.has_queries = False
     flags.has_testsets = False
@@ -131,5 +142,7 @@ def create_run_flags(
 
 def edit_run_flags(
     run: Optional[EvaluationRunEdit] = None,
+    *,
+    base_flags: Optional[EvaluationRunFlags] = None,
 ) -> Optional[EvaluationRunFlags]:
-    return _make_run_flags(run)
+    return _make_run_flags(run, base_flags=base_flags)

web/ee/next.config.ts

@@ -28,6 +28,8 @@ const config = {
             "@agenta/entity-ui",
             "@agenta/playground",
             "@agenta/playground-ui",
+            "@agenta/annotation",
+            "@agenta/annotation-ui",
         ],
     },
     typescript: {

web/ee/package.json

@@ -19,6 +19,8 @@
         "types:watch": "tsc -w"
     },
     "dependencies": {
+        "@agenta/annotation": "workspace:../packages/agenta-annotation",
+        "@agenta/annotation-ui": "workspace:../packages/agenta-annotation-ui",
         "@agenta/entities": "workspace:../packages/agenta-entities",
         "@agenta/entity-ui": "workspace:../packages/agenta-entity-ui",
         "@agenta/oss": "workspace:../oss",

web/ee/src/pages/w/[workspace_id]/p/[project_id]/annotations/[queue_id].tsx

@@ -0,0 +1,3 @@
+import AnnotationSessionPage from "@agenta/oss/src/pages/w/[workspace_id]/p/[project_id]/annotations/[queue_id]"
+
+export default AnnotationSessionPage

web/ee/src/pages/w/[workspace_id]/p/[project_id]/annotations/index.tsx

@@ -0,0 +1,3 @@
+import AnnotationQueuesPage from "@agenta/oss/src/pages/w/[workspace_id]/p/[project_id]/annotations"
+
+export default AnnotationQueuesPage

web/oss/next.config.ts

@@ -65,6 +65,8 @@ const COMMON_CONFIG: NextConfig = {
             "@agenta/entity-ui",
             "@agenta/playground",
             "@agenta/playground-ui",
+            "@agenta/annotation",
+            "@agenta/annotation-ui",
             // Icon libraries - ensure tree-shaking works for individual icon imports
             "@phosphor-icons/react",
             "lucide-react",
@@ -78,6 +80,8 @@ const COMMON_CONFIG: NextConfig = {
         "@agenta/entity-ui",
         "@agenta/playground",
         "@agenta/playground-ui",
+        "@agenta/annotation",
+        "@agenta/annotation-ui",
         ...(!isDevelopment
             ? [
                   "rc-util",

web/oss/package.json

@@ -19,6 +19,8 @@
         "types:watch": "tsc -w"
     },
     "dependencies": {
+        "@agenta/annotation": "workspace:../packages/agenta-annotation",
+        "@agenta/annotation-ui": "workspace:../packages/agenta-annotation-ui",
         "@agenta/entities": "workspace:../packages/agenta-entities",
         "@agenta/entity-ui": "workspace:../packages/agenta-entity-ui",
         "@agenta/playground": "workspace:../packages/agenta-playground",