Merge pull request '⚡ 加速生产统计与首页摘要加载' (#35) from codex/dashboard-load-parallel-20261007 into dev

Reviewed-on: #35
This commit is contained in:
longtao.wu 2026-10-08 11:20:41 +08:00
commit bd253016f4
2 changed files with 64 additions and 43 deletions

View File

@ -37,6 +37,7 @@ import (
bosapi "github.com/baidubce/bce-sdk-go/services/bos/api"
"github.com/go-chi/chi/v5"
"github.com/go-chi/chi/v5/middleware"
"golang.org/x/sync/errgroup"
)
type validationIssue struct {
@ -1939,28 +1940,32 @@ func (server *server) handleDashboard(writer http.ResponseWriter, request *http.
return
}
if server.tenantEnforced(request) {
projects, err := server.listProjectsForRequest(request.Context(), request)
if err != nil {
renderError(writer, http.StatusInternalServerError, err)
return
}
operators, err := server.listOperatorsForRequest(request.Context(), request)
if err != nil {
renderError(writer, http.StatusInternalServerError, err)
return
}
runSummaries, err := server.listRunSummariesForRequest(request.Context(), request, "")
if err != nil {
renderError(writer, http.StatusInternalServerError, err)
return
}
auditTasks, err := server.listAuditTasksForRequest(request.Context(), request, "all")
if err != nil {
renderError(writer, http.StatusInternalServerError, err)
return
}
settings, err := server.store.GetSettings(request.Context())
if err != nil {
var (
projects []domain.ProjectRecord
operators []domain.OperatorRecord
runSummaries []domain.RunSummary
auditTasks []domain.AuditTaskRecord
settings *domain.SettingsRecord
)
g, gctx := errgroup.WithContext(request.Context())
g.Go(func() error { var err error; projects, err = server.listProjectsForRequest(gctx, request); return err })
g.Go(func() error {
var err error
operators, err = server.listOperatorsForRequest(gctx, request)
return err
})
g.Go(func() error {
var err error
runSummaries, err = server.listRunSummariesForRequest(gctx, request, "")
return err
})
g.Go(func() error {
var err error
auditTasks, err = server.listAuditTasksForRequest(gctx, request, "all")
return err
})
g.Go(func() error { var err error; settings, err = server.store.GetSettings(gctx); return err })
if err := g.Wait(); err != nil {
renderError(writer, http.StatusInternalServerError, err)
return
}
@ -2004,8 +2009,21 @@ func (server *server) enrichDashboardHumanWork(ctx context.Context, request *htt
return
}
organizationID := server.requestOrganizationID(request)
items, err := server.store.ListHumanItems(ctx, organizationID, domain.HumanItemQuery{})
if err == nil {
var items []domain.HumanItemRecord
var packages []domain.DeliveryPackageRecord
var itemsErr error
var packagesErr error
g, gctx := errgroup.WithContext(ctx)
g.Go(func() error {
items, itemsErr = server.store.ListHumanItems(gctx, organizationID, domain.HumanItemQuery{})
return itemsErr
})
g.Go(func() error {
packages, packagesErr = server.store.ListDeliveryPackages(gctx, organizationID, domain.DeliveryPackageQuery{Mode: domain.RunModeProduction})
return packagesErr
})
_ = g.Wait()
if itemsErr == nil {
accepted := 0
decided := 0
seenVideos := map[string]struct{}{}
@ -2046,8 +2064,7 @@ func (server *server) enrichDashboardHumanWork(ctx context.Context, request *htt
summary.Tasks.QualityPassRate = float64(accepted) * 100 / float64(decided)
}
}
packages, err := server.store.ListDeliveryPackages(ctx, organizationID, domain.DeliveryPackageQuery{Mode: domain.RunModeProduction})
if err == nil {
if packagesErr == nil {
summary.Data.PackageCount = len(packages)
for _, item := range packages {
if item.Status == domain.DeliveryPackagePendingAcceptance {

View File

@ -6,6 +6,8 @@ import (
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/mongo/options"
"golang.org/x/sync/errgroup"
"time"
)
func (s *MemoryStore) GetProductionStatsScope(_ context.Context, org string) (productionstats.Scope, error) {
@ -115,7 +117,7 @@ func (s *MongoStore) LoadProductionStats(ctx context.Context, org string, projec
}
filter := organizationScopedFilter(org, bson.M{"projectId": bson.M{"$in": projects}})
read := func(c *mongo.Collection, f bson.M, projection bson.M, target any) error {
cursor, err := c.Find(ctx, f, options.Find().SetProjection(projection))
cursor, err := c.Find(ctx, f, options.Find().SetProjection(projection).SetMaxTime(15*time.Second))
if err != nil {
return err
}
@ -141,19 +143,24 @@ func (s *MongoStore) LoadProductionStats(ctx context.Context, org string, projec
}
}
runFilter := organizationScopedFilter(org, bson.M{"$or": bson.A{bson.M{"projectId": bson.M{"$in": projects}}, bson.M{"taskId": bson.M{"$in": captureIDs}}, bson.M{"id": bson.M{"$in": runIDs}}}})
if err := read(s.runs, runFilter, fields("id", "projectId", "workflowId", "taskId", "trigger", "mode", "parentRunId", "createdAt", "endedAt", "status", "deliveryOutcome", "failure", "error"), &d.Runs); err != nil {
return d, err
}
if err := read(s.humanItems, filter, fields("id", "projectId", "supplierId", "runId", "batchId", "legacyTaskId", "currentStageId", "status", "pendingCombinedSubmissionId", "releasePartitionId", "processingJob.status"), &d.Items); err != nil {
return d, err
}
if err := read(s.humanBatches, filter, fields("id", "sourceBatchId", "stages"), &d.Batches); err != nil {
return d, err
}
if err := read(s.annotationTasks, filter, fields("id", "runId", "supplierId", "status"), &d.Tasks); err != nil {
return d, err
}
if err := read(s.annotationWorklogEvents, filter, fields("id", "taskId", "supplierId", "eventType", "mode", "temporary", "createdAt"), &d.Worklogs); err != nil {
var g errgroup.Group
g.Go(func() error {
return read(s.runs, runFilter, fields("id", "projectId", "workflowId", "taskId", "trigger", "mode", "parentRunId", "createdAt", "endedAt", "status", "deliveryOutcome", "failure", "error"), &d.Runs)
})
g.Go(func() error {
return read(s.humanItems, filter, fields("id", "projectId", "supplierId", "runId", "batchId", "legacyTaskId", "currentStageId", "status", "pendingCombinedSubmissionId", "releasePartitionId", "processingJob.status"), &d.Items)
})
g.Go(func() error { return read(s.humanBatches, filter, fields("id", "sourceBatchId", "stages"), &d.Batches) })
g.Go(func() error {
return read(s.annotationTasks, filter, fields("id", "runId", "supplierId", "status"), &d.Tasks)
})
g.Go(func() error {
return read(s.annotationWorklogEvents, filter, fields("id", "taskId", "supplierId", "eventType", "mode", "temporary", "createdAt"), &d.Worklogs)
})
g.Go(func() error {
return read(s.deliveryPackages, filter, fields("id", "parentRunId", "childRunId", "supplierId", "mode", "temporary", "finalExportedAt", "status", "itemIds", "releasePartitionId", "acceptanceHumanItemId", "acceptanceReviews.id", "acceptanceReviews.decision", "acceptanceReviews.createdAt", "qualitySummary.prePackageAcceptance"), &d.Packages)
})
if err := g.Wait(); err != nil {
return d, err
}
ids := make([]string, 0, len(d.Items))
@ -165,8 +172,5 @@ func (s *MongoStore) LoadProductionStats(ctx context.Context, org string, projec
return d, err
}
}
if err := read(s.deliveryPackages, filter, fields("id", "parentRunId", "childRunId", "supplierId", "mode", "temporary", "finalExportedAt", "status", "itemIds", "releasePartitionId", "acceptanceHumanItemId", "acceptanceReviews.id", "acceptanceReviews.decision", "acceptanceReviews.createdAt", "qualitySummary.prePackageAcceptance"), &d.Packages); err != nil {
return d, err
}
return d, nil
}