diff --git a/backend/kitex_gen/coze/loop/evaluation/eval_set/coze.loop.evaluation.eval_set.go b/backend/kitex_gen/coze/loop/evaluation/eval_set/coze.loop.evaluation.eval_set.go index 8ba1488e6..323417c99 100644 --- a/backend/kitex_gen/coze/loop/evaluation/eval_set/coze.loop.evaluation.eval_set.go +++ b/backend/kitex_gen/coze/loop/evaluation/eval_set/coze.loop.evaluation.eval_set.go @@ -13967,7 +13967,7 @@ type ListEvaluationSetItemsResponse struct { Items []*eval_set.EvaluationSetItem `thrift:"items,1,optional" frugal:"1,optional,list" form:"items" json:"items,omitempty" query:"items"` Total *int64 `thrift:"total,100,optional" frugal:"100,optional,i64" json:"total" form:"total" query:"total"` NextPageToken *string `thrift:"next_page_token,101,optional" frugal:"101,optional,string" form:"next_page_token" json:"next_page_token,omitempty" query:"next_page_token"` - FilterTotal *int64 `thrift:"filterTotal,102,optional" frugal:"102,optional,i64" json:"filter_total" form:"filterTotal" query:"filterTotal"` + FilterTotal *int64 `thrift:"filter_total,102,optional" frugal:"102,optional,i64" json:"filter_total" form:"filter_total" query:"filter_total"` BaseResp *base.BaseResp `thrift:"BaseResp,255" frugal:"255,default,base.BaseResp" form:"BaseResp" json:"BaseResp" query:"BaseResp"` } @@ -14057,7 +14057,7 @@ var fieldIDToName_ListEvaluationSetItemsResponse = map[int16]string{ 1: "items", 100: "total", 101: "next_page_token", - 102: "filterTotal", + 102: "filter_total", 255: "BaseResp", } @@ -14341,7 +14341,7 @@ WriteFieldEndError: } func (p *ListEvaluationSetItemsResponse) writeField102(oprot thrift.TProtocol) (err error) { if p.IsSetFilterTotal() { - if err = oprot.WriteFieldBegin("filterTotal", thrift.I64, 102); err != nil { + if err = oprot.WriteFieldBegin("filter_total", thrift.I64, 102); err != nil { goto WriteFieldBeginError } if err := oprot.WriteI64(*p.FilterTotal); err != nil { diff --git a/backend/kitex_gen/coze/loop/evaluation/expt/coze.loop.evaluation.expt.go b/backend/kitex_gen/coze/loop/evaluation/expt/coze.loop.evaluation.expt.go index d2ab53786..222ab410c 100644 --- a/backend/kitex_gen/coze/loop/evaluation/expt/coze.loop.evaluation.expt.go +++ b/backend/kitex_gen/coze/loop/evaluation/expt/coze.loop.evaluation.expt.go @@ -51,7 +51,7 @@ type CreateExperimentRequest struct { EnableWeightedScore *bool `thrift:"enable_weighted_score,41,optional" frugal:"41,optional,bool" json:"enable_weighted_score" form:"enable_weighted_score" ` EvaluatorScoreWeights map[int64]float64 `thrift:"evaluator_score_weights,42,optional" frugal:"42,optional,map" json:"evaluator_score_weights" form:"evaluator_score_weights" ` ExptTemplateID *int64 `thrift:"expt_template_id,43,optional" frugal:"43,optional,i64" json:"expt_template_id" form:"expt_template_id" ` - ItemRetryNum *int32 `thrift:"item_retry_num,45,optional" frugal:"45,optional,i32" form:"item_retry_num" json:"item_retry_num,omitempty" query:"item_retry_num"` + ItemRetryNum *int32 `thrift:"item_retry_num,45,optional" frugal:"45,optional,i32" form:"item_retry_num" json:"item_retry_num,omitempty"` Session *common.Session `thrift:"session,200,optional" frugal:"200,optional,common.Session" form:"session" json:"session,omitempty" query:"session"` Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` } @@ -2368,7 +2368,7 @@ type SubmitExperimentRequest struct { // 是否启用评估器得分加权汇总，以及各评估器的权重配置（key 为 evaluator_version_id，value 为权重） EnableWeightedScore *bool `thrift:"enable_weighted_score,41,optional" frugal:"41,optional,bool" json:"enable_weighted_score" form:"enable_weighted_score" ` ExptTemplateID *int64 `thrift:"expt_template_id,42,optional" frugal:"42,optional,i64" json:"expt_template_id" form:"expt_template_id" ` - ItemRetryNum *int32 `thrift:"item_retry_num,45,optional" frugal:"45,optional,i32" form:"item_retry_num" json:"item_retry_num,omitempty" query:"item_retry_num"` + ItemRetryNum *int32 `thrift:"item_retry_num,45,optional" frugal:"45,optional,i32" form:"item_retry_num" json:"item_retry_num,omitempty"` Ext map[string]string `thrift:"ext,100,optional" frugal:"100,optional,map" form:"ext" json:"ext,omitempty"` Session *common.Session `thrift:"session,200,optional" frugal:"200,optional,common.Session" form:"session" json:"session,omitempty" query:"session"` Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` @@ -17255,7 +17255,6 @@ type CreateExperimentTemplateRequest struct { DefaultEvaluatorsConcurNum *int32 `thrift:"default_evaluators_concur_num,21,optional" frugal:"21,optional,i32" form:"default_evaluators_concur_num" json:"default_evaluators_concur_num,omitempty"` // 调度配置（不在 ExptTemplate 结构中，保留在顶层） ScheduleCron *string `thrift:"schedule_cron,22,optional" frugal:"22,optional,string" form:"schedule_cron" json:"schedule_cron,omitempty"` - ItemRetryNum *int32 `thrift:"item_retry_num,45,optional" frugal:"45,optional,i32" form:"item_retry_num" json:"item_retry_num,omitempty" query:"item_retry_num"` Session *common.Session `thrift:"session,200,optional" frugal:"200,optional,common.Session" form:"session" json:"session,omitempty" query:"session"` Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` } @@ -17346,18 +17345,6 @@ func (p *CreateExperimentTemplateRequest) GetScheduleCron() (v string) { return *p.ScheduleCron } -var CreateExperimentTemplateRequest_ItemRetryNum_DEFAULT int32 - -func (p *CreateExperimentTemplateRequest) GetItemRetryNum() (v int32) { - if p == nil { - return - } - if !p.IsSetItemRetryNum() { - return CreateExperimentTemplateRequest_ItemRetryNum_DEFAULT - } - return *p.ItemRetryNum -} - var CreateExperimentTemplateRequest_Session_DEFAULT *common.Session func (p *CreateExperimentTemplateRequest) GetSession() (v *common.Session) { @@ -17402,9 +17389,6 @@ func (p *CreateExperimentTemplateRequest) SetDefaultEvaluatorsConcurNum(val *int func (p *CreateExperimentTemplateRequest) SetScheduleCron(val *string) { p.ScheduleCron = val } -func (p *CreateExperimentTemplateRequest) SetItemRetryNum(val *int32) { - p.ItemRetryNum = val -} func (p *CreateExperimentTemplateRequest) SetSession(val *common.Session) { p.Session = val } @@ -17420,7 +17404,6 @@ var fieldIDToName_CreateExperimentTemplateRequest = map[int16]string{ 20: "create_eval_target_param", 21: "default_evaluators_concur_num", 22: "schedule_cron", - 45: "item_retry_num", 200: "session", 255: "Base", } @@ -17449,10 +17432,6 @@ func (p *CreateExperimentTemplateRequest) IsSetScheduleCron() bool { return p.ScheduleCron != nil } -func (p *CreateExperimentTemplateRequest) IsSetItemRetryNum() bool { - return p.ItemRetryNum != nil -} - func (p *CreateExperimentTemplateRequest) IsSetSession() bool { return p.Session != nil } @@ -17537,14 +17516,6 @@ func (p *CreateExperimentTemplateRequest) Read(iprot thrift.TProtocol) (err erro } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } - case 45: - if fieldTypeId == thrift.I32 { - if err = p.ReadField45(iprot); err != nil { - goto ReadFieldError - } - } else if err = iprot.Skip(fieldTypeId); err != nil { - goto SkipFieldError - } case 200: if fieldTypeId == thrift.STRUCT { if err = p.ReadField200(iprot); err != nil { @@ -17661,17 +17632,6 @@ func (p *CreateExperimentTemplateRequest) ReadField22(iprot thrift.TProtocol) er p.ScheduleCron = _field return nil } -func (p *CreateExperimentTemplateRequest) ReadField45(iprot thrift.TProtocol) error { - - var _field *int32 - if v, err := iprot.ReadI32(); err != nil { - return err - } else { - _field = &v - } - p.ItemRetryNum = _field - return nil -} func (p *CreateExperimentTemplateRequest) ReadField200(iprot thrift.TProtocol) error { _field := common.NewSession() if err := _field.Read(iprot); err != nil { @@ -17723,10 +17683,6 @@ func (p *CreateExperimentTemplateRequest) Write(oprot thrift.TProtocol) (err err fieldId = 22 goto WriteFieldError } - if err = p.writeField45(oprot); err != nil { - fieldId = 45 - goto WriteFieldError - } if err = p.writeField200(oprot); err != nil { fieldId = 200 goto WriteFieldError @@ -17877,24 +17833,6 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 22 end error: ", p), err) } -func (p *CreateExperimentTemplateRequest) writeField45(oprot thrift.TProtocol) (err error) { - if p.IsSetItemRetryNum() { - if err = oprot.WriteFieldBegin("item_retry_num", thrift.I32, 45); err != nil { - goto WriteFieldBeginError - } - if err := oprot.WriteI32(*p.ItemRetryNum); err != nil { - return err - } - if err = oprot.WriteFieldEnd(); err != nil { - goto WriteFieldEndError - } - } - return nil -WriteFieldBeginError: - return thrift.PrependError(fmt.Sprintf("%T write field 45 begin error: ", p), err) -WriteFieldEndError: - return thrift.PrependError(fmt.Sprintf("%T write field 45 end error: ", p), err) -} func (p *CreateExperimentTemplateRequest) writeField200(oprot thrift.TProtocol) (err error) { if p.IsSetSession() { if err = oprot.WriteFieldBegin("session", thrift.STRUCT, 200); err != nil { @@ -17967,9 +17905,6 @@ func (p *CreateExperimentTemplateRequest) DeepEqual(ano *CreateExperimentTemplat if !p.Field22DeepEqual(ano.ScheduleCron) { return false } - if !p.Field45DeepEqual(ano.ItemRetryNum) { - return false - } if !p.Field200DeepEqual(ano.Session) { return false } @@ -18038,18 +17973,6 @@ func (p *CreateExperimentTemplateRequest) Field22DeepEqual(src *string) bool { } return true } -func (p *CreateExperimentTemplateRequest) Field45DeepEqual(src *int32) bool { - - if p.ItemRetryNum == src { - return true - } else if p.ItemRetryNum == nil || src == nil { - return false - } - if *p.ItemRetryNum != *src { - return false - } - return true -} func (p *CreateExperimentTemplateRequest) Field200DeepEqual(src *common.Session) bool { if !p.Session.DeepEqual(src) { diff --git a/backend/kitex_gen/coze/loop/evaluation/expt/k-coze.loop.evaluation.expt.go b/backend/kitex_gen/coze/loop/evaluation/expt/k-coze.loop.evaluation.expt.go index 7094169e7..c28fd65bf 100644 --- a/backend/kitex_gen/coze/loop/evaluation/expt/k-coze.loop.evaluation.expt.go +++ b/backend/kitex_gen/coze/loop/evaluation/expt/k-coze.loop.evaluation.expt.go @@ -12793,20 +12793,6 @@ func (p *CreateExperimentTemplateRequest) FastRead(buf []byte) (int, error) { goto SkipFieldError } } - case 45: - if fieldTypeId == thrift.I32 { - l, err = p.FastReadField45(buf[offset:]) - offset += l - if err != nil { - goto ReadFieldError - } - } else { - l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) - offset += l - if err != nil { - goto SkipFieldError - } - } case 200: if fieldTypeId == thrift.STRUCT { l, err = p.FastReadField200(buf[offset:]) @@ -12949,20 +12935,6 @@ func (p *CreateExperimentTemplateRequest) FastReadField22(buf []byte) (int, erro return offset, nil } -func (p *CreateExperimentTemplateRequest) FastReadField45(buf []byte) (int, error) { - offset := 0 - - var _field *int32 - if v, l, err := thrift.Binary.ReadI32(buf[offset:]); err != nil { - return offset, err - } else { - offset += l - _field = &v - } - p.ItemRetryNum = _field - return offset, nil -} - func (p *CreateExperimentTemplateRequest) FastReadField200(buf []byte) (int, error) { offset := 0 _field := common.NewSession() @@ -12996,7 +12968,6 @@ func (p *CreateExperimentTemplateRequest) FastWriteNocopy(buf []byte, w thrift.N if p != nil { offset += p.fastWriteField1(buf[offset:], w) offset += p.fastWriteField21(buf[offset:], w) - offset += p.fastWriteField45(buf[offset:], w) offset += p.fastWriteField10(buf[offset:], w) offset += p.fastWriteField11(buf[offset:], w) offset += p.fastWriteField12(buf[offset:], w) @@ -13019,7 +12990,6 @@ func (p *CreateExperimentTemplateRequest) BLength() int { l += p.field20Length() l += p.field21Length() l += p.field22Length() - l += p.field45Length() l += p.field200Length() l += p.field255Length() } @@ -13088,15 +13058,6 @@ func (p *CreateExperimentTemplateRequest) fastWriteField22(buf []byte, w thrift. return offset } -func (p *CreateExperimentTemplateRequest) fastWriteField45(buf []byte, w thrift.NocopyWriter) int { - offset := 0 - if p.IsSetItemRetryNum() { - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I32, 45) - offset += thrift.Binary.WriteI32(buf[offset:], *p.ItemRetryNum) - } - return offset -} - func (p *CreateExperimentTemplateRequest) fastWriteField200(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetSession() { @@ -13176,15 +13137,6 @@ func (p *CreateExperimentTemplateRequest) field22Length() int { return l } -func (p *CreateExperimentTemplateRequest) field45Length() int { - l := 0 - if p.IsSetItemRetryNum() { - l += thrift.Binary.FieldBeginLength() - l += thrift.Binary.I32Length() - } - return l -} - func (p *CreateExperimentTemplateRequest) field200Length() int { l := 0 if p.IsSetSession() { @@ -13260,11 +13212,6 @@ func (p *CreateExperimentTemplateRequest) DeepCopy(s interface{}) error { p.ScheduleCron = &tmp } - if src.ItemRetryNum != nil { - tmp := *src.ItemRetryNum - p.ItemRetryNum = &tmp - } - var _session *common.Session if src.Session != nil { _session = &common.Session{} diff --git a/backend/kitex_gen/coze/loop/evaluation/openapi/coze.loop.evaluation.openapi.go b/backend/kitex_gen/coze/loop/evaluation/openapi/coze.loop.evaluation.openapi.go index 1f2e948ab..cc4028dd3 100644 --- a/backend/kitex_gen/coze/loop/evaluation/openapi/coze.loop.evaluation.openapi.go +++ b/backend/kitex_gen/coze/loop/evaluation/openapi/coze.loop.evaluation.openapi.go @@ -14824,7 +14824,7 @@ type SubmitExperimentOApiRequest struct { // 运行信息 ItemConcurNum *int32 `thrift:"item_concur_num,20,optional" frugal:"20,optional,i32" form:"item_concur_num" json:"item_concur_num,omitempty"` TargetRuntimeParam *common.RuntimeParam `thrift:"target_runtime_param,22,optional" frugal:"22,optional,common.RuntimeParam" form:"target_runtime_param" json:"target_runtime_param,omitempty"` - ItemRetryNum *int32 `thrift:"item_retry_num,45,optional" frugal:"45,optional,i32" form:"item_retry_num" json:"item_retry_num,omitempty" query:"item_retry_num"` + ItemRetryNum *int32 `thrift:"item_retry_num,45,optional" frugal:"45,optional,i32" form:"item_retry_num" json:"item_retry_num,omitempty"` Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` } diff --git a/backend/modules/evaluation/domain/service/expt_manage_execution_impl.go b/backend/modules/evaluation/domain/service/expt_manage_execution_impl.go index ed9ab1880..0152e07d1 100644 --- a/backend/modules/evaluation/domain/service/expt_manage_execution_impl.go +++ b/backend/modules/evaluation/domain/service/expt_manage_execution_impl.go @@ -1013,7 +1013,7 @@ func (e *ExptMangerImpl) LogRetryItemsRun(ctx context.Context, exptID int64, mod } if rl == nil { - return 0, false, errorx.Wrapf(err, "target runlog %v not found, expt_id: %v", runID, exptID) + return 0, false, errorx.New("target runlog %v not found, expt_id: %v", runID, exptID) } if err := rl.AppendItemIDs(itemIDs); err != nil { diff --git a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.expt.thrift b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.expt.thrift index 1835244bd..0b030a031 100644 --- a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.expt.thrift +++ b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.expt.thrift @@ -36,7 +36,7 @@ struct CreateExperimentRequest { 41: optional bool enable_weighted_score (api.body = 'enable_weighted_score', go.tag='json:"enable_weighted_score"') 42: optional map evaluator_score_weights (api.body = 'evaluator_score_weights', go.tag='json:"evaluator_score_weights"') 43: optional i64 expt_template_id (api.body='expt_template_id',api.js_conv='true', go.tag='json:"expt_template_id"') - 45: optional i32 item_retry_num (api.boy = 'item_retry_num') + 45: optional i32 item_retry_num (api.body = 'item_retry_num') 200: optional common.Session session @@ -75,7 +75,7 @@ struct SubmitExperimentRequest { // 是否启用评估器得分加权汇总，以及各评估器的权重配置（key 为 evaluator_version_id，value 为权重） 41: optional bool enable_weighted_score (api.body = 'enable_weighted_score', go.tag='json:"enable_weighted_score"') 42: optional i64 expt_template_id (api.body='expt_template_id',api.js_conv='true', go.tag='json:"expt_template_id"') - 45: optional i32 item_retry_num (api.boy = 'item_retry_num') + 45: optional i32 item_retry_num (api.body = 'item_retry_num') 100: optional map ext (api.body = 'ext') diff --git a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.openapi.thrift b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.openapi.thrift index 6cf6da27c..320674839 100644 --- a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.openapi.thrift +++ b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.openapi.thrift @@ -346,7 +346,7 @@ struct SubmitExperimentOApiRequest { 20: optional i32 item_concur_num (api.body = 'item_concur_num') 22: optional common.RuntimeParam target_runtime_param (api.body = 'target_runtime_param') - 45: optional i32 item_retry_num (api.boy = 'item_retry_num') + 45: optional i32 item_retry_num (api.body = 'item_retry_num') 255: optional base.Base Base }