Skip to content

Commit cb3d068

Browse files
xueyizhengxueyizheng
committed
add start/end time
1 parent ecd9985 commit cb3d068

File tree

7 files changed

+37
-22
lines changed

7 files changed

+37
-22
lines changed

‎backend/modules/evaluation/application/experiment_app.go‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1104,12 +1104,21 @@ func (e *experimentApplication) InsightAnalysisExperiment(ctx context.Context, r
11041104
if err != nil {
11051105
return nil, err
11061106
}
1107+
1108+
var startTime, endTime *int64
1109+
if got.StartAt != nil {
1110+
startTime = gptr.Of(got.StartAt.Unix())
1111+
}
1112+
if got.EndAt != nil {
1113+
endTime = gptr.Of(got.EndAt.Unix())
1114+
}
1115+
11071116
recordID, err := e.CreateAnalysisRecord(ctx, &entity.ExptInsightAnalysisRecord{
11081117
SpaceID: req.GetWorkspaceID(),
11091118
ExptID: req.GetExptID(),
11101119
CreatedBy: session.UserID,
11111120
Status: entity.InsightAnalysisStatus_Running,
1112-
}, session)
1121+
}, session, gptr.Indirect(startTime), gptr.Indirect(endTime))
11131122
if err != nil {
11141123
return nil, err
11151124
}

‎backend/modules/evaluation/domain/component/rpc/trace_agent.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ import (
1111

1212
//go:generate mockgen -destination=mocks/trace_agent.go -package=mocks . IAgentAdapter
1313
type IAgentAdapter interface {
14-
CallTraceAgent(ctx context.Context, spaceID int64, url string) (int64, error)
14+
CallTraceAgent(ctx context.Context, spaceID int64, url string, startTime, endTime int64) (int64, error)
1515
GetReport(ctx context.Context, spaceID, reportID int64) (report string, status entity.ReportStatus, err error)
1616
}

‎backend/modules/evaluation/domain/entity/event.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,11 @@ type ExportCSVEvent struct {
120120
ExperimentID int64
121121
SpaceID int64
122122

123-
Session *Session
124-
ExportScene ExportScene
125-
CreatedAt int64
123+
Session *Session
124+
ExportScene ExportScene
125+
CreatedAt int64
126+
ExptStartTime int64 // Unix Time
127+
ExptEndTime int64 // Unix Time
126128
}
127129

128130
type ExportScene int

‎backend/modules/evaluation/domain/service/insight_analysis.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
)
1111

1212
type IExptInsightAnalysisService interface {
13-
CreateAnalysisRecord(ctx context.Context, record *entity.ExptInsightAnalysisRecord, session *entity.Session) (int64, error)
14-
GenAnalysisReport(ctx context.Context, spaceID, exptID, recordID, CreateAt int64) error
13+
CreateAnalysisRecord(ctx context.Context, record *entity.ExptInsightAnalysisRecord, session *entity.Session, startTime, endTime int64) (int64, error)
14+
GenAnalysisReport(ctx context.Context, spaceID, exptID, recordID, CreateAt, startTime, endTime int64) error
1515
GetAnalysisRecordByID(ctx context.Context, spaceID, exptID, recordID int64, session *entity.Session) (*entity.ExptInsightAnalysisRecord, error)
1616
ListAnalysisRecord(ctx context.Context, spaceID, exptID int64, page entity.Page, session *entity.Session) ([]*entity.ExptInsightAnalysisRecord, int64, error)
1717
DeleteAnalysisRecord(ctx context.Context, spaceID, exptID, recordID int64) error

‎backend/modules/evaluation/domain/service/insight_analysis_impl.go‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,20 @@ func NewInsightAnalysisService(repo repo.IExptInsightAnalysisRecordRepo,
5555
}
5656
}
5757

58-
func (e ExptInsightAnalysisServiceImpl) CreateAnalysisRecord(ctx context.Context, record *entity.ExptInsightAnalysisRecord, session *entity.Session) (int64, error) {
58+
func (e ExptInsightAnalysisServiceImpl) CreateAnalysisRecord(ctx context.Context, record *entity.ExptInsightAnalysisRecord, session *entity.Session, startTime, endTime int64) (int64, error) {
5959
recordID, err := e.repo.CreateAnalysisRecord(ctx, record)
6060
if err != nil {
6161
return 0, err
6262
}
6363

6464
exportEvent := &entity.ExportCSVEvent{
65-
ExportID: recordID,
66-
ExperimentID: record.ExptID,
67-
SpaceID: record.SpaceID,
68-
ExportScene: entity.ExportSceneInsightAnalysis,
69-
CreatedAt: time.Now().Unix(),
65+
ExportID: recordID,
66+
ExperimentID: record.ExptID,
67+
SpaceID: record.SpaceID,
68+
ExportScene: entity.ExportSceneInsightAnalysis,
69+
CreatedAt: time.Now().Unix(),
70+
ExptStartTime: startTime,
71+
ExptEndTime: endTime,
7072
}
7173
err = e.exptPublisher.PublishExptExportCSVEvent(ctx, exportEvent, gptr.Of(time.Second*3))
7274
if err != nil {
@@ -76,7 +78,7 @@ func (e ExptInsightAnalysisServiceImpl) CreateAnalysisRecord(ctx context.Context
7678
return recordID, nil
7779
}
7880

79-
func (e ExptInsightAnalysisServiceImpl) GenAnalysisReport(ctx context.Context, spaceID, exptID, recordID, CreateAt int64) (err error) {
81+
func (e ExptInsightAnalysisServiceImpl) GenAnalysisReport(ctx context.Context, spaceID, exptID, recordID, CreateAt, startTime, endTime int64) (err error) {
8082
analysisRecord, err := e.repo.GetAnalysisRecordByID(ctx, spaceID, exptID, recordID)
8183
if err != nil {
8284
return err
@@ -125,7 +127,7 @@ func (e ExptInsightAnalysisServiceImpl) GenAnalysisReport(ctx context.Context, s
125127
return err
126128
}
127129

128-
reportID, err := e.agentAdapter.CallTraceAgent(ctx, spaceID, url)
130+
reportID, err := e.agentAdapter.CallTraceAgent(ctx, spaceID, url, startTime, endTime)
129131
if err != nil {
130132
return err
131133
}
@@ -135,11 +137,13 @@ func (e ExptInsightAnalysisServiceImpl) GenAnalysisReport(ctx context.Context, s
135137

136138
// 发送时间检查分析报告生成状态
137139
exportEvent := &entity.ExportCSVEvent{
138-
ExportID: recordID,
139-
ExperimentID: exptID,
140-
SpaceID: spaceID,
141-
ExportScene: entity.ExportSceneInsightAnalysis,
142-
CreatedAt: CreateAt,
140+
ExportID: recordID,
141+
ExperimentID: exptID,
142+
SpaceID: spaceID,
143+
ExportScene: entity.ExportSceneInsightAnalysis,
144+
CreatedAt: CreateAt,
145+
ExptStartTime: startTime, // 传递开始时间
146+
ExptEndTime: endTime, // 传递结束时间
143147
}
144148
err = e.exptPublisher.PublishExptExportCSVEvent(ctx, exportEvent, gptr.Of(time.Minute*3))
145149
if err != nil {

‎backend/modules/evaluation/infra/mq/rocket/consumer/expt_export.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func (e *ExptExportConsumer) HandleMessage(ctx context.Context, ext *mq.MessageE
5353
func (e *ExptExportConsumer) handleEvent(ctx context.Context, event *entity.ExportCSVEvent) (err error) {
5454
switch event.ExportScene {
5555
case entity.ExportSceneInsightAnalysis:
56-
err = e.exptInsightAnalysisService.GenAnalysisReport(ctx, event.SpaceID, event.ExperimentID, event.ExportID, event.CreatedAt)
56+
err = e.exptInsightAnalysisService.GenAnalysisReport(ctx, event.SpaceID, event.ExperimentID, event.ExportID, event.CreatedAt, event.ExptStartTime, event.ExptEndTime)
5757
if err != nil {
5858
logs.CtxError(ctx, "ExptExportConsumer GenAnalysisReport fail, expt_id:%v, err: %v", event.ExperimentID, err)
5959
return nil

‎backend/modules/evaluation/infra/rpc/agent/agent.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func NewAgentAdapter() rpc.IAgentAdapter {
1818
return &AgentAdapter{}
1919
}
2020

21-
func (a AgentAdapter) CallTraceAgent(ctx context.Context, spaceID int64, url string) (int64, error) {
21+
func (a AgentAdapter) CallTraceAgent(ctx context.Context, spaceID int64, url string, startTime, endTime int64) (int64, error) {
2222
return 0, errorx.NewByCode(errno.CommonInternalErrorCode, errorx.WithExtraMsg("CallTraceAgent not implement"))
2323
}
2424

0 commit comments

Comments
 (0)