From 5678afcd554c3abb1e4de5a34bebcb2280b3aac4 Mon Sep 17 00:00:00 2001 From: d-robotics Date: Thu, 19 Nov 2026 11:35:20 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Restore=20source=20history=20in?= =?UTF-8?q?=20final=20acceptance=20trace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CONTEXT.md | 2 +- internal/api/human_loop.go | 3 +- internal/api/review_trace.go | 144 +++++++++++++++++--- internal/api/review_trace_browser_test.go | 50 +++++-- internal/api/review_trace_test.go | 98 +++++++++++++ src/components/FinalAcceptanceWorkspace.tsx | 8 +- src/components/ReviewTrace.tsx | 64 ++++++--- src/pages/AnnotationOperations.tsx | 6 +- tests/browser/review-trace.mjs | 31 ++--- 9 files changed, 336 insertions(+), 70 deletions(-) diff --git a/CONTEXT.md b/CONTEXT.md index 245c65ce..d7523cc3 100644 --- a/CONTEXT.md +++ b/CONTEXT.md @@ -110,7 +110,7 @@ _Avoid_:公共可领取任务池(其中的任务尚未归属当前标注员 ## 审查 -**审查追溯**:已授权任务的只读事件投影。任务来源与流转记录合并为右栏顶部的一张可折叠卡片,标题行显示当前版本与打回次数,默认展示最近两条流转;普通任务卡可批量附加人员、供应商和退回统计。缺失值用 `-`,已知零次保留 `0`;版本来自修订字段,退回次数来自正式退回事件,不使用轮数或版本相减。历史没有创建起点时,首次提交和总退回次数保留未知。最终验收继续遵守供应商匿名规则。辅助统计失败不阻断任务列表,不回填或改写历史数据。 +**审查追溯**:已授权任务的只读事件投影。任务来源与流转记录合并为右栏顶部的一张可折叠卡片,标题行显示当前版本与打回次数,默认展示最近两条流转;普通任务卡可批量附加人员、供应商和退回统计。缺失值用 `-`,已知零次保留 `0`;版本来自修订字段,退回次数来自正式退回事件,不使用轮数或版本相减。历史没有创建起点时,首次提交和总退回次数保留未知。最终验收按当前来源分段展示送检与质检流转和验收所依据的标注版本,分别显示该分段的质检退回次数与验收任务的验收退回次数。来源流转不展示人员身份,供应商继续遵守匿名规则。辅助统计失败不阻断任务列表,不回填或改写历史数据。 **审查**:质检审核与最终验收的统称,操作者核对已有结果、记录问题并作出通过或退回决定,不直接修改原标注结果。 diff --git a/internal/api/human_loop.go b/internal/api/human_loop.go index fd0a5e89..02ad1815 100644 --- a/internal/api/human_loop.go +++ b/internal/api/human_loop.go @@ -2886,7 +2886,8 @@ func (server *server) ensureFanyuV5PrePackageAcceptance(ctx context.Context, sou } aggregate = append(aggregate, map[string]any{ "taskId": task.ID, "runId": task.RunID, "sourceHumanItemId": humanItem.ID, - "clipArtifactId": task.ArtifactID, "sourceVideo": task.SourceVideo, + "annotationRevision": latestRevision.Revision, + "clipArtifactId": task.ArtifactID, "sourceVideo": task.SourceVideo, "clipStart": task.ClipStart, "clipEnd": task.ClipEnd, "finalSlices": acceptanceSlices, "annotation": latestRevision.Segments, "poseSummary": poseSummary, "materialization": materialization, diff --git a/internal/api/review_trace.go b/internal/api/review_trace.go index daebc85a..f09b0caa 100644 --- a/internal/api/review_trace.go +++ b/internal/api/review_trace.go @@ -1,9 +1,12 @@ package api import ( + "context" "droboticflow/internal/domain" "net/http" + "slices" "sort" + "strings" ) type reviewTraceEvent struct { @@ -14,14 +17,15 @@ type reviewTraceEvent struct { Revision int `json:"revision"` } type reviewTrace struct { - Author string `json:"author"` - AuthorID string `json:"authorId"` - Supplier string `json:"supplier"` - FirstSubmittedAt string `json:"firstSubmittedAt"` - Revision int `json:"revision"` - Reviewer string `json:"reviewer"` - Rejections *int `json:"rejections"` - Events []reviewTraceEvent `json:"events"` + Author string `json:"author"` + AuthorID string `json:"authorId"` + Supplier string `json:"supplier"` + FirstSubmittedAt string `json:"firstSubmittedAt"` + Revision int `json:"revision"` + Reviewer string `json:"reviewer"` + Rejections *int `json:"rejections"` + QualityRejections *int `json:"qualityRejections"` + Events []reviewTraceEvent `json:"events"` } // This projection reads existing audit evidence; it never repairs or invents @@ -77,6 +81,7 @@ func (s *server) handleReviewTrace(w http.ResponseWriter, r *http.Request) { complete := false rejected := 0 first := "" + acceptance := item.CurrentStageID == fanyuV5PrePackageAcceptanceStageID for _, e := range events { if e.EventType == "created" { complete = true @@ -92,8 +97,14 @@ func (s *server) handleReviewTrace(w http.ResponseWriter, r *http.Request) { } case "approved", "combined_quality_approved": kind = "审核通过" + if acceptance { + kind = "验收通过" + } case "rejected", "combined_quality_rejected": kind = "审核退回" + if acceptance { + kind = "验收退回" + } rejected++ case "aggregate_acceptance_rejected": kind = "验收退回" @@ -108,14 +119,7 @@ func (s *server) handleReviewTrace(w http.ResponseWriter, r *http.Request) { if kind == "" { continue } - revision := intValue(e.Payload["revision"]) - if revision == 0 { - revision = intValue(e.Payload["annotationRevision"]) - } - if revision == 0 { - revision = intValue(e.Payload["reviewedRevision"]) - } - out.Events = append(out.Events, reviewTraceEvent{ID: e.ID, Kind: kind, Actor: name(e.ActorUserID), At: e.CreatedAt, Revision: revision}) + out.Events = append(out.Events, reviewTraceEvent{ID: e.ID, Kind: kind, Actor: name(e.ActorUserID), At: e.CreatedAt, Revision: traceEventRevision(e)}) } if complete { out.FirstSubmittedAt = first @@ -125,12 +129,114 @@ func (s *server) handleReviewTrace(w http.ResponseWriter, r *http.Request) { renderError(w, 500, err) return } - // Latest events first, identically in the compact panel and full history. - for i, j := 0, len(out.Events)-1; i < j; i, j = i+1, j-1 { - out.Events[i], out.Events[j] = out.Events[j], out.Events[i] + slices.Reverse(out.Events) + if acceptance { + if err := s.addAcceptanceSourceTrace(ctx, *item, events, r.URL.Query().Get("sourceItemId"), &out); err != nil { + renderError(w, 500, err) + return + } } + sort.SliceStable(out.Events, func(i, j int) bool { + return parseISOTime(out.Events[j].At).Before(parseISOTime(out.Events[i].At)) + }) renderJSON(w, http.StatusOK, out) } + +func traceEventRevision(event domain.HumanEventRecord) int { + for _, key := range []string{"revision", "annotationRevision", "reviewedRevision"} { + if revision := intValue(event.Payload[key]); revision > 0 { + return revision + } + } + return 0 +} + +func (s *server) addAcceptanceSourceTrace(ctx context.Context, item domain.HumanItemRecord, events []domain.HumanEventRecord, sourceID string, out *reviewTrace) error { + entries, _ := normalizeStructuredValue(item.Subject.Payload["items"]).([]any) + var entry map[string]any + for _, raw := range entries { + candidate, _ := raw.(map[string]any) + if (sourceID != "" && stringValue(candidate["sourceHumanItemId"]) == sourceID) || (sourceID == "" && len(entries) == 1) { + entry = candidate + break + } + } + sourceID = stringValue(entry["sourceHumanItemId"]) + taskID := stringValue(entry["taskId"]) + if sourceID == "" || sourceID == item.ID || taskID == "" || stringValue(entry["runId"]) != item.RunID { + return nil + } + batch, err := s.humanBatchForListRead(ctx, item.BatchID) + if err != nil || batch == nil || strings.TrimSpace(batch.SourceBatchID) == "" { + return err + } + sources, err := s.store.ListHumanItems(ctx, item.OrganizationID, domain.HumanItemQuery{ + IDs: []string{sourceID}, BatchID: batch.SourceBatchID, ProjectID: item.ProjectID, WorkflowID: item.WorkflowID, + RunID: item.RunID, LegacyTaskID: taskID, IdentityProjection: true, Limit: 1, + }) + if err != nil || len(sources) == 0 { + return err + } + // Each assembly (including reassembly after a return) records a created + // event. Claim and decision timestamps can be later than the frozen data. + cutoff := parseISOTime(item.CreatedAt) + for _, event := range events { + if at := parseISOTime(event.CreatedAt); event.EventType == "created" && at.After(cutoff) { + cutoff = at + } + } + if cutoff.IsZero() { + return nil + } + sourceEvents, err := s.store.ListHumanTraceEvents(ctx, item.OrganizationID, sourceID) + if err != nil { + return err + } + sort.SliceStable(sourceEvents, func(i, j int) bool { + return parseISOTime(sourceEvents[i].CreatedAt).Before(parseISOTime(sourceEvents[j].CreatedAt)) + }) + complete := false + rejections := 0 + first := "" + revision := 0 + for _, event := range sourceEvents { + if at := parseISOTime(event.CreatedAt); at.IsZero() || at.After(cutoff) { + continue + } + eventRevision := traceEventRevision(event) + var kind string + switch event.EventType { + case "created": + complete = true + case "combined_submitted": + kind = "提交审核" + if first == "" { + first = event.CreatedAt + } else { + kind = "重新提交" + } + case "combined_quality_approved": + kind = "质检通过" + revision = eventRevision + case "combined_quality_rejected": + kind = "质检退回" + rejections++ + } + if kind != "" { + // Source actors and supplier details stay private in acceptance. + out.Events = append(out.Events, reviewTraceEvent{ID: event.ID, Kind: kind, At: event.CreatedAt, Revision: eventRevision}) + } + } + out.Revision = intValue(entry["annotationRevision"]) + if out.Revision <= 0 { + out.Revision = revision + } + if complete { + out.FirstSubmittedAt = first + out.QualityRejections = &rejections + } + return nil +} func normalizedTraceOrg(org string) string { if org == "" { return domain.DefaultOrganizationID diff --git a/internal/api/review_trace_browser_test.go b/internal/api/review_trace_browser_test.go index 08f19ee4..113b8bb4 100644 --- a/internal/api/review_trace_browser_test.go +++ b/internal/api/review_trace_browser_test.go @@ -26,29 +26,61 @@ func runReviewTraceBrowser(t *testing.T, mode string) { f = acceptanceReviewDraftFixture(t) } receipt := mode == "acceptance-receipt" - if receipt { + traceSource := f.item.ID + if mode != "quality" { batch, err := f.store.GetHumanBatch(f.ctx, f.item.BatchID) if err != nil { t.Fatal(err) } - source := *batch - source.ID = "focus-source-batch" - source.Stages = domain.DefaultFanyuV58HumanStages() - source.RequirePrePackageAcceptance = true - if err := f.store.UpsertHumanBatch(f.ctx, source); err != nil { + sourceBatch := *batch + sourceBatch.ID = "focus-source-batch" + if receipt { + sourceBatch.Stages = domain.DefaultFanyuV58HumanStages() + sourceBatch.RequirePrePackageAcceptance = true + } + if err := f.store.UpsertHumanBatch(f.ctx, sourceBatch); err != nil { t.Fatal(err) } - batch.SourceBatchID = source.ID + batch.SourceBatchID = sourceBatch.ID if err := f.store.UpsertHumanBatch(f.ctx, *batch); err != nil { t.Fatal(err) } + for i, raw := range f.item.Subject.Payload["items"].([]any) { + entry := raw.(map[string]any) + entry["runId"] = f.item.RunID + entry["annotationRevision"] = i + 3 + source := domain.HumanItemRecord{ + ID: stringValue(entry["sourceHumanItemId"]), OrganizationID: f.item.OrganizationID, + ProjectID: f.item.ProjectID, WorkflowID: f.item.WorkflowID, RunID: f.item.RunID, + BatchID: sourceBatch.ID, LegacyTaskID: stringValue(entry["taskId"]), + } + if err := f.store.UpsertHumanItem(f.ctx, source); err != nil { + t.Fatal(err) + } + } + f.item.LatestAuthorUserID = "" + if err := f.store.UpsertHumanItem(f.ctx, f.item); err != nil { + t.Fatal(err) + } + traceSource = "source-a" + for _, kind := range []string{"created", "claimed"} { + if err := f.store.AppendHumanEvent(f.ctx, domain.HumanEventRecord{ + OrganizationID: f.item.OrganizationID, ItemID: f.item.ID, EventType: kind, + ActorUserID: f.reviewer.ID, CreatedAt: "2026-01-08T00:00:00Z", + }); err != nil { + t.Fatal(err) + } + } mode = "acceptance" } if err := f.store.UpsertOrganizationPlugin(f.ctx, domain.OrganizationPluginRecord{OrganizationID: domain.DefaultOrganizationID, PluginID: "annotation-qa", Enabled: true, Config: defaultAnnotationPluginConfig()}); err != nil { t.Fatal(err) } - for i, kind := range []string{"created", "combined_submitted", "combined_quality_rejected", "combined_submitted"} { - if err := f.store.AppendHumanEvent(f.ctx, domain.HumanEventRecord{OrganizationID: f.item.OrganizationID, ItemID: f.item.ID, EventType: kind, ActorUserID: f.annotator.ID, CreatedAt: time.Date(2026, 1, 1+i, 0, 0, 0, 0, time.UTC).Format(time.RFC3339), Payload: map[string]any{"annotationRevision": i + 1}}); err != nil { + for i, kind := range []string{"created", "combined_submitted", "combined_quality_rejected", "combined_submitted", "combined_quality_approved"} { + if mode == "quality" && kind == "combined_quality_approved" { + continue + } + if err := f.store.AppendHumanEvent(f.ctx, domain.HumanEventRecord{OrganizationID: f.item.OrganizationID, ItemID: traceSource, EventType: kind, ActorUserID: f.annotator.ID, CreatedAt: time.Date(2026, 1, 1+i, 0, 0, 0, 0, time.UTC).Format(time.RFC3339), Payload: map[string]any{"annotationRevision": 3}}); err != nil { t.Fatal(err) } } diff --git a/internal/api/review_trace_test.go b/internal/api/review_trace_test.go index 3e7b5ec1..0f0fdd9f 100644 --- a/internal/api/review_trace_test.go +++ b/internal/api/review_trace_test.go @@ -88,3 +88,101 @@ func TestReviewTraceSummaryFailureDoesNotHideTaskPool(t *testing.T) { t.Fatalf("metadata failure hid work: %d %s", res.Code, res.Body.String()) } } + +func TestReviewTraceAcceptanceProjectsOnlySelectedSource(t *testing.T) { + f := sharedAcceptanceFixture(t) + batch, err := f.store.GetHumanBatch(f.ctx, f.item.BatchID) + if err != nil { + t.Fatal(err) + } + f.item.CreatedAt = "2026-01-08T00:00:00Z" + f.item.AssignedUserID = f.reviewer.ID + f.item.CurrentRevision = 0 + f.item.LatestAuthorUserID = "" + entries := f.item.Subject.Payload["items"].([]any) + for i, raw := range entries { + entry := raw.(map[string]any) + entry["runId"] = f.item.RunID + source := domain.HumanItemRecord{ + ID: stringValue(entry["sourceHumanItemId"]), OrganizationID: f.item.OrganizationID, + ProjectID: f.item.ProjectID, WorkflowID: f.item.WorkflowID, RunID: f.item.RunID, + BatchID: batch.SourceBatchID, LegacyTaskID: stringValue(entry["taskId"]), + CurrentRevision: 9, LatestAuthorUserID: f.annotator.ID, SupplierID: f.annotator.SupplierID, + } + if i == 1 { + entry["annotationRevision"] = 4 + } + if err := f.store.UpsertHumanItem(f.ctx, source); err != nil { + t.Fatal(err) + } + } + foreign := entries[0].(map[string]any) + entries = append(entries, map[string]any{"sourceHumanItemId": "wrong-batch", "taskId": foreign["taskId"], "runId": f.item.RunID}) + f.item.Subject.Payload["items"] = entries + if err := f.store.UpsertHumanItem(f.ctx, f.item); err != nil { + t.Fatal(err) + } + if err := f.store.UpsertHumanItem(f.ctx, domain.HumanItemRecord{ + ID: "wrong-batch", OrganizationID: f.item.OrganizationID, ProjectID: f.item.ProjectID, + WorkflowID: f.item.WorkflowID, RunID: f.item.RunID, BatchID: "other", LegacyTaskID: stringValue(foreign["taskId"]), + }); err != nil { + t.Fatal(err) + } + add := func(itemID, kind, day string, revision int) { + t.Helper() + err := f.store.AppendHumanEvent(f.ctx, domain.HumanEventRecord{ + ID: itemID + "-" + day, ItemID: itemID, OrganizationID: f.item.OrganizationID, EventType: kind, + CreatedAt: "2026-01-" + day + "T00:00:00Z", ActorUserID: f.annotator.ID, + Payload: map[string]any{"reviewedRevision": revision, "comment": "private comment"}, + }) + if err != nil { + t.Fatal(err) + } + } + add(f.item.ID, "created", "08", 0) + add(f.item.ID, "rejected", "09", 0) + add(f.item.ID, "created", "12", 0) + add("source-a", "created", "01", 0) + add("source-a", "combined_submitted", "02", 2) + add("source-a", "combined_quality_rejected", "03", 2) + add("source-a", "combined_submitted", "04", 3) + add("source-a", "combined_quality_approved", "05", 3) + add("source-a", "aggregate_acceptance_rejected", "09", 0) + add("source-a", "combined_quality_approved", "11", 3) + add("source-a", "combined_quality_approved", "13", 9) + add("source-b", "combined_submitted", "06", 4) + add("wrong-batch", "combined_quality_approved", "05", 7) + read := func(query string) reviewTrace { + t.Helper() + res := f.request(http.MethodGet, "/api/human-items/"+f.item.ID+"/review-trace"+query, f.reviewer, nil) + var trace reviewTrace + if res.Code != http.StatusOK || json.Unmarshal(res.Body.Bytes(), &trace) != nil { + t.Fatalf("trace status=%d body=%s", res.Code, res.Body.String()) + } + if trace.AuthorID != "" || trace.Author != "" || trace.Supplier != "" || strings.Contains(res.Body.String(), "private comment") { + t.Fatalf("anonymous acceptance disclosed source metadata: %+v", trace) + } + return trace + } + a := read("?sourceItemId=source-a") + if a.Revision != 3 || a.FirstSubmittedAt != "2026-01-02T00:00:00Z" || + a.QualityRejections == nil || *a.QualityRejections != 1 || a.Rejections == nil || *a.Rejections != 1 || + len(a.Events) != 6 || a.Events[0].Kind != "质检通过" || a.Events[1].Kind != "验收退回" { + t.Fatalf("wrong source history: %+v", a) + } + for _, event := range a.Events { + if strings.HasPrefix(event.ID, "source-") && (event.Actor != "" || event.Revision == 9) { + t.Fatalf("source actor or newer revision exposed: %+v", event) + } + } + b := read("?sourceItemId=source-b") + if b.Revision != 4 || b.QualityRejections != nil || b.FirstSubmittedAt != "" || len(b.Events) != 2 { + t.Fatalf("wrong legacy source history: %+v", b) + } + for _, query := range []string{"", "?sourceItemId=wrong-batch", "?sourceItemId=unlisted"} { + got := read(query) + if got.Revision != 0 || got.QualityRejections != nil || len(got.Events) != 1 { + t.Fatalf("unexpected source read for %q: %+v", query, got) + } + } +} diff --git a/src/components/FinalAcceptanceWorkspace.tsx b/src/components/FinalAcceptanceWorkspace.tsx index d1f12b5c..0db13760 100644 --- a/src/components/FinalAcceptanceWorkspace.tsx +++ b/src/components/FinalAcceptanceWorkspace.tsx @@ -9,6 +9,7 @@ import { import { userErrorMessage } from "../lib/user-error-message.js"; import { stripTaskOpinionLines } from "../lib/task-scope-visibility.js"; import { AcceptanceSourceOpinions } from "./AcceptanceSourceOpinions"; +import { ReviewTracePanel, useReviewTrace } from "./ReviewTrace"; import { reviewCommandRequiresWrite, reviewShortcut } from "../lib/review-shortcuts.js"; import type { ReviewViewingProps, ReviewViewingController, ReviewPosition } from "./review-viewing"; import { ReviewCaptionDetails } from "./ReviewCaptions"; @@ -50,6 +51,7 @@ type PoseDraft = { overallGrade: string; }; type Props = ReviewViewingProps & { + reviewTraceEnabled?: boolean; key?: string; item: HumanItem; mine: boolean; @@ -108,7 +110,7 @@ export function FinalAcceptanceWorkspace({ onReviewEscape, reviewTimestampOpinions, reviewProblemPanel, - reviewTracePanel, + reviewTraceEnabled, }: Props) { const rawHuman = item.processingProfile === "raw_human"; const payload = (item.subject?.payload || {}) as Record; @@ -255,6 +257,8 @@ export function FinalAcceptanceWorkspace({ const groups = useMemo(() => acceptanceSliceGroups(entries, responses), [entries, responses]); const active = groups.find((g) => g.id === activeId) || groups[0]; + const traceSource = (active?.entry ?? entries[0])?.sourceHumanItemId || ""; + const reviewTrace = useReviewTrace(reviewTraceEnabled ? item.id : "", item.version, traceSource); const activeKey = active ? acceptanceMetadataKey(item.id, active) : ""; const member = (name: string) => active?.members.find((m: any) => m.name === name && m.contentAvailable); const left = member("left.mp4"), @@ -1117,7 +1121,7 @@ export function FinalAcceptanceWorkspace({