[feat][evaluation]fix aggr (#388)

* fix annotation aggr

* fix 乐观锁

* fix trajectory

---------

Co-authored-by: tpfz <tpfz@bytedance.com>

Author: 2 people

backend/kitex_gen/coze/loop/evaluation/expt/coze.loop.evaluation.expt.go

@@ -742,6 +742,7 @@ func (e *experimentApplication) BatchGetExperimentResult_(ctx context.Context, r
 		BaseExptID:     req.BaselineExperimentID,
 		Page:           page,
 		UseAccelerator: req.GetUseAccelerator(),
+		FullTrajectory: req.GetFullTrajectory(),
 	}
 	if err = buildExptTurnResultFilter(req, param); err != nil {
 		return nil, err

backend/kitex_gen/coze/loop/evaluation/expt/k-coze.loop.evaluation.expt.go

@@ -330,6 +330,8 @@ type MGetExperimentResultParam struct {
 	FilterAccelerators map[int64]*ExptTurnResultFilterAccelerator
 	UseAccelerator     bool
 	Page               Page
+	// FullTrajectory 表示在构建 eval_target_result 时是否需要包含轨迹（trajectory）相关信息
+	FullTrajectory bool
 }
 
 type MGetExperimentReportResult struct {

backend/modules/evaluation/application/experiment_app.go

@@ -563,6 +563,30 @@ func (e *ExptAggrResultServiceImpl) CreateAnnotationAggrResult(ctx context.Conte
 		return errorx.NewByCode(errno.CommonInvalidParamCode, errorx.WithExtraMsg("invalid field type"))
 	}
 
+	// 检查 ExptAggrResult 记录是否已存在，如果存在则走 Update 逻辑
+	exptAggrRes, err := e.exptAggrResultRepo.GetExptAggrResult(ctx, param.ExperimentID, int32(entity.FieldType_Annotation), param.FieldKey)
+	if err == nil && exptAggrRes != nil {
+		// 记录已存在，转换为 UpdateExptAggrResultParam 并调用 UpdateAnnotationAggrResult
+		logs.CtxInfo(ctx, "create annotation aggr result already exists, updating, experiment_id: %d, field_type: %s, field_key: %s", param.ExperimentID, param.FieldType, param.FieldKey)
+		updateParam := &entity.UpdateExptAggrResultParam{
+			SpaceID:      param.SpaceID,
+			ExperimentID: param.ExperimentID,
+			FieldType:    param.FieldType,
+			FieldKey:     param.FieldKey,
+		}
+		return e.UpdateAnnotationAggrResult(ctx, updateParam)
+	}
+
+	// 如果错误不是 ResourceNotFound，则返回错误
+	statusErr, ok := errorx.FromStatusError(err)
+	if ok && statusErr.Code() == errno.ResourceNotFoundCode {
+		// 记录不存在，继续原有的 create 逻辑
+		logs.CtxInfo(ctx, "create annotation aggr result doesn't exist, experiment_id: %d, field_type: %s, field_key: %s", param.ExperimentID, param.FieldType, param.FieldKey)
+	} else {
+		// 其他错误，直接返回
+		return err
+	}
+
 	tagKeyID, err := strconv.ParseInt(param.FieldKey, 10, 64)
 	if err != nil {
 		return err