Skip to content

Commit e3c8972

Browse files
tpfztpfz
andauthored
[fix][evaluation]eval online (#327)
* fix TargetConnector * fix ut * fix ut --------- Co-authored-by: tpfz <tpfz@bytedance.com>
1 parent 8889abe commit e3c8972

File tree

3 files changed

+38
-6
lines changed

3 files changed

+38
-6
lines changed

backend/modules/evaluation/domain/service/expt_manage_execution_impl.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@ func (e *ExptMangerImpl) CheckConnector(ctx context.Context, expt *entity.Experi
120120
}
121121

122122
func (e *ExptMangerImpl) checkTargetConnector(ctx context.Context, expt *entity.Experiment, session *entity.Session) error {
123-
if expt.Target == nil ||
124-
expt.Target.EvalTargetType == entity.EvalTargetTypeLoopTrace {
123+
if expt.Target == nil || expt.ExptType == entity.ExptType_Online {
125124
return nil
126125
}
127126

backend/modules/evaluation/domain/service/expt_manage_execution_impl_test.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,6 +1090,16 @@ func TestExptMangerImpl_CheckConnector(t *testing.T) {
10901090
SpaceID: 789,
10911091
EvalConf: &entity.EvaluationConfiguration{
10921092
ConnectorConf: entity.Connector{
1093+
TargetConf: &entity.TargetConf{
1094+
TargetVersionID: 1,
1095+
IngressConf: &entity.TargetIngressConf{
1096+
EvalSetAdapter: &entity.FieldAdapter{
1097+
FieldConfs: []*entity.FieldConf{
1098+
{FromField: "field1"},
1099+
},
1100+
},
1101+
},
1102+
},
10931103
EvaluatorsConf: &entity.EvaluatorsConf{
10941104
EvaluatorConf: []*entity.EvaluatorConf{
10951105
{
@@ -1108,7 +1118,11 @@ func TestExptMangerImpl_CheckConnector(t *testing.T) {
11081118
},
11091119
Target: &entity.EvalTarget{
11101120
EvalTargetType: entity.EvalTargetTypeLoopTrace,
1121+
EvalTargetVersion: &entity.EvalTargetVersion{
1122+
ID: 1,
1123+
},
11111124
},
1125+
TargetVersionID: 1,
11121126
EvalSet: &entity.EvaluationSet{
11131127
EvaluationSetVersion: &entity.EvaluationSetVersion{
11141128
EvaluationSetSchema: &entity.EvaluationSetSchema{

backend/modules/evaluation/domain/service/expt_manage_execution_validation_test.go

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,24 +115,43 @@ func TestExptMangerImpl_checkTargetConnector_VersionIDValidation(t *testing.T) {
115115
expectedError: false,
116116
},
117117
{
118-
name: "loop_trace_target_should_skip_validation",
118+
name: "loop_trace_target_should_fail_validation", // 修正测试名称以符合实际行为
119119
expt: &entity.Experiment{
120120
TargetVersionID: 123,
121+
TargetType: entity.EvalTargetTypeLoopPrompt, // 添加TargetType以触发fixTargetConf
121122
Target: &entity.EvalTarget{
122123
EvalTargetType: entity.EvalTargetTypeLoopTrace,
123124
},
125+
EvalSet: &entity.EvaluationSet{
126+
EvaluationSetVersion: &entity.EvaluationSetVersion{
127+
EvaluationSetSchema: &entity.EvaluationSetSchema{
128+
FieldSchemas: []*entity.FieldSchema{
129+
{Name: "field1"},
130+
},
131+
},
132+
},
133+
},
124134
EvalConf: &entity.EvaluationConfiguration{
125135
ConnectorConf: entity.Connector{
126136
TargetConf: &entity.TargetConf{
127-
TargetVersionID: 456, // Different version ID should be ignored
137+
TargetVersionID: 456, // Different version ID should cause error
138+
IngressConf: &entity.TargetIngressConf{
139+
EvalSetAdapter: &entity.FieldAdapter{
140+
FieldConfs: []*entity.FieldConf{
141+
{FromField: "field1"},
142+
},
143+
},
144+
},
128145
},
129146
},
130147
},
131148
},
132149
setupMocks: func(mgr *testExptManager) {
133-
// No mocks needed as validation should be skipped
150+
// No mocks needed
134151
},
135-
expectedError: false,
152+
expectedError: true,
153+
expectedErrorCode: "601204001",
154+
expectedErrorMsg: "target config's version id not match",
136155
},
137156
{
138157
name: "nil_target_should_skip_validation",

0 commit comments

Comments
 (0)